From 8290ed28103b0eae8cede7e644253ac98d1ecddf Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 20 Feb 2023 11:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java | 1 + .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 6 +++++- .../main/java/org/nl/wms/pda/mps/rest/OutController.java | 1 - .../src/main/resources/log/{ACSToMes.xml => AcsToLms.xml} | 2 +- .../src/main/resources/log/{MesToACS.xml => LmsToAcs.xml} | 2 +- lms/nladmin-system/src/main/resources/logback-spring.xml | 8 ++------ 6 files changed, 10 insertions(+), 10 deletions(-) rename lms/nladmin-system/src/main/resources/log/{ACSToMes.xml => AcsToLms.xml} (95%) rename lms/nladmin-system/src/main/resources/log/{MesToACS.xml => LmsToAcs.xml} (95%) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java index ff3e155c4..d5e92f4b7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java @@ -213,6 +213,7 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia thread.start(); } else if (SystemConfig.thread_auto_run.booleanValue() && (!DevelopConfig.develop.booleanValue() || !DevelopConfig.thread_auto_run_force_stop.contains(this.thread_code_index.get(i)))) { + thread.setName("test_"+thread.getName()); thread.start(); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index e26b47f86..df75c2ccd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -135,6 +135,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("message", "任务状态反馈成功!"); result.put("data", new JSONObject()); result.put("errArr", errArr); + log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString()); return result; } @@ -493,6 +494,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } result.put("status", HttpStatus.OK.value()); result.put("message", "下发成功!"); + log.info("apply返回参数：---------------------------------------------" + result.toString()); return result; } } finally { @@ -502,6 +504,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", "申请任务超时！" + type); + log.info("apply返回参数：---------------------------------------------" + result.toString()); + return result; } @@ -602,7 +606,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { lock.unlock(); } } - + log.info("deviceApply返回参数：---------------------------------------------" + result.toString()); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java index e81b9e10f..690cb55a5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.OutService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml similarity index 95% rename from lms/nladmin-system/src/main/resources/log/ACSToMes.xml rename to lms/nladmin-system/src/main/resources/log/AcsToLms.xml index b3ca345f5..74080ec33 100644 --- a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml +++ b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/ACSToMes/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/AcsToLms/%d{yyyy-MM-dd}.%i.log 15 diff --git a/lms/nladmin-system/src/main/resources/log/MesToACS.xml b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml similarity index 95% rename from lms/nladmin-system/src/main/resources/log/MesToACS.xml rename to lms/nladmin-system/src/main/resources/log/LmsToAcs.xml index b0aed616a..ad31a026c 100644 --- a/lms/nladmin-system/src/main/resources/log/MesToACS.xml +++ b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/MesToACS/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/LmsToAcs/%d{yyyy-MM-dd}.%i.log 15 diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index bc40bd84b..036d43bf5 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -14,19 +14,15 @@ https://juejin.cn/post/6844903775631572999 - - - - - - + +