From cd6a6508e777f32caaa417e1bd3b8e2c415d79cd Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Thu, 2 Jun 2022 14:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-system/pom.xml                        |   5 +
 .../HaiLiangCoatingDeviceDriver.java          | 108 +++++++++++++++++
 .../HaiLiangFeedingDeviceDriver.java          |  48 +++++++-
 .../HaiLiangFeedingTrunkDeviceDriver.java     |  13 +-
 .../HaiLiangLabelingDeviceDriver.java         | 109 +++++++++++++++++
 .../HaiLiangLetteringDeviceDriver.java        | 108 +++++++++++++++++
 .../HaiLiangRiskingDefination.java            |   2 +-
 .../HaiLiangRiskingDeviceDriver.java          | 112 +++++++++++++++++-
 .../HaiLiangStrappingDeviceDriver.java        | 108 +++++++++++++++++
 .../dto/ProduceshiftorderdetailDto.java       |  24 +++-
 .../impl/ProduceshiftorderServiceImpl.java    |   7 +-
 .../ProduceshiftorderdetailServiceImpl.java   |   2 +-
 .../org/nl/acs/order/service/wql/order.xls    | Bin 196608 -> 196608 bytes
 .../org/nl/modules/log/LogMarkerTypeEnum.java |  33 ++++++
 .../org/nl/modules/log/LogMarkerUtil.java     |   9 ++
 .../org/nl/modules/log/MongoDBAppender.java   |  52 ++++++++
 .../nl/modules/log/MongoDBAppenderBase.java   | 109 +++++++++++++++++
 .../modules/log/rest/RootLogController.java   |  42 +++++++
 .../modules/log/service/RootLogService.java   |  18 +++
 .../log/service/impl/RootLogServiceImpl.java  |  48 ++++++++
 .../main/resources/config/application-dev.yml |  10 +-
 .../resources/config/application-prod.yml     |  10 +-
 .../src/main/resources/log/AcsToErp.xml       |  31 ++---
 .../src/main/resources/log/AcsToWms.xml       |  31 ++---
 .../resources/log/AgvFeedbackServiceImpl.xml  |  16 +++
 .../main/resources/log/AgvLeaveServlet.xml    |  18 +++
 .../src/main/resources/log/AgvServiceImpl.xml |  32 -----
 .../src/main/resources/log/AgvackServlet.xml  |  32 -----
 .../src/main/resources/log/AutoCreateInst.xml |  33 ++----
 .../log/NDCSocketConnectionAutoRun.xml        |  31 ++---
 .../main/resources/log/QueryAgvTaskStatus.xml |  33 ++----
 .../resources/log/QueryXZAgvTaskStatus.xml    |  35 ++----
 .../src/main/resources/log/ScannerBarcode.xml |  32 -----
 .../src/main/resources/log/WmsToAcs.xml       |  35 ++----
 .../src/main/resources/logback-spring.xml     |  60 ++++++----
 35 files changed, 1087 insertions(+), 309 deletions(-)
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/LogMarkerTypeEnum.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/LogMarkerUtil.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppender.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppenderBase.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/rest/RootLogController.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/service/RootLogService.java
 create mode 100644 nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
 create mode 100644 nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
 create mode 100644 nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
 delete mode 100644 nladmin-system/src/main/resources/log/AgvServiceImpl.xml
 delete mode 100644 nladmin-system/src/main/resources/log/AgvackServlet.xml
 delete mode 100644 nladmin-system/src/main/resources/log/ScannerBarcode.xml

diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml
index 2cdb753..2419605 100644
--- a/nladmin-system/pom.xml
+++ b/nladmin-system/pom.xml
@@ -26,6 +26,11 @@
             <version>6.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>3.4.2</version>
+        </dependency>
 <!--
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java
index 8df1279..6f2a18c 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java
@@ -3,10 +3,21 @@ package org.nl.acs.device_driver.hailiang.hailiang_coating;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 海亮-裹膜机线体
@@ -23,9 +34,106 @@ public class HaiLiangCoatingDeviceDriver extends AbstractOpcDeviceDriver impleme
     }
 
 
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
+
+    String device_code;
+    int mode = 0;
+    int last_mode = 0;
+    int error = 0;
+    int move = 0;
+    int order = 0;
+    int order_detail = 0;
+    int detail_qty = 0;
+    int detail_qualified_qty = 0;
+
+    boolean requireSucess = false;
+
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
+
     @Override
     public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            order = this.itemProtocol.getOrder();
+            order_detail = this.itemProtocol.getOrder_detail();
+            //当前工单明细号上料数量
+            detail_qty = this.itemProtocol.getDetail_qty();
+            //当前工单明细号上料合格数量
+            detail_qualified_qty = this.itemProtocol.getDetail_qualified_qty();
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+            }
+        } catch (Exception var17) {
+            return;
+        }
 
