From f2fba165f5a8de71729a1ed9546eac971507b257 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 09:21:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  395 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 324 insertions(+), 71 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3850d4e..afbcd87 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -12,6 +12,7 @@
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.core.DevpThread;
+import com.zy.core.News;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
@@ -132,7 +133,7 @@
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 5;
+    private int barcodeSize = 9;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -200,6 +201,14 @@
                     case 9:
                         write9((StaProtocol)task.getData());
                         break;
+                    case 10:
+                        write10((StaProtocol)task.getData());
+                        break;
+                    case 11:
+                        write11((StaProtocol)task.getData());
+                        break;
+                    case 99:
+                        write99((Integer) task.getData());
                     default:
                         break;
                 }
@@ -292,42 +301,70 @@
                 staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
             }
         }
+
         if (slave.getId()==2){
             Thread.sleep(200);
             int[] staNosRgv = {623,624,625,626};
             for (int i = 0; i < staNosRgv.length; i++) {
                 OperateResultExOne<byte[]> resultRgv = siemensS7Net.Read("DB100."+(1800+i*6), (short) 5);
+                OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*12), (short) 8);
                 if (resultRgv.IsSuccess) {
                     Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
                     StaProtocol staProtocol = station.get(siteId);
                     if (null == staProtocol) {
-                        staProtocol = new StaProtocol();
-                        staProtocol.setSiteId(siteId);
-                        station.put(siteId, staProtocol);
+                        continue;
                     }
-                    staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));     // 灏忚溅鐩爣浣�
+                    try{
+                        staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
 
-                    staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));   // 鐩爣绔�
+                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 褰撳墠浣嶇疆
 
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 4, 1);
-                    staProtocol.setRGV1(status[0]);  // 鑷姩
-                    staProtocol.setRGV2(status[1]);  // 鏈夌墿
-                    staProtocol.setRGV3(status[2]); // 鍙叆
-                    staProtocol.setRGV4(status[3]);//
-                    staProtocol.setRGV5(status[4]);  //
-                    staProtocol.setRGV6(status[5]);  // 婊℃墭鐩�
+                        boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
+                        staProtocol.setRGV1(status[0]);  // 灏忚溅鏃犺揣绌洪棽
+                        staProtocol.setRGV2(status[1]);  // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+                        staProtocol.setRGV3(status[2]); // 灏忚溅杩愯涓�
+
+//                        staProtocol.setRGV1(false);  // 灏忚溅鏃犺揣绌洪棽
+//                        staProtocol.setRGV2(true);  // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+//                        staProtocol.setRGV3(false); // 灏忚溅杩愯涓�
+
+                        staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+                        staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4));  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+                        staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6));  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+//
+//                        staProtocol.setRGV44((short) 0);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+//                        staProtocol.setRGV55((short) 0);  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+//                        staProtocol.setRGV66((short) 0);  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+                        staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+                        staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2);  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+                        staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2);  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+
+                    }catch (Exception e){
+                        log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
+                    }
                 }
             }
         }
 
+
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
         if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {  //1:217  2:221  3:null 4:215  5:219
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
+            int[] staNosRgv = {281,292,173,214,120,100,101,102,103};
+
+            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174(173) 4:214  5:120
+                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)) {
+                    Integer siteId = staNosRgv[i]; // 绔欑偣缂栧彿
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        continue;
+                    }
+                    staProtocol.setBarcode(barcode);
                     barcodeThread.setBarcode(barcode);
                 }
             }
@@ -394,9 +431,9 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(500);
             write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+//            Thread.sleep(500);
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
             if(write.IsSuccess || write1.IsSuccess){
                 writeCount=6;
             }else {
@@ -534,44 +571,55 @@
             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));
+            log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚  缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSONString(staProtocol));
         }
     }
 
     /**
      * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
      */
