From 62107c34d3bb40649c6af1385a5f61d81104cf47 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 10 四月 2026 12:56:51 +0800
Subject: [PATCH] 1

---
 zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java |  501 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 352 insertions(+), 149 deletions(-)

diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1d424f4..cd76c30 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,6 +45,15 @@
 
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
 
+    private volatile boolean connected = false;
+
+    private static final int WRITE_RETRY_MAX = 5;
+    private static final int WRITE_RETRY_INTERVAL_MS = 200;
+    private static final int READ_INTERVAL_MS = 100;
+    private static final int DB_UPDATE_INTERVAL_MS = 1000; // 鏁版嵁搴撴洿鏂伴棿闅�
+
+    private long lastDbUpdateTime = 0;
+
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -55,7 +64,7 @@
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
         connect();
-        while (true) {
+        while (!Thread.currentThread().isInterrupted()) {
             try {
                 TaskType step = TaskType.READ;
                 Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
@@ -74,181 +83,333 @@
                     default:
                         break;
                 }
-                Thread.sleep(100);
+                Thread.sleep(READ_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                log.warn("SiemensDevp绾跨▼琚腑鏂� [id:{}]", slave.getId());
+                break;
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("SiemensDevp绾跨▼杩愯寮傚父 [id:{}]", slave.getId(), e);
+                // 鍙戠敓寮傚父鏃跺皾璇曢噸杩�
+                reconnect();
             }
+        }
+        // 绾跨▼閫�鍑烘椂鍏抽棴杩炴帴
+        close();
+        log.info("SiemensDevp绾跨▼宸查��鍑� [id:{}]", slave.getId());
+    }
 
+    /**
+     * 鍒濆鍖栨垨閲嶇疆绔欑偣鐘舵��
+     */
+    private void initSite() {
+        List<Integer> staNos = slave.getStaNos();
+        for (Integer siteId : staNos) {
+            StaProtocol staProtocol = getOrCreateStaProtocol(siteId);
+            resetStaProtocol(staProtocol);
         }
     }
 
     /**
-     * 鍒濆鍖栫珯鐐圭姸鎬�
+     * 鑾峰彇鎴栧垱寤虹珯鐐瑰崗璁璞�
      */
-    private void initSite() {
-        List<Integer> staNos = slave.getStaNos();
-        // 绔欑偣缂栧彿
-        for (Integer siteId : staNos) {
-            StaProtocol staProtocol = station.get(siteId);
-            if (null == staProtocol) {
-                staProtocol = new StaProtocol();
-                staProtocol.setSiteId(siteId);
-                station.put(siteId, staProtocol);
-            }
-            staProtocol.setWorkNo(0);    // ID
-            staProtocol.setAutoing(false);      // 鑷姩
-            staProtocol.setLoading(false);      // 鏈夌墿
-            staProtocol.setInEnable(false);     // 鍙叆
-            staProtocol.setOutEnable(false);    // 鍙嚭
-            staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
-            staProtocol.setStaNo(0);     // 鐩爣绔�
+    private StaProtocol getOrCreateStaProtocol(Integer siteId) {
+        return station.computeIfAbsent(siteId, id -> {
+            StaProtocol protocol = new StaProtocol();
+            protocol.setSiteId(id);
+            return protocol;
+        });
+    }
 
-            if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                staProtocol.setPakMk(true);
-            }
+    /**
+     * 閲嶇疆绔欑偣鍗忚鐘舵��
+     */
+    private void resetStaProtocol(StaProtocol staProtocol) {
+        staProtocol.setWorkNo(0);
+        staProtocol.setAutoing(false);
+        staProtocol.setLoading(false);
+        staProtocol.setInEnable(false);
+        staProtocol.setOutEnable(false);
+        staProtocol.setEmptyMk(false);
+        staProtocol.setStaNo(0);
+
+        if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+            staProtocol.setPakMk(true);
         }
     }
 
     @Override
     public boolean connect() {
-        boolean result = false;
+        // 濡傛灉宸茶繛鎺ワ紝鍏堝叧闂棫杩炴帴
+        if (siemensS7Net != null) {
+            try {
+                siemensS7Net.ConnectClose();
+            } catch (Exception e) {
+                log.warn("鍏抽棴鏃LC杩炴帴寮傚父 [id:{}]", slave.getId(), e);
+            }
+        }
+
         siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
         siemensS7Net.setRack(slave.getRack().byteValue());
         siemensS7Net.setSlot(slave.getSlot().byteValue());
+        
         OperateResult connect = siemensS7Net.ConnectServer();
         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()));