+
+        if (mode == 0) {
+
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+
+            message = "有报警";
+            //无报警
+        } else {
+            message = "";
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    break;
+                case 2:
+                    break;
+                case 4:
+                    //上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
+                    }
+                    break;
+                case 5:
+                    //强制上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
+                    }
+                    break;
+            }
+        }
+        last_mode = mode;
     }
 
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setWraping_finished(status);
+            dto.setWraping_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
+
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
+    }
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDeviceDriver.java
index 561d3bc..cbd32ad 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDeviceDriver.java
@@ -3,11 +3,22 @@ package org.nl.acs.device_driver.hailiang.hailiang_feeding;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 海亮-上料线体
@@ -23,6 +34,11 @@ public class HaiLiangFeedingDeviceDriver extends AbstractOpcDeviceDriver impleme
         return this.device;
     }
 
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
 
     String device_code;
     int mode = 0;
@@ -36,6 +52,9 @@ public class HaiLiangFeedingDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     boolean requireSucess = false;
 
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
     @Override
     public void execute() {
         String message = null;
@@ -77,13 +96,13 @@ public class HaiLiangFeedingDeviceDriver extends AbstractOpcDeviceDriver impleme
                 case 4:
                     //上料完成
                     if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
-                        
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
                     }
                     break;
                 case 5:
                     //强制上料完成
                     if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
-
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
                     }
                     break;
             }
@@ -92,4 +111,29 @@ public class HaiLiangFeedingDeviceDriver extends AbstractOpcDeviceDriver impleme
     }
 
 
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setFeeding_finished(status);
+            dto.setFeeding_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
+
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
+    }
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
index 3d4f0ac..6039e15 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
@@ -119,10 +119,14 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
                 this.setRequireSucess(false);
             }
 
-            if(order >0 && order_detail>0){
-                update_detail(String.valueOf(order),String.valueOf(order_detail));
+            try{
+                if(order >0 && order_detail>0){
+                    update_detail(String.valueOf(order),String.valueOf(order_detail));
+                }
             }
+            catch (Exception e){
 
+            }
 
         } catch (Exception var17) {
             return;
@@ -147,7 +151,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
                     break;
                 case 3:
                     //申请工单
-                    if(!requireSucess && ready == 1 ){
+                    if(!requireSucess && ready == 1 && order ==0 && order_detail ==0 ){
                         apply_order();
                     }
                     break;
@@ -171,6 +175,9 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
         } else {
             this.detail_time= date;
             ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order),String.valueOf(order_detail));
+            if(ObjectUtil.isEmpty(dto)){
+                return false;
+            }
             //上料数量
             dto.setPresent_feeding_number(String.valueOf(detail_feeding_qty));
             //上料合格数量
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java
index 7ee835c..4e07efd 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDeviceDriver.java
@@ -3,10 +3,21 @@ package org.nl.acs.device_driver.hailiang.hailiang_labeling;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 海亮贴标线体
@@ -22,9 +33,107 @@ public class HaiLiangLabelingDeviceDriver extends AbstractOpcDeviceDriver implem
         return this.device;
     }
 
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
+
+    String device_code;
+    int mode = 0;
+    int last_mode = 0;
+    int error = 0;
+    int move = 0;
+    int order = 0;
+    int order_detail = 0;
+    int detail_qty = 0;
+    int detail_qualified_qty = 0;
+
+    boolean requireSucess = false;
+
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
     @Override
     public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            order = this.itemProtocol.getOrder();
+            order_detail = this.itemProtocol.getOrder_detail();
+            //当前工单明细号上料数量
+            detail_qty = this.itemProtocol.getDetail_qty();
+            //当前工单明细号上料合格数量
+            detail_qualified_qty = this.itemProtocol.getDetail_qualified_qty();
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+            }
+        } catch (Exception var17) {
+            return;
+        }
+
+
+        if (mode == 0) {
+
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+
+            message = "有报警";
+            //无报警
+        } else {
+            message = "";
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    break;
+                case 2:
+                    break;
+                case 4:
+                    //上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
+                    }
+                    break;
+                case 5:
+                    //强制上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
+                    }
+                    break;
+            }
+        }
+        last_mode = mode;
+    }
+
+
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setLabeling_finished(status);
+            dto.setLabeling_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
 
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
     }
 
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java
index 4790af2..ef85336 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDeviceDriver.java
@@ -3,10 +3,21 @@ package org.nl.acs.device_driver.hailiang.hailiang_lettering;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 海亮贴标线体
@@ -17,6 +28,27 @@ import org.nl.acs.opc.Device;
 public class HaiLiangLetteringDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
 
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
+
+    String device_code;
+    int mode = 0;
+    int last_mode = 0;
+    int error = 0;
+    int move = 0;
+    int order = 0;
+    int order_detail = 0;
+    int detail_qty = 0;
+    int detail_qualified_qty = 0;
+
+    boolean requireSucess = false;
+
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
     @Override
     public Device getDevice() {
         return this.device;
@@ -24,7 +56,83 @@ public class HaiLiangLetteringDeviceDriver extends AbstractOpcDeviceDriver imple
 
     @Override
     public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            order = this.itemProtocol.getOrder();
+            order_detail = this.itemProtocol.getOrder_detail();
+            //当前工单明细号上料数量
+            detail_qty = this.itemProtocol.getDetail_qty();
+            //当前工单明细号上料合格数量
+            detail_qualified_qty = this.itemProtocol.getDetail_qualified_qty();
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+            }
+        } catch (Exception var17) {
+            return;
+        }
+
 
