From 93ff20c63a5e22e83d08a9e326fe12391eb82abc Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 19 七月 2025 09:31:28 +0800
Subject: [PATCH] 初始化1.0

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  302 +++++++++++++++++++++++++++++---------------------
 1 files changed, 175 insertions(+), 127 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7a5f576..8626b0b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -44,20 +44,19 @@
     private short heartBeatVal = 1;
 
     public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
-        add(100);add(101);add(102);add(103);add(104);
-        add(105);add(106);add(107);
+        add(101);
+        add(102);
+        add(103);
+        add(104);
+        add(105);
+        add(106);
     }};
-
-    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-//        add(401);add(402);
-    }};
-
-    private Integer count=0;
+    private Integer count = 0;
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 4;
+    private int barcodeSize = 3;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -69,7 +68,7 @@
      */
     public IoModeType ioModeOf1F = IoModeType.NONE;
     public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
+    //    public IoModeType ioMode = IoModeType.NONE;
     public IoModeType ioModeOf3F = IoModeType.NONE;
     public IoModeType ioModeOf4F = IoModeType.NONE;
 //    public IoModeType ioMode = IoModeType.NONE;
@@ -82,8 +81,6 @@
         switch (slave.getId()) {
             case 1:
                 return staNos1;
-            case 2:
-                return staNos2;
             default:
                 throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
@@ -107,7 +104,7 @@
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
-                        write((StaProtocol)task.getData());
+                        write((StaProtocol) task.getData());
                         break;
                     default:
                         break;
@@ -126,9 +123,9 @@
      * 鍒濆鍖栫珯鐐圭姸鎬�
      */
     private void initSite() {
-        count ++;
+        count++;
         ArrayList<Integer> staNos = getStaNo();
-        if(count > 10) {
+        if (count > 10) {
             // 绔欑偣缂栧彿
             for (Integer siteId : staNos) {
                 StaProtocol staProtocol = station.get(siteId);
@@ -160,12 +157,12 @@
         siemensS7Net.setRack(slave.getRack().byteValue());
         siemensS7Net.setSlot(slave.getSlot().byteValue());
         OperateResult connect = siemensS7Net.ConnectServer();
-        if(connect.IsSuccess){
+        if (connect.IsSuccess) {
             result = true;
-            OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } else {
-            OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
             log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             initSite();
         }
@@ -181,7 +178,7 @@
         updateIoMode();
         ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
         if (result.IsSuccess) {
             for (int i = 0; i < staNoSize; i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -191,96 +188,70 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 宸ヤ綔鍙�
 
-               staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 鐩爣绔�
+
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
+                staProtocol.setAutoing(status[0]);  //
+                staProtocol.setLoading(status[1]);  // 鏈夌墿
+                staProtocol.setInEnable(status[2]); // 鍙叆
+                staProtocol.setOutEnable(status[3]);// 鍙嚭
+                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
+                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
+                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
+                staProtocol.setLow(status[7]);      // 浣庡簱浣�
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
             }
         }
         Thread.sleep(200);
-//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
-//        if (result0.IsSuccess) {
-//            for (int i = 0; i < staNoSize; i++) {
-//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                StaProtocol staProtocol = station.get(siteId);
-//                if (null == staProtocol) {
-//                    staProtocol = new StaProtocol();
-//                    staProtocol.setSiteId(siteId);
-//                    station.put(siteId, staProtocol);
-//                }
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
-//            }
-//        }
-//        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = null;
-        if(slave.getId()==1) {
-            result1 = siemensS7Net.Read("DB102.0", (short) (staNoSize*2));
-            if (result1.IsSuccess) {
-                for (int i = 0; i < staNoSize; i++) {
-                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
-                    StaProtocol staProtocol = station.get(siteId);
-                    staProtocol.setAutoing(status[0]);  // 鑷姩
-                    staProtocol.setLoading(status[1]);  // 鏈夌墿
-                    staProtocol.setInEnable(status[2]); // 鍙叆
-                    staProtocol.setOutEnable(status[3]);// 鍙嚭
-                    staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-                    staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                    staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                    staProtocol.setLow(status[7]);      // 浣庡簱浣�
 
-                    if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                        staProtocol.setPakMk(true);
-                    }
-                    count = 0;
+        //鎵爜鍣�
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.600.0", (short) (barcodeSize * 10));
+        if (result2.IsSuccess) {
+            for (int i = 0; i < barcodeSize; i++) {
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 10+2, 8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+                if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
                 }
-            }
-        } else if(slave.getId()==2) {
-//            result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize * 2));
-//            if (result1.IsSuccess) {
-//                for (int i = 0; i < staNoSize; i++) {
-//                    Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i * 2, 1);
-//                    StaProtocol staProtocol = station.get(siteId);
-//                    staProtocol.setAutoing(status[0]);  // 鑷姩
-//                    staProtocol.setLoading(status[1]);  // 鏈夌墿
-//                    staProtocol.setInEnable(status[2]); // 鍙叆
-//                    staProtocol.setOutEnable(status[3]);// 鍙嚭
-//                    staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-//                    staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-//                    staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-//                    staProtocol.setLow(status[7]);      // 浣庡簱浣�
-//
-//                    if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-//                        staProtocol.setPakMk(true);
-//                    }
-//                }
-//                count = 0;
-//            }
-        }
-
-        Thread.sleep(200);
-        if(slave.getId()==1) {
-            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB102.40", (short) (barcodeSize * 8));
-            if (result2.IsSuccess) {
-                for (int i = 0; i < barcodeSize; i++) {
-                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
-                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                        barcodeThread.setBarcode(barcode);
-                    }
-                }
-
             }
         }
 
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
-//        }
+        //澶栧舰妫�娴�
+        OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.702.0", (short) (barcodeSize*6));
+        if (resultErr1.IsSuccess) {
+            for (int i = 0; i < barcodeSize; i++) {
+                int sta = 0;
+                switch (i) {
+                    case 0:
+                        sta = 102;
+                        break;
+                    case 1:
+                        sta = 104;
+                        break;
+                    case 2:
+                        sta = 106;
+                        break;
+                }
+                StaProtocol staProtocol1 = station.get(sta);
+                boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, i*6, 1);
+                staProtocol1.setFrontErr(status1[0]);
+                staProtocol1.setBackErr(status1[1]);
+                staProtocol1.setHighErr(status1[2]);
+                staProtocol1.setLeftErr(status1[3]);
+                staProtocol1.setRightErr(status1[4]);
+                staProtocol1.setWeightErr(status1[5]);
+                staProtocol1.setBarcodeErr(status1[6]);
+            }
+        }
 
-        if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {
 
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+        if (!Cools.isEmpty(result) && result.IsSuccess) {
+
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
             try {
@@ -311,31 +282,55 @@
      * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
      */
     private void write(StaProtocol staProtocol) throws InterruptedException {
-        if (null == staProtocol) {
+        if (staProtocol == null) {
             return;
         }
+
         ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[2];
-        array[0] = staProtocol.getWorkNo();
-        array[1] = staProtocol.getStaNo();
-          OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
 
-//        OperateResult write = siemensS7Net.Write("DB100.0" + index*4, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//        Thread.sleep(500);
-//        OperateResult write1 = siemensS7Net.Write("DB100.2" + index*4+2, staProtocol.getStaNo());    // 鐩爣绔�
-
-        if (!write.IsSuccess) {
-            staProtocol = station.get(staProtocol.getSiteId());
-            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
-                staProtocol.setPakMk(true);
-            }
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+        if (index == -1) {
+            log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId());
+            return;
         }
+
+        int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟
+        boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪
+        String plcAddressWorkNo = "DB100." + index * 6;
+        String plcAddressStaNo = "DB100." + (index * 6 + 4);
+        Thread.sleep(100);
+        while (writeCount < 5) {
+            // **璇诲彇褰撳墠PLC鐘舵�侊紝閬垮厤涓嶅繀瑕佺殑鍐欏叆**
+            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
+            if (readResult.IsSuccess) {
+                int currentWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+                short currentStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+
+                if (currentWorkNo == staProtocol.getWorkNo().intValue() && currentStaNo == staProtocol.getStaNo()) {
+                    log.info("绔欑偣 {} 褰撳墠鐘舵�佸凡鍖归厤锛屾棤闇�閲嶅鍐欏叆", staProtocol.getSiteId());
+                    return;
+                }
+            }
+
+            // **娓呴浂骞剁‘璁�**
+            if (!clearPLCData(plcAddressWorkNo, plcAddressStaNo, staProtocol.getSiteId())) {
+                writeCount++;
+                continue; // 閲嶆柊灏濊瘯娓呴浂
+            }
+
+            // **鍐欏叆鏂颁换鍔�**
+            if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
+                writeFlag = true;
+                log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                break;
+            }
+
+            log.warn("杈撻�佺嚎鍛戒护鍐欏叆澶辫触锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            writeCount++;
+        }
+
+        // **鍐欏叆澶辫触澶勭悊**
+        handleWriteFailure(staProtocol, writeFlag);
     }
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
@@ -358,18 +353,12 @@
                 log.error("鍐欏叆杈撻�佺嚎3F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
-        if (this.ioModeOf4F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.86", this.ioModeOf4F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎4F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-            }
-        }
     }
 
     /**
      * 蹇冭烦
      */
-    private void heartbeat(){
+    private void heartbeat() {
         if (heartBeatVal == 1) {
             heartBeatVal = 2;
         } else {
@@ -400,14 +389,14 @@
     public static void main(String[] args) {
         System.out.println(staNos1.indexOf(129));
         System.out.println(staNos1.size());
-        for (int i = 0; i< staNos1.size(); i++) {
+        for (int i = 0; i < staNos1.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);
 //            System.out.println(i);
         }
         int index = staNos1.indexOf(128);
-        System.out.println(index*2);
-        System.out.println(index*2 + 200);
+        System.out.println(index * 2);
+        System.out.println(index * 2 + 200);
     }
 
 //    public static void main(String[] args) throws Exception {
@@ -430,5 +419,64 @@
 //        System.out.println(JSON.toJSONString(devpThread.station));
 //
 //    }
+    /**
+     * 娓呴浂 PLC 鏁版嵁骞堕獙璇佹竻闆舵槸鍚︽垚鍔�
+     */
+    private boolean clearPLCData(String plcAddressWorkNo, String plcAddressStaNo, int siteId) throws InterruptedException {
+        siemensS7Net.Write(plcAddressWorkNo, 0);
+        siemensS7Net.Write(plcAddressStaNo, (short) 0);
+        Thread.sleep(100); // 绛夊緟PLC璇嗗埆
+
+        OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
+        if (readResult.IsSuccess) {
+            int readWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+            short readStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+            if (readWorkNo == 0 && readStaNo == 0) {
+                return true; // 娓呴浂鎴愬姛
+            }
+        }
+
+        log.warn("绔欑偣 {} 娓呴浂澶辫触锛屽皾璇曢噸鏂版竻闆�...", siteId);
+        return false;
+    }
+
+    /**
+     * 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔�
+     */
+    private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
+        OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo());
+
+        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
+
+        if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
+            Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
+            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
+            if (readResult.IsSuccess) {
+                int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+                short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
+                return workNo == staProtocol.getWorkNo().intValue() && staNo == staProtocol.getStaNo();
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 澶勭悊鍐欏叆澶辫触鐨勬儏鍐�
+     */
+    private void handleWriteFailure(StaProtocol staProtocol, boolean writeFlag) {
+        if (!writeFlag) {
+            StaProtocol currentStaProtocol = station.get(staProtocol.getSiteId());
+            if (currentStaProtocol.getWorkNo() == 0 && currentStaProtocol.getStaNo() == 0) {
+                currentStaProtocol.setPakMk(true);
+            }
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�侾LC缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
+                    slave.getId(), JSON.toJSON(currentStaProtocol)));
+            log.error("杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ワ紝PLC缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(currentStaProtocol));
+        } else {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护鎴愬姛 [id:{1}] >>>>> {2}",
+                    DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+            log.info("杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] >>>>> {}", slave.getId(), JSON.toJSON(staProtocol));
+        }
+    }
 
 }

--
Gitblit v1.9.1