From 9efe3f1d2ccb7375e5d81df7b5c29723dd99cc89 Mon Sep 17 00:00:00 2001
From: dubin <dubin@163.com>
Date: 星期一, 19 五月 2025 17:10:14 +0800
Subject: [PATCH] 代码优化
---
src/main/java/com/zy/core/thread/LedThread.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index acd6f89..a0995f5 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -5,11 +5,13 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.service.CommandInfoService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
@@ -46,6 +48,7 @@
private Set<Integer> workNos = new HashSet<>();
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ private StringBuffer errorMsg = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
@@ -75,6 +78,9 @@
// 澶嶄綅
case 2:
reset();
+ break;
+ case 5:
+ error((String) task.getData());
break;
default:
break;
@@ -116,14 +122,11 @@
}
page.newLine("\n");
+ //鏇存柊鎸囦护鐘舵��
CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = new CommandInfo();
- commandInfo.setWrkNo(command.getWorkNo());
- commandInfo.setCommandStatus(1);
- commandInfo.setStartTime(new Date());
- commandInfo.setDevice("led");
- commandInfo.setCommand(JSON.toJSONString(command));
- commandInfoService.insert(commandInfo);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
+ commandInfoService.updateById(commandInfo);
}
// 璁剧疆瀛椾綋
@@ -203,10 +206,13 @@
screen.turnOn();
} catch (Exception ignore) {
}
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
if (connRes) {
log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.deleteDeviceError("led", slave.getId());
} else {
log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ deviceErrorService.addDeviceError("led", slave.getId(), "led杩炴帴澶辫触");
}
return connRes;
}
@@ -457,8 +463,10 @@
//
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
screen.disconnect();
-
-
+ }
+ private void error(String msg) {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
}
}
--
Gitblit v1.9.1