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 |  515 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 335 insertions(+), 180 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a7ba3b2..6707f1f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,27 +8,22 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.common.utils.News;
 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.IoModeType;
 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;
 
 /**
@@ -43,61 +38,88 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-//    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-//
-//    }};
+
     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(108);add(109);add(110);add(111);
-        add(112);add(113);add(114);add(115);
-        add(116);add(117);add(118);add(119);
-        add(120);add(121);add(122);add(123);
-        add(124);add(125);add(126);add(127);
-        add(128);add(129);add(130);add(131);
-        add(132);add(133);add(134);add(135);
-        add(136);add(137);add(138);add(139);
-        add(140);add(141);add(142);add(143);
-        add(144);add(145);add(146);add(147);
-        add(148);add(149);add(150);add(151);
-        add(152);add(153);add(154);add(155);
-        add(156);add(157);add(158);add(159);
-        add(160);add(161);
-        add(200);add(201);add(202);
+        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);
+    }};
 
-    private Integer count=0;
+    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);
+    }};
 
-    /**
-     * 鏉$爜鏁伴噺
-     */
-    private int barcodeSize = 6;
+    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);
+    }};
 
-    /**
-     * 鍏ュ嚭搴撴ā寮�
-     * 0锛氭湭鐭�
-     * 1锛氬叆搴撳惎鍔ㄤ腑
-     * 2.鍏ュ簱妯″紡
-     * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
-     * 4.鍑哄簱妯″紡
-     */
-    public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
-    public IoModeType ioModeOf4F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
+    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> getStaNo() {
-        switch (slave.getId()) {
-            case 1:
-                return staNos1;
+    private ArrayList<Integer> getRgvSiteBackWrkNo() {
+        switch (this.slave.getId()) {
+            case 1: return rgvSiteBackWrkNo1;
+            case 2: return rgvSiteBackWrkNo2;
+            case 3: return rgvSiteBackWrkNo3;
             default:
-                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
         }
+        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
@@ -120,25 +142,36 @@
                     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(300);
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
         }
     }
+
     /**
      * 鍒濆鍖栫珯鐐圭姸鎬�
      */
     private void initSite() {
-        count ++;
         ArrayList<Integer> staNos = getStaNo();
-        if(count > 77) {
             // 绔欑偣缂栧彿
             for (Integer siteId : staNos) {
                 StaProtocol staProtocol = station.get(siteId);
@@ -159,8 +192,6 @@
                     staProtocol.setPakMk(true);
                 }
             }
-            count = 0;
-        }
     }
 
     @Override
@@ -186,14 +217,45 @@
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
-    private void read() throws InterruptedException {
-//        // 鏇存柊鍏ュ嚭搴撴ā寮�
-//        updateIoMode();
+    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"));
+                }
+                return;
+            }
+        }
+
         ArrayList<Integer> staNos = getStaNo();
-        int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
-        if (result.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
+        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) {
@@ -220,63 +282,90 @@
                 }
             }
         }
-//        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
-////        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
-//        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(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
-//
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
-//            }
-//        }
-//
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 4));
-//        if (result1.IsSuccess) {
-//            for (int i = 0; i < staNoSize; i++) {
-//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 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);
-//                }
-//
-//                if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
-//                    staProtocol.setStamp(0);
-//                }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
-//                    //lfd鍏ュ簱鍗拌  褰搒tamp>=2鏃舵墠鍏ュ簱
-//                    staProtocol.setStamp(staProtocol.getStamp()+1);
-//                }
-//            }
-//        }
 
-        //鏉$爜鎵弿鍣�
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(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)){
-//                            && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
-                    barcodeThread.setBarcode(barcode);
+        // 璇绘晠闅滀俊鎭弽棣�
+        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]);
             }
         }
 
@@ -293,9 +382,12 @@
                 }
 
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (null != basDevpService && !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();
@@ -316,47 +408,25 @@
         if (null == staProtocol) {
             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 = null;
-        OperateResult write1 = null;
+        // 鍙栫珯鐐逛笅鏍囷紝璁$畻plc鍋忕Щ閲�
+        int i = getStaNo().indexOf(staProtocol.getSiteId());
+
+        OperateResult write;
+        OperateResult write1;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-//            write = siemensS7Net.Write("DB100.0" + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//            Thread.sleep(500);
-//            write1 = siemensS7Net.Write("DB100.0" + index*2+2, staProtocol.getStaNo());    // 鐩爣绔�
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(500);
-            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            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){
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.0" + index*2, (short) 2);
-                OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100.0" + index*2+2, (short) 2);
-                if(readResult.IsSuccess && readResult1.IsSuccess){
-                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
-                    if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        log.info("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屽苟涓斿洖璇绘垚鍔熴�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                        break;
-                    } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
-                        writeCount++;
-                        log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗杩斿洖鎴愬姛锛屼絾鏄鍙栦换鍔″�间笉涓�鑷淬�傚爢鍨涙満plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                    }
-                } else {
-                    writeCount++;
-                    log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                }
+                log.info("杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛,绔欑偣锛歿},浠诲姟鍙�:{},鐩爣绔欙細{}",staProtocol.getSiteId(),staProtocol.getWorkNo(),staProtocol.getStaNo());
+                break;
             }
             else {
                 writeCount++;
-                log.error("鍐欏叆鍫嗗灈鏈哄懡浠ゅ悗璇诲彇澶辫触銆傚爢鍨涙満plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
         }while (writeCount<5);
 
@@ -373,13 +443,111 @@
         }
     }
 
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
-    private void updateIoMode() throws InterruptedException {
-        if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+    /**
+     * 鍐欏熬妗朵俊鍙�
+     */
+    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());
         }
     }
 
@@ -414,25 +582,12 @@
         siemensS7Net.ConnectClose();
     }
 
-    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++) {
-//            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);
-    }
-
-//    public static void main(String[] args) throws Exception {
-//        DevpSlave slave = new DevpSlave();
-//        slave.setIp("192.168.2.125");
-//        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-//        devpThread.connect();
-//        devpThread.read();
+    public static void main(String[] args) throws Exception {
+        DevpSlave slave = new DevpSlave();
+        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);
@@ -445,7 +600,7 @@
 //        // 璇�
 //        devpThread.read();
 //        System.out.println(JSON.toJSONString(devpThread.station));
-//
-//    }
+
+    }
 
 }

--
Gitblit v1.9.1