liyg 1 年之前
父节点
当前提交
714749d89d

+ 5 - 1
src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -67,7 +67,11 @@ public class LogAspect {
         }
         if(map==null || map.get("userId")==null ||map.get("userName") ==null){
             log.error("缺乏日志必要参数"+map);
-            return new RESTfulResult("500","缺乏日志必要参数"+map,"缺乏日志必要参数"+map);
+            Map<String,Object> resultMap = new HashMap<>();
+            resultMap.put("code","500");
+            resultMap.put("message","缺乏日志必要参数");
+            resultMap.put("data","缺乏日志必要参数"+map);
+            return resultMap;
         }
         //获取切点处的注解及其参数
         LogAround logAround = method.getAnnotation(LogAround.class);

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -52,7 +52,7 @@ public class AMScontroller {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"采购订单"})
-    public RESTfulResult purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map) {
+    public Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.purchaseOrderSync(map);
     }
 

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderSync")
-    RESTfulResult purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> purchaseOrderSync(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amsorders/purchaseOrderAdd")
     Map<String, Object> purchaseOrderAdd(@RequestBody(required = false) Map<String, Object> map);