【全局结果集处理】增加SpringMvc全局结果集处理

byit-myth-admin/pom.xml

@@ -39,6 +39,11 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.byit</groupId>
+            <artifactId>byit-myth-validation</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
     </dependencies>
 

byit-myth-admin/src/main/java/com/byit/controller/JobController.java

 package com.byit.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.byit.conf.MythJobAutoConfigure;
+import com.byit.enums.AdminEnums;
 import com.byit.job.dto.JobRunResultDto;
 import com.byit.job.dto.PluginBeanJobInfo;
+import com.byit.job.exceptions.BusinessException;
+import com.byit.job.vo.ResponseResult;
 import com.byit.model.JobTask;
 import com.byit.service.JobTaskService;
 import com.byit.thread.LogCallbackThread;
 import com.byit.util.SourceObj2TargetObjUtil;
+import com.byit.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +49,11 @@ public class JobController {
 
     @GetMapping(value = "getJobTask")
     public List<JobTask> getJobInfo(){
+        ValidationUtil.dataNotNull(null,"不能为null");
         return jobTaskService.findJobTaskByTriggerNextTimeLessThanEqual(11);
     }
+    @GetMapping("test")
+    public String test(){
+        return "ASDSADSADSADSAD";
+    }
 }

byit-myth-core/myth-admin-core/pom.xml

@@ -70,6 +70,11 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.byit</groupId>
+            <artifactId>byit-myth-validation</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
     </dependencies>
 

byit-myth-core/myth-admin-core/src/main/java/com/byit/advice/ExceptionHandle.java

 package com.byit.advice;
 
+import com.byit.exception.DataValidationException;
 import com.byit.job.enums.IEnum;
 import com.byit.job.exceptions.IException;
 import com.byit.job.vo.ResponseResult;
-import com.byit.util.ResponseResultUtil;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -25,8 +25,10 @@ public class ExceptionHandle {
         e.printStackTrace();
         if(e instanceof IException){
             return error(e);
+        }else if(e instanceof DataValidationException){
+            return ResponseResult.error("500",e.getMessage());
         }
-        return ResponseResultUtil.error("未知错误");
+        return ResponseResult.error("未知错误");
     }
 
     /**
@@ -37,6 +39,6 @@ public class ExceptionHandle {
     private ResponseResult error(Exception e){
         IException iException = (IException)e;
         IEnum iEnum = iException.getIEnum();
-        return ResponseResultUtil.error(iEnum);
+        return ResponseResult.error(iEnum);
     }
 }

byit-myth-core/myth-admin-core/src/main/java/com/byit/advice/ResponseAdvice.java

+package com.byit.advice;
+
+import com.alibaba.fastjson.JSON;
+import com.byit.job.vo.ResponseResult;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+/**
+ * @program: byit-myth-job->ResponseAdvice
+ * @description: TODO
+ * @author: huangfu
+ * @date: 2019/12/25 16:57
+ **/
+@RestControllerAdvice
+public class ResponseAdvice implements ResponseBodyAdvice {
+    @Override
+    public boolean supports(MethodParameter methodParameter, Class aClass) {
+        return true;
+    }
+    /**
+     *
+     * @param res 返回结果
+     * @param methodParameter 方法参数
+     * @param mediaType
+     * @param aClass
+     * @param serverHttpRequest
+     * @param serverHttpResponse
+     * @return
+     */
+    @Override
+    public Object beforeBodyWrite(Object res, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+        if(!(res instanceof ResponseResult)){
+            return JSON.toJSONString(ResponseResult.ok(res));
+        }
+        return res;
+    }
+
+
+
+}

byit-myth-core/myth-admin-core/src/main/java/com/byit/enums/AdminEnums.java

