From 21eac69df8b18ef44ab267a4e2efe714f985d8d9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 14:26:57 +0800
Subject: [PATCH] 提升机穿梭车配置

---
 src/main/java/com/zy/core/thread/LiftThread.java         |  291 ++++++++++++++++++------------------
 src/main/webapp/views/console.html                       |    4 
 src/main/webapp/static/css/console.css                   |    2 
 src/main/webapp/views/shuttle.html                       |   49 +----
 src/main/resources/application.yml                       |   98 ++++++++++++
 src/main/java/com/zy/asrs/controller/LiftController.java |   14 -
 src/main/webapp/static/css/shuttle.css                   |   10 
 7 files changed, 265 insertions(+), 203 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 2226d09..a45f231 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -52,14 +52,13 @@
     @ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
     public R liftStateTable(){
         List<LiftStateTableVo> list = new ArrayList<>();
-        List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
-        for (BasLift basLift : lifts) {
+        for (LiftSlave slave : slaveProperties.getLift()) {
             // 琛ㄦ牸琛�
             LiftStateTableVo vo = new LiftStateTableVo();
-            vo.setLiftNo(basLift.getLiftNo());   //鎻愬崌鏈哄彿
+            vo.setLiftNo(slave.getId());   //鎻愬崌鏈哄彿
             list.add(vo);
             // 鑾峰彇鎻愬崌鏈轰俊鎭�
-            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
             if (liftThread == null) {
                 vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
                 continue;
@@ -100,14 +99,13 @@
     @ManagerAuth(memo = "鎻愬崌鏈烘暟鎹〃")
     public R liftMsgTable(){
         List<LiftMsgTableVo> list = new ArrayList<>();
-        List<BasLift> lifts = basLiftService.selectList(new EntityWrapper<BasLift>().orderBy("lift_no"));
-        for (BasLift basLift : lifts) {
+        for (LiftSlave slave : slaveProperties.getLift()) {
             // 琛ㄦ牸琛�
             LiftMsgTableVo vo = new LiftMsgTableVo();
-            vo.setLiftNo(basLift.getLiftNo());   //  鎻愬崌鏈哄彿
+            vo.setLiftNo(slave.getId());   //  鎻愬崌鏈哄彿
             list.add(vo);
             // 鑾峰彇鎻愬崌鏈轰俊鎭�
-            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
+            LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
             if (liftThread == null) {
                 continue;
             }
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index d2dfb3a..8e1f381 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -4,9 +4,10 @@
 import HslCommunication.Core.Types.OperateResult;
 import HslCommunication.Core.Types.OperateResultExOne;
 import HslCommunication.ModBus.ModbusTcpNet;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
 import com.core.common.DateUtils;
-import com.core.common.RadixTools;
 import com.core.common.SpringUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasLift;
@@ -45,7 +46,7 @@
 @Slf4j
 public class LiftThread implements  Runnable, ThreadHandler {
 
-    private ModbusTcpNet modbusTcpNet;
+    private SiemensS7Net siemensS7Net;
     private LiftSlave slave;
     private LiftProtocol liftProtocol;
     private RedisUtil redisUtil;
@@ -92,10 +93,8 @@
     public boolean connect() {
         boolean result = false;
         //-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
-        modbusTcpNet = new ModbusTcpNet(slave.getIp(), slave.getPort(), (byte) 0x02);
-        // 褰撲綘闇�瑕佹寚瀹氭牸寮忕殑鏁版嵁瑙f瀽鏃讹紝灏遍渶瑕佽缃笅闈㈢殑杩欎釜淇℃伅
-        modbusTcpNet.setDataFormat(DataFormat.ABCD);
-        OperateResult connect = modbusTcpNet.ConnectServer();
+        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
+        OperateResult connect = siemensS7Net.ConnectServer();
         if(connect.IsSuccess){
             result = true;
             OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戞彁鍗囨満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -104,14 +103,14 @@
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
             log.error("鎻愬崌鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] ", slave.getId(), slave.getIp(), slave.getPort());
         }
-        modbusTcpNet.ConnectClose();
+        siemensS7Net.ConnectClose();
         //-------------------------鎻愬崌鏈鸿繛鎺ユ柟娉�------------------------//
         return result;
     }
 
     @Override
     public void close() {
-        modbusTcpNet.ConnectClose();
+        siemensS7Net.ConnectClose();
     }
 
     private void read() {
@@ -132,13 +131,12 @@
             }
         } catch (Exception e) {
             OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            initLift();
         }
     }
 
     private void readStatus() {
         try {
-            OperateResultExOne<byte[]> result = modbusTcpNet.Read("41117", (short) 50);
+            OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.200", (short) 24);
             if (result.IsSuccess) {
                 if (null == liftProtocol) {
                     liftProtocol = new LiftProtocol();
@@ -147,97 +145,97 @@
 
                 //----------璇诲彇鎻愬崌鏈虹姸鎬�-----------
                 //鑾峰彇鏁版嵁
-                byte[] content = result.Content;
-                //鎻愬崌鏈洪攣瀹�
-                liftProtocol.setLiftLock(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content, 0)));
-                //浣嶇疆鍒拌揪鍙嶉
-                liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
-
-
-                byte b1 = modbusTcpNet.getByteTransform().TransByte(content, 5);
-                byte b2 = modbusTcpNet.getByteTransform().TransByte(content, 4);
-                int[] datas1 = CommonUtils.byteToBits(b1);
-                int[] datas2 = CommonUtils.byteToBits(b2);
-                //鍑嗗灏辩华
-                liftProtocol.setReady(CommonUtils.intToBoolean(datas1[0]));
-                //杩愯涓�
-                liftProtocol.setRunning(CommonUtils.intToBoolean(datas1[1]));
-                //鑱旀満/鍗曟満
-                liftProtocol.setMode(CommonUtils.intToBoolean(datas1[2]));
-                //杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
-                liftProtocol.setLineFrontHasStock(CommonUtils.intToBoolean(datas1[3]));
-                //杈撻�佺嚎姝h浆鍙嶉
-                liftProtocol.setForwardRotationFeedback(CommonUtils.intToBoolean(datas1[4]));
-                //杈撻�佺嚎鍙嶈浆鍙嶉
-                liftProtocol.setReverseFeedback(CommonUtils.intToBoolean(datas1[5]));
-                //杈撻�佺嚎鐢垫満杩囪浇
-                liftProtocol.setMotorOverload(CommonUtils.intToBoolean(datas1[6]));
-                //杈撻�佺嚎鏈鍏夌數鏈夎揣
-                liftProtocol.setLineEndHasStock(CommonUtils.intToBoolean(datas1[7]));
-                //杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
-                liftProtocol.setInConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[0]));
-                //鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
-                liftProtocol.setOutConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[1]));
-                //骞冲彴浣嶇疆鍋忓樊鎶ヨ
-                liftProtocol.setPlatPositionDeviationAlarm(CommonUtils.intToBoolean(datas2[2]));
-                //骞冲彴鎵煩鍋忓樊鎶ヨ
-                liftProtocol.setPlatTorqueDeviationAlarm(CommonUtils.intToBoolean(datas2[3]));
-                //骞冲彴鍥涘悜杞︽娴�
-                liftProtocol.setPlatShuttleCheck(CommonUtils.intToBoolean(datas2[4]));
-
-                //鏈氨缁姸鎬�
-                liftProtocol.setNotReady(modbusTcpNet.getByteTransform().TransInt16(content,6));
-                //浼烘湇1閿欒
-                liftProtocol.setServoError1(modbusTcpNet.getByteTransform().TransInt16(content,8));
-                //浼烘湇2閿欒
-                liftProtocol.setServoError2(modbusTcpNet.getByteTransform().TransInt16(content,10));
-                //浼烘湇3閿欒
-                liftProtocol.setServoError3(modbusTcpNet.getByteTransform().TransInt16(content,12));
-                //浼烘湇4閿欒
-                liftProtocol.setServoError4(modbusTcpNet.getByteTransform().TransInt16(content,14));
-                //鎻愬崌鏈哄疄闄呴�熷害鍙嶉
-                liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,16));
-
-                ///璇诲彇鎻愬崌鏈虹姸鎬�-end
-
-                //灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
-                BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
-                BasLift basLift = liftService.selectById(liftProtocol.getLiftNo());
-                if (basLift == null) {
-                    basLift = new BasLift();
-                    //鎻愬崌鏈哄彿
-                    basLift.setLiftNo(slave.getId());
-                    liftService.insert(basLift);
-                }
-                basLift.setStatus(liftProtocol.getProtocolStatus());
-                basLift.setWrkNo(liftProtocol.getTaskNo().intValue());
-                basLift.setUpdateTime(new Date());
-                basLift.setPakMk(liftProtocol.getPakMk());
-                basLift.setLiftLock(liftProtocol.getLiftLock());
-                basLift.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback().intValue());
-                basLift.setReady(liftProtocol.getReady());
-                basLift.setRunning(liftProtocol.getRunning());
-                basLift.setMode(liftProtocol.getMode());
-                basLift.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
-                basLift.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
-                basLift.setReverseFeedback(liftProtocol.getReverseFeedback());
-                basLift.setMotorOverload(liftProtocol.getMotorOverload());
-                basLift.setLineEndHasStock(liftProtocol.getLineEndHasStock());
-                basLift.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
-                basLift.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
-                basLift.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
-                basLift.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
-                basLift.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
-                basLift.setNotReady(liftProtocol.getNotReady().intValue());
-                basLift.setServoError1(liftProtocol.getServoError1().intValue());
-                basLift.setServoError2(liftProtocol.getServoError2().intValue());
-                basLift.setServoError3(liftProtocol.getServoError3().intValue());
-                basLift.setServoError4(liftProtocol.getServoError4().intValue());
-                basLift.setLiftActualSpeed(liftProtocol.getLiftActualSpeed().intValue());
-                if (liftService.updateById(basLift)) {
-                    OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-//                    log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-                }
+//                byte[] content = result.Content;
+//                //鎻愬崌鏈洪攣瀹�
+//                liftProtocol.setLiftLock(CommonUtils.shortToBoolean(modbusTcpNet.getByteTransform().TransInt16(content, 0)));
+//                //浣嶇疆鍒拌揪鍙嶉
+//                liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
+//
+//
+//                byte b1 = modbusTcpNet.getByteTransform().TransByte(content, 5);
+//                byte b2 = modbusTcpNet.getByteTransform().TransByte(content, 4);
+//                int[] datas1 = CommonUtils.byteToBits(b1);
+//                int[] datas2 = CommonUtils.byteToBits(b2);
+//                //鍑嗗灏辩华
+//                liftProtocol.setReady(CommonUtils.intToBoolean(datas1[0]));
+//                //杩愯涓�
+//                liftProtocol.setRunning(CommonUtils.intToBoolean(datas1[1]));
+//                //鑱旀満/鍗曟満
+//                liftProtocol.setMode(CommonUtils.intToBoolean(datas1[2]));
+//                //杈撻�佺嚎鍓嶇鍏夌數鏈夎揣
+//                liftProtocol.setLineFrontHasStock(CommonUtils.intToBoolean(datas1[3]));
+//                //杈撻�佺嚎姝h浆鍙嶉
+//                liftProtocol.setForwardRotationFeedback(CommonUtils.intToBoolean(datas1[4]));
+//                //杈撻�佺嚎鍙嶈浆鍙嶉
+//                liftProtocol.setReverseFeedback(CommonUtils.intToBoolean(datas1[5]));
+//                //杈撻�佺嚎鐢垫満杩囪浇
+//                liftProtocol.setMotorOverload(CommonUtils.intToBoolean(datas1[6]));
+//                //杈撻�佺嚎鏈鍏夌數鏈夎揣
+//                liftProtocol.setLineEndHasStock(CommonUtils.intToBoolean(datas1[7]));
+//                //杩涜緭閫佺嚎鍗℃墭鐩樻姤璀�
+//                liftProtocol.setInConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[0]));
+//                //鍑鸿緭閫佺嚎鍗℃墭鐩樻姤璀�
+//                liftProtocol.setOutConveyLineCardTrayAlarm(CommonUtils.intToBoolean(datas2[1]));
+//                //骞冲彴浣嶇疆鍋忓樊鎶ヨ
+//                liftProtocol.setPlatPositionDeviationAlarm(CommonUtils.intToBoolean(datas2[2]));
+//                //骞冲彴鎵煩鍋忓樊鎶ヨ
+//                liftProtocol.setPlatTorqueDeviationAlarm(CommonUtils.intToBoolean(datas2[3]));
+//                //骞冲彴鍥涘悜杞︽娴�
+//                liftProtocol.setPlatShuttleCheck(CommonUtils.intToBoolean(datas2[4]));
+//
+//                //鏈氨缁姸鎬�
+//                liftProtocol.setNotReady(modbusTcpNet.getByteTransform().TransInt16(content,6));
+//                //浼烘湇1閿欒
+//                liftProtocol.setServoError1(modbusTcpNet.getByteTransform().TransInt16(content,8));
+//                //浼烘湇2閿欒
+//                liftProtocol.setServoError2(modbusTcpNet.getByteTransform().TransInt16(content,10));
+//                //浼烘湇3閿欒
+//                liftProtocol.setServoError3(modbusTcpNet.getByteTransform().TransInt16(content,12));
+//                //浼烘湇4閿欒
+//                liftProtocol.setServoError4(modbusTcpNet.getByteTransform().TransInt16(content,14));
+//                //鎻愬崌鏈哄疄闄呴�熷害鍙嶉
+//                liftProtocol.setLiftActualSpeed(modbusTcpNet.getByteTransform().TransInt16(content,16));
+//
+//                ///璇诲彇鎻愬崌鏈虹姸鎬�-end
+//
+//                //灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
+//                BasLiftService liftService = SpringUtils.getBean(BasLiftService.class);
+//                BasLift basLift = liftService.selectById(liftProtocol.getLiftNo());
+//                if (basLift == null) {
+//                    basLift = new BasLift();
+//                    //鎻愬崌鏈哄彿
+//                    basLift.setLiftNo(slave.getId());
+//                    liftService.insert(basLift);
+//                }
+//                basLift.setStatus(liftProtocol.getProtocolStatus());
+//                basLift.setWrkNo(liftProtocol.getTaskNo().intValue());
+//                basLift.setUpdateTime(new Date());
+//                basLift.setPakMk(liftProtocol.getPakMk());
+//                basLift.setLiftLock(liftProtocol.getLiftLock());
+//                basLift.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback().intValue());
+//                basLift.setReady(liftProtocol.getReady());
+//                basLift.setRunning(liftProtocol.getRunning());
+//                basLift.setMode(liftProtocol.getMode());
+//                basLift.setLineFrontHasStock(liftProtocol.getLineFrontHasStock());
+//                basLift.setForwardRotationFeedback(liftProtocol.getForwardRotationFeedback());
+//                basLift.setReverseFeedback(liftProtocol.getReverseFeedback());
+//                basLift.setMotorOverload(liftProtocol.getMotorOverload());
+//                basLift.setLineEndHasStock(liftProtocol.getLineEndHasStock());
+//                basLift.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
+//                basLift.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+//                basLift.setPlatPositionDeviationAlarm(liftProtocol.getPlatPositionDeviationAlarm());
+//                basLift.setPlatTorqueDeviationAlarm(liftProtocol.getPlatTorqueDeviationAlarm());
+//                basLift.setPlatShuttleCheck(liftProtocol.getPlatShuttleCheck());
+//                basLift.setNotReady(liftProtocol.getNotReady().intValue());
+//                basLift.setServoError1(liftProtocol.getServoError1().intValue());
+//                basLift.setServoError2(liftProtocol.getServoError2().intValue());
+//                basLift.setServoError3(liftProtocol.getServoError3().intValue());
+//                basLift.setServoError4(liftProtocol.getServoError4().intValue());
+//                basLift.setLiftActualSpeed(liftProtocol.getLiftActualSpeed().intValue());
+//                if (liftService.updateById(basLift)) {
+//                    OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+////                    log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+//                }
 
             }else {
                 OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆憑1}鎻愬崌鏈簆lc鐘舵�佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
@@ -245,7 +243,6 @@
             }
         } catch (Exception e) {
             OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆戞彁鍗囨満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
-            initLift();
         }
     }
 
