From 0306ec76b20c4ee96f7b726155c4e0c9ce43d47d Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 26 十二月 2024 16:12:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  520 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 376 insertions(+), 144 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e0961e1..f7690df 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,8 +10,11 @@
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.mapper.RgvOneSignMapper;
 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;
@@ -206,6 +209,8 @@
                     case 11:
                         write11((StaProtocol)task.getData());
                         break;
+                    case 99:
+                        write99((Integer) task.getData());
                     default:
                         break;
                 }
@@ -304,62 +309,127 @@
             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*4), (short) 4);
+                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;
                     }
                     try{
                         staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
 
                         staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 褰撳墠浣嶇疆
+//                        staProtocol.setNowRow((short)2);   // 褰撳墠浣嶇疆
 
                         boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
-                        boolean[] status2 = siemensS7Net.getByteTransform().TransBool(resultRgv2.Content, 2, 1);
-                        staProtocol.setRGV1(status[0]);  // 鑷姩
-                        staProtocol.setRGV2(status[1]);  // 鏈夌墿
-                        staProtocol.setRGV3(status[2]); // 鍙叆
-                        staProtocol.setRGV4(status2[0]);//
-                        staProtocol.setRGV5(status2[1]);  //
-                        staProtocol.setRGV6(status2[2]);  // 婊℃墭鐩�
+                        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){
-                        System.out.println(e.getMessage());
+                        log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
                     }
                 }
+            }
+        } else if (slave.getId()==1){
+            try{
+                OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (16));
+
+                int smallEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 0);// 灏忔枡绌烘墭
+                int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 澶ф枡绌烘墭
+                int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 灏忔枡缈昏浆
+                int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 澶ф枡缈昏浆
+                int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131鎺掗槦
+                int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126鎺掗槦
+                int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312鎺掗槦
+                int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310鎺掗槦
+
+                updateRgvOneSign("smallEmpty",smallEmpty);
+                updateRgvOneSign("bigEmpty",bigEmpty);
+                updateRgvOneSign("smallTurn",smallTurn);
+                updateRgvOneSign("bigTurn",bigTurn);
+                updateRgvOneSign("LineUp131",LineUp131);
+                updateRgvOneSign("LineUp126",LineUp126);
+                updateRgvOneSign("LineUp312",LineUp312);
+                updateRgvOneSign("LineUp310",LineUp310);
+
+            } catch (Exception e){
+                log.error("璇诲彇杈撻�佺嚎鏁伴噺鏍囪鍑虹幇寮傚父锛�"+e);
             }
         }
 
 
         //鏉$爜鎵弿鍣�
         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");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+            int[] staNosRgv = new int[]{281,292,173,214,120};
+            if (slave.getId()==2){
+                staNosRgv = new int[]{453,460,518,532,607};
+            }
+            for (int i = 0; i < barcodeSize; i++) {
+                //1:281  2:292  3:174(173) 4:214  5:120
+                //6:453  7:460  8:508 9:534  10:611
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, (i + 1+((slave.getId()-1)*5)));
                 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);
                 }
             }
         }
 
