瀏覽代碼

修复错误移动目录的问题

lixing 4 年之前
父節點
當前提交
14cc173939

+ 1 - 1
fm-common/src/main/java/com/persagy/fm/common/exception/FmExceptionHandler.java

@@ -2,8 +2,8 @@ package com.persagy.fm.common.exception;
 
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.exception.BusinessException;
-import com.persagy.fm.common.response.FmResponseMsg;
 import com.persagy.fm.common.response.FmResponseUtil;
+import com.persagy.fm.common.response.FmResponseMsg;
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

+ 0 - 1
fm-common/src/main/java/com/persagy/fm/common/model/dto/DmpBaseQueryDTO.java

@@ -1,7 +1,6 @@
 package com.persagy.fm.common.model.dto;
 
 import lombok.Data;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 import java.util.Set;

+ 0 - 1
fm-common/src/main/java/com/persagy/fm/common/model/entity/BaseEntity.java

@@ -12,7 +12,6 @@ import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.UUID;
 
 /**
  * 实体基类

+ 16 - 7
fm-common/src/main/java/com/persagy/fm/common/response/FmDmpResponseUtil.java

@@ -2,16 +2,25 @@ package com.persagy.fm.common.response;
 
 import com.persagy.common.constant.DMPConstant;
 import com.persagy.common.utils.DMPResponseUtil;
+import org.apache.poi.ss.formula.functions.T;
 
 /**
- * @description:
- * @author: lixing
- * @company: Persagy Technology Co.,Ltd
- * @since: 2021/3/8 6:23 下午
- * @version: V1.0
- **/
+ * fm数据中台结果处理通用类
+ *
+ * @author lixing
+ * @version V1.0 2021/3/16 5:05 下午
+ */
 public class FmDmpResponseUtil extends DMPResponseUtil {
-    public static boolean isSuccess(DmpPageResponse pageResponse) {
+
+    /**
+     * 判断数据中台的分页查询是否成功
+     *
+     * @param pageResponse 数据中台分页查询结果
+     * @return true/false
+     * @author lixing
+     * @version V1.0 2021/3/16 5:05 下午
+     */
+    public static boolean isSuccess(DmpPageResponse<T> pageResponse) {
         return DMPConstant.DMP_RESULT_VAL.equals(pageResponse.getResult());
     }
 }

+ 1 - 1
fm-common/src/main/java/com/persagy/fm/common/utils/DmpUpsertResultUtil.java

@@ -2,8 +2,8 @@ package com.persagy.fm.common.utils;
 
 import com.persagy.fm.common.response.FmDmpResponseUtil;
 import com.persagy.fm.common.response.FmResponseItem;
-import com.persagy.fm.common.response.FmResponseUpsertVO;
 import com.persagy.fm.common.response.FmResponseUtil;
+import com.persagy.fm.common.response.FmResponseUpsertVO;
 
 /**
  * @description:

+ 1 - 0
fm-server/pom.xml

@@ -10,6 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>fm-server</artifactId>
+    <version>3.0.1</version>
     <dependencies>
         <!-- 集成框架工具类 -->
         <dependency>

+ 1 - 3
fm-server/src/main/java/com/persagy/fm/server/ServerApplication.java

@@ -1,4 +1,4 @@
-package com.persagy.fm.server;
+package com.persagy;
 
 import com.persagy.log.annotation.EnableControllerLog;
 import org.mybatis.spring.annotation.MapperScan;
@@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -26,7 +25,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Configuration
 @EnableScheduling
 @SpringBootApplication(exclude = AopAutoConfiguration.class)
-@ComponentScan(basePackages = {"com.persagy.fm"})
 @MapperScan(value = "com.persagy.fm.*.dao")
 public class ServerApplication {