Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.config;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.aspect.LogAspect;
 import lombok.extern.slf4j.Slf4j;
@@ -93,15 +94,17 @@ public class RequestFilter implements Filter {
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
                params.put("accessToken",accessToken);
+               log.info("params:"+params.toJSONString());
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);
            } else {
-               log.info("无请求体!");
+               log.info("无请求体，使用原生请求处理!");
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
-           log.error("");
+           log.info("过滤失败，使用原生请求处理！");
+           log.info(e.getMessage());
            e.printStackTrace();
            chain.doFilter(request, response);
        }

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.controller;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,7 +29,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("${api.version}/ams")
-public class AMScontroller {
+public class AMScontroller  extends BaseRESTfulController {
     @Autowired
     AmsFeign amsFeign;
 
@@ -708,13 +709,13 @@ public class AMScontroller {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping(value = "/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody(required = false) Map<String, Object> map,
+    @PostMapping(value = "/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody(required = false) Map<String, Object> map,
                                  Integer apiId,
                                  Integer pageNum,
                                  Integer pageSize
     ) {
-        return amsFeign.getamsproductionordersyncs(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return amsFeign.getProductOrderList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
 
     }
 

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -259,8 +259,8 @@ public interface AmsFeign {
                                  @RequestParam Integer pageSize);
 
 
-    @PostMapping(value = "api/v1/ams/amsproductionordersyncs/getamsproductionordersyncs")
-    RESTfulResult getamsproductionordersyncs(@RequestBody Map<String, Object> objectMap,
+    @PostMapping(value = "api/v1/ams/amsorders/getProductOrderList")
+    Map<String, Object> getProductOrderList(@RequestBody Map<String, Object> objectMap,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize);