From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  488 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 426 insertions(+), 62 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4dde49d..6707f1f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,25 +5,25 @@
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.service.BasDevpService;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
 import com.zy.core.model.protocol.StaProtocol;
+import com.zy.entity.BasDevp;
+import com.zy.service.BasDevpService;
+import com.zy.utils.News;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -39,8 +39,87 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
 
+    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+        add(1001);add(1002);add(1004);add(1005);add(1006);add(1007);add(1008);add(1009);add(1010);add(1011);add(1012);
+        add(1018);add(1017);add(1016);add(1015);add(1014);add(1020);add(1019);add(1013);add(1043);add(1042);add(1041);
+        add(1022);add(1023);add(1024);add(1025);add(1026);add(1027);add(1028);add(1030);add(1031);add(1032);add(1033);
+        add(1034);add(1035);add(1036);add(1038);add(1039);add(1040);
+    }};
+
+    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+        add(1044);add(1045);add(1046);add(1047);add(1048);add(1049);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);add(1058);
+        add(1061);add(1062);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);add(1063);add(1064);add(1065);
+        add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);
+        add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);add(1088);add(1089);add(1090);
+    }};
+
+    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+        add(1091);add(1092);add(1093);add(1094);add(1095);add(1096);add(1097);add(1098);add(1099);add(1100);add(1101);add(1102);
+        add(1103);add(1104);add(1105);add(1106);add(1107);
+    }};
+
+    public static final ArrayList<Integer> rgvSiteBackWrkNo1= new ArrayList<Integer>() {{
+        add(1001);add(1006);add(1012);add(1018);add(1019);add(1041);add(1022);add(1026);add(1033);add(1034);
+    }};
+
+    public static final ArrayList<Integer> rgvSiteBackWrkNo2= new ArrayList<Integer>() {{
+        add(1044);
+    }};
+
+    public static final ArrayList<Integer> rgvSiteBackWrkNo3= new ArrayList<Integer>() {{
+        add(1105);add(1100);add(1091);add(1094);add(1097);
+    }};
+
+    public static final ArrayList<Integer> barcodeList = new ArrayList<Integer>() {{
+        add(1); add(2); add(3); add(4);
+    }};
+
+    // 澶栧舰妫�娴�1鍙穚lc
+    public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
+        add(1006); add(1012);add(1018);add(1041);
+    }};
+
+    // 澶栧舰妫�娴�2鍙穚lc
+    public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
+        add(1083); add(1086);add(1089);
+    }};
+
+    // 鍑虹綈瑁呯嚎鍙嶉缁檞cs淇℃伅绔欑偣
+    public static final ArrayList<Integer> gzxResultSite = new ArrayList<Integer>() {{
+        add(1081); add(1084);add(1087);
+    }};
+
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
+    }
+
+    private ArrayList<Integer> getRgvSiteBackWrkNo() {
+        switch (this.slave.getId()) {
+            case 1: return rgvSiteBackWrkNo1;
+            case 2: return rgvSiteBackWrkNo2;
+            case 3: return rgvSiteBackWrkNo3;
+            default:
+        }
+        return new ArrayList<>();
+    }
+
+    private ArrayList<Integer> getStaNo() {
+        switch (this.slave.getId()) {
+            case 1: return staNos1;
+            case 2: return staNos2;
+            case 3: return staNos3;
+            default:
+        }
+        return new ArrayList<>();
+    }
+
+    private ArrayList<Integer> getStaNosErrList() {
+        switch (this.slave.getId()) {
+            case 1: return staNosErrList1;
+            case 2: return staNosErrList2;
+            default:
+        }
+        return new ArrayList<>();
     }
 
     @Override
@@ -63,18 +142,56 @@
                     case 2:
                         write((StaProtocol)task.getData());
                         break;
+                    // 鍐欏熬妗朵俊鍙�
+                    case 3:
+                        writeTail((StaProtocol)task.getData());
+                        break;
+                    // 鍐欏叆缃愯绾挎《鍨嬩俊鎭�
+                    case 4:
+                        writeGzx((StaProtocol)task.getData());
+                        break;
+                    // 缁欑綈瑁呯嚎鍐欏彲鍑�
+                    case 5:
+                        writeGzxkc((StaProtocol)task.getData());
+                        break;
                     default:
                         break;
                 }
-
                 // 蹇冭烦
-                heartbeat();
-                Thread.sleep(400);
+//                heartbeat();
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
         }
+    }
+
+    /**
+     * 鍒濆鍖栫珯鐐圭姸鎬�
+     */
+    private void initSite() {
+        ArrayList<Integer> staNos = getStaNo();
+            // 绔欑偣缂栧彿
+            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((short) 0);     // 鐩爣绔�
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
     }
 
     @Override
@@ -87,43 +204,78 @@
         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()));
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.info("SiemensDevp"+" - 1"+" - 杈撻�佺嚎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()));
-            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
+        initSite();
         return result;
     }
 
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
-    private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 40);
-        if (result.IsSuccess) {
-            for (int i = 1; i <= 8; i++) {
-                StaProtocol staProtocol = station.get(i);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(i);
-                    station.put(i, staProtocol);
+    private void read() {
+
+        // 璇荤綈瑁呯嚎鍙嶉淇℃伅
+        if (slave.getId() > 3) {
+//            log.info("璇诲彇{}鍙风綈瑁呯嚎plc淇℃伅鎴愬姛",slave.getId());
+            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 58);
+            if (read.IsSuccess) {
+                // 鎴愬搧淇℃伅鍙嶉鍒扮綈瑁呯嚎鍑哄彛绔欑偣
+                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+                StaProtocol staProtocol = devpThread.getStation().get(gzxResultSite.get(slave.getId()-4));
+                if (staProtocol != null) {
+                    staProtocol.setWantBucketFlag(siemensS7Net.getByteTransform().TransInt16(read.Content, 0));// 缃愯绾胯妗跺瀷淇″彿
+                    staProtocol.setWrkNo(siemensS7Net.getByteTransform().TransInt16(read.Content, 2));
+                    double weight208l1 = siemensS7Net.getByteTransform().TransInt32(read.Content, 4); // 200L妗�1鍑�閲�
+                    double weight208l2 = siemensS7Net.getByteTransform().TransInt32(read.Content, 8); // 200L妗�2鍑�閲�
+                    double weight208l3 = siemensS7Net.getByteTransform().TransInt32(read.Content, 12); // 200L妗�3鍑�閲�
+                    double weight208l4 = siemensS7Net.getByteTransform().TransInt32(read.Content, 16); // 200L妗�4鍑�閲�
+                    double weight1T = siemensS7Net.getByteTransform().TransInt32(read.Content, 20); // 1T妗跺噣閲�
+//                    log.info("璇诲彇宸ョ綈瑁呯嚎鍑�閲� 200l妗�1:{},200l妗�2:{},200l妗�3:{},200l妗�4:{},1t妗�:{}",weight208l1,weight208l2,weight208l3,weight208l4,weight1T);
+                    staProtocol.setWeight(weight208l1 + weight208l2 + weight208l3 + weight208l4 + weight1T);
+                    staProtocol.setGrossWeight(siemensS7Net.getByteTransform().TransInt32(read.Content, 24));
+                    staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(read.Content, 28,12,"UTF-8"));
+                    staProtocol.setBatch(siemensS7Net.getByteTransform().TransString(read.Content, 40,10,"UTF-8"));
+                    staProtocol.setManuDate(siemensS7Net.getByteTransform().TransString(read.Content, 50,8,"UTF-8"));
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, (i-1)*2+20));   // 鐩爣绔�
+                return;
             }
         }