+        if (mode == 0) {
+
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+
+            message = "有报警";
+            //无报警
+        } else {
+            message = "";
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    break;
+                case 2:
+                    break;
+                case 4:
+                    //上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
+                    }
+                    break;
+                case 5:
+                    //强制上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
+                    }
+                    break;
+            }
+        }
+        last_mode = mode;
     }
 
+
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setLabeling_finished(status);
+            dto.setLabeling_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
+
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
+    }
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java
index 65cb2eb..f0a6ce3 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java
@@ -12,7 +12,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * 海亮裹膜机
+ * 海亮套冒线体
  */
 @Service
 public class HaiLiangRiskingDefination implements OpcDeviceDriverDefination {
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDeviceDriver.java
index ef77b93..721270d 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDeviceDriver.java
@@ -3,13 +3,24 @@ package org.nl.acs.device_driver.hailiang.hailiang_risking;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * 海亮-裹膜线体
+ * 海亮-套冒线体
  */
 @Slf4j
 @Data
@@ -17,6 +28,28 @@ import org.nl.acs.opc.Device;
 public class HaiLiangRiskingDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
 
+
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
+
+    String device_code;
+    int mode = 0;
+    int last_mode = 0;
+    int error = 0;
+    int move = 0;
+    int order = 0;
+    int order_detail = 0;
+    int detail_qty = 0;
+    int detail_qualified_qty = 0;
+
+    boolean requireSucess = false;
+
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
     @Override
     public Device getDevice() {
         return this.device;
@@ -25,7 +58,84 @@ public class HaiLiangRiskingDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     @Override
     public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            order = this.itemProtocol.getOrder();
+            order_detail = this.itemProtocol.getOrder_detail();
+            //当前工单明细号上料数量
+            detail_qty = this.itemProtocol.getDetail_qty();
+            //当前工单明细号上料合格数量
+            detail_qualified_qty = this.itemProtocol.getDetail_qualified_qty();
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+            }
+        } catch (Exception var17) {
+            return;
+        }
+
+
+        if (mode == 0) {
+
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+
+            message = "有报警";
+            //无报警
+        } else {
+            message = "";
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    break;
+                case 2:
+                    break;
+                case 4:
+                    //上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
+                    }
+                    break;
+                case 5:
+                    //强制上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
+                    }
+                    break;
+            }
+        }
+        last_mode = mode;
+    }
+
+
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setSleeveing_finished(status);
+            dto.setSleeveing_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
 
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
     }
 
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDeviceDriver.java
index 559f698..1c65764 100644
--- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDeviceDriver.java
+++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDeviceDriver.java
@@ -3,10 +3,21 @@ package org.nl.acs.device_driver.hailiang.hailiang_strapping;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.opc.Device;
+import org.nl.acs.order.service.ProduceshiftorderService;
+import org.nl.acs.order.service.ProduceshiftorderdetailService;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 海亮-捆扎线体
@@ -22,10 +33,107 @@ public class HaiLiangStrappingDeviceDriver extends AbstractOpcDeviceDriver imple
         return this.device;
     }
 
+    @Autowired
+    ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
+
+    @Autowired
+    ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class);
+
+    String device_code;
+    int mode = 0;
+    int last_mode = 0;
+    int error = 0;
+    int move = 0;
+    int order = 0;
+    int order_detail = 0;
+    int detail_qty = 0;
+    int detail_qualified_qty = 0;
+
+    boolean requireSucess = false;
+
+    private Date detail_time = new Date();
+    private int detail_time_out = 3000;
+
 
     @Override
     public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            order = this.itemProtocol.getOrder();
