代码更新

lms/nladmin-system/src/main/java/org/nl/modules/common/utils/SecurityUtils.java

@@ -32,7 +32,12 @@ public class SecurityUtils {
         } catch (Exception e) {
             return new CurrentUser();
         }
-        return null;
+        // 给一个acs
+        CurrentUser currentUser = new CurrentUser();
+        currentUser.setId(2L);
+        currentUser.setUsername("acs");
+        currentUser.setNickName("ACS系统");
+        return currentUser;
     }
 
     /**

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

@@ -2,6 +2,7 @@
 package org.nl.wms.ext.acs.rest;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -35,6 +36,7 @@ public class WmsToAcsController {
     @PostMapping
     @Log("WMS给ACS发送任务")
     @ApiOperation("WMS给ACS发送任务")
+    @SaIgnore
     public ResponseEntity<Object> issueTaskToAcs(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
         return new ResponseEntity<>(wmsToAcsService.issueTaskToAcs(arr), HttpStatus.OK);
@@ -43,6 +45,7 @@ public class WmsToAcsController {
     @PostMapping("/cancel")
     @Log("WMS主动取消ACS任务")
     @ApiOperation("WMS主动取消ACS任务")
+    @SaIgnore
     public ResponseEntity<Object> cancelToAcs(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
         return new ResponseEntity<>(wmsToAcsService.cancelToAcs(arr), HttpStatus.OK);
@@ -51,6 +54,7 @@ public class WmsToAcsController {
     @PostMapping("/updatePointStatus")
     @Log("WMS更新ACS点位状态")
     @ApiOperation("WMS更新ACS点位状态")
+    @SaIgnore
     public ResponseEntity<Object> updatePointStatus(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
         return new ResponseEntity<>(wmsToAcsService.updatePointStatus(arr), HttpStatus.OK);
@@ -59,6 +63,7 @@ public class WmsToAcsController {
     @PostMapping("/order")
     @Log("WMS开工向acs下发工单")
     @ApiOperation("WMS开工向acs下发工单")
+    @SaIgnore
     public ResponseEntity<Object> startWork(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
         return new ResponseEntity<>(wmsToAcsService.order(arr), HttpStatus.OK);
@@ -67,6 +72,7 @@ public class WmsToAcsController {
     @PostMapping("/orderStatusUpdate")
     @Log("WMS向acs发送强制完成")
     @ApiOperation("WMS强制完成向acs发送强制完成")
+    @SaIgnore
     public ResponseEntity<Object> orderStatusUpdate(@RequestBody Map whereJson) {
         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data")));
         return new ResponseEntity<>(wmsToAcsService.orderStatusUpdate(arr), HttpStatus.OK);
@@ -75,6 +81,7 @@ public class WmsToAcsController {
     @PostMapping("/querydevice")
     @Log("WMS向acs发送获取点位状态")
     @ApiOperation("WMS向acs发送获取点位状态")
+    @SaIgnore
     public ResponseEntity<Object> getPointStatus(@RequestBody JSONArray whereJson) {
         return new ResponseEntity<>(wmsToAcsService.getPointStatus(whereJson), HttpStatus.OK);
     }