@@ -255,51 +252,53 @@
             return false;
         }
 
-        command.setLiftNo(slave.getId().shortValue());
-        short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
+//        command.setLiftNo(slave.getId().shortValue());
+//        short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
+//
+//        try {
+//            Thread.sleep(500);//鍛戒护涓嬪彂鍓嶄紤鐪�
+//        } catch (InterruptedException e) {
+//            throw new RuntimeException(e);
+//        }
+//
+//        OperateResult result = modbusTcpNet.Write("41088", array);
+//        if (result != null && result.IsSuccess) {
+//            News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+//            OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+//
+//            try {
+//                Thread.sleep(500);//鍛戒护涓嬪彂鍚庝紤鐪�
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
+//
+//            for (int i = 0; i < 5; i++) {
+//                if (command.getRun().intValue() == 4 || command.getRun().intValue() == 5) {
+//                    break;//绯荤粺澶嶄綅鍜岄摼鏉″仠姝㈣浆鍔ㄤ笉闇�瑕侀噸鍙�
+//                }
+//                readStatus();//閲嶆柊璇诲彇鐘舵��
+//                if (liftProtocol.getRunning()) {
+//                    break;
+//                }
+//
+//                //鍒ゆ柇鏄惁杩愯涓紝濡備笉杩愯锛岄噸鏂颁笅鍙戝懡浠�
+//                result = modbusTcpNet.Write("41088", array);
+//                News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {},娆℃暟锛歿}", slave.getId(), JSON.toJSON(command), i);
+//                OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2},娆℃暟锛歿}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command), i));
+//                try {
+//                    Thread.sleep(300);//鍛戒护涓嬪彂鍚庝紤鐪�
+//                } catch (InterruptedException e) {
+//                    throw new RuntimeException(e);
+//                }
+//            }
+//            return true;
+//        } else {
+//            OutputQueue.LIFT.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());
+//            return false;
+//        }
 