+            order_detail = this.itemProtocol.getOrder_detail();
+            //当前工单明细号上料数量
+            detail_qty = this.itemProtocol.getDetail_qty();
+            //当前工单明细号上料合格数量
+            detail_qualified_qty = this.itemProtocol.getDetail_qualified_qty();
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+            }
+        } catch (Exception var17) {
+            return;
+        }
+
+
+        if (mode == 0) {
+
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+
+            message = "有报警";
+            //无报警
+        } else {
+            message = "";
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    break;
+                case 2:
+                    break;
+                case 4:
+                    //上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0){
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"01");
+                    }
+                    break;
+                case 5:
+                    //强制上料完成
+                    if(!requireSucess && order > 0 && order_detail > 0 && detail_qty>0 && detail_qualified_qty>0 ) {
+                        update_detail(String.valueOf(order),String.valueOf(order_detail),"02");
+                    }
+                    break;
+            }
+        }
+        last_mode = mode;
+    }
+
+    public synchronized boolean update_detail(String order, String order_detail,String status) {
+        Date date = new Date();
+        if (date.getTime() - this.detail_time_out < (long) this.detail_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.detail_time_out);
+            return false;
+        } else {
+            this.detail_time = date;
+            ProduceshiftorderdetailDto dto = produceshiftorderdetailService.findOrderDetailFromCache(String.valueOf(order), String.valueOf(order_detail));
+            dto.setStrap_finished(status);
+            dto.setStrap_finish_time(date.toString());
+            produceshiftorderdetailService.update(dto);
+            writing(itemProtocol.item_to_command,String.valueOf(mode));
+            return true;
+        }
+    }
 
