lyhzzz 3 years ago
parent
commit
2a6895a69a

+ 0 - 6
pom.xml

@@ -20,12 +20,6 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-common-utils</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-fyun</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>

+ 0 - 8
src/main/java/com/fdkankan/manage/ManageApplication.java

@@ -9,14 +9,6 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/27
- **/
 @SpringBootApplication
 @EnableTransactionManagement//开启事务
 @EnableDiscoveryClient

+ 1 - 0
src/main/java/com/fdkankan/manage/controller/DataController.java

@@ -55,6 +55,7 @@ public class DataController {
     public ResultData downData(@RequestParam(required = false,defaultValue = "0") Integer type){
         return ResultData.ok(dataService.downData(type));
     }
+
     /**
      *统计场景数量订单
      * @param type  0:日 ,1:月,2:年

+ 18 - 0
src/main/java/com/fdkankan/manage/exception/BusinessException.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.exception;
+
+import lombok.Data;
+
+/**
+ * 自定义业务异常类
+ */
+@Data
+public class BusinessException extends RuntimeException {
+    private int code;
+    private String message;
+
+    public BusinessException(Integer code,String msg){
+        this.code = code;
+        this.message = msg;
+    }
+
+}

+ 35 - 0
src/main/java/com/fdkankan/manage/exception/GlobalExceptionHandler.java

@@ -0,0 +1,35 @@
+package com.fdkankan.manage.exception;
+
+import com.fdkankan.common.response.ResultData;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * 全局异常处理器
+ */
+@RestControllerAdvice
+@Slf4j
+public class GlobalExceptionHandler {
+
+    /**
+     * 处理未知异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = Exception.class)
+    public ResultData exceptionHandler(Exception e) throws Exception {
+        log.error("服务错误:", e);
+        return ResultData.error( 500, e.getMessage());
+    }
+
+    /**
+     * 处理业务异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = BusinessException.class)
+    public ResultData businessExceptionHandler(BusinessException e) {
+        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
+        return ResultData.error(e.getCode(), e.getMessage());
+    }
+}

+ 1 - 1
src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -15,7 +15,7 @@ public class AutoGenerate {
 
     public static void main(String[] args) {
 
-        String path =System.getProperty("user.dir") + "\\4dkankan-center-manage";
+        String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
                 "t_employ_note"

+ 0 - 1
src/main/java/com/fdkankan/manage/mapper/IDataMapper.java

@@ -21,6 +21,5 @@ public interface IDataMapper {
 
     List<OrderDataGroupByCount> downDataGroupBy(@Param("dateFormat")String dateFormat);
 
-
     List<SceneDataGroupByCount> sceneNumDataGroupBy(@Param("dateFormat")String dateFormat, @Param("type") Integer type);
 }