From 651222961dfc3566e9ab4fdca18de57c674ad701 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 17:19:04 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 14 +++++++-------
1 files changed, 7 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..c84328d 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<>();
@@ -216,12 +216,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 +252,7 @@
boolean b = this.updateById(poleLightemit);
// 缁戝畾鐏潌
- if (b && poleLightemit.getPoleId() != null) {
+ if (b && poleLightemit.getStreetlightId() != null) {
//鍏堝垹闄ょ粦瀹氬叧绯�
poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
//鍐嶇粦瀹�
@@ -260,7 +260,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