From eb5e61b0f85c78455caa4e0ba54245aff982ba3d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 六月 2023 09:13:00 +0800
Subject: [PATCH] 孚能

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   68 ++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ee14cc7..3998985 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -54,7 +54,7 @@
     private int barcodeSize = 2;
     public IoModeType ioMode = IoModeType.NONE;
 
-    public int[][] startSignal = new int[48][2];
+    public int[][] startSignal = new int[48][3];
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -89,47 +89,47 @@
                         StaProtocol staProtocol2 = (StaProtocol)task.getData();
                         siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
                         break;
-                    //澶嶄綅娴嬭瘯淇″彿
-                    case 3:
-                        StaProtocol staProtocol = (StaProtocol)task.getData();
-                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
-                        break;
-                    default:
-                        break;
-                }
-                // 蹇冭烦
+        //澶嶄綅娴嬭瘯淇″彿
+        case 3:
+        StaProtocol staProtocol = (StaProtocol)task.getData();
+        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+        break;
+        default:
+        break;
+    }
+    // 蹇冭烦
 //                heartbeat();
                 Thread.sleep(400);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+} catch (Exception e) {
+        e.printStackTrace();
+        }
 
         }
-    }
+        }
 
-    @Override
-    public boolean connect() {
+@Override
+public boolean connect() {
         boolean result = false;
         siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
         siemensS7Net.setRack(slave.getRack().byteValue());
         siemensS7Net.setSlot(slave.getSlot().byteValue());
         OperateResult connect = siemensS7Net.ConnectServer();
         if(connect.IsSuccess){
-            result = true;
-            OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        result = true;
+        OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+        log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         } else {
-            OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+        OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+        log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
         return result;
-    }
+        }
 
-    /**
-     * 璇诲彇鐘舵�� ====> 鏁村潡plc
-     */
-    private void read() throws InterruptedException {
+/**
+ * 璇诲彇鐘舵�� ====> 鏁村潡plc
+ */
+private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
         int staNoSize = staNos.size();
@@ -205,12 +205,17 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
-        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
+        //娴嬭瘯鏌滅姸鎬佽幏鍙�
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
+        //鍚姩绉诲簱鎸夐挳
+        OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
+        //娑堥槻鎶ヨ
+        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
         if(result3.IsSuccess) {
             for(int i=0; i<48; i++){
-                startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
-                startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
+                startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//娴嬭瘯鏌滅姸鎬�
+                startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//娑堥槻鐘舵��
+                startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//鍚姩鎸夐挳鐘舵��
             }
         }
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
@@ -251,7 +256,8 @@
      */
     private void write103(String packNo){
         try{
-            OperateResult write = siemensS7Net.Write("DB109.", packNo);
+
+            OperateResult write = siemensS7Net.Write("DB109.0", packNo);
             if (!write.IsSuccess) {
                 OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(packNo)));
                 log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(packNo));

--
Gitblit v1.9.1