111

src/main/java/com/fdkankan/engineering/controller/EngineeringController.java

@@ -29,9 +29,9 @@ public class EngineeringController {
     private IEngineeringService engineeringService;
 
     @PostMapping("/pageList")
-    public ResultData pageList(@RequestBody RequestBase param){
+    public Page pageList(@RequestBody RequestBase param){
         Page<Engineering> page = engineeringService.page(new Page<>(param.getPageNum(), param.getPageSize()));
-        return ResultData.ok(page);
+        return page;
     }
 
 }

src/main/java/com/fdkankan/engineering/controller/ResponseAdvice.java

@@ -1,47 +1,49 @@
-//package com.fdkankan.engineering.controller;
-//
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.fdkankan.db.response.PageInfo;
-//import com.fdkankan.web.response.BaseResponseAdvice;
-//import com.fdkankan.web.response.ResultData;
-//import lombok.extern.slf4j.Slf4j;
-//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;
-//
-//@RestControllerAdvice
-//@Slf4j
-//public class ResponseAdvice extends BaseResponseAdvice {
-//    @Override
-//    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
-//        return true;
-//    }
-//
-//    @Override
-//    public Object beforeBodyWrite(Object body, MethodParameter methodParameter,
-//        MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass,
-//        ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-//        //admin监控请求，直接返回
-//        if(serverHttpRequest.getURI().getPath().contains("actuator")){
-//            return body;
-//        }
-//        if(body instanceof Page){
-//            Page page = (Page) body;
-//            return ResultData.ok(new PageInfo<>(page.getCurrent(), page.getSize(), page.getTotal(), page.getRecords()));
-//        }
-//        if(body instanceof String){
-//            return JSONObject.toJSONString(ResultData.ok(body));
-//        }
-//        if (body instanceof ResultData) {
-//            return body;
-//        } else {
-//            return ResultData.ok(body);
-//        }
-//    }
-//}
+package com.fdkankan.engineering.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.db.response.PageInfo;
+import com.fdkankan.web.response.BaseResponseAdvice;
+import com.fdkankan.web.response.ResultData;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+@RestControllerAdvice
+@Slf4j
+public class ResponseAdvice implements ResponseBodyAdvice {
+
+    @Override
+    public boolean supports(MethodParameter returnType, Class converterType) {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object body, MethodParameter returnType,
+        MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request,
+        ServerHttpResponse response) {
+        if(request.getURI().getPath().contains("actuator")){
+            return body;
+        }
+
+        if(body instanceof String){
+            return JSONObject.toJSONString(ResultData.ok(body));
+        }
+        if(body instanceof Page){
+            Page page = (Page) body;
+            return ResultData.ok(new PageInfo(page.getCurrent(), page.getSize(), page.getTotal(), page.getRecords()));
+        }
+        if (body instanceof ResultData) {
+            return body;
+        } else {
+            return ResultData.ok(body);
+        }
+    }
+
+}