+    public void writing(String param, String value) {
+        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + param;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_param, Double.parseDouble(value));
+        ReadUtil.write(itemMap, server);
     }
 
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
index 208966b..fbfe358 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
@@ -141,7 +141,10 @@ public class ProduceshiftorderdetailDto implements Serializable {
     private String feeding_start_time;
 
     /** 上料完成时间 */
-    private String feeding_end_time;
+    private String feeding_finish_time;
+
+    /** 上料完成 */
+    private String feeding_finished;
 
     /** 刻字合格数量 */
     private String qualified_lettering_number;
@@ -152,12 +155,18 @@ public class ProduceshiftorderdetailDto implements Serializable {
     /** 刻字完成时间 */
     private String lettering_finish_time;
 
+    /** 刻字完成 */
+    private String lettering_finished;
+
     /** 当前套冒数量 */
     private String present_sleeveing_number;
 
     /** 套冒合格数量 */
     private String qualified_sleeveing_number;
 
+    /** 套冒完成 */
+    private String sleeveing_finished;
+
     /** 套冒开始时间 */
     private String sleeveing_start_time;
 
@@ -165,10 +174,13 @@ public class ProduceshiftorderdetailDto implements Serializable {
     private String sleeveing_finish_time;
 
     /** 捆扎开始时间 */
-    private String starp_start_time;
+    private String strap_start_time;
 
     /** 捆扎完成时间 */
-    private String starp_finish_time;
+    private String strap_finish_time;
+
+    /** 捆扎完成 */
+    private String strap_finished;
 
     /** 裹膜数量 */
     private String wraping_number;
@@ -185,12 +197,18 @@ public class ProduceshiftorderdetailDto implements Serializable {
     /** 裹膜完成时间 */
     private String wraping_finish_time;
 
+    /** 裹膜完成 */
+    private String wraping_finished;
+
     /** 贴标开始时间 */
     private String labeling_start_time;
 
     /** 贴标完成时间 */
     private String labeling_finish_time;
 
+    /** 贴标完成 */
+    private String labeling_finished;
+
     /** 开始时间 */
     private String start_time;
 
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index 37cacde..97491cd 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -255,6 +255,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             String detail_qty = detaildto.getOrder_detail_qty();
             //刻字信息
             String lettering_message = detaildto.getLettering_message();
+            String lettering_message2 = detaildto.getLettering_message2();
+            //贴标模板
+            String labeling_template = detaildto.getLabeling_template();
             //捆扎每包数量
             String strap_number = detaildto.getStrap_number();
             //尾料数量
@@ -275,7 +278,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             detaildto.setLength(length);
             detaildto.setWall_thickness(wall_thickness);
             detaildto.setOuter_diameter(outer_diameter);
-            detaildto.setLabeling_message(lettering_message);
+            detaildto.setLettering_message(lettering_message);
+            detaildto.setLettering_message2(lettering_message2);
+            detaildto.setLabeling_template(labeling_template);
             detaildto.setStrap_number(strap_number);
             detaildto.setStrap_tailint_number(strap_tailint_number);
             WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail");
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
index b15b8db..c41f851 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
@@ -175,7 +175,7 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
             map.put("上料数量", produceshiftorderdetail.getFeeding_qty());
             map.put("上料合格数量", produceshiftorderdetail.getFeeding_qualified_qty());
             map.put("上料开始时间", produceshiftorderdetail.getFeeding_start_time());
-            map.put("上料完成时间", produceshiftorderdetail.getFeeding_end_time());
+            map.put("上料完成时间", produceshiftorderdetail.getFeeding_finish_time());
             map.put("刻字合格数量", produceshiftorderdetail.getQualified_lettering_number());
             map.put("刻字开始时间", produceshiftorderdetail.getLettering_start_time());
             map.put("刻字完成时间", produceshiftorderdetail.getLettering_finish_time());
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls
index fdb533102f5e05f0834f457d451c93011f315c47..0394b6f40a562a9b4c8a01bdae423aa10f7a7bec 100644
GIT binary patch
delta 9170
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

delta 9127
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
P0^LfXvtIj#(Te^L(6jsa

diff --git a/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerTypeEnum.java b/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerTypeEnum.java
new file mode 100644
index 0000000..8041541
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerTypeEnum.java
@@ -0,0 +1,33 @@
+package org.nl.modules.log;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+public enum LogMarkerTypeEnum {
+    DEFAULT("default", "默认日志"),
+    REQUEST("request", "请求日志"),
+    QUARTZ("quartz", "定时器日志"),
+    DEVICE_EXECUTE("device_execute", "设备执行日志"),
+    AGV_TASK_STATUS("agv_task_status", "agv任务状态日志"),
+    AGV_FEEDBACK_SERVLET("agv_feedback_servlet", "反馈AGV请求"),
+    AGV_LEAVE_SERVLET("agv_leave_servlet", "AGV请求离开"),
+    ACS_TO_ERP("acs_to_erp", "ACS请求ERP"),
+    ACS_TO_WMS("acs_to_wms", "ACS请求WMS"),
+    AUTO_CREATE_INST("auto_create_inst", "自动创建指令"),
+    NDC_SOCKET_CONNECTION_AUTORUN("ndc_socket_connection_autorun", "NDC自动连接"),
+    XZ_AGV_TASK_STATUS("xz_agv_task_status", "仙知AGV指令状态"),
+    WMS_TO_ACS("wms_to_acs", "WMS下发ACS");
+    // 成员变量
+    private String name;
+    private String code;
+
+    // 构造方法
+    private LogMarkerTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static Marker getMarker(LogMarkerTypeEnum logType) {
+        return MarkerFactory.getMarker(logType.code);
+    }
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerUtil.java b/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerUtil.java
new file mode 100644
index 0000000..a428159
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/LogMarkerUtil.java
@@ -0,0 +1,9 @@
+package org.nl.modules.log;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+public class LogMarkerUtil {
+    private static final Marker MARKER = MarkerFactory.getMarker("test_marker");
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppender.java b/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppender.java
new file mode 100644
index 0000000..6af3945
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppender.java
@@ -0,0 +1,52 @@
+package org.nl.modules.log;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import org.bson.Document;
+import org.slf4j.Marker;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * https://www.cnblogs.com/lzghyh/p/14913230.html
+ * https://juejin.cn/post/6844903488896385037
+ * https://cloud.tencent.com/developer/article/1384035
+ * https://www.freesion.com/article/229560377/
+ */
+public class MongoDBAppender extends MongoDBAppenderBase<ILoggingEvent> {
+    public MongoDBAppender() {
+        super("loggingEvents");
+    }
+
+    @Override
+    protected Document toMongoDocument(ILoggingEvent eventObject) {
+
+        final Document doc = new Document();
+        doc.append("date", DateUtil.now());
+        doc.append("source", source);
+        try {
+            doc.append("ip", InetAddress.getLocalHost().getHostAddress());
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+        Marker marker = eventObject.getMarker();
+        if (!ObjectUtil.isEmpty(marker)) {
+            doc.append("marker", marker.getName());
+        }else {
+            doc.append("marker", "default");
+        }
+
+        doc.append("level", eventObject.getLevel().toString());
+        doc.append("logger", eventObject.getLoggerName());
+        doc.append("thread", eventObject.getThreadName());
+        doc.append("message", eventObject.getFormattedMessage());
+        if (eventObject.getMDCPropertyMap() != null && !eventObject.getMDCPropertyMap().isEmpty())
+            doc.append("mdc", eventObject.getMDCPropertyMap());
+        // ...
+        return doc;
+    }
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppenderBase.java b/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppenderBase.java
new file mode 100644
index 0000000..ceab43b
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/MongoDBAppenderBase.java
@@ -0,0 +1,109 @@
+package org.nl.modules.log;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.UnsynchronizedAppenderBase;
+import cn.hutool.core.util.ObjectUtil;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import lombok.Data;
+import org.bson.Document;
+import org.slf4j.Marker;
+
+import java.net.UnknownHostException;
+import java.util.Collections;
+
+/**
+ * MongoDBAppender适配类
+ */
+@Data
+public abstract class MongoDBAppenderBase<E> extends UnsynchronizedAppenderBase<E> {
+    private MongoClient mongo;
+    MongoDatabase db;
+    private MongoCollection<Document> eventsCollection;
+
+    private String host = "127.0.0.1"; // 地址
+    private int port = 27017;           // 端口号
+    private String dbName = "db";       // 库名
+    private String collectionName;      // 集合名
+    private String username;            // 用户名
+    private String password;            // 密码
+    protected String source;
+
+    private int connectionsPerHost = 10; // 空闲线程池中最大链接数
+    private int threadsAllowedToBlockForConnectionMultiplier = 5; //一个线程等待链接可用的最大等待毫秒数
+    private int maxWaitTime = 1000 * 60 * 2;  // 最长等待时间
+    private int connectTimeout;
+    private int socketTimeout;
+    private int wtimeout;
+
+    MongoDBAppenderBase(String collectionName) {
+        this.collectionName = collectionName;
+    }
+
+    @Override
+    public void start() {
+        try {
+            connectToMongoDB();
+            super.start();
+        } catch (UnknownHostException e) {
+            addError("Error connecting to MongoDB server: " + host + ":" + port,
+                    e);
+        }
+    }
+
+    private void connectToMongoDB() throws UnknownHostException {
+        // 用户名 数据库 密码
+        if (username != null && password != null) {
+
+            MongoCredential credential = MongoCredential.createCredential(
+                    username, dbName, password.toCharArray());
+            ServerAddress serverAddress = new ServerAddress(host, port);
+            mongo = new MongoClient(serverAddress, Collections.singletonList(credential), buildOptions());
+        } else {
+            mongo = new MongoClient(new ServerAddress(host, port), buildOptions());
+        }
+
+        db = mongo.getDatabase(dbName);
+        eventsCollection = db.getCollection(collectionName);
+
+    }
+
+    private MongoClientOptions buildOptions() {
+        final MongoClientOptions.Builder options = new MongoClientOptions.Builder();
+        options.connectionsPerHost(connectionsPerHost);
+        options.threadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier);
+        options.maxWaitTime(maxWaitTime);
+        options.connectTimeout(connectTimeout);
+        options.socketTimeout(socketTimeout);
+        options.maxWaitTime(wtimeout);
+        return options.build();
+    }
+
+    protected abstract Document toMongoDocument(E event);
+
+    @Override
+    protected void append(E eventObject) {
+        if (eventObject instanceof ILoggingEvent) {
+            ILoggingEvent evt = (ILoggingEvent) eventObject;
+            Marker marker = evt.getMarker();
+            if (ObjectUtil.isEmpty(marker))
+                marker = LogMarkerTypeEnum.getMarker(LogMarkerTypeEnum.DEFAULT);
+            eventsCollection = db.getCollection(marker.getName());
+
+        }
+
+        eventsCollection.insertOne(toMongoDocument(eventObject));
+    }
+
+    @Override
+    public void stop() {
+        if (mongo != null)
+            mongo.close();
+        super.stop();
+    }
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/rest/RootLogController.java b/nladmin-system/src/main/java/org/nl/modules/log/rest/RootLogController.java
new file mode 100644
index 0000000..0ad0ee4
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/rest/RootLogController.java
@@ -0,0 +1,42 @@
+
+package org.nl.modules.log.rest;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.annotation.Log;
+import org.nl.modules.log.service.RootLogService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author ldjun
+ * @date 2021-08-19
+ **/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "系统日志")
+@RequestMapping("/api/rootLog")
+@Slf4j
+public class RootLogController {
+
+    private final RootLogService rootLogService;
+
+    @GetMapping
+    @Log("查询系统日志")
+    @ApiOperation("查询系统日志")
+    //@PreAuthorize("@el.check('point:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(rootLogService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/service/RootLogService.java b/nladmin-system/src/main/java/org/nl/modules/log/service/RootLogService.java
new file mode 100644
index 0000000..b76d889
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/service/RootLogService.java
@@ -0,0 +1,18 @@
+package org.nl.modules.log.service;
+
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+/**
+ * 系统日志查询
+ */
+public interface RootLogService {
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> queryAll(Map whereJson, Pageable page);
+}
diff --git a/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
new file mode 100644
index 0000000..3f15590
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
@@ -0,0 +1,48 @@
+package org.nl.modules.log.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.log.service.RootLogService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ldjun
+ * @description 服务实现
+ * @date 2021-08-19
+ **/
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class RootLogServiceImpl implements RootLogService {
+
+    private final MongoTemplate mongoTemplate;
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+        //查询条件
+        Query query = Query.query(Criteria.where("level").is("INFO"));
+
+        //根据条件得到的总条数
+        long totalSize = mongoTemplate.count(query, Map.class, "log_root");
+
+        //处理分页
+        query.skip(page.getPageNumber()).limit(page.getPageSize());
+        List<Map> list = mongoTemplate.find(query, Map.class, "log_root");
+
+        //封装前端分页查询结果
+        JSONObject result = new JSONObject();
+        result.put("content", list);
+        result.put("totalElements", totalSize);
+
+        mongoTemplate.findById("",null,null);
+        return result;
+    }
+}
diff --git a/nladmin-system/src/main/resources/config/application-dev.yml b/nladmin-system/src/main/resources/config/application-dev.yml
index 70dab9d..72fdc56 100644
--- a/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/nladmin-system/src/main/resources/config/application-dev.yml
@@ -55,11 +55,11 @@ spring:
         wall:
           config:
             multi-statement-alagvslow: true
-#  data:
-#    mongodb:
-#      host: 192.168.81.251
-#      port: 27017
-#      database: nlacs
+  data:
+    mongodb:
+      host: 127.0.0.1
+      port: 27017
+      database: nlacs
   redis:
     #数据库索引
     database: ${REDIS_DB:0}
diff --git a/nladmin-system/src/main/resources/config/application-prod.yml b/nladmin-system/src/main/resources/config/application-prod.yml
index 0b69047..cfb77a3 100644
--- a/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/nladmin-system/src/main/resources/config/application-prod.yml
@@ -53,11 +53,11 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-#  data:
-#    mongodb:
-#      host: 127.0.0.1
-#      port: 27017
-#      database: logdb
+  data:
+    mongodb:
+      host: 127.0.0.1
+      port: 27017
+      database: logdb
   redis:
     #数据库索引
     database: ${REDIS_DB:0}
diff --git a/nladmin-system/src/main/resources/log/AcsToErp.xml b/nladmin-system/src/main/resources/log/AcsToErp.xml
index 4050229..46f3bc9 100644
--- a/nladmin-system/src/main/resources/log/AcsToErp.xml
+++ b/nladmin-system/src/main/resources/log/AcsToErp.xml
@@ -1,32 +1,17 @@
 <?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="FILE7" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACS请求ERP/%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>
-        </encoder>
-
+    <appender name="acs_to_erp" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>acs_to_erp</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
 
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
     <!-- 打印sql -->
     <logger name=" org.nl.acs.ext.erp.service.impl.AcsToErpServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE7"/>
+        <appender-ref ref="acs_to_erp"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/AcsToWms.xml b/nladmin-system/src/main/resources/log/AcsToWms.xml
index 0b25379..6ba12f1 100644
--- a/nladmin-system/src/main/resources/log/AcsToWms.xml
+++ b/nladmin-system/src/main/resources/log/AcsToWms.xml
@@ -1,32 +1,17 @@
 <?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="FILE8" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACS请求WMS/%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>
-        </encoder>
-
+    <appender name="acs_to_wms" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>acs_to_wms</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
 
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
     <!-- 打印sql -->
     <logger name="org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE8"/>
+        <appender-ref ref="acs_to_wms"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml b/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
new file mode 100644
index 0000000..c236d0c
--- /dev/null
+++ b/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <appender name="agv_feedback_servlet" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>agv_feedback_servlet</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+    </appender>
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
+        <appender-ref ref="agv_feedback_servlet"/>
+    </logger>
+</included>
diff --git a/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml b/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
new file mode 100644
index 0000000..3c9d096
--- /dev/null
+++ b/nladmin-system/src/main/resources/log/AgvLeaveServlet.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <appender name="agv_leave_servlet" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>agv_leave_servlet</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+    </appender>
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.device_driver.electric_fence.ItemProtocol" level="info" additivity="false">
+        <appender-ref ref="agv_leave_servlet"/>
+    </logger>
+
+</included>
diff --git a/nladmin-system/src/main/resources/log/AgvServiceImpl.xml b/nladmin-system/src/main/resources/log/AgvServiceImpl.xml
deleted file mode 100644
index 9da02c8..0000000
--- a/nladmin-system/src/main/resources/log/AgvServiceImpl.xml
+++ /dev/null
@@ -1,32 +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}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE5" 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>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>
-        </encoder>
-
-    </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE5"/>
-    </logger>
-</included>
diff --git a/nladmin-system/src/main/resources/log/AgvackServlet.xml b/nladmin-system/src/main/resources/log/AgvackServlet.xml
deleted file mode 100644
index 4956055..0000000
--- a/nladmin-system/src/main/resources/log/AgvackServlet.xml
+++ /dev/null
@@ -1,32 +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}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE6" 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>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>
-        </encoder>
-
-    </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.device_driver.magic_agv.AgvackServlet" level="info" additivity="false">
-        <appender-ref ref="FILE6"/>
-    </logger>
-</included>
diff --git a/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/nladmin-system/src/main/resources/log/AutoCreateInst.xml
index fe653c6..3117421 100644
--- a/nladmin-system/src/main/resources/log/AutoCreateInst.xml
+++ b/nladmin-system/src/main/resources/log/AutoCreateInst.xml
@@ -1,31 +1,16 @@
 <?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}/自动创建指令/%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>
-        </encoder>
+    <appender name="auto_create_inst" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>auto_create_inst</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
     <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task.AutoCreateInst" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
+    <logger name="org.nl.modules.quartz.task1.AutoCreateInst" level="info" additivity="false">
+        <appender-ref ref="auto_create_inst"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml
index 27c2b31..e908af7 100644
--- a/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml
+++ b/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml
@@ -1,32 +1,17 @@
 <?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="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/NDC/%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>
-        </encoder>
-
+    <appender name="ndc_socket_connection_autorun" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>ndc_socket_connection_autorun</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
 
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
     <!-- 打印sql -->
     <logger name="org.nl.start.auto.run.NDCSocketConnectionAutoRun" level="info" additivity="false">
-        <appender-ref ref="FILE10"/>
+        <appender-ref ref="ndc_socket_connection_autorun"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
index 7d4d2e6..565a189 100644
--- a/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
+++ b/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml
@@ -1,32 +1,15 @@
 <?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="FILE4" 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>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>
-        </encoder>
-
+    <appender name="agv_task_status" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>agv_task_status</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
     <logger name="org.nl.modules.quartz.task.QueryMagicAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="FILE4"/>
+        <appender-ref ref="agv_task_status"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml b/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml
index 7f573f5..4dd0141 100644
--- a/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml
+++ b/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml
@@ -1,32 +1,15 @@
 <?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="FILE10" 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>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>
-        </encoder>
-
+    <appender name="xz_agv_task_status" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>xz_agv_task_status</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task.QueryXZAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="FILE10"/>
+    <logger name="org.nl.modules.quartz.task1.QueryXZAgvTaskStatus" level="info" additivity="false">
+        <appender-ref ref="xz_agv_task_status"/>
     </logger>
 </included>
diff --git a/nladmin-system/src/main/resources/log/ScannerBarcode.xml b/nladmin-system/src/main/resources/log/ScannerBarcode.xml
deleted file mode 100644
index c0e5d9a..0000000
--- a/nladmin-system/src/main/resources/log/ScannerBarcode.xml
+++ /dev/null
@@ -1,32 +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}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE11" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/扫码记录/%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>
-        </encoder>
-
-    </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver" level="info" additivity="false">
-        <appender-ref ref="FILE11"/>
-    </logger>
-</included>
diff --git a/nladmin-system/src/main/resources/log/WmsToAcs.xml b/nladmin-system/src/main/resources/log/WmsToAcs.xml
index 61a4cbd..51e95e9 100644
--- a/nladmin-system/src/main/resources/log/WmsToAcs.xml
+++ b/nladmin-system/src/main/resources/log/WmsToAcs.xml
@@ -1,32 +1,19 @@
 <?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="FILE9" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/WMS下发ACS/%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>
-        </encoder>
-
+    <appender name="wms_to_acs" class="org.nl.modules.log.MongoDBAppender">
+        <dbName>acs_log</dbName>
+        <collectionName>wms_to_acs</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
     <!-- 打印sql -->
     <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE9"/>
+        <appender-ref ref="wms_to_acs"/>
     </logger>
+    <!--<logger name="org.nl.acs.device_driver.electric_fence.ItemProtocol" level="info" additivity="false">
+        <appender-ref ref="wms_to_acs"/>
+    </logger>-->
 </included>
diff --git a/nladmin-system/src/main/resources/logback-spring.xml b/nladmin-system/src/main/resources/logback-spring.xml
index 9e7b6a0..5079f21 100644
--- a/nladmin-system/src/main/resources/logback-spring.xml
+++ b/nladmin-system/src/main/resources/logback-spring.xml
@@ -35,26 +35,39 @@ https://juejin.cn/post/6844903775631572999
         </encoder>
 
         <!--    转为JSON    https://www.zoleet.com/details/328.html-->
-       <!-- <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <pattern>
-                    <pattern>
-                        {
-                        "appName": "logistics-core",
-                        "time": "%date{yyyy-MM-dd HH:mm:ss.SSS}",
-                        "level": "%level",
-                        "pid": "${PID:-}",
-                        "thread": "%thread",
-                        "class": "%logger",
-                        "method": "%method",
-                        "line": "%line",
-                        "message": "%message",
-                        "statck_trace": "%xEx"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
-        </encoder>-->
+        <!-- <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+             <providers>
+                 <pattern>
+                     <pattern>
+                         {
+                         "appName": "logistics-core",
+                         "time": "%date{yyyy-MM-dd HH:mm:ss.SSS}",
+                         "level": "%level",
+                         "pid": "${PID:-}",
+                         "thread": "%thread",
+                         "class": "%logger",
+                         "method": "%method",
+                         "line": "%line",
+                         "message": "%message",
+                         "statck_trace": "%xEx"
+                         }
+                     </pattern>
+                 </pattern>
+             </providers>
+         </encoder>-->
+    </appender>
+
+    <appender name="MONGO" class="org.nl.modules.log.MongoDBAppender">
+        <host>127.0.0.1</host>
+        <port>27017</port>
+        <!--   <username>admin</username>
+           <password>123456</password>-->
+        <dbName>acs_log</dbName>
+        <collectionName>default</collectionName>
+        <source>${CONTEXT_NAME}</source>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
     </appender>
 
 
@@ -91,6 +104,7 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="dev">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="MONGO"/>
         </root>
 
         <logger name="jdbc.audit" level="ERROR" additivity="false">
@@ -102,9 +116,9 @@ https://juejin.cn/post/6844903775631572999
         <logger name="springfox.documentation" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-<!--        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">-->
-<!--            <appender-ref ref="CONSOLE"/>-->
-<!--        </logger>-->
+        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
         <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>