From db479403cb04f33586584844d9cbdde513201712 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 七月 2024 15:42:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SteThread.java |  340 ++++++++++++++++----------------------------------------
 1 files changed, 96 insertions(+), 244 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 9a4be94..483c4e7 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -17,8 +17,8 @@
 import com.zy.core.ThreadHandler;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
-import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.SteLocaType;
 import com.zy.core.enums.SteStatusType;
 import com.zy.core.model.SteSlave;
 import com.zy.core.model.Task;
@@ -43,8 +43,6 @@
     private SteSlave slave;
     private SteProtocol steProtocol;
     private short heartBeatVal = 1;
-    private boolean V20011 = true;
-    private boolean V20001 = true;
     private boolean resetFlag = false;
 
     public SteThread(SteSlave slave) {
@@ -102,10 +100,10 @@
     @Override
     public boolean connect() {
         boolean result = false;
-        // 涓嶈兘鏈� 妲藉彿 鍜� 鏈烘灦鍙�
-        siemensS7Net = new SiemensS7Net(SiemensPLCS.S200Smart, slave.getIp());
-//        siemensS7Net.setRack(slave.getRack().byteValue());
-//        siemensS7Net.setSlot(slave.getSlot().byteValue());
+        //
+        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;
@@ -125,106 +123,56 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensS7Net.Read("V800", (short) 70);
+            OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 28);
             if (result.IsSuccess) {
                 if (null == steProtocol) {
                     steProtocol = new SteProtocol();
                     steProtocol.setSteNo(slave.getId().shortValue());
                 }
-//                steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
                 steProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));
                 steProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
-                OperateResultExOne<Boolean> executeRes = siemensS7Net.ReadBool("V2001.0");
-                if (executeRes.IsSuccess) {
-                    steProtocol.setExecute(executeRes.Content);
-                }
-                OperateResultExOne<Boolean> waitingRes = siemensS7Net.ReadBool("V2001.1");
+
+                OperateResultExOne<Boolean> waitingRes = siemensS7Net.ReadBool("DB101.20.2");
                 if (waitingRes.IsSuccess) {
                     steProtocol.setWaiting(waitingRes.Content);
                 }
-//                if (steProtocol.getSteNo()==1){
-//                    if (!steProtocol.getWaiting().equals(V20011)){
-//                        News.error("灏忚溅鍙� ={} :V2001.1鍦板潃璇诲彇鍊间笉涓�鑷达紝璇�={}  璁板綍={}",steProtocol.getSteNo(),steProtocol.getWaiting(),V20011);
-//                    }
-//                    V20011=steProtocol.getWaiting();
-//                    OperateResultExOne<Boolean> waitingRes2 = siemensS7Net.ReadBool("V2000.1");
-//                    if (waitingRes2.IsSuccess) {
-//                        if (!waitingRes2.Content.equals(V20001)){
-//                            News.error("灏忚溅鍙� ={} :V2000.1鍦板潃璇诲彇鍊间笉涓�鑷达紝璇�={} 璁板綍={}",steProtocol.getSteNo(),waitingRes2.Content,V20001);
-//                        }
-//                        V20001=waitingRes2.Content;
-//                    }
-//                    OperateResultExOne<Boolean> waitingRes3 = siemensS7Net.ReadBool("V2500.1");
-//                    if (waitingRes3.IsSuccess) {
-//                        if (!waitingRes3.Content.equals(waitingRes2.Content)){
-//                            News.error("灏忚溅鍙� ={} :V2000.1鍦板潃璇诲彇鍊间笉涓�鑷达紝璇�={} 锛� V2500.1鍦板潃璇诲彇鍊间笉涓�鑷达紝璇�={}",steProtocol.getSteNo(),waitingRes2.Content,waitingRes3.Content);
+
+                steProtocol.setCharge(siemensS7Net.getByteTransform().TransSingle(result.Content, 6));
+                steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 10));
+                steProtocol.setTaskType(siemensS7Net.getByteTransform().TransInt16(result.Content, 12));
+                steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 14));
+                steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));
+                steProtocol.setLev(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
+                steProtocol.setLoca(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
+                steProtocol.setLocaStart(siemensS7Net.getByteTransform().TransInt16(result.Content, 22));
+                steProtocol.setLocaEnd(siemensS7Net.getByteTransform().TransInt16(result.Content, 24));
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 26, 1);
+//                steProtocol.setReady(status[0]?(short)1:(short)0);
+//                steProtocol.setReady(status[1]?(short)1:(short)0);
+                steProtocol.setReady(status[3]?(short)1:(short)0);
+//                steProtocol.setReady(status[3]?(short)1:(short)0);
+//                steProtocol.setTrack(status[6]?(short)1:(short)0);
+
+                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);
+
+                steProtocol.setChargeStatus(status2[0]?(short)1:(short)0);
+                steProtocol.setTrack(status2[1]?(short)1:(short)0);
+
+//                steProtocol.setLoad(status2[6]?(short)1:(short)0);
+                steProtocol.setLoad(status2[7]?(short)1:(short)0);
+
+                OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+//                // 澶嶄綅淇″彿
+//                if (steProtocol.getWaiting()) {
+//                    if (resetFlag) {
+//                        SteCommand steCommand = new SteCommand();
+//                        steCommand.setComplete(true);
+//                        if (write(steCommand) && confirmPos()) {
+//                            resetFlag = false;
 //                        }
 //                    }
 //                }