-        Thread.sleep(100);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.40", (short) 8);
-        if (result1.IsSuccess) {
-            for (int i = 1; i <= 8; i++) {
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i-1, 1);
-                StaProtocol staProtocol = station.get(i);
+
+        ArrayList<Integer> staNos = getStaNo();
+        if(staNos == null) {
+            log.error("璇诲彇plc鍦板潃鍧楋紝鑾峰彇绔欑偣鍒楄〃澶辫触");
+            return;
+        }
+
+        // 璇荤珯鐐逛俊鎭弽棣�
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNos.size() * 8));
+        if (result.IsSuccess)   {
+            for (int i = 0; i < staNos.size(); 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(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
+
+                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);
@@ -131,29 +283,121 @@
             }
         }
 
-        if (result.IsSuccess && result1.IsSuccess) {
+        // 璇绘晠闅滀俊鎭弽棣�
+        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.920", (short) (staNos.size()*4));
+        if (resultErr2.IsSuccess) {
+            for (int i = 0; i < staNos.size(); i++) {
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i * 4 + 2, 1);
+                StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
+                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]);
+
+            }
+        }
+
+        // 璇籸gv鏀捐揣绔欑偣浠诲姟鍙峰弽棣�
+        ArrayList<Integer> rgvSiteBackWrkNo = getRgvSiteBackWrkNo();
+        OperateResultExOne<byte[]> rgvSiteBackWrkNoResult = siemensS7Net.Read("DB101.1440", (short) (rgvSiteBackWrkNo.size() * 2));
+        if (rgvSiteBackWrkNoResult.IsSuccess) {
+            for (int i = 0; i < rgvSiteBackWrkNo.size(); i ++ ){
+                short hideWrkNo = siemensS7Net.getByteTransform().TransInt16(rgvSiteBackWrkNoResult.Content, i * 2);
+                StaProtocol staProtocol = station.get(getRgvSiteBackWrkNo().get(i));
+                staProtocol.setHideWorkNo((int) hideWrkNo);
+            }
+        }
+
+        // 璇绘潯鐮佹壂鎻忓櫒
+        if(slave.getId() == 1) {
+            OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
+            if (barcodeResult.IsSuccess) {
+                for (int i = 0; i < barcodeList.size(); i++) {
+                    String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*8,8, "UTF-8");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeList.get(i));
+                    if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
+                }
+            }
+        }
+
+        // 璇荤┖妗朵俊鎭弽棣�
+        if (slave.getId() == 1) {
+            OperateResultExOne<byte[]> emptyBucketsResult = siemensS7Net.Read("DB101.1320", (short) (staNosErrList1.size() * 6));
+            if (emptyBucketsResult.IsSuccess) {
+                for (int i = 0; i < staNosErrList1.size(); i++) {
+                    // 妗剁被鍨嬫爣璇�
+                    int bucketType = siemensS7Net.getByteTransform().TransInt16(emptyBucketsResult.Content, i * 6);
+                    // 妗舵暟閲�
+                    int bucketCount = siemensS7Net.getByteTransform().TransInt16(emptyBucketsResult.Content, i * 6 + 2);
+                    // 灏炬《鏍囪瘑
+                    boolean[] tailSupportArray= siemensS7Net.getByteTransform().TransBool(emptyBucketsResult.Content, i * 6 + 4,1);
+                    boolean tailSupportFlag = tailSupportArray[0];
+//                    log.info("绌烘《淇℃伅鍙嶉锛岀珯鐐癸細{}锛屾《绫诲瀷鏍囪瘑锛歿}锛屾暟閲忥細{}锛屽熬妗舵爣璇嗭細{}",staNosErrList1.get(i),bucketType,bucketCount,tailSupportFlag);
+                    StaProtocol staProtocol = station.get(staNosErrList1.get(i));
+                    if (null == staProtocol) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId(staNosErrList1.get(i));
+                        station.put(staNosErrList1.get(i), staProtocol);
+                    }
+                    staProtocol.setBucketType(String.valueOf(bucketType));
+                    staProtocol.setBucketCount(bucketCount);
+                    staProtocol.setTailSupportFlag(tailSupportFlag);
+                }
+            }
+        }
+
+        // 璇诲褰㈡娴�
+        ArrayList<Integer> staNosErrList = getStaNosErrList();
+        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNosErrList.size()*4));
+        if (resultErr.IsSuccess){
+            for (int i = 0;i<staNosErrList.size();i++){
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
+                StaProtocol staProtocol = station.get(staNosErrList.get(i));
+                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 (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
             try {
                 List<BasDevp> basDevps = new ArrayList<>();
-                for (int i = 1; i <= 8; i++) {
-                    StaProtocol staProtocol = station.get(i);
+                for (Integer siteId : staNos) {
+                    StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
                 }
+
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (!basDevpService.updateBatchById(basDevps)) {
-                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+                if(basDevps.size() > 0) {
+                    if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+                        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()));
-                log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", 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()));
-            log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+//            log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         }
     }
 
@@ -164,26 +408,146 @@
         if (null == staProtocol) {
             return;
         }
-        OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        Thread.sleep(300);
-        OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo());    // 鐩爣绔�
-//        boolean[] status = new boolean[8];
-//        status[0] = staProtocol.isAutoing();
-//        status[1] = staProtocol.isLoading();
-//        status[2] = staProtocol.isInEnable();
-//        status[3] = staProtocol.isOutEnable();
-//        status[4] = staProtocol.isEmptyMk();
-//        OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status);     //  鐘舵��
-        if (!write.IsSuccess || !write1.IsSuccess) {
+
+        // 鍙栫珯鐐逛笅鏍囷紝璁$畻plc鍋忕Щ閲�
+        int i = getStaNo().indexOf(staProtocol.getSiteId());
+
+        OperateResult write;
+        OperateResult write1;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write1 = siemensS7Net.Write("DB100." + (i*6 +4), staProtocol.getStaNo());    // 鐩爣绔�
+            write = siemensS7Net.Write("DB100." + (i*6), staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(200);
+            if(write.IsSuccess && write1.IsSuccess){
+                log.info("杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛,绔欑偣锛歿},浠诲姟鍙�:{},鐩爣绔欙細{}",staProtocol.getSiteId(),staProtocol.getWorkNo(),staProtocol.getStaNo());
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
+
+        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));
+            News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎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));
+            News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
+        }
+    }
+
+    /**
+     * 鍐欏熬妗朵俊鍙�
+     */
+    private void writeTail(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+
+        OperateResult write;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100.600", staProtocol.isTailSupportFlag() ? 1 : 0);    // 0 涓嶆槸灏炬《锛�1 鏄熬妗�
+            Thread.sleep(200);
+            if(write.IsSuccess){
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("鍐欏叆灏炬《鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屾槸鍚﹀熬妗�={},鍐欏叆娆℃暟={}", slave.getId(), staProtocol.isTailSupportFlag(), writeCount);
+            }
+        }while (writeCount<5);
+
+        if (!write.IsSuccess) {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ熬妗跺懡浠ゆ暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.isTailSupportFlag()));
+            News.error("SiemensDevp"+" - 4"+" - 鍐欏叆灏炬《鍛戒护鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.isTailSupportFlag());
+        } else {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 鍐欏叆灏炬《鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.isTailSupportFlag()));
+            News.info("SiemensDevp"+" - 5"+" - 鍐欏叆灏炬《鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), staProtocol.isTailSupportFlag());
+        }
+    }
+
+    /**
+     * 鍏ョ綈瑁呯嚎鍓峸cs鍐欐《鍨嬩俊鎭�
+     */
+    private void writeGzx(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        short[] common = new short[3];
+        common[0] = Short.parseShort(staProtocol.getBucketType());
+        common[1] = (short) staProtocol.getBucketCount();
+        common[2] = staProtocol.getWorkNo().shortValue();
+        OperateResult write;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100.0", common);
+            Thread.sleep(200);
+            if(write.IsSuccess){
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屾槸鍚﹀熬妗�={},鍐欏叆娆℃暟={}", slave.getId(), staProtocol.isTailSupportFlag(), writeCount);
+            }
+        }while (writeCount<5);
+
+        if (!write.IsSuccess) {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ熬妗跺懡浠ゆ暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.isTailSupportFlag()));
+            News.error("SiemensDevp"+" - 4"+" - 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.isTailSupportFlag());
+        } else {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.isTailSupportFlag()));
+            News.info("SiemensDevp"+" - 5"+" - 缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鍛戒护涓嬪彂鎴愬姛 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), staProtocol.getBucketType());
+        }
+    }
+
+    /**
+     * 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿
+     */
+    private void writeGzxkc(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        short[] common = new short[1];
+        common[0] = (short) staProtocol.getPlaceableFlag();
+
+        OperateResult write;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100.6", common);
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.6", (short) 2);
+            if(write.IsSuccess && read.IsSuccess){
+                short i = siemensS7Net.getByteTransform().TransInt16(read.Content, 0);
+                if ( i != 1) {
+                    writeCount++;
+                    log.error("缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鎴愬姛锛屼絾鍥炶澶辫触锛氳鍙栧�硷細{},杈撻�佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", i, slave.getId(), writeCount);
+                    continue;
+                }
+                break;
+            }
+            else {
+                writeCount++;
+                log.error("缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿锛歿}澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}", common[0], slave.getId(), writeCount);
+            }
+        }while (writeCount<5);
+
+        if (!write.IsSuccess) {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戠粰缃愯绾垮啓鍏ュ彲鍑轰俊鍙峰け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), staProtocol.getPlaceableFlag()));
+            News.error("SiemensDevp"+" - 4"+" - 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), staProtocol.getPlaceableFlag());
+        } else {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), staProtocol.getPlaceableFlag()));
+            News.info("SiemensDevp"+" - 5"+" - 缁欑綈瑁呯嚎鍐欏叆鍙嚭淇″彿鍛戒护涓嬪彂鎴愬姛 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), staProtocol.getPlaceableFlag());
         }
     }
 