-        try {
-            Thread.sleep(500);//鍛戒护涓嬪彂鍓嶄紤鐪�
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-
-        OperateResult result = modbusTcpNet.Write("41088", array);
-        if (result != null && result.IsSuccess) {
-            News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
-            OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-
-            try {
-                Thread.sleep(500);//鍛戒护涓嬪彂鍚庝紤鐪�
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-
-            for (int i = 0; i < 5; i++) {
-                if (command.getRun().intValue() == 4 || command.getRun().intValue() == 5) {
-                    break;//绯荤粺澶嶄綅鍜岄摼鏉″仠姝㈣浆鍔ㄤ笉闇�瑕侀噸鍙�
-                }
-                readStatus();//閲嶆柊璇诲彇鐘舵��
-                if (liftProtocol.getRunning()) {
-                    break;
-                }
-
-                //鍒ゆ柇鏄惁杩愯涓紝濡備笉杩愯锛岄噸鏂颁笅鍙戝懡浠�
-                result = modbusTcpNet.Write("41088", array);
-                News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {},娆℃暟锛歿}", slave.getId(), JSON.toJSON(command), i);
-                OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2},娆℃暟锛歿}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command), i));
-                try {
-                    Thread.sleep(300);//鍛戒护涓嬪彂鍚庝紤鐪�
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            return true;
-        } else {
-            OutputQueue.LIFT.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());
-            return false;
-        }
+        return true;
     }
 
     //鑾峰彇鍛戒护鎶ユ枃
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cb5c777..d3e4abb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=skasrs
+    url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
@@ -175,10 +175,104 @@
     port: 502
     rack: 0
     slot: 0
