From 4f0c98099f43028d29546c7000ef48bc89282dc4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 18:35:52 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index fdae699..9f03fab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -11,6 +11,7 @@
import com.sandu.ximon.admin.utils.FileUtil;
import com.sandu.ximon.admin.utils.HtmlTemplateUtils;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,22 +76,38 @@
}
}
+ /**
+ * 鍙栧嚭鍦ㄧ嚎鐨勭啓璁�
+ * @param list
+ * @return
+ */
public List<PoleLightemitEntity> ledOnline(List<PoleLightemitEntity> list) {
List<PoleLightemitEntity> onLineList = new ArrayList<>();
for (PoleLightemitEntity poleLightemitEntity : list) {
- poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
- if (poleLightemitEntity.getIsOpen()) {
+// if(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true")){
+// poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+// }
+ poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()));
+ boolean ledOnLine = lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode());
+ if (ledOnLine) {
+ poleLightemitEntity.setOnLine(true);
onLineList.add(poleLightemitEntity);
+ } else {
+ poleLightemitEntity.setOnLine(false);
}
}
return onLineList;
}
+ /**
+ * 璁剧疆鍦ㄧ嚎鐘舵��
+ * @param list
+ */
public void ledOnlineCheck(List<PoleLightemitEntity> list) {
for (PoleLightemitEntity poleLightemitEntity : list) {
- poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
-
+ poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()));
+ poleLightemitEntity.setOnLine(lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode()));
}
}
@@ -103,14 +120,17 @@
*/
public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
+ Pole getpole = poleLightemitDao.getpole(lightControlCode);
if (xiXun == null) {
return null;
}
- String isScreenOpen = lightemitUtils.getIsScreenOpen(xiXun.getLightemitControlCode());
- if (isScreenOpen.contains("true")) {
- xiXun.setIsOpen(true);
- }
- xiXun.setIsOpen(false);
+ boolean isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
+
+ xiXun.setIsOpen(lightemitUtils.getIsScreenOpen(lightControlCode));
+ xiXun.setOnLine(isScreenOpen);
+ xiXun.setStreetlightName(getpole.getPoleName());
+ xiXun.setStreetlightId(getpole.getId());
+
return xiXun;
}
--
Gitblit v1.9.3