From 12e8918355b5ae37b7f7b8fe8a79f494fb957b74 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 9 May 2023 17:09:52 +0800
Subject: [PATCH] fix XZAGV

---
 .../acs/agv/server/impl/AgvServiceImpl.java   |  6 +++-
 .../ItemProtocol.java                         |  2 +-
 .../machines_site/ItemProtocol.java           |  2 +-
 .../ndxy_special/ItemProtocol.java            |  2 +-
 .../ndxy_special_two/ItemProtocol.java        |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../standard_inspect_site/ItemProtocol.java   |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../standard_rgv/ItemProtocol.java            |  2 +-
 .../ItemProtocol.java                         |  2 +-
 .../whxr/whxr_weighing/ItemProtocol.java      |  2 +-
 .../ykbk_special/ItemProtocol.java            |  2 +-
 .../nl/modules/quartz/task/ToAgvDevice.java   |  1 +
 .../main/resources/config/application-dev.yml |  2 +-
 .../src/main/resources/log/AgvServiceImpl.xml |  4 +--
 .../resources/log/QueryXZAgvDeviceStatus.xml  | 32 +++++++++++++++++++
 .../src/main/resources/logback-spring.xml     |  1 +
 24 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 hd/nladmin-system/src/main/resources/log/QueryXZAgvDeviceStatus.xml

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
index e60864a..1d58135 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
@@ -600,7 +600,8 @@ public class AgvServiceImpl implements AgvService {
             HttpResponse result2 = HttpRequest.get(agvurl2)
                     .timeout(20000)//超时，毫秒
                     .execute();
-
+            log.info("查询agv状态数据 vehicles:" + result.body());
+            log.info("查询agv状态数据 vehicleDetails:" + result2.body());
             System.out.println("查询agv状态数据:" + result.body());
             if (result.getStatus() == 200) {
                 JSONArray ja = JSONArray.fromObject(result.body());
@@ -612,6 +613,9 @@ public class AgvServiceImpl implements AgvService {
                     String transportOrder = jo.getString("transportOrder");
                     JSONObject detailjo = JSONObject.fromObject(result2.body());
                     JSONObject item = (JSONObject) detailjo.get(name);
+                    if(ObjectUtil.isEmpty(detailjo.get(name))){
+                        continue;
+                    }
                     String x = item.getString("x");
                     String y = item.getString("y");
                     String angle = item.getString("angle");
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java
index 31087d3..c8150c2 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/feedback_agv_status_site/ItemProtocol.java
@@ -33,7 +33,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java
index db6518f..38eb7c1 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/machines_site/ItemProtocol.java
@@ -69,7 +69,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/ItemProtocol.java
index 676af02..5a46832 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/ItemProtocol.java
@@ -79,7 +79,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special_two/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special_two/ItemProtocol.java
index 3e2d248..4e04f12 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special_two/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special_two/ItemProtocol.java
@@ -74,7 +74,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/ItemProtocol.java
index d2f1ed7..d170c72 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/ItemProtocol.java
@@ -84,7 +84,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_plcscanner/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_plcscanner/ItemProtocol.java
index 53cab70..5126320 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_plcscanner/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_plcscanner/ItemProtocol.java
@@ -101,7 +101,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_scanner/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_scanner/ItemProtocol.java
index f378458..38a5f62 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_scanner/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control_with_scanner/ItemProtocol.java
@@ -96,7 +96,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_monitor/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_monitor/ItemProtocol.java
index b53ff2a..4f4586a 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_monitor/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_monitor/ItemProtocol.java
@@ -79,7 +79,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java
index e7dee60..f0ad3d8 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java
@@ -72,7 +72,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java
index d74ab34..f2a74eb 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/ItemProtocol.java
@@ -74,7 +74,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/ItemProtocol.java
index 782bb3c..1d848f9 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/ItemProtocol.java
@@ -75,7 +75,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java
index 49962f2..d5c2e11 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_inspect_site/ItemProtocol.java
@@ -79,7 +79,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java
index 45dc65a..e18c09b 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/ItemProtocol.java
@@ -87,7 +87,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java
index 8476c4c..98a547b 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_photoelectric_inspect_site/ItemProtocol.java
@@ -95,7 +95,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_rgv/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_rgv/ItemProtocol.java
index fc2fec4..5332d33 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_rgv/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_rgv/ItemProtocol.java
@@ -94,7 +94,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java
index d81b9d2..435ae98 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_special_inspect_site/ItemProtocol.java
@@ -72,7 +72,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_weighing/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_weighing/ItemProtocol.java
index 7fa616a..f510446 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_weighing/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_weighing/ItemProtocol.java
@@ -190,7 +190,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ykbk_special/ItemProtocol.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ykbk_special/ItemProtocol.java
index 448fbf8..0f87ebb 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ykbk_special/ItemProtocol.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ykbk_special/ItemProtocol.java
@@ -74,7 +74,7 @@ public class ItemProtocol {
     public int getOpcIntegerValue(String protocol) {
         Integer value = this.driver.getIntegerValue(protocol);
         if (value == null) {
-            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            //log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
             setIsonline(false);
         } else {
             setIsonline(true);
diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java
index 94d200f..72fa923 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java
@@ -31,6 +31,7 @@ public class ToAgvDevice {
         JSONObject json = new JSONObject();
         Map<String, AgvDto> agv_map = agvService.findAllAgvFromCache();
         if(ObjectUtil.isEmpty(agv_map)){
+            System.out.println("AGV设备数据为空，无法反馈");
             return;
         }
         JSONArray agv_rows = new JSONArray();
diff --git a/hd/nladmin-system/src/main/resources/config/application-dev.yml b/hd/nladmin-system/src/main/resources/config/application-dev.yml
index f9d3a4d..b371c7e 100644
--- a/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -9,7 +9,7 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:zgln_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hs_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:tg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
 #      password: ${DB_PWD:P@ssw0rd}
 #      password: ${DB_PWD:Root.123456}
diff --git a/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml b/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml
index 6e848d3..378957f 100644
--- a/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml
+++ b/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!-- 按照每天生成日志文件 -->
-    <appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="AgvServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
             <FileNamePattern>${LOG_HOME}/反馈AGV请求/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
@@ -27,6 +27,6 @@
 
     <!-- 打印sql -->
     <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE5"/>
+        <appender-ref ref="AgvServiceImpl"/>
     </logger>
 </included>
diff --git a/hd/nladmin-system/src/main/resources/log/QueryXZAgvDeviceStatus.xml b/hd/nladmin-system/src/main/resources/log/QueryXZAgvDeviceStatus.xml
new file mode 100644
index 0000000..e6cfbf5
--- /dev/null
+++ b/hd/nladmin-system/src/main/resources/log/QueryXZAgvDeviceStatus.xml
@@ -0,0 +1,32 @@
+<?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="QueryXZAgvDeviceStatus" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/查询仙知AGV设备状态/%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>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.modules.quartz.task.QueryXZAgvDeviceStatus" level="info" additivity="false">
+        <appender-ref ref="QueryXZAgvDeviceStatus"/>
+    </logger>
+</included>
diff --git a/hd/nladmin-system/src/main/resources/logback-spring.xml b/hd/nladmin-system/src/main/resources/logback-spring.xml
index 9bd5afe..eff5efc 100644
--- a/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -26,6 +26,7 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/QueryXZAgvTaskStatus.xml"/>
     <include resource="log/NDCSocketConnectionAutoRun.xml"/>
     <include resource="log/ScannerBarcode.xml"/>
+    <include resource="log/QueryXZAgvDeviceStatus.xml"/>
 
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">