From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 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 a453632..ad35832 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
@@ -12,6 +12,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.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -71,12 +72,20 @@
} else {
poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId());
}
- if (isOnLine) {
- return ledOnline(poleLightemitEntityList);
- } else {
- ledOnlineCheck(poleLightemitEntityList);
- return poleLightemitEntityList;
+
+ List<PoleLightemitEntity> temp = new ArrayList<>();
+ for (PoleLightemitEntity poleLightemitEntity : poleLightemitEntityList) {
+ //鏌ヨ璁惧鍦ㄧ嚎鐘舵��
+ boolean onLine = lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode());
+ //鏌ヨ灞忓箷鐨勫紑鍚姸鎬�
+ String isOpen = lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode());
+ poleLightemitEntity.setIsOpen(String.valueOf(isOpen));
+ poleLightemitEntity.setOnLine(onLine);
+ if (!isOnLine || onLine) {
+ temp.add(poleLightemitEntity);
+ }
}
+ return temp;
}
/**
@@ -153,6 +162,7 @@
if (xiXun != null) {
equipmentInfo.setEquipmentCreateTime(xiXun.getCreateTime());
equipmentInfo.setEquipmentMac(xiXun.getLightemitControlCode());
+ equipmentInfo.setEquipmentName(xiXun.getLightemitName());
}
boolean isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
if (isScreenOpen) {
@@ -176,6 +186,17 @@
poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
}
+
+ /**
+ * 鐔欐睕led鏂板鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>();
+ listCode.add(poleLightemit.getLightemitControlCode());
+ String content = "{灞忓箷id锛�" + poleLightemit.getLightemitId() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + poleLightemit.getLightemitControlCode() + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED鏂板", content);
+ /**
+ * 鐔欐睕led鏂板鏃ュ織璁板綍缁撴潫
+ */
// poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
}
@@ -188,7 +209,7 @@
boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getLightemitControlCode(), PoleBindingEnums.XIXUN);
if (!belong) {
- throw new RuntimeException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ throw new BusinessException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
}
poleLightemit.setLightemitId(ledId);
boolean b = this.updateById(poleLightemit);
@@ -204,24 +225,54 @@
poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
}
+
+ /**
+ * 鐔欐睕led缂栬緫鏃ュ織璁板綍寮�濮�
+ */
+ List<String> listCode = new ArrayList<>();
+ listCode.add(byId.getLightemitControlCode());
+ String content = "{灞忓箷id锛�" + byId.getLightemitId() + "锛� 灞忓箷鍘熷悕锛�" + byId.getLightemitName() + "锛� 灞忓箷鍚嶇О锛�" + poleLightemit.getLightemitName() + "锛� 灞忓箷缂栫爜锛�" + byId.getLightemitControlCode() + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED缂栬緫", content);
+ /**
+ * 鐔欐睕led缂栬緫鏃ュ織璁板綍缁撴潫
+ */
// poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
}
public boolean deletePoleLightemit(List<Long> ledIds) {
List<PoleLightemitEntity> poleLightemitEntities = listByIds(ledIds);
+ if (poleLightemitEntities != null && poleLightemitEntities.size() != 0) {
+ throw new BusinessException("璁惧涓嶅瓨鍦�");
+ }
+ List<String> listCode = new ArrayList<>();
// 鍒犻櫎璁惧缁戝畾
if (poleLightemitEntities != null && poleLightemitEntities.size() != 0) {
for (PoleLightemitEntity poleLightemitEntitie : poleLightemitEntities) {
if (poleLightemitEntitie.getLightemitControlCode() != null) {
//鍒犻櫎缁戝畾鍏崇郴//鍏堝垹闄ょ粦瀹氬叧绯�
+ listCode.add(poleLightemitEntitie.getLightemitControlCode());
poleBindingService.unBindPole(poleLightemitEntitie.getLightemitControlCode());
}
}
}
//鍒犻櫎璁惧
boolean b = removeByIds(ledIds);
+
+ /**
+ * 鐔欐睕led鍒犻櫎鏃ュ織璁板綍寮�濮�
+ */
+ List<String> nameList = new ArrayList<>();
+ for (PoleLightemitEntity poleLightemitEntitie : poleLightemitEntities) {
+ nameList.add(poleLightemitEntitie.getLightemitName());
+ }
+
+ String content = "{鍒犻櫎鐔欐睕LED鐨勮澶囦俊鎭細" + nameList.toString() + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕LED鍒犻櫎", content);
+ /**
+ * 鐔欐睕led鍒犻櫎鏃ュ織璁板綍缁撴潫
+ */
return b;
// poleStreetlightLightemitService.saveStreetlightLightemit(poleLightemit.getLightemitId(),poleLightemit.getStreetlightId());
}
--
Gitblit v1.9.3