From d9505e143cdf452c3a33752b380ee1b3a410601d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 14:48:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java b/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
index e6bcffd..9af0b90 100644
--- a/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
+++ b/src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java
@@ -3,12 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.DeviceConfigService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.protocol.ShuttleProtocol;
-import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ShuttleThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -18,6 +19,7 @@
import org.springframework.stereotype.Component;
import java.util.HashMap;
+import java.util.List;
/**
* 灏忚溅鐢甸噺棰勮妫�娴� => 寮哄埗棰勮
@@ -29,7 +31,7 @@
@Autowired
private ConfigService configService;
@Autowired
- private SlaveProperties slaveProperties;
+ private DeviceConfigService deviceConfigService;
/**
* 灏忚溅鐢甸噺棰勮妫�娴� => 寮哄埗棰勮
@@ -53,12 +55,22 @@
shuttlePowerEarlyValue = Integer.parseInt(shuttlePowerEarlyConfig.getValue());
}
+ String title = "";
+ Config dingdingReportTitleConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "dingdingReportTitle"));
+ if (dingdingReportTitleConfig != null) {
+ title = dingdingReportTitleConfig.getValue();
+ }
+
StringBuffer buffer = new StringBuffer();
- buffer.append("銆愰�氱煡銆戝洓鍚戝簱\n");//娑堟伅鏍囬
+ buffer.append("銆愰�氱煡銆�");
+ buffer.append(title);
+ buffer.append("鍥涘悜搴揬n");//娑堟伅鏍囬
boolean hasReport = false;//鏄惁鏈夐渶瑕佹姤鍛婄殑鏁版嵁
- for (ShuttleSlave slave : slaveProperties.getShuttle()) {
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
+ for (DeviceConfig device : shuttleList) {
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
if (shuttleThread == null) {
continue;
}
--
Gitblit v1.9.1