-            News.info("SiemensDevp" + " - 1" + " - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            connected = true;
+            News.info("SiemensDevp - 1 - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", 
+                    slave.getId(), slave.getIp(), slave.getPort());
+            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 [id:{}] [ip:{}] [rack:{}] [slot:{}]", 
+                    slave.getId(), slave.getIp(), slave.getRack(), slave.getSlot());
         } 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()));
-            News.error("SiemensDevp" + " - 2" + " - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            connected = false;
+            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()));
+            News.error("SiemensDevp - 2 - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", 
+                    slave.getId(), slave.getIp(), slave.getPort());
+            log.error("杈撻�佺嚎plc杩炴帴澶辫触 [id:{}] [ip:{}] [error:{}]", 
+                    slave.getId(), slave.getIp(), connect.Message);
         }
-        siemensS7Net.ConnectClose();
+        
         initSite();
-        return result;
+        return connected;
+    }
+
+    /**
+     * 閲嶈繛鏈哄埗
+     */
+    private void reconnect() {
+        log.warn("灏濊瘯閲嶆柊杩炴帴PLC [id:{}]", slave.getId());
+        try {
+            Thread.sleep(1000); // 閲嶈繛鍓嶇瓑寰�1绉�
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return;
+        }
+        connect();
     }
 
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
+        if (!connected || siemensS7Net == null) {
+            log.warn("PLC鏈繛鎺ワ紝璺宠繃璇诲彇 [id:{}]", slave.getId());
+            return;
+        }
+
         List<Integer> staNos = slave.getStaNos();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read(StationStatusField.ALL.buildAddress(), (short) (staNoSize * StationStatusField.ALL.getByteLength()));
-        if (result.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.setWorkNo((int) siemensS7Net.getByteTransform().TransUInt32(result.Content, i * StationStatusField.ALL.getByteLength()));
-                staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * StationStatusField.ALL.getByteLength() + 4));
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * StationStatusField.ALL.getByteLength() + 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);
-                }
-            }
+        
+        // 璇诲彇绔欑偣鐘舵��
+        OperateResultExOne<byte[]> result = siemensS7Net.Read(
+                StationStatusField.ALL.buildAddress(), 
+                (short) (staNoSize * StationStatusField.ALL.getByteLength()));
+        
+        if (!result.IsSuccess) {
+            log.error("璇诲彇绔欑偣鐘舵�佸け璐� [id:{}] [error:{}]", slave.getId(), result.Message);
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}]", 
+                    DateUtils.convert(new Date()), slave.getId(), slave.getIp()));
+            connected = false;
+            return;
         }
 
+        byte[] content = result.Content;
+        for (int i = 0; i < staNoSize; i++) {
+            Integer siteId = staNos.get(i);
+            StaProtocol staProtocol = getOrCreateStaProtocol(siteId);
+            parseStationStatus(content, i, staProtocol);
+        }
 
