optimize package

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/annotation/NoRequestLog.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/annotation/NoRequestLog.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.annotation;
+package com.tzld.piaoquan.sde.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/base/CommonRequest.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/api/CommonRequest.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine.common.base;
+package com.tzld.piaoquan.sde.common.api;
 
-import com.tzld.piaoquan.supply.demand.engine.model.dto.BaseInfoDTO;
+import com.tzld.piaoquan.sde.model.dto.BaseInfoDTO;
 
 /**
  * 请求参数

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/base/CommonResponse.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/api/CommonResponse.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.base;
+package com.tzld.piaoquan.sde.common.api;
 
 /**
  * Common Response

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/base/CacheKeyConstant.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/constant/CacheKeyConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.base;
+package com.tzld.piaoquan.sde.common.constant;
 
 /**
  * 缓存Key

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/base/Constant.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/constant/Constant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.base;
+package com.tzld.piaoquan.sde.common.constant;
 
 /**
  * 常量

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/ExceptionEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/ExceptionEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/IsDeleteEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/IsDeleteEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/SubTaskStatusEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/SubTaskStatusEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/SubTaskTypeEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/SubTaskTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/TaskStatusEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/TaskStatusEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/enums/TaskTypeEnum.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/enums/TaskTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.enums;
+package com.tzld.piaoquan.sde.common.enums;
 
 import lombok.Getter;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/exception/CommonException.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/exception/BizException.java

@@ -1,23 +1,18 @@
-package com.tzld.piaoquan.supply.demand.engine.common.exception;
+package com.tzld.piaoquan.sde.common.exception;
 
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.tzld.piaoquan.supply.demand.engine.common.enums.ExceptionEnum;
+import com.tzld.piaoquan.sde.common.enums.ExceptionEnum;
 
 /**
  * 异常
  *
  * @author supeng
  */