+  # 鍥涘悜绌挎杞�3
+  shuttle[2]:
+    id: 3
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�4
+  shuttle[3]:
+    id: 4
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�5
+  shuttle[4]:
+    id: 5
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�6
+  shuttle[5]:
+    id: 6
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�7
+  shuttle[6]:
+    id: 7
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�8
+  shuttle[7]:
+    id: 8
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�9
+  shuttle[8]:
+    id: 9
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�10
+  shuttle[9]:
+    id: 10
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
   # 鎻愬崌鏈�1
   lift[0]:
     id: 1
-    ip: 10.10.10.231
+    ip: 192.168.4.250
+    port: 502
+    row: 18
+    bay: 2
+    sta[0]:
+      staNo: 105
+      lev: 1
+    sta[1]:
+      staNo: 106
+      lev: 2
+    sta[2]:
+      staNo: 107
+      lev: 3
+    sta[3]:
+      staNo: 108
+      lev: 4
+  # 鎻愬崌鏈�2
+  lift[1]:
+    id: 2
+    ip: 127.0.0.1
+    port: 502
+    row: 18
+    bay: 2
+    sta[0]:
+      staNo: 105
+      lev: 1
+    sta[1]:
+      staNo: 106
+      lev: 2
+    sta[2]:
+      staNo: 107
+      lev: 3
+    sta[3]:
+      staNo: 108
+      lev: 4
+  # 鎻愬崌鏈�3
+  lift[2]:
+    id: 3
+    ip: 127.0.0.1
     port: 502
     row: 18
     bay: 2
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index b3db022..9b8f1db 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -198,7 +198,7 @@
 }
 .states {
 	background-image: url(../images/line.png);
-	margin-bottom:54px;
+	/*margin-bottom:54px;*/
 }
 .button {
 	margin-left: 5%;
diff --git a/src/main/webapp/static/css/shuttle.css b/src/main/webapp/static/css/shuttle.css
index 130b897..44cfee4 100644
--- a/src/main/webapp/static/css/shuttle.css
+++ b/src/main/webapp/static/css/shuttle.css
@@ -15,7 +15,7 @@
     background-color: #fff;
     border-radius: 5px;
     box-shadow: 0 0 3px rgba(0,0,0,.3);
-    height: 25%;
+    height: 28%;
 }
 /* 宸� */
 .command-log {
@@ -97,7 +97,7 @@
 .shuttle-msg {
     /*overflow: auto;*/
     margin-top: 10px;
-    height: 23%;
+    height: 35%;
     background-color: #fff;
     border-radius: 5px;
     box-shadow: 0 0 3px rgba(0,0,0,.3);
@@ -138,7 +138,7 @@
 
 /* 浠诲姟璁惧閫夋嫨妗� */
 .task-select {
-    width: 13%;
+    width: 26%;
     height: 100%;
     overflow: hidden;
     display: inline-block;
@@ -198,7 +198,7 @@
 
 /* 浠诲姟浣滀笟閫夋嫨妗� */
 .task-operator {
-    width: 86%;
+    width: 73%;
     height: 100%;
     overflow: hidden;
     padding: 5px 0 10px 20px;
@@ -259,7 +259,7 @@
 /* -------------------- 绗洓妯″潡 -------------------- */
 .shuttle-output-board {
     margin-top: 10px;
-    height: 20%;
+    height: 10%;
     background-color: #fff;
     border-radius: 5px;
     box-shadow: 0 0 3px rgba(0,0,0,.3);
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 9dca6b9..5a080ce 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -66,7 +66,7 @@
         <!-- 鍥涘悜绌挎杞︾姸鎬� -->
         <div class="line-status">
             <div class="body-head">绌挎杞︾姸鎬�</div>
-            <div id="shuttle-status-box">
+            <div id="shuttle-status-box" style="height: 100px;overflow-y: scroll;overflow-x: hidden;">
             </div>
             <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
             <div class="button item-group">
@@ -82,7 +82,7 @@
         <!-- 鎻愬崌鏈虹姸鎬� -->
         <div class="line-status">
             <div class="body-head">鎻愬崌鏈虹姸鎬�</div>
-            <div id="lift-status-box">
+            <div id="lift-status-box" style="height: 120px;overflow-y: scroll;overflow-x: hidden;">
 
             </div>
             <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index fda3c72..0651ec9 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -20,15 +20,15 @@
         <div style="padding: 10px;height: 100%">
             <!-- 鏃ュ織鐩戞帶鏉� -->
             <div class="log-board">
-                <div class="command-log" id="commandLogId" style="width: 5%;">
-<!--                    <div data-shuttleNo="1" class="shuttle-command-item">-->
-<!--                        <label>1#</label>-->
-<!--                        <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>-->
-<!--                        <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>-->
-<!--                    </div>-->
-                </div>
+<!--                <div class="command-log" id="commandLogId" style="width: 5%;">-->
+<!--&lt;!&ndash;                    <div data-shuttleNo="1" class="shuttle-command-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                        <label>1#</label>&ndash;&gt;-->
+<!--&lt;!&ndash;                        <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>&ndash;&gt;-->
+<!--&lt;!&ndash;                        <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>&ndash;&gt;-->
+<!--&lt;!&ndash;                    </div>&ndash;&gt;-->
+<!--                </div>-->
                 <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
-                <div class="shuttle-state" style="width: 95%;">
+                <div class="shuttle-state" style="width: 100%;">
                     <table id="shuttle-state-table">
                         <thead>
                             <tr>
@@ -88,9 +88,9 @@
                 <!-- 璁惧浠诲姟閫夋嫨 -->
                 <div class="task-select">
                     <!-- 閫夋嫨 -->
-                    <div id="shuttle-select" class="operator-item">
+                    <div id="shuttle-select" class="operator-item" style="width: 100%;">
                         <span class="select-title">鍥涘悜绌挎杞﹀彿</span>
-                        <div class="select-container" id="shuttleRadioBoxId">
+                        <div class="select-container" id="shuttleRadioBoxId" style="display: flex;flex-wrap: wrap;justify-content: center;align-items: center;">
 <!--                            <label><input type="radio" name="shuttleSelect" value="1" checked>&nbsp;1鍙风┛姊溅</label>-->
                         </div>
                     </div>
@@ -137,35 +137,6 @@
                                 </div>
                             </div>
 
-<!--                            <div style="width: 20%;">-->
-<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
-<!--                                    <span class="select-title">璁剧疆閰嶇疆鍙傛暟</span>-->
-<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
-<!--                                        <div class="select-container-item">-->
-<!--                                            <span>杩愯閫熷害</span>-->
-<!--                                            <label><input id="runSpeed" type="text" name="runSpeed" /></label>-->
-<!--                                        </div>-->
-<!--                                        <div class="select-container-item">-->
-<!--                                            <span>鍏呯數闃堝��</span>-->
-<!--                                            <label><input id="chargeLine" type="text" name="runSpeed" /></label>-->
-<!--                                        </div>-->
-
-<!--                                        <div>-->
-<!--                                            <button class="item" onclick="shuttleParamSave()">淇濆瓨</button>-->
-<!--                                        </div>-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                            </div>-->
-
-<!--                            <div style="width: 15%;">-->
-<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
-<!--                                    <span class="select-title">閰嶇疆鍙傛暟</span>-->
-<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
-<!--                                        <div>杩愯閫熷害锛�<span id="runSpeedText"></span></div>-->
-<!--                                        <div>鍏呯數闃堝�硷細<span id="chargeLineText"></span></div>-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                            </div>-->
                         </div>
                     </fieldset>
                 </div>

--
Gitblit v1.9.1