From 3c88ed137df2428dd43a405336cbd79011345efd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 28 六月 2022 16:22:02 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 cfccca7..616465a 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
@@ -65,7 +65,7 @@
* @param isOnLine
* @return
*/
- public List<PoleLightemitEntity> listLed(String keyword,Integer order,Integer seq, boolean isOnLine) {
+ public List<PoleLightemitEntity> listLed(String keyword, Integer order, Integer seq, boolean isOnLine) {
List<PoleLightemitEntity> poleLightemitEntityList;
//鎺掑簭瀛楁
String orderByResult = "id";
@@ -105,9 +105,9 @@
//瓒呯
if (SecurityUtils.getClientId() == null) {
- poleLightemitEntityList = poleLightemitDao.listLed(keyword, null,orderBy);
+ poleLightemitEntityList = poleLightemitDao.listLed(keyword, null, orderBy);
} else {
- poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(),orderBy);
+ poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(), orderBy);
}
List<PoleLightemitEntity> temp = new ArrayList<>();
@@ -123,6 +123,35 @@
}
}
return temp;
+ }
+
+
+ /**
+ * 缁戝畾浣跨敤
+ *
+ * @param keyword
+ * @return
+ */
+ public List<PoleLightemitEntity> listLedOnBinding(String keyword) {
+ List<PoleLightemitEntity> poleLightemitEntityList;
+
+
+ //瓒呯
+ if (SecurityUtils.getClientId() == null) {
+ poleLightemitEntityList = poleLightemitDao.listLedOnBinding(keyword, null);
+ } else {
+ poleLightemitEntityList = poleLightemitDao.listLedOnBinding(keyword, SecurityUtils.getUserId());
+ }
+
+ for (PoleLightemitEntity poleLightemitEntity : poleLightemitEntityList) {
+ //鏌ヨ璁惧鍦ㄧ嚎鐘舵��
+ boolean onLine = lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode());
+ //鏌ヨ灞忓箷鐨勫紑鍚姸鎬�
+ String isOpen = lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode());
+ poleLightemitEntity.setIsOpen(String.valueOf(isOpen));
+ poleLightemitEntity.setOnLine(onLine);
+ }
+ return poleLightemitEntityList;
}
/**
@@ -216,12 +245,12 @@
boolean save = this.save(poleLightemit);
// 缁戝畾鐏潌
- if (save && poleLightemit.getPoleId() != null) {
+ if (save && poleLightemit.getStreetlightId() != null) {
PoleBindingParam poleBindingParam = new PoleBindingParam();
poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
poleBindingParam.setDeviceType(1);
poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
- poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
+ poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
}
/**
@@ -252,7 +281,7 @@
boolean b = this.updateById(poleLightemit);
// 缁戝畾鐏潌
- if (b && poleLightemit.getPoleId() != null) {
+ if (b && poleLightemit.getStreetlightId() != null) {
//鍏堝垹闄ょ粦瀹氬叧绯�
poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
//鍐嶇粦瀹�
@@ -260,7 +289,7 @@
poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
poleBindingParam.setDeviceType(10);
poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
- poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
+ poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
}
/**
--
Gitblit v1.9.3