-        //鏉$爜鎵弿鍣�
+        // 璇诲彇鏉$爜
+        readBarcodes();
+
+        // 璇诲彇澶栧舰妫�娴嬮敊璇�
+        readDimensionErrors();
+
+        // 璇诲彇PLC鏁呴殰
+        readPlcAlarms(staNos, staNoSize);
+
+        // 瀹氭湡鏇存柊鏁版嵁搴擄紙闄嶄綆棰戠巼锛�
+        updateDatabaseIfNeeded();
+    }
+
+    /**
+     * 瑙f瀽鍗曚釜绔欑偣鐘舵��
+     */
+    private void parseStationStatus(byte[] content, int index, StaProtocol staProtocol) {
+        int offset = index * StationStatusField.ALL.getByteLength();
+        staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(content, offset));
+        staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(
+                content, offset + StationStatusField.FINAL_TARGET.getOffset()));
+        
+        boolean[] status = siemensS7Net.getByteTransform().TransBool(
+                content, offset + StationStatusField.STATUS_WORD.getOffset(), 
+                StationStatusField.STATUS_WORD.getByteLength());
+        
+        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);
+        }
+    }
+
+    /**
+     * 璇诲彇鏉$爜淇℃伅
+     */
+    private void readBarcodes() {
         List<Integer> barcodeArr = slave.getBarcodeArr();
-        OperateResultExOne<byte[]> result5 = siemensS7Net.Read(DeviceField.BARCODE.buildAddress(), (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
-        if (result5.IsSuccess) {
-            for (int i = 0; i < barcodeArr.size(); i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * DeviceField.BARCODE.getByteLength(), DeviceField.BARCODE.getByteLength(), "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeArr.get(i));
-                if (Cools.isEmpty(barcode)) {
+        if (barcodeArr == null || barcodeArr.isEmpty()) {
+            return;
+        }
+
+        OperateResultExOne<byte[]> result = siemensS7Net.Read(
+                DeviceField.BARCODE.buildAddress(), 
+                (short) (barcodeArr.size() * DeviceField.BARCODE.getByteLength()));
+        
+        if (!result.IsSuccess) {
+            log.warn("璇诲彇鏉$爜澶辫触 [id:{}]", slave.getId());
+            return;
+        }
+
+        byte[] content = result.Content;
+        for (int i = 0; i < barcodeArr.size(); i++) {
+            String barcode = siemensS7Net.getByteTransform().TransString(
+                    content, i * DeviceField.BARCODE.getByteLength(), 
+                    DeviceField.BARCODE.getByteLength(), "UTF-8");
+            
+            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(
+                    SlaveType.Barcode, barcodeArr.get(i));
+            
+            if (Cools.isEmpty(barcode)) {
+                if (barcodeThread != null) {
                     barcodeThread.clearBarcode();
-                } else {
-                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                        barcodeThread.setBarcode(barcode);
-                        log.info("鏂欑鐮侊細{}", barcode);
-                    }
+                }
+            } else {
+                if (barcodeThread != null && !barcode.equals(barcodeThread.getBarcode())) {
+                    barcodeThread.setBarcode(barcode);
+                    log.info("鏂欑鐮侊細{}", barcode);
                 }
             }
         }
+    }
 
+    /**
+     * 璇诲彇澶栧舰妫�娴嬮敊璇�
+     */
+    private void readDimensionErrors() {
         List<Integer> staNosError = slave.getStaNosError();
-        OperateResultExOne<byte[]> resultError = siemensS7Net.Read(DeviceField.DIMENSION_WORD.buildAddress(), (short) (staNoSize * DeviceField.DIMENSION_WORD.getByteLength()));
-        if (resultError.IsSuccess) {
-            for (int i = 0; i < staNosError.size(); i++) {
-                Integer siteId = staNosError.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i * DeviceField.DIMENSION_WORD.getByteLength(), DeviceField.DIMENSION_WORD.getByteLength());
-                staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
-                staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
-                staProtocol.setHighErr(status[2]);// 楂樿秴闄�
-                staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
-                staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
-                staProtocol.setWeightErr(status[5]); // 瓒呴噸
-                staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
-            }
+        if (staNosError == null || staNosError.isEmpty()) {
+            return;
         }
 
-        //plc鏁呴殰
-        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read(PlcAlarmDefinition.ALL.buildAddress(), (short) (staNoSize * PlcAlarmDefinition.ALL.getByteLength()));
-        if (resultErr2.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * PlcAlarmDefinition.ALL.getByteLength(), PlcAlarmDefinition.ALL.getByteLength());
+        OperateResultExOne<byte[]> result = siemensS7Net.Read(
+                DeviceField.DIMENSION_WORD.buildAddress(), 
+                (short) (staNosError.size() * DeviceField.DIMENSION_WORD.getByteLength()));
+        
+        if (!result.IsSuccess) {
+            log.warn("璇诲彇澶栧舰妫�娴嬮敊璇け璐� [id:{}]", slave.getId());
+            return;
+        }
+
+        byte[] content = result.Content;
+        for (int i = 0; i < staNosError.size(); i++) {
+            Integer siteId = staNosError.get(i);
+            StaProtocol staProtocol = getOrCreateStaProtocol(siteId);
+            
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(
+                    content, i * DeviceField.DIMENSION_WORD.getByteLength(), 
+                    DeviceField.DIMENSION_WORD.getByteLength());
+            
+            staProtocol.setFrontErr(status[0]);
+            staProtocol.setBackErr(status[1]);
+            staProtocol.setHighErr(status[2]);
+            staProtocol.setLeftErr(status[3]);
+            staProtocol.setRightErr(status[4]);
+            staProtocol.setWeightErr(status[5]);
+            staProtocol.setBarcodeErr(status[6]);
+        }
+    }
+
+    /**
+     * 璇诲彇PLC鏁呴殰淇℃伅
+     */
+    private void readPlcAlarms(List<Integer> staNos, int staNoSize) {
+        OperateResultExOne<byte[]> result = siemensS7Net.Read(
+                PlcAlarmDefinition.ALL.buildAddress(), 
+                (short) (staNoSize * PlcAlarmDefinition.ALL.getByteLength()));
+        
+        if (!result.IsSuccess) {
+            log.warn("璇诲彇PLC鏁呴殰淇℃伅澶辫触 [id:{}]", slave.getId());
+            return;
+        }
+
+        byte[] content = result.Content;
+        for (int i = 0; i < staNoSize; i++) {
+            Integer siteId = staNos.get(i);
+            StaProtocol staProtocol = station.get(siteId);
+            if (staProtocol == null) {
+                continue;
+            }
+
+            boolean[] status = siemensS7Net.getByteTransform().TransBool(
+                    content, i * PlcAlarmDefinition.ALL.getByteLength(), 1);
+            
+            staProtocol.setBreakerErr(status[0]);
+            staProtocol.setInfraredErr(status[1]);
+            staProtocol.setOutTimeErr(status[2]);
+            staProtocol.setSeizeSeatErr(status[3]);
+            staProtocol.setWrkYgoodsN(status[4]);
+            staProtocol.setInverterErr(status[5]);
+            staProtocol.setContactErr(status[6]);
+            staProtocol.setUpcontactErr(status[7]);
+        }
+    }
+
+    /**
+     * 鎸夐渶鏇存柊鏁版嵁搴擄紙闄嶄綆鏇存柊棰戠巼锛�
+     */
+    private void updateDatabaseIfNeeded() {
+        long currentTime = System.currentTimeMillis();
+        if (currentTime - lastDbUpdateTime < DB_UPDATE_INTERVAL_MS) {
+            return;
+        }
+
+        try {
+            List<Integer> staNos = slave.getStaNos();
+            List<Devp> devps = new ArrayList<>(staNos.size());
+            for (Integer siteId : staNos) {
                 StaProtocol staProtocol = station.get(siteId);
                 if (staProtocol != null) {
-                    staProtocol.setBreakerErr(status[0]);
-                    staProtocol.setInfraredErr(status[1]);
-                    staProtocol.setOutTimeErr(status[2]);
-                    staProtocol.setSeizeSeatErr(status[3]);
-                    staProtocol.setWrkYgoodsN(status[4]);
-                    staProtocol.setInverterErr(status[5]);
-                    staProtocol.setContactErr(status[6]);
-                    staProtocol.setUpcontactErr(status[7]);
-                }
-            }
-        }
-
-        if (result.IsSuccess) {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
-
-            // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-            try {
-                List<Devp> devps = new ArrayList<>();
-                for (Integer siteId : staNos) {
-                    StaProtocol staProtocol = station.get(siteId);
                     devps.add(staProtocol.toSqlModel());
                 }
-                DevpService devpService = SpringContextUtil.getBean(DevpService.class);
-                if (null != devpService) {
-                    devpService.updateBatchByDevpNo(devps);
-                } else {
-                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-                }
-            } catch (Exception e) {
-                initSite();
-                e.printStackTrace();
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-                News.error("SiemensDevp" + " - 3" + " - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
-        } 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()));
+            if (devps.isEmpty()) {
+                return;
+            }
+
+            DevpService devpService = SpringContextUtil.getBean(DevpService.class);
+            if (devpService != null) {
+                devpService.updateBatchByDevpNo(devps);
+                lastDbUpdateTime = currentTime;
+                log.debug("鎵归噺鏇存柊鏁版嵁搴撴垚鍔� [id:{}] [count:{}]", slave.getId(), devps.size());
+            } else {
+                log.error("DevpService鏈壘鍒帮紝鏃犳硶鏇存柊鏁版嵁搴� [id:{}]", slave.getId());
+            }
+        } catch (Exception e) {
+            log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� [id:{}]", slave.getId(), e);
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}]", 
+                    DateUtils.convert(new Date()), slave.getId()));
+            News.error("SiemensDevp - 3 - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}]", slave.getId());
+            // 鏇存柊澶辫触鏃堕噸缃珯鐐圭姸鎬�
+            initSite();
         }
     }
 
