From e3fcf332eff28c90c31dc5f982035d50691fa9c3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 15:32:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 0599ea8..73e2b60 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -47,7 +47,7 @@
while (true) {
try {
int step = 1;
- Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
+ Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
if (task != null) {
step = task.getStep();
}
@@ -130,7 +130,7 @@
crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setError1(melsecMcNet.getByteTransform().TransBool(result.Content, 24, 2));
- crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
+ crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransBool(result.Content, 26, 2));
crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 30));
crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
@@ -182,7 +182,7 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnNo(slave.getId());
- if (basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
@@ -212,6 +212,7 @@
System.out.println(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ return;
} while (false);
@@ -253,7 +254,8 @@
public static void main(String[] args) throws InterruptedException {
CrnSlave slave = new CrnSlave();
slave.setId(1);
- slave.setIp("192.168.6.9");
+ slave.setIp("192.168.3.39");
+ slave.setPort(5015);
slave.setRack(0);
slave.setSlot(0);
CrnThread crnThread = new CrnThread(slave);
--
Gitblit v1.9.1