From 6d25ccf7d7a582ab861e4b9dc0a38cb6cbf21588 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 16 六月 2023 09:43:44 +0800 Subject: [PATCH] 提升机状态读取 --- src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 4 ++-- src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java | 2 +- src/main/java/com/zy/asrs/controller/ShuttleController.java | 2 +- src/main/java/com/zy/core/thread/ShuttleThread.java | 4 ++-- src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 9 ++++++++- src/main/webapp/views/shuttle.html | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java index c373d3b..63a991a 100644 --- a/src/main/java/com/zy/asrs/controller/ShuttleController.java +++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java @@ -115,7 +115,7 @@ vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//褰撳墠鎴栬�呬箣鍓嶈鍒扮殑浜岀淮鐮佸�� vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//璇诲埌鐨勪簩缁寸爜X鏂瑰悜鍋忕Щ閲� vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲� - vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage() * 0.1);//褰撳墠鐨勭數鍘嬪�� + vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//褰撳墠鐨勭數鍘嬪�� vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//褰撳墠鐨勬ā鎷熼噺鍊� vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害 vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//褰撳墠鐨勮璧颁己鏈嶉�熷害 diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java index 67713f4..0382394 100644 --- a/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java +++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java @@ -40,7 +40,7 @@ /** * 褰撳墠鐨勭數鍘嬪�� */ - private Short currentVoltage; + private Integer currentVoltage; /** * 褰撳墠鐨勬ā鎷熼噺鍊� diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java index 4ef529b..08bf110 100644 --- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java +++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java @@ -129,7 +129,7 @@ /** * 褰撳墠鐨勭數鍘嬪�� */ - private Double currentVoltage; + private Integer currentVoltage; /** * 褰撳墠鐨勬ā鎷熼噺鍊� @@ -216,4 +216,11 @@ return ShuttleProtocolStatusType.get(this.status).desc; } + public String getCurrentVoltage$() { + if (this.currentVoltage == null) { + return ""; + } + return (this.currentVoltage / 1000.0) + "V"; + } + } diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java index 99b40c0..d56f972 100644 --- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java @@ -84,7 +84,7 @@ /** * 鐢垫睜娓╁害 */ - private Short batteryTemp; + private Integer batteryTemp; /** * 閿欒缂栧彿 @@ -149,7 +149,7 @@ /** * 褰撳墠鐨勭數鍘嬪�� */ - private Short currentVoltage; + private Integer currentVoltage; /** * 褰撳墠鐨勬ā鎷熼噺鍊� diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java index d6e8c04..25a2ef2 100644 --- a/src/main/java/com/zy/core/thread/ShuttleThread.java +++ b/src/main/java/com/zy/core/thread/ShuttleThread.java @@ -129,7 +129,7 @@ //鐢垫睜鐢甸噺鐧惧垎姣� shuttleProtocol.setBatteryPower(modbusTcpNet.getByteTransform().TransInt16(content,4)); //鐢垫睜娓╁害 - shuttleProtocol.setBatteryTemp(modbusTcpNet.getByteTransform().TransInt16(content,6)); + shuttleProtocol.setBatteryTemp(modbusTcpNet.getByteTransform().TransUInt16(content, 6)); //閿欒缂栧彿 shuttleProtocol.setErrorCode(modbusTcpNet.getByteTransform().TransInt16(content,8)); //Plc杈撳嚭鐘舵�両O @@ -150,7 +150,7 @@ //璇诲埌鐨勪簩缁寸爜Y鏂瑰悜鍋忕Щ閲� shuttleProtocol.setCodeOffsetY(modbusTcpNet.getByteTransform().TransInt16(content,20)); //褰撳墠鐨勭數鍘嬪�� - shuttleProtocol.setCurrentVoltage(modbusTcpNet.getByteTransform().TransInt16(content,22)); + shuttleProtocol.setCurrentVoltage(modbusTcpNet.getByteTransform().TransUInt16(content, 22)); //褰撳墠鐨勬ā鎷熼噺鍊� shuttleProtocol.setCurrentAnalogValue(modbusTcpNet.getByteTransform().TransInt16(content,24)); //褰撳墠鐨勫崌闄嶄己鏈嶉�熷害 diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html index 4cd0f62..680c66b 100644 --- a/src/main/webapp/views/shuttle.html +++ b/src/main/webapp/views/shuttle.html @@ -590,7 +590,7 @@ setVal(tr.children("td").eq(13), table[i-1].currentOrBeforeCode); setVal(tr.children("td").eq(14), table[i-1].codeOffsetX); setVal(tr.children("td").eq(15), table[i-1].codeOffsetY); - setVal(tr.children("td").eq(16), table[i-1].currentVoltage ? table[i-1].currentVoltage + "V" : ""); + setVal(tr.children("td").eq(16), table[i-1].currentVoltage$); setVal(tr.children("td").eq(17), table[i-1].currentAnalogValue); } } else if (res.code === 403){ -- Gitblit v1.9.1