-        //RGV灏忚溅
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
-        if (result3.IsSuccess) {
-            Integer siteId = 2000;
-            StaProtocol staProtocol = station.get(siteId);
-            if (null == staProtocol) {
-                staProtocol = new StaProtocol();
-                staProtocol.setSiteId(siteId);
-                station.put(siteId, staProtocol);
+        if (slave.getId()==2){
+            OperateResultExOne<byte[]> result464 = siemensS7Net.Read("DB101.3720",(short)(8));
+            if (result464.IsSuccess) {
+                String barcode = siemensS7Net.getByteTransform().TransString(result464.Content,0,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 11);
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    StaProtocol staProtocol = station.get(464);
+                    if (null != staProtocol) {
+                        staProtocol.setBarcode(barcode);
+                        barcodeThread.setBarcode(barcode);
+                    }
+                }
             }
-            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
         }
+
+//        //RGV灏忚溅
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
+//        if (result3.IsSuccess) {
+//            Integer siteId = 2000;
+//            StaProtocol staProtocol = station.get(siteId);
+//            if (null == staProtocol) {
+//                staProtocol = new StaProtocol();
+//                staProtocol.setSiteId(siteId);
+//                station.put(siteId, staProtocol);
+//            }
+//            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
+//        }
 
         if (result.IsSuccess) {
 
@@ -373,9 +443,13 @@
                     basDevps.add(staProtocol.toSqlModel());
                 }
 
-                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
-                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+                try{
+                    BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+                    if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+                        throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+                    }
+                } catch (Exception e){
+                    log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -408,9 +482,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 {
@@ -443,26 +517,8 @@
         Integer siteId = staProtocol.getSiteId();
         Integer index =0;
         switch (siteId){
-            case 118:
+            case 607:
                 index=0;
-                break;
-            case 119:
-                index=1;
-                break;
-            case 120:
-                index=2;
-                break;
-            case 121:
-                index=3;
-                break;
-            case 131:
-                index=4;
-                break;
-            case 135:
-                index=5;
-                break;
-            case 147:
-                index=6;
                 break;
             default:
                 return;
@@ -472,7 +528,7 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100.600." + index, true);    // 浠诲姟瀹屾垚
+            write = siemensS7Net.Write("DB100.1872", (short) 1);    // 浠诲姟瀹屾垚
             if(write.IsSuccess){
                 writeCount=6;
             }else {
@@ -501,26 +557,8 @@
         Integer siteId = staProtocol.getSiteId();
         Integer index =0;
         switch (siteId){
-            case 118:
+            case 607:
                 index=0;
-                break;
-            case 119:
-                index=1;
-                break;
-            case 120:
-                index=2;
-                break;
-            case 121:
-                index=3;
-                break;
-            case 131:
-                index=4;
-                break;
-            case 135:
-                index=5;
-                break;
-            case 147:
-                index=6;
                 break;
             default:
                 return;
@@ -530,10 +568,10 @@
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100.600." + index, false);    // 浠诲姟瀹屾垚澶嶄綅
+            write = siemensS7Net.Write("DB100.1872", (short) 0);    // 浠诲姟瀹屾垚澶嶄綅
             if(write.IsSuccess){
                 writeCount=6;
-            }else {
+            } else {
                 writeCount++;
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
@@ -548,7 +586,7 @@
             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));
         }
     }
 
@@ -559,26 +597,43 @@
         if (null == staProtocol) {
             return;
         }
+        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 = "DB100.1826.2";
+                resultV1 = "DB100.1830";
+                resultV2 = "DB100.1826";
+                resultV3 = "DB100.1828";
                 break;
             case 624:
-                resultV1 = "DB100.1830.2";
+                resultV1 = "DB100.1842";
+                resultV2 = "DB100.1838";
+                resultV3 = "DB100.1840";
                 break;
             case 625:
-                resultV1 = "DB100.1834.2";
+                resultV1 = "DB100.1854";
+                resultV2 = "DB100.1850";
+                resultV3 = "DB100.1852";
                 break;
             case 626:
-                resultV1 = "DB100.1838.2";
+                resultV1 = "DB100.1866";
+                resultV2 = "DB100.1862";
+                resultV3 = "DB100.1864";
                 break;
             default:
                 return;
         }
-        result1 = siemensS7Net.Write(resultV1, rgv6);
+        siemensS7Net.Write(resultV2, (short) 0);
+        siemensS7Net.Write(resultV3, (short) 0);
+        result1 = siemensS7Net.Write(resultV1, resultS1);
 
         //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
         try {
@@ -591,27 +646,72 @@
         do {
             try{
                 if(!result1.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
-                    result1 = siemensS7Net.Write(resultV1, rgv6);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�1  鍐欏叆鐩存帴澶辫触 ===>> [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);
-                    if (status[2]){
+                    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(resultV1, rgv6);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�2  鍐欏叆鐩存帴澶辫触 ===>> [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(resultV1, rgv6);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�3  鍐欏叆鐩存帴澶辫触 ===>> [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);
+
+        //纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
+        try {
+            Thread.sleep(200);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        writeCount = 1;
+        do {
+            try{
+                if(!result2.IsSuccess){
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�4  鍐欏叆鐩存帴澶辫触 ===>> [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) {
+                    short status = siemensS7Net.getByteTransform().TransInt16(resultRead1.Content, 0);
+                    if (status == resultS2){
+                        break;
+                    } else {
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�5  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result2 = siemensS7Net.Write(resultV1, resultS2);
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�6  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
                     Thread.sleep(100);
                     writeCount++;
                     continue;
@@ -627,75 +727,133 @@
         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 = "";
-        switch (staProtocol.getSiteId()){
-            case 623:
-                resultV1 = "DB100.1826";
-                break;
-            case 624:
-                resultV1 = "DB100.1830";
-                break;
-            case 625:
-                resultV1 = "DB100.1834";
-                break;
-            case 626:
-                resultV1 = "DB100.1838";
-                break;
-            default:
-                return;
-        }
+        String resultV2 = "";
+        short resultS1 = 1;
+        short resultS2 = 2;
         if (rgv4){
-            result1 = siemensS7Net.Write(resultV1+".0", rgv4);
-        } else {
-            result1 = siemensS7Net.Write(resultV1+".1", rgv5);
+            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.toJSON(staProtocol),writeCount);
-                    if (rgv4){
-                        result1 = siemensS7Net.Write(resultV1+".0", rgv4);
-                    } else {
-                        result1 = siemensS7Net.Write(resultV1+".1", rgv5);
-                    }
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�7  鍐欏叆鐩存帴澶辫触 ===>> [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);
-                    if (status[rgv4? 0:1]){
+//                    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.toJSON(staProtocol),writeCount);
-                        if (rgv4){
-                            result1 = siemensS7Net.Write(resultV1+".0", rgv4);
-                        } else {
-                            result1 = siemensS7Net.Write(resultV1+".1", rgv5);
-                        }
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�8  鍐欏叆鐩存帴澶辫触 ===>> [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);
-                    if (rgv4){
-                        result1 = siemensS7Net.Write(resultV1+".0", rgv4);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�9  鍐欏叆鐩存帴澶辫触 ===>> [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鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�10  鍐欏叆鐩存帴澶辫触 ===>> [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 {
-                        result1 = siemensS7Net.Write(resultV1+".1", rgv5);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�11  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                        result2 = siemensS7Net.Write(resultV1, resultS2);
+
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
                     }
+                } else {
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�12  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
+                    result2 = siemensS7Net.Write(resultV1, resultS2);
                     Thread.sleep(100);
                     writeCount++;
                     continue;
@@ -716,22 +874,24 @@
         OperateResult result2 = null;
         String resultV1 = "";
         String resultV2 = "";
+        News.error("RGV鍐欏叆鍛戒护"+JSON.toJSONString(staProtocol));
+
         switch (staProtocol.getSiteId()){
             case 623:
                 resultV1 = "DB100.1824";
-                resultV2 = "DB100.1828";
+                resultV2 = "DB100.1848";
                 break;
             case 624:
-                resultV1 = "DB100.1828";
-                resultV2 = "DB100.1824";
+                resultV1 = "DB100.1836";
+                resultV2 = "DB100.1860";
                 break;
             case 625:
-                resultV1 = "DB100.1832";
-                resultV2 = "DB100.1836";
+                resultV1 = "DB100.1848";
+                resultV2 = "DB100.1824";
                 break;
             case 626:
-                resultV1 = "DB100.1836";
-                resultV2 = "DB100.1832";
+                resultV1 = "DB100.1860";
+                resultV2 = "DB100.1836";
                 break;
             default:
                 return;
@@ -749,7 +909,7 @@
         do {
             try{
                 if(!result1.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�13  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -761,14 +921,14 @@
                     if (transInt16 == resultS1){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�14  鍐欏叆鐩存帴澶辫触 ===>> [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鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�15  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result1 = siemensS7Net.Write(resultV1, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -784,7 +944,7 @@
         do {
             try{
                 if(!result2.IsSuccess){
-                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                    log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�16  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result2 = siemensS7Net.Write(resultV2, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -796,14 +956,14 @@
                     if (transInt16 == resultS1){
                         break;
                     } else {
-                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
+                        log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�17  鍐欏叆鐩存帴澶辫触 ===>> [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鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�18  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                     result2 = siemensS7Net.Write(resultV2, resultS1);
                     Thread.sleep(100);
                     writeCount++;
@@ -817,15 +977,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("鍐欏叆澶ф枡绠辫緭閫佺嚎椤跺崌涓嬮檷淇″彿澶辫触锛岄噸鏂颁笅鍙戜换鍔�19  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                    result = siemensS7Net.Write(resultV1, true);
+                    Thread.sleep(100);
+                    writeCount++;
+                    continue;
+                }
+                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("DB500.0", (byte) 1);
+                if (resultRead1.IsSuccess) {
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
+                    if (status[devNo-1]){
+                        break;
+                    } else {
+                        log.error("鍐欏叆澶ф枡绠辫緭閫佺嚎椤跺崌涓嬮檷淇″彿澶辫触锛岄噸鏂颁笅鍙戜换鍔�20  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
+                        result = siemensS7Net.Write(resultV1, true);
+                        Thread.sleep(100);
+                        writeCount++;
+                        continue;
+                    }
+                } else {
+                    log.error("鍐欏叆澶ф枡绠辫緭閫佺嚎椤跺崌涓嬮檷淇″彿澶辫触锛岄噸鏂颁笅鍙戜换鍔�21  鍐欏叆鐩存帴澶辫触 ===>> [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) {
@@ -854,13 +1067,32 @@
      * 璁剧疆鍏ュ簱鏍囪
      */
     @Override
-    public void setPakMk(Integer siteId, boolean pakMk) {
+    public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
         StaProtocol staProtocol = station.get(siteId);
         if (null != staProtocol) {
+            log.info("閿佸畾鍏ュ簱鏍囪锛岀珯鐐瑰彿={};pakMk={};鏃堕棿={};鏍囪={}",siteId,pakMk,new Date(),i);
             staProtocol.setPakMk(pakMk);
         }
     }
 
+    public void updateRgvOneSign(String signType,Integer oneSign){
+        RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);
+
+        try{
+            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+            if (!Cools.isEmpty(rgvOneSign)){
+                rgvOneSign.setRgvOneSign(oneSign);
+                rgvOneSignMapper.updateById(rgvOneSign);
+            }
+        } catch (Exception e){
+            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
+            if (!Cools.isEmpty(rgvOneSign)){
+                rgvOneSign.setRgvOneSign(999);
+                rgvOneSignMapper.updateById(rgvOneSign);
+            }
+        }
+    }
+
     @Override
     public void close() {
         siemensS7Net.ConnectClose();

--
Gitblit v1.9.1