-    private void write10(StaProtocol staProtocol) throws InterruptedException {
+    private void write11(StaProtocol staProtocol) throws InterruptedException {
         if (null == staProtocol) {
             return;
         }
-        boolean rgv4 = staProtocol.isRGV4();
-        boolean rgv5 = staProtocol.isRGV5();
+        News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
+        boolean rgv6 = staProtocol.isRGV6();
         OperateResult result1 = null;
         OperateResult result2 = null;
         String resultV1 = "";
         String resultV2 = "";
+        String resultV3 = "";
+        short resultS1 = 1;
+        short resultS2 = 2;
         switch (staProtocol.getSiteId()){
             case 623:
-                resultV1 = "1804";
-                resultV2 = "1804";
+                resultV1 = "DB100.1830";
+                resultV2 = "DB100.1826";
+                resultV3 = "DB100.1828";
                 break;
             case 624:
-                resultV1 = "1810";
-                resultV2 = "1810";
+                resultV1 = "DB100.1842";
+                resultV2 = "DB100.1838";
+                resultV3 = "DB100.1840";
                 break;
             case 625:
-                resultV1 = "1816";
-                resultV2 = "1816";
+                resultV1 = "DB100.1854";
+                resultV2 = "DB100.1850";
+                resultV3 = "DB100.1852";
                 break;
             case 626:
-                resultV1 = "1822";
-                resultV2 = "1822";
+                resultV1 = "DB100.1866";
+                resultV2 = "DB100.1862";
+                resultV3 = "DB100.1864";
                 break;
             default:
                 return;
         }
-        result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+        siemensS7Net.Write(resultV2, (short) 0);
+        siemensS7Net.Write(resultV3, (short) 0);
+        result1 = siemensS7Net.Write(resultV1, resultS1);
+
         //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
         try {
             Thread.sleep(200);
@@ -583,28 +631,27 @@
         do {
             try{
                 if(!result1.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                    result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
                     continue;
                 }
                 OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
                 if (resultRead1.IsSuccess) {
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
-                    boolean status1 = status[rgv4? 4:3];
-                    if (status1 == rgv4?rgv5:rgv4){
+                    short status = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+                    if (status == 1){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                        result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result1 = siemensS7Net.Write(resultV1, resultS1);
                         Thread.sleep(100);
                         writeCount++;
                         continue;
                     }
                 } else {
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                    result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
                     continue;
@@ -615,33 +662,41 @@
             writeCount++;
         } while (writeCount<6);
 
-        result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
+        result2 = siemensS7Net.Write(resultV1, resultS2);
+
+        //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
         writeCount = 1;
         do {
             try{
                 if(!result2.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                    result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
+
                     Thread.sleep(100);
                     writeCount++;
                     continue;
                 }
-                OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 1);
-                if (resultRead2.IsSuccess) {
-                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead2.Content, 0, 1);
-                    boolean status1 = status[rgv4? 3:4];
-                    if (status1 ==  rgv4?rgv4:rgv5){
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
+                if (resultRead1.IsSuccess) {
+                    short status = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+                    if (status == resultS2){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                        result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result2 = siemensS7Net.Write(resultV1, resultS2);
                         Thread.sleep(100);
                         writeCount++;
                         continue;
                     }
                 } else {
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                    result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
                     Thread.sleep(100);
                     writeCount++;
                     continue;
@@ -652,6 +707,149 @@
             writeCount++;
         } while (writeCount<6);
     }
+
+    private void write10(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
+        boolean rgv4 = staProtocol.isRGV4();
+        boolean rgv5 = staProtocol.isRGV5();
+        OperateResult result1 = null;
+        OperateResult result2 = null;
+        String resultV1 = "";
+        String resultV2 = "";
+        short resultS1 = 1;
+        short resultS2 = 2;
+        if (rgv4){
+            switch (staProtocol.getSiteId()){
+                case 623:
+                    resultV1 = "DB100.1826";
+                    resultV2 = "DB100.1830";
+                    break;
+                case 624:
+                    resultV1 = "DB100.1838";
+                    resultV2 = "DB100.1842";
+                    break;
+                case 625:
+                    resultV1 = "DB100.1850";
+                    resultV2 = "DB100.1854";
+                    break;
+                case 626:
+                    resultV1 = "DB100.1862";
+                    resultV2 = "DB100.1866";
+                    break;
+                default:
+                    return;
+            }
+        } else if (rgv5){
+            switch (staProtocol.getSiteId()){
+                case 623:
+                    resultV1 = "DB100.1828";
+                    resultV2 = "DB100.1830";
+                    break;
+                case 624:
+                    resultV1 = "DB100.1840";
+                    resultV2 = "DB100.1842";
+                    break;
+                case 625:
+                    resultV1 = "DB100.1852";
+                    resultV2 = "DB100.1854";
+                    break;
+                case 626:
+                    resultV1 = "DB100.1864";
+                    resultV2 = "DB100.1866";
+                    break;
+                default:
+                    return;
+            }
+        }
+        siemensS7Net.Write(resultV2, (short) 0);
+        result1 = siemensS7Net.Write(resultV1, resultS1);
+        //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        int writeCount = 1;
+        do {
+            try{
+                if(!result1.IsSuccess){
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result1 = siemensS7Net.Write(resultV1, resultS1);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
+                if (resultRead1.IsSuccess) {
+//                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+                    short statusR1 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+                    if (statusR1 == resultS1){
+                        break;
+                    } else {
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result1 = siemensS7Net.Write(resultV1, resultS1);
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result1 = siemensS7Net.Write(resultV1, resultS1);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+            }catch (Exception e){
+                log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+            }
+            writeCount++;
+        } while (writeCount<6);
+
+
+        result2 = siemensS7Net.Write(resultV1, resultS2);
+
+        writeCount = 1;
+        do {
+            try{
+                if(!result2.IsSuccess){
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
+                if (resultRead1.IsSuccess) {
+//                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+                    short statusR1 = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+                    if (statusR1 == resultS2){
+                        break;
+                    } else {
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result2 = siemensS7Net.Write(resultV1, resultS2);
+
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+            }catch (Exception e){
+                log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+            }
+            writeCount++;
+        } while (writeCount<6);
+    }
+
     private void write9(StaProtocol staProtocol) throws InterruptedException {
         if (null == staProtocol) {
             return;
@@ -661,22 +859,24 @@
         OperateResult result2 = null;
         String resultV1 = "";
         String resultV2 = "";
+        News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
         switch (staProtocol.getSiteId()){
             case 623:
-                resultV1 = "1800";
-                resultV2 = "1812";
+                resultV1 = "DB100.1824";
+                resultV2 = "DB100.1848";
                 break;
             case 624:
-                resultV1 = "1806";
-                resultV2 = "1818";
+                resultV1 = "DB100.1836";
+                resultV2 = "DB100.1860";
                 break;
             case 625:
-                resultV1 = "1812";
-                resultV2 = "1800";
+                resultV1 = "DB100.1848";
+                resultV2 = "DB100.1824";
                 break;
             case 626:
-                resultV1 = "1818";
-                resultV2 = "1806";
+                resultV1 = "DB100.1860";
+                resultV2 = "DB100.1836";
                 break;
             default:
                 return;
@@ -694,7 +894,7 @@
         do {
             try{
                 if(!result1.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -706,14 +906,14 @@
                     if (transInt16 == resultS1){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                         result1 = siemensS7Net.Write(resultV1, resultS1);
                         Thread.sleep(100);
                         writeCount++;
                         continue;
                     }
                 } else {
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -729,7 +929,7 @@
         do {
             try{
                 if(!result2.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result2 = siemensS7Net.Write(resultV2, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -741,14 +941,14 @@
                     if (transInt16 == resultS1){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                         result2 = siemensS7Net.Write(resultV2, resultS1);
                         Thread.sleep(100);
                         writeCount++;
                         continue;
                     }
                 } else {
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result2 = siemensS7Net.Write(resultV2, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -762,15 +962,68 @@
 
         if (!result1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSONString(staProtocol)));
+            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSONString(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));
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(staProtocol)));
+            log.info("杈撻�佺嚎鍛戒护涓嬪彂瀹屾垚  缁欒緭閫佸浣� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSONString(staProtocol));
         }
     }
 
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
+    private void write99(Integer devNo) throws InterruptedException {
+        String resultV1 = "";
+        switch (devNo){
+            case 1:
+                resultV1 = "DB500.0.0";
+                break;
+            case 2:
+                resultV1 = "DB500.0.1";
+                break;
+            case 3:
+                resultV1 = "DB500.0.2";
+                break;
+            default:
+                return;
+        }
+        OperateResult result = siemensS7Net.Write(resultV1, true);
+        Integer writeCount = 0;
+        do {
+            try{
+                if(!result.IsSuccess){
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                    result = siemensS7Net.Write(resultV1, true);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
+                if (resultRead1.IsSuccess) {
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+                    if (status[devNo-1]){
+                        break;
+                    } else {
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                        result = siemensS7Net.Write(resultV1, true);
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                    result = siemensS7Net.Write(resultV1, true);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+            }catch (Exception e){
+                log.error("鍐欏叆鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
+            }
+            writeCount++;
+        } while (writeCount<6);
+    }
+
+
+        // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
         if (this.ioModeOf2F != IoModeType.NONE) {
             if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {

--
Gitblit v1.9.1