From 90df60711ee73a78bd0ee007158b49391d4ce0c7 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 18 Feb 2025 14:09:52 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/sch/task_manage/AbstractTask.java  |  8 ++++
 .../src/main/resources/config/application.yml |  2 +-
 .../main/resources/log/XgAgvDeviceDriver.xml  | 34 --------------
 .../src/main/resources/logback-spring.xml     | 45 ++++++++++++-------
 .../src/views/system/notice/index.vue         |  9 ++++
 5 files changed, 47 insertions(+), 51 deletions(-)
 delete mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index aed2e0f..58808a9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -112,6 +112,14 @@ public abstract class AbstractTask {
             this.setTask(task.getConfig_code(), taskDto);
             list.add(taskDto);
             JSONObject result = AcsUtil.notifyAcs("api/wms/task", list);
+            try {
+                Integer.parseInt(result.getString("status"));
+            } catch (Exception e) {
+                // 消息通知
+                noticeService.createNotice("失败原因：" + result.getString("message"), "任务下发失败",
+                        NoticeTypeEnum.EXCEPTION.getCode());
+                continue;
+            }
             if (HttpStatus.OK.value() == result.getInteger("status")) {
                 for (SchBaseTask schBaseTask : taskList) {
                     schBaseTask.setTask_status(TaskStatus.ISSUED.getCode());
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
index 0cdd6e6..7d8ac25 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml
@@ -19,7 +19,7 @@ spring:
       enabledBanner: false                        # 是否启用 控制台banner，默认true
       enabledCollect: true                        # 是否开启监控指标采集，默认true
       collectorTypes: logging          # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer
-      logPath: d:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
+      logPath: c:\log\wms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置
       monitorInterval: 8
       tomcatTp: # tomcat webserver 线程池配置
         threadPoolAliasName: tomcat 线程池          # 线程池别名，可选
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml
deleted file mode 100644
index c805802..0000000
--- a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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}"/>
-    <!--<define name="DEVICECODE" class="org.nl.common.logging.DeviceCodeDir"/>-->
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE_XGAGV" 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>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</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="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.system.service.lucene.impl.LuceneExecuteLogServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE_XGAGV"/>
-    </logger>
-</included>
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 7d7d41c..23db562 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
@@ -38,7 +38,7 @@ https://juejin.cn/post/6844903775631572999
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>100MB</maxFileSize>
+            <maxFileSize>150MB</maxFileSize>
             <!--所有日志最多占多大容量-->
             <totalSizeCap>50GB</totalSizeCap>
         </rollingPolicy>
@@ -57,88 +57,101 @@ https://juejin.cn/post/6844903775631572999
     </appender>
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="debug">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.apache" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.hibernate" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="io.netty" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="jdbc" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="io.lettuce" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="com.fasterxml" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.quartz" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="com.google" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="springfox" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="log4jdbc" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="nl.basjes" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
     </springProfile>
 
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="debug">
-            <appender-ref ref="CONSOLE"/>
+        <root level="info">
+            <appender-ref ref="asyncFileAppender"/>
         </root>
         <logger name="org.springframework" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.apache" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.hibernate" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="io.netty" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="jdbc" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="io.lettuce" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="com.fasterxml" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.quartz" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="com.google" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="springfox" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="log4jdbc" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="nl.basjes" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncFileAppender"/>
         </logger>
     </springProfile>
 
diff --git a/lms/nladmin-ui/src/views/system/notice/index.vue b/lms/nladmin-ui/src/views/system/notice/index.vue
index 5090a96..53174c7 100644
--- a/lms/nladmin-ui/src/views/system/notice/index.vue
+++ b/lms/nladmin-ui/src/views/system/notice/index.vue
@@ -20,6 +20,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="信息内容">
+            <el-input
+              v-model="query.notice_content"
+              clearable
+              size="mini"
+              placeholder="请输入内容"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="信息类型">
             <el-select
               v-model="query.notice_type"