-                OperateResultExOne<Boolean> inEmptyRes = siemensS7Net.ReadBool("V2001.2");
-                if (inEmptyRes.IsSuccess) {
-                    steProtocol.setInEmpty(inEmptyRes.Content);
-                }
-                OperateResultExOne<Boolean> outEmptyRes = siemensS7Net.ReadBool("V2001.3");
-                if (outEmptyRes.IsSuccess) {
-                    steProtocol.setOutEmpty(outEmptyRes.Content);
-                }
-                steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt16(result.Content, 6));
-                steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt16(result.Content, 8));
-                steProtocol.setCharge(siemensS7Net.getByteTransform().TransSingle(result.Content, 10));
-//                steProtocol.setFullCharge();
-//                steProtocol.setLowCharge();
-                steProtocol.setFeed(siemensS7Net.getByteTransform().TransInt16(result.Content, 14));
-                steProtocol.setLoca(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));
-//                steProtocol.setCloser();
-//                steProtocol.setSpeed();
-                steProtocol.setPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
-                steProtocol.setLoad(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
-                steProtocol.setTrack(siemensS7Net.getByteTransform().TransInt16(result.Content, 22));
-                steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 24));
-                steProtocol.setTaskType(siemensS7Net.getByteTransform().TransInt16(result.Content, 28));
-                steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 30));
-                steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 32));
-                steProtocol.setLev(siemensS7Net.getByteTransform().TransInt16(result.Content, 34));
-
-//                steProtocol.setHisTaskNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 58));
-//                steProtocol.setHisTaskStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 62));
-//                steProtocol.setCheckQty(siemensS7Net.getByteTransform().TransInt16(result.Content, 64));
-                steProtocol.setReady(siemensS7Net.getByteTransform().TransInt16(result.Content, 36));
-//                steProtocol.setChargeNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 68));
-
-//                steProtocol.setHeart(siemensS7Net.getByteTransform().TransInt16(result.Content, 72));
-                steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 38));
-                steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 40));
-                steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
-                steProtocol.setChargeStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
-                OperateResultExOne<Boolean> steChargeRes = siemensS7Net.ReadBool("V740.6");
-                if (steChargeRes.IsSuccess) {
-                    steProtocol.setSteCharge(steChargeRes.Content);
-                    if (steChargeRes.Content){
-                        steProtocol.setChargeStatus((short)1);
-                    }
-                }
-
-                OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
-
-                // 澶嶄綅淇″彿
-                if (steProtocol.getWaiting()) {
-                    News.info("-------------绗竴姝ャ�乕绌挎杞﹀彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负{}锛岀瓑寰匴CS纭锛侊紒{}",
-                            slave.getId(),steProtocol.getTaskNo(),steProtocol.getStatus(), resetFlag);
-                    if (resetFlag) {
-                        News.info("绗簩姝ャ�佹敹鍒颁富绾跨▼澶嶄綅鏍囪 resetFlag = true,[绌挎杞﹀彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负{}锛岀瓑寰匴CS纭锛侊紒{}",
-                                slave.getId(),steProtocol.getTaskNo(),steProtocol.getStatus(), resetFlag);
-                        SteCommand steCommand = new SteCommand();
-                        steCommand.setComplete(true);
-                        if (write(steCommand) && confirmPos()) {
-                            resetFlag = false;
-                            News.info("绗笁姝ャ�佸彂閫佸浣嶅懡浠ゆ垚鍔� resetFlag = false,[绌挎杞﹀彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负{}锛岀瓑寰匴CS纭锛侊紒{}",
-                                    slave.getId(),steProtocol.getTaskNo(),steProtocol.getStatus(), resetFlag);
-                        }
-                    }
-                }
-
 
                 // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
                 BasSteService service = SpringUtils.getBean(BasSteService.class);
