From 79e16a8e1d4aee1cccb36c859f5e54b0ce27fa9b Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 6 Feb 2023 18:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/modules/mnt/websocket/WebSocketServer.java   | 4 ++--
 .../java/org/nl/wms/ext/acs/rest/AcsToWmsController.java     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/WebSocketServer.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/WebSocketServer.java
index f6e9d0c27..e2e5b1230 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/WebSocketServer.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/WebSocketServer.java
@@ -77,7 +77,7 @@ public class WebSocketServer {
 	 * @param message 客户端发送过来的消息*/
 	@OnMessage
 	public void onMessage(String message, Session session) {
-		log.info("收到来"+sid+"的信息:"+message);
+//		log.info("收到来"+sid+"的信息:"+message);
 		//群发消息
 		for (WebSocketServer item : webSocketSet) {
 			try {
@@ -106,7 +106,7 @@ public class WebSocketServer {
 	 * */
 	public static void sendInfo(SocketMsg socketMsg,@PathParam("sid") String sid) throws IOException {
 		String message = JSONObject.toJSONString(socketMsg);
-		log.info("推送消息到"+sid+"，推送内容:"+message);
+//		log.info("推送消息到"+sid+"，推送内容:"+message);
 		for (WebSocketServer item : webSocketSet) {
 			try {
 				//这里可以设定只推送给这个sid的，为null则全部推送
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index 3f1976b34..eb87b30e4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -50,7 +50,6 @@ public class AcsToWmsController {
     @PostMapping("/apply")
     @Log(value = "申请任务",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("申请任务")
-    @SaCheckPermission("menu:list")
     @SaIgnore
     public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
@@ -59,7 +58,7 @@ public class AcsToWmsController {
     @PostMapping("/againApply")
     @Log(value = "二次申请任务",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("二次申请任务")
-    @SaCheckPermission("menu:list")
+
     @SaIgnore
     public ResponseEntity<Object> againApply(@RequestBody String task_id) {
         return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK);
@@ -92,7 +91,7 @@ public class AcsToWmsController {
     @Log(value = "仓位初始化",  isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS)
     @ApiOperation("仓位初始化")
     @SaIgnore
-    @SaCheckPermission("menu:list")
+
     public ResponseEntity<Object> initialize(@RequestBody JSONObject json) {
         acsToWmsService.initialize(json);
         return new ResponseEntity<>(HttpStatus.OK);