@@ -256,36 +417,69 @@
      * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
      */
     private void write(StaProtocol staProtocol) throws InterruptedException {
-        if (null == staProtocol) {
+        if (staProtocol == null) {
+            log.warn("鍐欏叆鏁版嵁涓虹┖锛岃烦杩� [id:{}]", slave.getId());
             return;
         }
+
+        if (!connected || siemensS7Net == null) {
+            log.error("PLC鏈繛鎺ワ紝鏃犳硶鍐欏叆 [id:{}]", slave.getId());
+            return;
+        }
+
         List<Integer> staNos = slave.getStaNos();
         int index = staNos.indexOf(staProtocol.getSiteId());
+        if (index < 0) {
+            log.error("绔欑偣缂栧彿涓嶅瓨鍦ㄤ簬閰嶇疆涓� [id:{}] [siteId:{}]", slave.getId(), staProtocol.getSiteId());
+            return;
+        }
 
-        OperateResult write = null;
-        OperateResult write1 = null;
-        //浠诲姟涓嬪彂娆℃暟
+        int baseOffset = index * TaskField.ALL.getByteLength();
+        String workNoAddr = TaskField.TASK_NUMBER.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION 
+                + (baseOffset + TaskField.TASK_NUMBER.getOffset());
+        String destStaAddr = TaskField.DEST_STATION.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION 
+                + (baseOffset + TaskField.DEST_STATION.getOffset());
+
+        // 浠诲姟涓嬪彂閲嶈瘯鏈哄埗
         int writeCount = 0;
-        do {
-            write = siemensS7Net.Write(TaskField.TASK_NUMBER.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.TASK_NUMBER.getOffset()), staProtocol.getWorkNo().shortValue());    // 宸ヤ綔鍙�
-            Thread.sleep(200);
-            write1 = siemensS7Net.Write(TaskField.DEST_STATION.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION + (index * TaskField.ALL.getByteLength() + TaskField.DEST_STATION.getOffset()), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
-            if (write.IsSuccess && write1.IsSuccess) {
-                log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+        boolean success = false;
+        
+        while (writeCount < WRITE_RETRY_MAX) {
+            OperateResult writeResult = siemensS7Net.Write(workNoAddr, staProtocol.getWorkNo().shortValue());
+            Thread.sleep(WRITE_RETRY_INTERVAL_MS);
+            
+            OperateResult writeResult1 = siemensS7Net.Write(destStaAddr, staProtocol.getStaNo().shortValue());
+            
+            if (writeResult.IsSuccess && writeResult1.IsSuccess) {
+                log.info("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] [siteId:{}] [workNo:{}] [destSta:{}] [retry:{}]", 
+                        slave.getId(), staProtocol.getSiteId(), staProtocol.getWorkNo(), 
+                        staProtocol.getStaNo(), writeCount);
+                success = true;
                 break;
-            } else {
-                writeCount++;
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
-        } while (writeCount < 5);
+            
+            writeCount++;
+            log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触 [id:{}] [siteId:{}] [retry:{}] [workErr:{}] [destErr:{}]", 
+                    slave.getId(), staProtocol.getSiteId(), writeCount, 
+                    writeResult.Message, writeResult1.Message);
+            
+            if (writeCount < WRITE_RETRY_MAX) {
+                Thread.sleep(WRITE_RETRY_INTERVAL_MS);
+            }
+        }
 
-        if (!write.IsSuccess) {
-            staProtocol = station.get(staProtocol.getSiteId());
-            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
-                staProtocol.setPakMk(true);
+        if (!success) {
+            StaProtocol currentSta = station.get(staProtocol.getSiteId());
+            if (currentSta != null && currentSta.getWorkNo() == 0 && currentSta.getStaNo() == 0) {
+                currentSta.setPakMk(true);
             }
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+            
+            String errorMsg = MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", 
+                    slave.getId(), JSON.toJSON(staProtocol));
+            OutputQueue.DEVP.offer(errorMsg);
+            News.error("SiemensDevp - 4 - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", 
+                    slave.getId(), JSON.toJSON(staProtocol));
+            log.error(errorMsg);
         }
     }
 
@@ -303,7 +497,16 @@
 
     @Override
     public void close() {
-        siemensS7Net.ConnectClose();
+        if (siemensS7Net != null) {
+            try {
+                siemensS7Net.ConnectClose();
+                log.info("PLC杩炴帴宸插叧闂� [id:{}]", slave.getId());
+            } catch (Exception e) {
+                log.error("鍏抽棴PLC杩炴帴寮傚父 [id:{}]", slave.getId(), e);
+            } finally {
+                connected = false;
+            }
+        }
     }
 
 

--
Gitblit v1.9.1