日志系统更新

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.InterfaceLogType;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.springframework.http.HttpStatus;
@@ -31,7 +32,7 @@ public class AcsToWmsController {
     private final AcsToWmsService acsToWmsService;
 
     @PostMapping("/status")
-    @Log("ACS给WMS反馈任务状态")
+    @Log(value = "ACS给WMS反馈任务状态",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("ACS给WMS反馈任务状态")
     @SaIgnore
     public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
@@ -39,7 +40,7 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/orderFinish")
-    @Log("ACS给WMS下发工单完成状态")
+    @Log(value = "ACS给WMS下发工单完成状态",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("ACS给WMS下发工单完成状态")
     @SaIgnore
     public ResponseEntity<Object> orderFinish(@RequestBody String string) {
@@ -47,7 +48,7 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/apply")
-    @Log("申请任务")
+    @Log(value = "申请任务",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("申请任务")
     @SaCheckPermission("menu:list")
     @SaIgnore
@@ -56,7 +57,7 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/againApply")
-    @Log("二次申请任务")
+    @Log(value = "二次申请任务",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("二次申请任务")
     @SaCheckPermission("menu:list")
     @SaIgnore
@@ -65,15 +66,14 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/deviceApply")
-    @Log("申请贴标、捆扎")
-    @ApiOperation("申请贴标、捆扎")
+    @Log(value = "申请贴标、捆扎",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @SaIgnore
     public ResponseEntity<Object> deviceApply(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(acsToWmsService.deviceApply(jo), HttpStatus.OK);
     }
 
     @PostMapping("/process")
-    @Log("RCS上报密集库任务异常处理")
+    @Log(value = "RCS上报密集库任务异常处理",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("RCS上报密集库任务异常处理")
     @SaIgnore
     public ResponseEntity<Object> process(@RequestBody JSONObject jo) {
@@ -81,7 +81,7 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/initialize")
-    @Log("仓位初始化")
+    @Log(value = "仓位初始化",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("仓位初始化")
     @SaIgnore
     @SaCheckPermission("menu:list")

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.InterfaceLogType;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.springframework.http.HttpStatus;
@@ -33,7 +34,7 @@ public class WmsToAcsController {
     private final WmsToAcsService wmsToAcsService;
 
     @PostMapping
-    @Log("WMS给ACS发送任务")
+    @Log(value = "WMS给ACS发送任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS给ACS发送任务")
     public ResponseEntity<Object> issueTaskToAcs(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -41,7 +42,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/cancel")
-    @Log("WMS主动取消ACS任务")
+    @Log(value = "WMS主动取消ACS任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS主动取消ACS任务")
     public ResponseEntity<Object> cancelToAcs(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -49,7 +50,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/updatePointStatus")
-    @Log("WMS更新ACS点位状态")
+    @Log(value = "WMS更新ACS点位状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS更新ACS点位状态")
     public ResponseEntity<Object> updatePointStatus(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -57,7 +58,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/order")
-    @Log("WMS开工向acs下发工单")
+    @Log(value = "WMS开工向acs下发工单", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS开工向acs下发工单")
     public ResponseEntity<Object> startWork(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -65,7 +66,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/orderStatusUpdate")
-    @Log("WMS向acs发送强制完成")
+    @Log(value = "WMS向acs发送强制完成", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS强制完成向acs发送强制完成")
     public ResponseEntity<Object> orderStatusUpdate(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -73,7 +74,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/querydevice")
-    @Log("WMS向acs发送获取点位状态")
+    @Log(value = "WMS向acs发送获取点位状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS向acs发送获取点位状态")
     public ResponseEntity<Object> getPointStatus(@RequestBody JSONArray whereJson) {
         return new ResponseEntity<>(wmsToAcsService.getPointStatus(whereJson), HttpStatus.OK);
@@ -81,7 +82,7 @@ public class WmsToAcsController {
 
 
     @PostMapping("/updateTask")
-    @Log("WMS向acs发送更新任务状态")
+    @Log(value = "WMS向acs发送更新任务状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("WMS向acs发送更新任务状态")
     public ResponseEntity<Object> updateTask(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -89,7 +90,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/action")
-    @Log("给ACS下发修改PLC的值")
+    @Log(value = "给ACS下发修改PLC的值", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("给ACS下发修改PLC的值")
     public ResponseEntity<Object> action(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
@@ -97,7 +98,7 @@ public class WmsToAcsController {
     }
 
     @PostMapping("/putPlusPullAction")
-    @Log("给ACS下发修改PLC的值")
+    @Log(value = "给ACS下发修改PLC的值", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS)
     @ApiOperation("给ACS下发修改PLC的值")
     public ResponseEntity<Object> putPlusPullAction(@RequestBody JSONObject jo) {
         return new ResponseEntity<>(wmsToAcsService.putPlusPullAction(jo), HttpStatus.OK);