@@ -198,7 +562,7 @@
         }
         OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
         if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("SiemensDevp"+" - 7"+" - 杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
         }
     }
 
@@ -220,22 +584,22 @@
 
     public static void main(String[] args) throws Exception {
         DevpSlave slave = new DevpSlave();
-        slave.setIp("192.168.2.125");
+        slave.setIp("10.10.10.18");
         SiemensDevpThread devpThread = new SiemensDevpThread(slave);
         devpThread.connect();
         devpThread.read();
-        // 鍐�
-        StaProtocol staProtocol = devpThread.getStation().get(1);
-        staProtocol.setWorkNo((short) 232);
-        staProtocol.setStaNo((short) 6);
-        staProtocol.setAutoing(true);
-        staProtocol.setEmptyMk(true);
-        staProtocol.setInEnable(true);
-        devpThread.write(staProtocol);
-        System.out.println("----------------------------------------");
-        // 璇�
-        devpThread.read();
-        System.out.println(JSON.toJSONString(devpThread.station));
+//        // 鍐�
+//        StaProtocol staProtocol = devpThread.getStation().get(1);
+//        staProtocol.setWorkNo((short) 232);
+//        staProtocol.setStaNo((short) 6);
+//        staProtocol.setAutoing(true);
+//        staProtocol.setEmptyMk(true);
+//        staProtocol.setInEnable(true);
+//        devpThread.write(staProtocol);
+//        System.out.println("----------------------------------------");
+//        // 璇�
+//        devpThread.read();
+//        System.out.println(JSON.toJSONString(devpThread.station));
 
     }
 

--
Gitblit v1.9.1