-public class CommonException extends RuntimeException {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CommonException.class);
+@Slf4j
+public class BizException extends RuntimeException {
     /**
      * 异常
      */
@@ -48,24 +43,24 @@ public class CommonException extends RuntimeException {
         this.msg = msg;
     }
 
-    public CommonException(Throwable throwable) {
+    public BizException(Throwable throwable) {
         super(throwable);
     }
 
-    public CommonException(int code, String msg) {
+    public BizException(int code, String msg) {
         super(msg);
         this.code = code;
         this.msg = msg;
     }
 
-    public CommonException(ExceptionEnum exceptionEnum) {
+    public BizException(ExceptionEnum exceptionEnum) {
         super(exceptionEnum.getMsg());
         this.exceptionEnum = exceptionEnum;
         this.code = exceptionEnum.getCode();
         this.msg = exceptionEnum.getMsg();
     }
 
-    public CommonException(ExceptionEnum exceptionEnum, String msg) {
+    public BizException(ExceptionEnum exceptionEnum, String msg) {
         super(msg);
         this.exceptionEnum = exceptionEnum;
         this.code = exceptionEnum.getCode();
@@ -73,13 +68,13 @@ public class CommonException extends RuntimeException {
     }
 
 
-    public CommonException(int code, String msg, Throwable throwable) {
+    public BizException(int code, String msg, Throwable throwable) {
         super(msg, throwable);
         this.code = code;
         this.msg = msg;
     }
 
-    public CommonException(ExceptionEnum exceptionEnum, Throwable throwable) {
+    public BizException(ExceptionEnum exceptionEnum, Throwable throwable) {
         super(exceptionEnum.getMsg(), throwable);
         this.exceptionEnum = exceptionEnum;
         this.code = exceptionEnum.getCode();
@@ -90,8 +85,8 @@ public class CommonException extends RuntimeException {
     @Override
     public void printStackTrace() {
         if (exceptionEnum != null) {
-            LOGGER.info("exception code = {}, msg = {}", exceptionEnum.getCode(), exceptionEnum.getMsg());
+            log.info("exception code = {}, msg = {}", exceptionEnum.getCode(), exceptionEnum.getMsg());
         }
-        LOGGER.info("exception code = {}, msg = {}", code, msg);
+        log.info("exception code = {}, msg = {}", code, msg);
     }
 }

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/exception/CacheException.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/exception/CacheException.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.exception;
+package com.tzld.piaoquan.sde.common.exception;
 
 /**
  * 缓存异常

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/exception/DAOException.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/exception/DAOException.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.exception;
+package com.tzld.piaoquan.sde.common.exception;
 
 /**
  * DAO异常

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/exception/HttpServiceException.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/exception/HttpServiceException.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.exception;
+package com.tzld.piaoquan.sde.common.exception;
 
 import lombok.Getter;
 import lombok.Setter;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/common/exception/TimeoutException.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/common/exception/TimeoutException.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.common.exception;
+package com.tzld.piaoquan.sde.common.exception;
 
 
 import lombok.Setter;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/config/MybatisPlusConfig.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.config;
+package com.tzld.piaoquan.sde.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/config/RedisTemplateConfig.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/config/RedisTemplateConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.config;
+package com.tzld.piaoquan.sde.config;
 
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.springframework.beans.factory.annotation.Qualifier;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/config/SwaggerConfig.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.config;
+package com.tzld.piaoquan.sde.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,7 +22,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.tzld.piaoquan.supply.demand.engine.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.tzld.piaoquan.sde.controller"))
                 .paths(PathSelectors.any())
                 .build();
     }

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/config/XxlJobConfig.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.config;
+package com.tzld.piaoquan.sde.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import lombok.extern.slf4j.Slf4j;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdPromptTemplateMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdPromptTemplateMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdPromptTemplate;
+import com.tzld.piaoquan.sde.model.entity.SdPromptTemplate;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdStrategyMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdStrategyMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdStrategy;
+import com.tzld.piaoquan.sde.model.entity.SdStrategy;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdSubTaskMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTask;
+import com.tzld.piaoquan.sde.model.entity.SdSubTask;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdSubTaskRawResultMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskRawResultMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTaskRawResult;
+import com.tzld.piaoquan.sde.model.entity.SdSubTaskRawResult;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdSubTaskResultItemMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskResultItemMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTaskResultItem;
+import com.tzld.piaoquan.sde.model.entity.SdSubTaskResultItem;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdTaskMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdTaskMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
+import com.tzld.piaoquan.sde.model.entity.SdTask;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/dao/mapper/SdTaskResultMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdTaskResultMapper.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.dao.mapper;
+package com.tzld.piaoquan.sde.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTaskResult;
+import com.tzld.piaoquan.sde.model.entity.SdTaskResult;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/dto/BaseInfoDTO.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/dto/BaseInfoDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.dto;
+package com.tzld.piaoquan.sde.model.dto;
 
 /**
  * 基础信息

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdPromptTemplate.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdPromptTemplate.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdStrategy.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdStrategy.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdSubTask.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdSubTask.java

@@ -1,8 +1,10 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.tzld.piaoquan.sde.common.enums.SubTaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.SubTaskTypeEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -31,13 +33,13 @@ public class SdSubTask {
     /**
      * 子任务类型：1 DECONSTRUCT(解构), 2 CLUSTER(聚类)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskTypeEnum
+     * @see SubTaskTypeEnum
      */
     private Integer subTaskType;
     /**
      * 执行状态：0 INIT, 1 SUBMITTED(已提交), 2 RUNNING(运行中), 3 SUCCESS, 4 FAILED 5 TIMEOUT
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskStatusEnum
+     * @see SubTaskStatusEnum
      */
     private Integer taskStatus;
     /**

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdSubTaskRawResult.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdSubTaskRawResult.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdSubTaskResultItem.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdSubTaskResultItem.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdTask.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdTask.java

@@ -1,8 +1,10 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -34,14 +36,14 @@ public class SdTask {
     /**
      * 任务类型：1 DECONSTRUCT(解构), 2 CLUSTER(聚类)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskTypeEnum
+     * @see TaskTypeEnum
      */
     private Integer taskType;
     /**
      * 任务状态：0 INIT(初始化), 1 PRE_PROCESSING(前置处理/子任务处理中),
      * 2 READY(就绪), 3 PROCESSING(处理中), 4 SUCCESS(成功) 5 FAILED(失败) 6 TIMEOUT(超时)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskStatusEnum
+     * @see TaskStatusEnum
      */
     private Integer taskStatus;
     /**

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/po/SdTaskResult.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/entity/SdTaskResult.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.po;
+package com.tzld.piaoquan.sde.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/PageParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/PageParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
 import lombok.Data;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/SubTaskGetParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/SubTaskGetParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
 import lombok.Data;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/SubTaskListParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/SubTaskListParam.java

@@ -1,5 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
+import com.tzld.piaoquan.sde.common.enums.SubTaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.SubTaskTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,13 +24,13 @@ public class SubTaskListParam extends PageParam {
     /**
      * 子任务类型：1 DECONSTRUCT(解构), 2 CLUSTER(聚类)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskTypeEnum
+     * @see SubTaskTypeEnum
      */
     private Integer subTaskType;
     /**
      * 执行状态：0 INIT, 1 SUBMITTED(已提交), 2 RUNNING(运行中), 3 SUCCESS, 4 FAILED 5 TIMEOUT
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskStatusEnum
+     * @see SubTaskStatusEnum
      */
     private Integer taskStatus;
     /**

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/TaskCreateParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/TaskCreateParam.java

@@ -1,5 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
+import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -16,7 +17,7 @@ public class TaskCreateParam {
     /**
      * 任务类型
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskTypeEnum
+     * @see TaskTypeEnum
      */
     @NotNull(message = "任务类型不能为空")
     private Integer taskType;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/TaskGetParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/TaskGetParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
 import lombok.Data;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/param/TaskListParam.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/request/TaskListParam.java

@@ -1,11 +1,10 @@
-package com.tzld.piaoquan.supply.demand.engine.model.param;
+package com.tzld.piaoquan.sde.model.request;
 
+import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * 任务创建参数
@@ -22,7 +21,7 @@ public class TaskListParam extends PageParam {
     /**
      * 任务类型
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskTypeEnum
+     * @see TaskTypeEnum
      */
     @NotNull(message = "任务类型不能为空")
     private Integer taskType;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/vo/SdSubTaskVO.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/vo/SdSubTaskVO.java

@@ -1,5 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.model.vo;
+package com.tzld.piaoquan.sde.model.vo;
 
+import com.tzld.piaoquan.sde.common.enums.SubTaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.SubTaskTypeEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -26,14 +28,14 @@ public class SdSubTaskVO {
     /**
      * 子任务类型：1 DECONSTRUCT(解构), 2 CLUSTER(聚类)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskTypeEnum
+     * @see SubTaskTypeEnum
      */
     private Integer subTaskType;
     private String subTaskTypeLabel;
     /**
      * 执行状态：0 INIT, 1 SUBMITTED(已提交), 2 RUNNING(运行中), 3 SUCCESS, 4 FAILED 5 TIMEOUT
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskStatusEnum
+     * @see SubTaskStatusEnum
      */
     private Integer taskStatus;
     private String taskStatusLabel;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/model/vo/SdTaskVO.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/model/vo/SdTaskVO.java

@@ -1,5 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.model.vo;
+package com.tzld.piaoquan.sde.model.vo;
 
+import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
 import lombok.Data;
 
 import java.util.Date;
@@ -25,7 +27,7 @@ public class SdTaskVO {
     /**
      * 任务类型：1 DECONSTRUCT(解构), 2 CLUSTER(聚类)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskTypeEnum
+     * @see TaskTypeEnum
      */
     private Integer taskType;
     private String taskTypeLabel;
@@ -33,7 +35,7 @@ public class SdTaskVO {
      * 任务状态：0 INIT(初始化), 1 PRE_PROCESSING(前置处理/子任务处理中),
      * 2 READY(就绪), 3 PROCESSING(处理中), 4 SUCCESS(成功) 5 FAILED(失败) 6 TIMEOUT(超时)
      *
-     * @see com.tzld.piaoquan.supply.demand.engine.common.enums.TaskStatusEnum
+     * @see TaskStatusEnum
      */
     private Integer taskStatus;
     private String taskStatusLabel;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/LoghubService.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/LoghubService.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.service;
+package com.tzld.piaoquan.sde.service;
 
 import java.util.Map;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/OpenRouterService.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/OpenRouterService.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.service;
+package com.tzld.piaoquan.sde.service;
 
 /**
  *

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/SubTaskService.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/SubTaskService.java

@@ -1,11 +1,11 @@
-package com.tzld.piaoquan.supply.demand.engine.service;
+package com.tzld.piaoquan.sde.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.model.param.SubTaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.SubTaskListParam;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdSubTaskVO;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.model.request.SubTaskGetParam;
+import com.tzld.piaoquan.sde.model.request.SubTaskListParam;
+import com.tzld.piaoquan.sde.model.entity.SdSubTask;
+import com.tzld.piaoquan.sde.model.vo.SdSubTaskVO;
 
 /**
  * @author supeng

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/TaskService.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/TaskService.java

@@ -1,12 +1,12 @@
-package com.tzld.piaoquan.supply.demand.engine.service;
+package com.tzld.piaoquan.sde.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskCreateParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskListParam;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdTaskVO;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
+import com.tzld.piaoquan.sde.model.request.TaskGetParam;
+import com.tzld.piaoquan.sde.model.request.TaskListParam;
+import com.tzld.piaoquan.sde.model.entity.SdTask;
+import com.tzld.piaoquan.sde.model.vo.SdTaskVO;
 
 /**
  *

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/impl/LoghubServiceImpl.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/LoghubServiceImpl.java

@@ -1,8 +1,8 @@
-package com.tzld.piaoquan.supply.demand.engine.service.impl;
+package com.tzld.piaoquan.sde.service.impl;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.tzld.commons.aliyun.log.AliyunLogManager;
-import com.tzld.piaoquan.supply.demand.engine.service.LoghubService;
+import com.tzld.piaoquan.sde.service.LoghubService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/impl/OpenRouterServiceImpl.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/OpenRouterServiceImpl.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine.service.impl;
+package com.tzld.piaoquan.sde.service.impl;
 
-import com.tzld.piaoquan.supply.demand.engine.service.OpenRouterService;
+import com.tzld.piaoquan.sde.service.OpenRouterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/impl/SubTaskServiceImpl.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/SubTaskServiceImpl.java

@@ -1,20 +1,18 @@
-package com.tzld.piaoquan.supply.demand.engine.service.impl;
+package com.tzld.piaoquan.sde.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.IsDeleteEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.SubTaskTypeEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.TaskStatusEnum;
-import com.tzld.piaoquan.supply.demand.engine.dao.mapper.SdSubTaskMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.param.SubTaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.SubTaskListParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTask;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdSubTaskVO;
-import com.tzld.piaoquan.supply.demand.engine.service.SubTaskService;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.common.enums.IsDeleteEnum;
+import com.tzld.piaoquan.sde.common.enums.SubTaskTypeEnum;
+import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
+import com.tzld.piaoquan.sde.dao.mapper.SdSubTaskMapper;
+import com.tzld.piaoquan.sde.model.request.SubTaskGetParam;
+import com.tzld.piaoquan.sde.model.request.SubTaskListParam;
+import com.tzld.piaoquan.sde.model.entity.SdSubTask;
+import com.tzld.piaoquan.sde.model.vo.SdSubTaskVO;
+import com.tzld.piaoquan.sde.service.SubTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/service/impl/TaskServiceImpl.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/TaskServiceImpl.java

@@ -1,28 +1,27 @@
-package com.tzld.piaoquan.supply.demand.engine.service.impl;
+package com.tzld.piaoquan.sde.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.common.base.Constant;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.ExceptionEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.IsDeleteEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.TaskStatusEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.enums.TaskTypeEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.exception.CommonException;
-import com.tzld.piaoquan.supply.demand.engine.dao.mapper.SdStrategyMapper;
-import com.tzld.piaoquan.supply.demand.engine.dao.mapper.SdTaskMapper;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskCreateParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskListParam;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdStrategy;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdTaskVO;
-import com.tzld.piaoquan.supply.demand.engine.service.TaskService;
-import com.tzld.piaoquan.supply.demand.engine.util.DateUtil;
-import com.tzld.piaoquan.supply.demand.engine.util.IdGeneratorUtil;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.common.constant.Constant;
+import com.tzld.piaoquan.sde.common.enums.ExceptionEnum;
+import com.tzld.piaoquan.sde.common.enums.IsDeleteEnum;
+import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
+import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
+import com.tzld.piaoquan.sde.common.exception.BizException;
+import com.tzld.piaoquan.sde.dao.mapper.SdStrategyMapper;
+import com.tzld.piaoquan.sde.dao.mapper.SdTaskMapper;
+import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
+import com.tzld.piaoquan.sde.model.request.TaskGetParam;
+import com.tzld.piaoquan.sde.model.request.TaskListParam;
+import com.tzld.piaoquan.sde.model.entity.SdStrategy;
+import com.tzld.piaoquan.sde.model.entity.SdTask;
+import com.tzld.piaoquan.sde.model.vo.SdTaskVO;
+import com.tzld.piaoquan.sde.service.TaskService;
+import com.tzld.piaoquan.sde.util.DateUtil;
+import com.tzld.piaoquan.sde.util.IdGeneratorUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,18 +65,18 @@ public class TaskServiceImpl implements TaskService {
         wrapper.eq(SdStrategy::getId, strategyId).eq(SdStrategy::getIsDeleted, IsDeleteEnum.NORMAL.getValue());
         boolean strategyIdExists = sdStrategyMapper.exists(wrapper);
         if (!strategyIdExists) {
-            throw new CommonException(ExceptionEnum.DATA_NOT_EXIST, "该策略不存在");
+            throw new BizException(ExceptionEnum.DATA_NOT_EXIST, "该策略不存在");
         }
         sdTask.setStrategyId(params.getStrategyId());
         TaskTypeEnum taskTypeEnum = TaskTypeEnum.getInstance(params.getTaskType());
         if (Objects.isNull(taskTypeEnum)) {
-            throw new CommonException(ExceptionEnum.NOT_SUPPORT_TASK_TYPE);
+            throw new BizException(ExceptionEnum.NOT_SUPPORT_TASK_TYPE);
         }
         sdTask.setTaskType(params.getTaskType());
         sdTask.setTaskStatus(TaskStatusEnum.INIT.getValue());
         int flag = sdTaskMapper.insert(sdTask);
         if (flag <= 0) {
-            throw new CommonException(ExceptionEnum.DATA_INSERT_ERROR);
+            throw new BizException(ExceptionEnum.DATA_INSERT_ERROR);
         }
     }
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/util/DateUtil.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.util;
+package com.tzld.piaoquan.sde.util;
 
 import java.time.*;
 import java.time.format.DateTimeFormatter;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/util/IdGeneratorUtil.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/IdGeneratorUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.util;
+package com.tzld.piaoquan.sde.util;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/util/IpUtil.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/IpUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.util;
+package com.tzld.piaoquan.sde.util;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/util/ODPSManager.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/ODPSManager.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.util;
+package com.tzld.piaoquan.sde.util;
 
 import com.aliyun.odps.Instance;
 import com.aliyun.odps.Odps;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/util/RedisUtil.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/RedisUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine.util;
+package com.tzld.piaoquan.sde.util;
 
 import org.apache.ibatis.cache.CacheException;
 import org.springframework.beans.factory.annotation.Autowired;

supply-demand-engine-core/src/main/resources/mybatis-generator-config.xml

@@ -32,7 +32,7 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
 
-        <javaModelGenerator targetPackage="com.tzld.piaoquan.supply.demand.engine.model.po" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="com.tzld.piaoquan.sde.model.entity" targetProject="src/main/java">
             <property name="constructorBased" value="false"/>
             <property name="enableSubPackages" value="true"/>
             <property name="immutable" value="false"/>
@@ -42,7 +42,7 @@
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
 
-        <javaClientGenerator targetPackage="com.tzld.piaoquan.supply.demand.engine.dao.mapper" type="XMLMAPPER" targetProject="src/main/java">
+        <javaClientGenerator targetPackage="com.tzld.piaoquan.sde.dao.mapper" type="XMLMAPPER" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 

supply-demand-engine-job/pom.xml

@@ -30,7 +30,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<mainClass>com.tzld.piaoquan.supply.demand.engine.Application</mainClass>
+					<mainClass>com.tzld.piaoquan.sde.Application</mainClass>
 					<layout>ZIP</layout>
 				</configuration>
 				<executions>

supply-demand-engine-job/src/main/java/com/tzld/piaoquan/supply/demand/engine/Application.java → supply-demand-engine-job/src/main/java/com/tzld/piaoquan/sde/JobApplication.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine;
+package com.tzld.piaoquan.sde;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -16,15 +16,15 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @Slf4j
 @SpringBootApplication
-@MapperScan("com.tzld.piaoquan.supply.demand.engine.dao.mapper")
-@ServletComponentScan("com.tzld.piaoquan.supply.demand.engine")
+@MapperScan("com.tzld.piaoquan.sde.dao.mapper")
+@ServletComponentScan("com.tzld.piaoquan.sde")
 @EnableFeignClients
 @EnableEurekaClient
 @EnableSwagger2
-public class Application {
+public class JobApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(JobApplication.class, args);
 		log.info("supply-demand-engine-job SpringBoot Start Success");
 	}
 

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/supply/demand/engine/controller/IndexController.java → supply-demand-engine-job/src/main/java/com/tzld/piaoquan/sde/controller/HealthController.java

@@ -1,15 +1,18 @@
-package com.tzld.piaoquan.supply.demand.engine.controller;
+package com.tzld.piaoquan.sde.controller;
 
-import com.tzld.piaoquan.supply.demand.engine.common.annotation.NoRequestLog;
+import com.tzld.piaoquan.sde.common.annotation.NoRequestLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author supeng
+ */
 @Slf4j
 @RestController
 @RequestMapping("/")
-public class IndexController {
+public class HealthController {
     /**
      * 探活
      *

supply-demand-engine-job/src/main/java/com/tzld/piaoquan/supply/demand/engine/job/TaskJob.java → supply-demand-engine-job/src/main/java/com/tzld/piaoquan/sde/job/TaskJob.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.supply.demand.engine.job;
+package com.tzld.piaoquan.sde.job;
 
-import com.tzld.piaoquan.supply.demand.engine.service.SubTaskService;
-import com.tzld.piaoquan.supply.demand.engine.service.TaskService;
+import com.tzld.piaoquan.sde.service.SubTaskService;
+import com.tzld.piaoquan.sde.service.TaskService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;

supply-demand-engine-job/src/main/resources/application-dev.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /Users/Heyu/datalog/weblog/${project.name}

supply-demand-engine-job/src/main/resources/application-pre.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-mybatis:
-  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-job/src/main/resources/application-prod.yml

@@ -36,10 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-mybatis:
-  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-  mapper-locations: classpath:mapper/*.xml
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-job/src/main/resources/application-stress.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-mybatis:
-  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-job/src/main/resources/application-test.yml

@@ -36,10 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-mybatis:
-  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-  mapper-locations: classpath:mapper/*.xml
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-job/src/main/resources/application.yml

@@ -17,8 +17,12 @@ server:
     context-path: /supply-demand-engine-job
     session:
       timeout: 60
-pagehelper:
-  helper-dialect: mysql
+
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.tzld.piaoquan.sde.model.entity
+  configuration:
+    map-underscore-to-camel-case: true
 
 aliyun:
   log:

supply-demand-engine-job/src/main/resources/logback-spring.xml

@@ -167,19 +167,19 @@
     -->
 
     <springProfile name="dev">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="test">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="pre">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="stress">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="prod">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
 
     <root level="info">

supply-demand-engine-job/src/test/java/com/tzld/piaoquan/supply/demand/engine/BaseTest.java → supply-demand-engine-job/src/test/java/com/tzld/piaoquan/sde/BaseTest.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine;
+package com.tzld.piaoquan.sde;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

supply-demand-engine-service/pom.xml

@@ -30,7 +30,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.tzld.piaoquan.supply.demand.engine.Application</mainClass>
+                    <mainClass>com.tzld.piaoquan.sde.Application</mainClass>
                     <layout>ZIP</layout>
                 </configuration>
                 <executions>

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/supply/demand/engine/Application.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/ServiceApplication.java

@@ -1,5 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine;
+package com.tzld.piaoquan.sde;
 
+import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,17 +16,17 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  *
  * @author supeng
  */
+@Slf4j
 @SpringBootApplication
-@MapperScan("com.tzld.piaoquan.supply.demand.engine.dao.mapper")
-@ServletComponentScan("com.tzld.piaoquan.supply.demand.engine")
+@MapperScan("com.tzld.piaoquan.sde.dao.mapper")
+@ServletComponentScan("com.tzld.piaoquan.sde")
 @EnableFeignClients
 @EnableEurekaClient
 @EnableSwagger2
-public class Application{
-    private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
+public class ServiceApplication{
 
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-        LOGGER.info("supply-demand-engine-service SpringBoot Start Success");
+        SpringApplication.run(ServiceApplication.class, args);
+        log.info("supply-demand-engine-service SpringBoot Start Success");
     }
 }

supply-demand-engine-job/src/main/java/com/tzld/piaoquan/supply/demand/engine/controller/IndexController.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/HealthController.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine.controller;
+package com.tzld.piaoquan.sde.controller;
 
-import com.tzld.piaoquan.supply.demand.engine.common.annotation.NoRequestLog;
+import com.tzld.piaoquan.sde.common.annotation.NoRequestLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/")
-public class IndexController {
+public class HealthController {
     /**
      * 探活
      *

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/supply/demand/engine/controller/SubTaskController.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/SubTaskController.java

@@ -1,15 +1,14 @@
-package com.tzld.piaoquan.supply.demand.engine.controller;
+package com.tzld.piaoquan.sde.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonResponse;
-import com.tzld.piaoquan.supply.demand.engine.model.param.*;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdSubTask;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdSubTaskVO;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdTaskVO;
-import com.tzld.piaoquan.supply.demand.engine.service.SubTaskService;
-import com.tzld.piaoquan.supply.demand.engine.service.TaskService;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.common.api.CommonResponse;
+import com.tzld.piaoquan.sde.model.request.SubTaskGetParam;
+import com.tzld.piaoquan.sde.model.request.SubTaskListParam;
+import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
+import com.tzld.piaoquan.sde.model.entity.SdSubTask;
+import com.tzld.piaoquan.sde.model.vo.SdSubTaskVO;
+import com.tzld.piaoquan.sde.service.SubTaskService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/supply/demand/engine/controller/TaskController.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/TaskController.java

@@ -1,14 +1,14 @@
-package com.tzld.piaoquan.supply.demand.engine.controller;
+package com.tzld.piaoquan.sde.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonRequest;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonResponse;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskCreateParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskGetParam;
-import com.tzld.piaoquan.supply.demand.engine.model.param.TaskListParam;
-import com.tzld.piaoquan.supply.demand.engine.model.po.SdTask;
-import com.tzld.piaoquan.supply.demand.engine.model.vo.SdTaskVO;
-import com.tzld.piaoquan.supply.demand.engine.service.TaskService;
+import com.tzld.piaoquan.sde.common.api.CommonRequest;
+import com.tzld.piaoquan.sde.common.api.CommonResponse;
+import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
+import com.tzld.piaoquan.sde.model.request.TaskGetParam;
+import com.tzld.piaoquan.sde.model.request.TaskListParam;
+import com.tzld.piaoquan.sde.model.entity.SdTask;
+import com.tzld.piaoquan.sde.model.vo.SdTaskVO;
+import com.tzld.piaoquan.sde.service.TaskService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/aop/LogRequestAop.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/web/aspect/LogRequestAspect.java

@@ -1,12 +1,12 @@
-package com.tzld.piaoquan.supply.demand.engine.aop;
+package com.tzld.piaoquan.sde.web.aspect;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import com.tzld.commons.aliyun.log.AliyunLogManager;
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonResponse;
-import com.tzld.piaoquan.supply.demand.engine.common.base.Constant;
-import com.tzld.piaoquan.supply.demand.engine.util.IpUtil;
+import com.tzld.piaoquan.sde.common.api.CommonResponse;
+import com.tzld.piaoquan.sde.common.constant.Constant;
+import com.tzld.piaoquan.sde.util.IpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Aspect
 @Component
-public class LogRequestAop {
+public class LogRequestAspect {
 
     private final AliyunLogManager aliyunLogManager;
     /**
@@ -44,14 +44,14 @@ public class LogRequestAop {
     private String topic;
 
     @Autowired
-    public LogRequestAop(AliyunLogManager aliyunLogManager) {
+    public LogRequestAspect(AliyunLogManager aliyunLogManager) {
         this.aliyunLogManager = aliyunLogManager;
     }
 
     /**
      * 切入点
      */
-    @Pointcut("execution(public * com.tzld.piaoquan.supply.demand.engine..*Controller.*(..)) && !@annotation(com.tzld.piaoquan.supply.demand.engine.common.annotation.NoRequestLog)")
+    @Pointcut("execution(public * com.tzld.piaoquan.sde..*Controller.*(..)) && !@annotation(com.tzld.piaoquan.sde.common.annotation.NoRequestLog)")
     public void requestLog() {
     }
 

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/filter/AuthFilter.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/web/filter/AuthFilter.java

@@ -1,11 +1,9 @@
-package com.tzld.piaoquan.supply.demand.engine.filter;
+package com.tzld.piaoquan.sde.web.filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
 
 import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
 import java.io.IOException;
 
 /**

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/filter/LogTraceFilter.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/web/filter/LogTraceFilter.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.supply.demand.engine.filter;
+package com.tzld.piaoquan.sde.web.filter;
 
-import com.tzld.piaoquan.supply.demand.engine.common.base.Constant;
+import com.tzld.piaoquan.sde.common.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/supply/demand/engine/handle/GlobalExceptionHandle.java → supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/web/handler/GlobalExceptionHandler.java

@@ -1,17 +1,17 @@
-package com.tzld.piaoquan.supply.demand.engine.handle;
+package com.tzld.piaoquan.sde.web.handler;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.tzld.piaoquan.supply.demand.engine.common.base.CommonResponse;
+import com.tzld.piaoquan.sde.common.api.CommonResponse;
+import com.tzld.piaoquan.sde.common.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import com.tzld.piaoquan.supply.demand.engine.common.enums.ExceptionEnum;
-import com.tzld.piaoquan.supply.demand.engine.common.exception.CommonException;
+import com.tzld.piaoquan.sde.common.enums.ExceptionEnum;
 
 /**
  * 全局异常处理器
@@ -20,12 +20,12 @@ import com.tzld.piaoquan.supply.demand.engine.common.exception.CommonException;
  */
 @Slf4j
 @RestControllerAdvice
-public class GlobalExceptionHandle {
+public class GlobalExceptionHandler {
     /**
      * 处理自定义业务异常
      */
-    @ExceptionHandler(CommonException.class)
-    public CommonResponse<Object> handleCommonException(CommonException e) {
+    @ExceptionHandler(BizException.class)
+    public CommonResponse<Object> handleBizException(BizException e) {
         return CommonResponse.create(e.getCode(), e.getMsg());
     }
 

supply-demand-engine-service/src/main/resources/application-dev.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /Users/Heyu/datalog/weblog/${project.name}

supply-demand-engine-service/src/main/resources/application-pre.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-service/src/main/resources/application-prod.yml

@@ -36,10 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-service/src/main/resources/application-stress.yml

@@ -36,11 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-service/src/main/resources/application-test.yml

@@ -36,10 +36,6 @@ spring:
         max-idle: 8
         min-idle: 0
 
-#mybatis:
-#  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
-#  mapper-locations: classpath:mapper/*.xml
-
 logging:
   file:
     path: /datalog/weblog/${project.name}

supply-demand-engine-service/src/main/resources/application.yml

@@ -17,12 +17,10 @@ server:
     context-path: /supply-demand-engine-service
     session:
       timeout: 60
-pagehelper:
-  helper-dialect: mysql
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: com.tzld.piaoquan.supply.demand.engine.model.po
+  type-aliases-package: com.tzld.piaoquan.sde.model.entity
   configuration:
     map-underscore-to-camel-case: true
 

supply-demand-engine-service/src/main/resources/logback-spring.xml

@@ -167,19 +167,19 @@
     -->
 
     <springProfile name="dev">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="test">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="pre">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="stress">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
     <springProfile name="prod">
-        <logger name="com.tzld.piaoquan.supply.demand.engine" level="info"/>
+        <logger name="com.tzld.piaoquan.sde" level="info"/>
     </springProfile>
 
     <root level="info">

supply-demand-engine-service/src/test/java/com/tzld/piaoquan/supply/demand/engine/BaseTest.java → supply-demand-engine-service/src/test/java/com/tzld/piaoquan/sde/BaseTest.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.supply.demand.engine;
+package com.tzld.piaoquan.sde;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;