rev：增加日志

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<SchBaseTask> 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;
     }
 

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;
+}

lms/nladmin-system/nlsso-server/src/main/resources/log/LmsToMes.xml

@@ -2,33 +2,32 @@
 <included>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
-    <!--<define name="DEVICECODE" class="org.nl.common.logging.DeviceCodeDir"/>-->
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_XGAGV" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE4" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/XgAgvDeviceDriver/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/LmsToMes/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
             <maxFileSize>200MB</maxFileSize>
             <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
+            <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>${log.charset}</charset>
         </encoder>
-
     </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="true">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
+    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+        <discardingThreshold>2</discardingThreshold>
+        <queueSize>500</queueSize>
+        <appender-ref ref="FILE4"/>
+    </appender>
+    <logger name="org.nl.wms.ext.mes.service.impl.WmsToMesServiceImpl" level="info" additivity="true">
+          <appender-ref ref="asyncFileAppender"/>
+    </logger>
 
     <!-- 打印sql -->
-    <logger name="org.nl.system.service.lucene.impl.LuceneExecuteLogServiceImpl" level="info" additivity="true">
-        <appender-ref ref="FILE_XGAGV"/>
-    </logger>
 </included>

lms/nladmin-system/nlsso-server/src/main/resources/log/MesToLms.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE3" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/MesToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+    </appender>
+
+    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+        <discardingThreshold>2</discardingThreshold>
+        <queueSize>500</queueSize>
+        <appender-ref ref="FILE3"/>
+    </appender>
+
+      <logger name="org.nl.wms.ext.mes.service.impl.MesToWmsServiceImpl" level="info" additivity="true">
+          <appender-ref ref="asyncFileAppender"/>
+      </logger>
+
+    <!-- 打印sql -->
+</included>

lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -18,7 +18,8 @@ https://juejin.cn/post/6844903775631572999
     <!--引入默认的一些设置-->
     <!--<include resource="log/XrToMes.xml"/>
     <include resource="log/MesToErp.xml"/>-->
-    <include resource="log/XgAgvDeviceDriver.xml"/>
+    <include resource="log/LmsToMes.xml"/>
+    <include resource="log/MesToLms.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--withJansi 参数改为true-->
@@ -63,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
     </appender>
 
     <!--异步到文件-->
-        <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+    <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
         <discardingThreshold>0</discardingThreshold>
         <queueSize>500</queueSize>
         <appender-ref ref="FILE"/>