From 2227ac30417816c72d204540aa7c60caf747aa1a Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 24 Oct 2024 15:07:45 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/acs/agv/server/AgvWaitUtil.java | 9 ++--- .../server/impl/XianGongAgvServiceImpl.java | 13 +++---- .../java/org/nl/acs/ext/wms/LmsHttpUtil.java | 6 ++++ .../resources/config/application-dev2.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/log/AcsToWms.xml | 5 +-- .../src/main/resources/log/XgToAcs.xml | 19 +++++----- .../src/main/resources/logback-spring.xml | 35 +++++++++++-------- .../src/views/monitor/server/index.vue | 1 + .../LmsToMes/2024-10-24.0.log | 0 .../MesToLms/2024-10-24.0.log | 0 .../mes/service/impl/MesToWmsServiceImpl.java | 7 ++++ .../nl/wms/sch/task_manage/AcsCarType.java | 21 +++++++++++ .../src/main/resources/log/LmsToMes.xml | 33 +++++++++++++++++ .../src/main/resources/log/MesToLms.xml | 35 +++++++++++++++++++ .../src/main/resources/logback-spring.xml | 5 +-- 16 files changed, 152 insertions(+), 41 deletions(-) rename lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml => acs2/nladmin-system/src/main/resources/log/XgToAcs.xml (66%) create mode 100644 lms/nladmin-system/logPath_IS_UNDEFINED/LmsToMes/2024-10-24.0.log create mode 100644 lms/nladmin-system/logPath_IS_UNDEFINED/MesToLms/2024-10-24.0.log create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsCarType.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/log/LmsToMes.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/log/MesToLms.xml diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java index bd9fbba..d86f3b9 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java @@ -1,6 +1,7 @@ package org.nl.acs.agv.server; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -61,7 +62,7 @@ public class AgvWaitUtil { if (flag) { JSONObject result = new JSONObject(); - result.put("status", 200); + result.put("status", HttpStatus.HTTP_OK); result.put("message", "允许取货！"); log.info("允许仙工AGV取货，设备号 - {}", deviceCode); return result; @@ -101,7 +102,7 @@ public class AgvWaitUtil { if (flag) { JSONObject result = new JSONObject(); - result.put("status", 200); + result.put("status", HttpStatus.HTTP_OK); result.put("message", "允许取货后离开！"); log.info("允许仙工AGV取货后离开，设备号 - {}", deviceCode); return result; @@ -147,7 +148,7 @@ public class AgvWaitUtil { if (flag) { JSONObject result = new JSONObject(); - result.put("status", 200); + result.put("status", HttpStatus.HTTP_OK); result.put("message", "允许放货！"); log.info("允许仙工AGV放货，设备号 - {}", deviceCode); return result; @@ -188,7 +189,7 @@ public class AgvWaitUtil { if (flag) { JSONObject result = new JSONObject(); - result.put("status", 200); + result.put("status", HttpStatus.HTTP_OK); result.put("message", "允许放货后离开！"); log.info("允许仙工AGV放货后离开，设备号 - {}", deviceCode); return result; diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index d336044..c45b78f 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.acs.agv.server.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -157,14 +158,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { // 记录车号 driver.setCar_no(reqParam.getString("robot_name")); - result.put("code", 200); + result.put("code", HttpStatus.HTTP_OK); result.put("message", "ok"); } else { - result.put("code", 400); + result.put("code", HttpStatus.HTTP_BAD_REQUEST); result.put("message", "ok"); } } else { - result.put("code", 400); + result.put("code", HttpStatus.HTTP_BAD_REQUEST); result.put("message", "ok"); } log.info("getBlockGroup反馈AGV输出参数:{}", result.toString()); @@ -197,14 +198,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { if (device.getExtraValue().get("is_clean").toString().equals("1")) { driver.setCar_no(""); } - result.put("code", 200); + result.put("code", HttpStatus.HTTP_OK); result.put("message", "ok"); } else { - result.put("code", 400); + result.put("code", HttpStatus.HTTP_BAD_REQUEST); result.put("message", "ok"); } } else { - result.put("code", 400); + result.put("code", HttpStatus.HTTP_BAD_REQUEST); result.put("message", "ok"); } log.info("releaseBlockGroup反馈AGV输出参数:{}", result.toString()); diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsHttpUtil.java b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsHttpUtil.java index f9b62cd..1f8d842 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsHttpUtil.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsHttpUtil.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import lombok.extern.slf4j.Slf4j; import org.nl.acs.config.AcsConfig; import org.nl.acs.ext.RequestAdapter; import org.nl.acs.ext.ResponseAdapter; @@ -19,6 +20,7 @@ import org.springframework.stereotype.Component; * @Date 2024/4/22 */ @Component +@Slf4j public class LmsHttpUtil { private static final RequestAdapter REQUEST_ADAPTER = new LmsRequestAdapter(); @@ -29,6 +31,7 @@ public class LmsHttpUtil { @ToOthersInterfaceLog("ACS->LMS") public UnifiedResponse sendPostRequest(String path, W requestParam, Class type) { + log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + requestParam.toString()); if (!StrUtil.equals(paramService.findByCode(AcsConfig.HAS_WMS).getValue(), "1")) { return new UnifiedResponse<>(false, "未开启连接该系统！"); } @@ -39,6 +42,7 @@ public class LmsHttpUtil { .body(JSON.toJSONString(requestParam)) .execute() .body(); + log.info("acs向lms反馈任务状态，输出参数：--------------------------------------" + RESPONSE_ADAPTER.adapt(body, type).toString()); return RESPONSE_ADAPTER.adapt(body, type); } catch (Exception e) { return new UnifiedResponse<>(false, e.getMessage()); @@ -47,6 +51,7 @@ public class LmsHttpUtil { @ToOthersInterfaceLog("ACS->LMS") public UnifiedResponse sendPostRequest(String path, W requestParam) { + log.info("acs向lms反馈任务状态，请求参数：--------------------------------------" + requestParam.toString()); if (!StrUtil.equals(paramService.findByCode(AcsConfig.HAS_WMS).getValue(),"1")) { return new UnifiedResponse<>(false, "未开启连接该系统！"); } @@ -59,6 +64,7 @@ public class LmsHttpUtil { .body(JSON.toJSONString(array)) .execute() .body(); + log.info("acs向lms反馈任务状态，输出参数：--------------------------------------" + RESPONSE_ADAPTER.adapt(body, null).toString()); return RESPONSE_ADAPTER.adapt(body, null); } catch (Exception e) { return new UnifiedResponse<>(false, e.getMessage()); diff --git a/acs2/nladmin-system/src/main/resources/config/application-dev2.yml b/acs2/nladmin-system/src/main/resources/config/application-dev2.yml index 2d990f2..3d7206a 100644 --- a/acs2/nladmin-system/src/main/resources/config/application-dev2.yml +++ b/acs2/nladmin-system/src/main/resources/config/application-dev2.yml @@ -140,7 +140,7 @@ file: avatarMaxSize: 5 logging: file: - path: /Users/onepiece/myFile/acs + path: C:\log\ACS config: classpath:logback-spring.xml # Sa-Token配置 diff --git a/acs2/nladmin-system/src/main/resources/config/application.yml b/acs2/nladmin-system/src/main/resources/config/application.yml index 0602e94..9982b5c 100644 --- a/acs2/nladmin-system/src/main/resources/config/application.yml +++ b/acs2/nladmin-system/src/main/resources/config/application.yml @@ -44,7 +44,7 @@ rsa: private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== logging: file: - path: C:\log\ACS + path: C:\logs\ACS config: classpath:logback-spring.xml # sa-token白名单配置 security: diff --git a/acs2/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs2/nladmin-system/src/main/resources/log/AcsToWms.xml index 324ae5c..fc2caf2 100644 --- a/acs2/nladmin-system/src/main/resources/log/AcsToWms.xml +++ b/acs2/nladmin-system/src/main/resources/log/AcsToWms.xml @@ -22,12 +22,13 @@ - + + 2 512 - + diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/acs2/nladmin-system/src/main/resources/log/XgToAcs.xml similarity index 66% rename from lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml rename to acs2/nladmin-system/src/main/resources/log/XgToAcs.xml index b1c296c..fe841f0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml +++ b/acs2/nladmin-system/src/main/resources/log/XgToAcs.xml @@ -2,12 +2,11 @@ - - + - ${LOG_HOME}/XgAgvDeviceDriver/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/XG请求ACS/%d{yyyy-MM-dd}.%i.log 15 @@ -23,12 +22,12 @@ - - - - - + + + + 512 + + + diff --git a/acs2/nladmin-system/src/main/resources/logback-spring.xml b/acs2/nladmin-system/src/main/resources/logback-spring.xml index 4e378ad..2f9cc61 100644 --- a/acs2/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs2/nladmin-system/src/main/resources/logback-spring.xml @@ -15,24 +15,28 @@ https://juejin.cn/post/6844903775631572999 value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/> - + - - - + + - - + + - + + true + ${log.pattern} - ${log.charset} + + + + @@ -51,19 +55,20 @@ https://juejin.cn/post/6844903775631572999 - - - 0 - 200 - - + - + 512 + + + 0 + 200 + + diff --git a/acs2/nladmin-ui/src/views/monitor/server/index.vue b/acs2/nladmin-ui/src/views/monitor/server/index.vue index 920861e..8f7d9e7 100644 --- a/acs2/nladmin-ui/src/views/monitor/server/index.vue +++ b/acs2/nladmin-ui/src/views/monitor/server/index.vue @@ -219,6 +219,7 @@ export default { } }, created() { + debugger this.init() this.monitor = window.setInterval(() => { setTimeout(() => { diff --git a/lms/nladmin-system/logPath_IS_UNDEFINED/LmsToMes/2024-10-24.0.log b/lms/nladmin-system/logPath_IS_UNDEFINED/LmsToMes/2024-10-24.0.log new file mode 100644 index 0000000..e69de29 diff --git a/lms/nladmin-system/logPath_IS_UNDEFINED/MesToLms/2024-10-24.0.log b/lms/nladmin-system/logPath_IS_UNDEFINED/MesToLms/2024-10-24.0.log new file mode 100644 index 0000000..e69de29 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java index c778b88..86cfa70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java @@ -75,6 +75,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { @Override @Transactional(rollbackFor = Exception.class) public JSONObject taskSend(JSONObject jo) { + log.info("mes接口taskSend下发任务输入参数："+jo.toString()); // 返回给mes的结果 JSONObject result = new JSONObject(); // 需要返回的所有任务及状态 @@ -157,11 +158,14 @@ public class MesToWmsServiceImpl implements MesToWmsService { } resultAllList.addAll(erroList); result.put("item", resultAllList); + log.info("mes接口taskSend下发任务输出参数："+result.toString()); return result; } @Override public JSONObject SearchTasks(JSONObject jo) { + log.info("mes接口SearchTasks查看任务输入参数："+jo.toString()); + JSONObject result = new JSONObject(); // 查询所有任务 List taskList = taskService.list( @@ -188,12 +192,14 @@ public class MesToWmsServiceImpl implements MesToWmsService { result.put("ReturnStatus", 0); result.put("MsgTime", DateUtil.now()); result.put("TaskLists", mesDtoList); + log.info("mes接口SearchTasks查看任务输出参数："+result.toString()); return result; } @Override @Transactional(rollbackFor = Exception.class) public JSONObject deleteTask(JSONObject jo) { + log.info("mes接口deleteTask删除任务输入参数："+jo.toString()); JSONObject result = new JSONObject(); // 根据任务号查询出对应任务 SchBaseTask taskDao = taskService.getByCode(jo.getString("TaskCode")); @@ -222,6 +228,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { result.put("ReturnStatus",0); result.put("ReturnInfo", "任务【"+jo.getString("TaskCode")+"】删除成功!"); result.put("MsgTime", DateUtil.now()); + log.info("mes接口deleteTask删除任务输出参数："+result.toString()); return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsCarType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsCarType.java new file mode 100644 index 0000000..685d6d7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsCarType.java @@ -0,0 +1,21 @@ +package org.nl.wms.sch.task_manage; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * acs车辆类型 + */ +@Getter +@RequiredArgsConstructor +public enum AcsCarType { + + GROUP_001("Group-001","ps20"), + GROUP_002("Group-001","ps30"), + GROUP_003("Group-001","ps10"), + GROUP_004("Group-001","ps15") + ; + + private final String code; + private final String name; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/LmsToMes.xml b/lms/nladmin-system/nlsso-server/src/main/resources/log/LmsToMes.xml new file mode 100644 index 0000000..343504a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/log/LmsToMes.xml @@ -0,0 +1,33 @@ + + + + + + + + + ${LOG_HOME}/LmsToMes/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + 2 + 500 + + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/MesToLms.xml b/lms/nladmin-system/nlsso-server/src/main/resources/log/MesToLms.xml new file mode 100644 index 0000000..9b50f97 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/resources/log/MesToLms.xml @@ -0,0 +1,35 @@ + + + + + + + + + ${LOG_HOME}/MesToLms/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + + 2 + 500 + + + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 295ac12..6753008 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -18,7 +18,8 @@ https://juejin.cn/post/6844903775631572999 - + + @@ -63,7 +64,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500