@@ -243,13 +191,11 @@
 
                 }
             } else {
-                OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆憑1}绌挎杞lc鐘舵�佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
+                OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆憑1}绌挎杞lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
                 throw new CoolException(MessageFormat.format( "绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
             }
         } catch (Exception e) {
-//            e.printStackTrace();
             OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆戣鍙栫┛姊溅plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-//            News.error("璇诲彇绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
             initSte();
         }
 
@@ -258,64 +204,34 @@
     /**
      * 鍐欏叆鏁版嵁
      */
-    private boolean write(SteCommand command) throws InterruptedException {
-        if (null == command) {
+    private boolean write(SteCommand command){
+        return this.write(command, 1);
+    }
+
+    /**
+     * 鍐欏叆鏁版嵁
+     */
+    private boolean write(SteCommand command, int times){
+        if (null == command || times > 2) {
             News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
-            return false;
-        }
-        //鍒ゆ柇灏忚溅鏄惁鍦ㄥ厖鐢�
-        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
-        if (devpThread.charge0
-                && !Cools.isEmpty(command.getRow(),command.getBay(),command.getLev())
-                && command.getRow().intValue()==1 && command.getBay().intValue()==1 && command.getLev().intValue()==1){
-            // led 寮傚父鏄剧ず
-            LedThread ledThread1 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
-            LedThread ledThread2 = (LedThread) SlaveConnection.get(SlaveType.Led, 2);
-            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
-            if (ledThread1 != null && ledThread2 != null && ledThread3 != null) {
-                MessageQueue.offer(SlaveType.Led, 1, new Task(3, "绌挎杞︽鍦�1鎺掑厖鐢垫々鍏呯數"));
-                MessageQueue.offer(SlaveType.Led, 2, new Task(3, "绌挎杞︽鍦�1鎺掑厖鐢垫々鍏呯數"));
-                MessageQueue.offer(SlaveType.Led, 3, new Task(3, "绌挎杞︽鍦�1鎺掑厖鐢垫々鍏呯數"));
-            }
-            News.error("绌挎杞︽鍦�1鎺掑厖鐢垫々鍏呯數");
-            return false;
-        }else if (devpThread.charge1
-                && !Cools.isEmpty(command.getRow(),command.getBay(),command.getLev())
-                && command.getRow().intValue()==13 && command.getBay().intValue()==1 && command.getLev().intValue()==1){
-            // led 寮傚父鏄剧ず
-            LedThread ledThread1 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
-            LedThread ledThread2 = (LedThread) SlaveConnection.get(SlaveType.Led, 2);
-            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
-            if (ledThread1 != null && ledThread2 != null && ledThread3 != null) {
-                MessageQueue.offer(SlaveType.Led, 1, new Task(3, "绌挎杞︽鍦�13鎺掑厖鐢垫々鍏呯數"));
-                MessageQueue.offer(SlaveType.Led, 2, new Task(3, "绌挎杞︽鍦�13鎺掑厖鐢垫々鍏呯數"));
-                MessageQueue.offer(SlaveType.Led, 3, new Task(3, "绌挎杞︽鍦�13鎺掑厖鐢垫々鍏呯數"));
-            }
-            News.error("绌挎杞︽鍦�13鎺掑厖鐢垫々鍏呯數");
             return false;
         }
         command.setSteNo(slave.getId());
         OperateResult result = null;
+        News.error("绌挎杞﹀啓鍏ュ懡浠�"+JSON.toJSONString(command));
+
         // 寮�濮嬩换鍔�
         if (!command.getComplete()) {
             //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
-            siemensS7Net.Write("V2000.0", false);
-            siemensS7Net.Write("V2000.1", false);
-//            siemensS7Net.Write("V2500.1", false);
-            Thread.sleep(200);
-            OperateResultExOne<Boolean> waitingRes2 = siemensS7Net.ReadBool("V2000.1");
-            if (waitingRes2.IsSuccess) {
-                if(!waitingRes2.Content){
-                    News.error("閲嶇疆浠诲姟瀹屾垚纭浣嶆垚鍔�");
-                } else {
-                    News.error("閲嶇疆浠诲姟瀹屾垚纭浣嶅け璐�1");
-                }
-            } else {
-                News.error("閲嶇疆浠诲姟瀹屾垚纭浣嶅け璐�2");
-            }
-
+            siemensS7Net.Write("DB100.0", (short) 0);//璁惧鍙�
+            siemensS7Net.Write("DB100.2", (short) 0);//浠诲姟鍙�
+            siemensS7Net.Write("DB100.12", (short) 0);//璧峰鐐逛綅
+            siemensS7Net.Write("DB100.14", (short) 0);//鐩殑鐐逛綅
+            siemensS7Net.Write("DB100.16.0", false);//浠诲姟寮�濮嬬‘璁や綅
+            siemensS7Net.Write("DB100.16.1", false);//浠诲姟瀹屾垚纭浣�
+//            siemensS7Net.Write("DB100.18", (short) 0);//纭寲缃愬彿
             // 1.浠诲姟鍙�
-            OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
+            OperateResult result0 = siemensS7Net.Write("DB100.2", command.getTaskNo().shortValue());
             try {
                 Thread.sleep(200);
             } catch (InterruptedException e) {
@@ -324,41 +240,28 @@
             // 浣滀笟
             if (command.getTaskMode() != 0) {
                 // 2.浣滀笟
-                OperateResult result1 = siemensS7Net.Write("V1000", command.getTaskMode());
+                OperateResult result1 = siemensS7Net.Write("DB100.4", command.getTaskMode());
+                OperateResult result2 = siemensS7Net.Write("DB100.12", (short) command.getStartLoad().shortValue());//璧峰鐐逛綅
+                OperateResult result3 = siemensS7Net.Write("DB100.14", (short) command.getEndLoad().shortValue());//鐩殑鐐逛綅
+                OperateResult result4 = siemensS7Net.Write("DB100.18", (short) command.getJarNo());//鐩殑鐐逛綅
                 // 3.纭寮�濮嬩换鍔�
-                if (result0.IsSuccess && result1.IsSuccess) {
-                    result = siemensS7Net.Write("V2000.0", true);
-                    siemensS7Net.Write("V2000.1", false);
-//                    siemensS7Net.Write("V2500.1", false);
-                }
+                if (result0.IsSuccess && result1.IsSuccess && result2.IsSuccess && result3.IsSuccess && result4.IsSuccess) {
+                    result = siemensS7Net.Write("DB100.16.0", true);
 
-            // 鍏朵粬鎸囦护
-            } else {
-                // 鎺у埗妯″紡
-                if (command.getControlMode() != null) {
-                    result =  siemensS7Net.Write("V1010", command.getControlMode());
-                // 澶嶄綅淇″彿
-                } else if (command.getReset() != null) {
-                    result =  siemensS7Net.Write("V2000.2", command.getReset());
-                // 鍒犻櫎鎸囦护
-                } else if (command.getDelete() != null) {
-                    result =  siemensS7Net.Write("V2000.3", command.getDelete());
-                // 鏃犳晥鎸囦护
-                } else if (command.getRun() != null) {
-                    result =  siemensS7Net.Write("V1016", command.getRun());
-                    // 鏃犳晥鎸囦护
-                }else {
-                    return false;
+                    try {
+                        Thread.sleep(300);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
-
-        // 浠诲姟瀹屾垚
+            // 浠诲姟瀹屾垚
         } else {
-            siemensS7Net.Write("V2000.0", false);
-            siemensS7Net.Write("V998", (short) 0);
-            siemensS7Net.Write("V1000", (short) 0);
-            result = siemensS7Net.Write("V2000.1", true);
-//            result = siemensS7Net.Write("V2500.1", true);
+//            siemensS7Net.Write("DB100.2", (short) 0);//浠诲姟鍙�
+//            siemensS7Net.Write("DB100.4.0", (short) 0);//浠诲姟绫诲瀷
+            siemensS7Net.Write("DB100.16.0", false);//浠诲姟寮�濮嬬‘璁や綅
+
+            result = siemensS7Net.Write("DB100.16.1", true);//浠诲姟瀹屾垚纭
         }
 
         try {
@@ -391,13 +294,6 @@
         } catch (Exception ignore) {}
 
         if (result != null && result.IsSuccess) {
-            // 缁存姢鏁版嵁搴撴帓鍒楀眰
-            if (!steProtocol.getWaiting()) {
-                if (!Cools.isEmpty(command.getRow(), command.getBay(), command.getLev())) {
-                    this.modifyPos(command.getRow().intValue(), command.getBay().intValue(), command.getLev().intValue());
-                }
-            }
-
             News.info("绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
             OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
             return true;
@@ -408,20 +304,13 @@
         }
     }
 
-    public void modifyPos(Integer row, Integer bay, Integer lev) {
-        BasSteService service = SpringUtils.getBean(BasSteService.class);
-        if (!service.updatePos(this.slave.getId(), row, bay, lev)) {
-            News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
-        }
-    }
-
     public boolean confirmPos() {
         BasSteService service = SpringUtils.getBean(BasSteService.class);
         BasSte basSte = service.selectById(slave.getId());
         if (basSte != null) {
             // 鏇存柊plc鏁版嵁鍧�
             short[] arr = new short[] {basSte.getRow().shortValue(), basSte.getBay().shortValue(), basSte.getLev().shortValue()};
-            OperateResult result = siemensS7Net.Write("V1002", arr);
+            OperateResult result = siemensS7Net.Write("DB100.6", arr);
             if (result.IsSuccess) {
                 // 鏇存柊鏁版嵁搴�
                 if (service.updatePakMk(this.slave.getId(), "N")) {
@@ -436,7 +325,7 @@
 
     public boolean modifyPosHandle(Integer row, Integer bay, Integer lev) {
         short[] arr = new short[] {row.shortValue(), bay.shortValue(), lev.shortValue()};
-        OperateResult result = siemensS7Net.Write("V1002", arr);
+        OperateResult result = siemensS7Net.Write("DB100.6", arr);
         if (!result.IsSuccess) {
             News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
             return false;
@@ -451,7 +340,7 @@
 
     @Override
     public void close() {
-//        siemensS7Net.ConnectClose();
+        siemensS7Net.ConnectClose();
     }
 
     /**
@@ -469,61 +358,24 @@
         }
     }
 
-//    public void modifyPos(int wrkNo, int row, int bay, int lev) {
-//        BasSteService service = SpringUtils.getBean(BasSteService.class);
-//        if (!service.updatePos(wrkNo,this.slave.getId(), row, bay, lev)) {
-//            News.error("鏇存柊{}鍙风┛姊溅瀹氫綅澶辫触 ===>> 鎺掞細銆恵}銆�, 鍒楋細銆恵}銆戯紝灞傦細銆恵}銆�", this.slave.getId(), row, bay, lev);
-//        }
-//    }
-
     /******************************************************************************************/
     /**************************************** 娴嬭瘯涓撶敤 *****************************************/
     /*****************************************************************************************/
-    public static void main(String[] args) throws InterruptedException {
-        SteSlave slave = new SteSlave();
-        slave.setId(1);
-        slave.setIp("192.168.2.1");
-        slave.setPort(502);
-        SteThread thread = new SteThread(slave);
-        thread.connect();
-        thread.readStatus();
-        System.out.println(JSON.toJSONString(thread.steProtocol));
-
-        // 浠诲姟浣滀笟
+//    public static void main(String[] args) throws InterruptedException {
+//        SteSlave slave = new SteSlave();
+//        slave.setId(1);
+//        slave.setIp("192.168.2.1");
+//        slave.setPort(502);
+//        SteThread thread = new SteThread(slave);
+//        thread.connect();
+//        thread.readStatus();
+//        System.out.println(JSON.toJSONString(thread.steProtocol));
+//
+//        // 绌挎杞﹁繍琛岀姝�
 //        SteCommand command = new SteCommand();
-//        command.setSteNo(1); // 鍫嗗灈鏈虹紪鍙�
-//        Random random = new Random();
-//        int taskNo = random.nextInt(9090);
-//        command.setTaskNo(taskNo); // 宸ヤ綔鍙�
-//        command.setTaskMode(SteTaskModeType.MOVE_LEFT); // 浠诲姟妯″紡
+////        command.setRun((short)0);
 //        thread.write(command);
-
-        // 浠诲姟瀹屾垚
-//        SteCommand command = new SteCommand();
-//        command.setSteNo(1); // 鍫嗗灈鏈虹紪鍙�
-//        command.setComplete(Boolean.TRUE); // 浠诲姟妯″紡
-//        thread.write(command);
-
-        // 鎺у埗妯″紡
-//        SteCommand command = new SteCommand();
-//        command.setControlMode((short) 1);
-//        thread.write(command);
-
-        // 澶嶄綅淇″彿
-//        SteCommand command = new SteCommand();
-//        command.setReset(Boolean.TRUE);
-//        thread.write(command);
-
-        // 鍒犻櫎鎸囦护
-//        SteCommand command = new SteCommand();
-//        command.setDelete(Boolean.TRUE);
-//        thread.write(command);
-
-        // 绌挎杞﹁繍琛岀姝�
-        SteCommand command = new SteCommand();
-        command.setRun((short)0);
-        thread.write(command);
-
-    }
+//
+//    }
 
 }

--
Gitblit v1.9.1