@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
  **/
 @AllArgsConstructor
 public enum  AdminEnums implements IEnum {
+    TEST("2132131","滚犊子")
     ;
     String code;
     String msg;

byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskRunLog.java

@@ -16,7 +16,6 @@ import lombok.NoArgsConstructor;
  */
 @ApiModel
 @Data
-@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 public class JobTaskRunLog implements Serializable {

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaBeanJobTask.java

@@ -11,6 +11,7 @@ import com.byit.model.JobTaskSchedule;
 import com.byit.rpc.remoting.invoker.route.LoadBalance;
 import com.byit.rpc.remoting.invoker.route.RpcLoadBalance;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
+
 import com.byit.util.SpringUtil;
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/LogCallbackThread.java

 package com.byit.thread;
 
 import com.byit.job.dto.JobRunResultDto;
-import com.byit.model.JobTaskRunLog;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.util.SpringUtil;

byit-myth-core/myth-admin-core/src/main/java/com/byit/util/ResponseResultUtil.java

-package com.byit.util;
-
-import com.byit.job.enums.IEnum;
-import com.byit.job.vo.ResponseResult;
-
-/**
- * @author huangfu
- */
-public class ResponseResultUtil<T> {
-    /**
-     * 成功
-     * @param t
-     * @param <T>
-     * @return
-     */
-    public static<T> ResponseResult<T> ok(T t){
-        ResponseResult<T> tResponseResult = new ResponseResult<>();
-        tResponseResult.setCode("0000000");
-        tResponseResult.setMsg("成功");
-        tResponseResult.setResult(t);
-        return tResponseResult;
-    }
-
-    /**
-     * 错误
-     * @param iEnum
-     * @param <T>
-     * @return
-     */
-    public static<T> ResponseResult<T> error(IEnum iEnum){
-        ResponseResult<T> tResponseResult = new ResponseResult<>();
-        tResponseResult.setCode(iEnum.getCode());
-        tResponseResult.setMsg(iEnum.getMsg());
-        return tResponseResult;
-    }
-
-    /**
-     * 错误
-     * @param msg
-     * @param <T>
-     * @return
-     */
-    public static<T> ResponseResult<T> error(String msg){
-        ResponseResult<T> tResponseResult = new ResponseResult<>();
-        tResponseResult.setMsg(msg);
-        return tResponseResult;
-    }
-}

byit-myth-core/myth-core-common/src/main/java/com/byit/job/vo/ResponseResult.java

 package com.byit.job.vo;
 
+import com.byit.job.enums.IEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,4 +19,69 @@ public class ResponseResult<T> {
     private String code;
     private T result;
     private String msg;
+    private Long timeCost;
+
+    /**
+     * 成功
+     * @param t
+     * @param <T>
+     * @return
+     */
+    public static<T> ResponseResult<T> ok(T t){
+        ResponseResult<T> tResponseResult = new ResponseResult<>();
+        tResponseResult.setCode("0000000");
+        tResponseResult.setMsg("成功");
+        tResponseResult.setResult(t);
+        return tResponseResult;
+    }
+    /**
+     * 成功
+     * @param <T>
+     * @return
+     */
+    public static<T> ResponseResult<T> ok(){
+        ResponseResult<T> tResponseResult = new ResponseResult<>();
+        tResponseResult.setCode("0000000");
+        tResponseResult.setMsg("成功");
+        return tResponseResult;
+    }
+
+    /**
+     * 错误
+     * @param iEnum
+     * @param <T>
+     * @return
+     */
+    public static<T> ResponseResult<T> error(IEnum iEnum){
+        ResponseResult<T> tResponseResult = new ResponseResult<>();
+        tResponseResult.setCode(iEnum.getCode());
+        tResponseResult.setMsg(iEnum.getMsg());
+        return tResponseResult;
+    }
+
+    /**
+     * 错误
+     * @param msg
+     * @param <T>
+     * @return
+     */
+    public static<T> ResponseResult<T> error(String msg){
+        ResponseResult<T> tResponseResult = new ResponseResult<>();
+        tResponseResult.setMsg(msg);
+        tResponseResult.setCode("00000500");
+        return tResponseResult;
+    }
+
+    /**
+     * 错误
+     * @param msg
+     * @param <T>
+     * @return
+     */
+    public static<T> ResponseResult<T> error(String code,String msg){
+        ResponseResult<T> tResponseResult = new ResponseResult<>();
+        tResponseResult.setMsg(msg);
+        tResponseResult.setCode(code);
+        return tResponseResult;
+    }
 }
\ No newline at end of file