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/controller/GetListOnBindingController.java | 4 +-
dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 15 ++-----
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 32 ++++++---------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 14 +++---
5 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index a1715ea..e0cb933 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -85,22 +85,23 @@
private Long userId;
/**
- * 缁戝畾鐏潌ID
- */
-
- @TableField(exist = false)
- private Long streetlightId;
- @JsonIgnore
- @TableField(exist = false)
- private Long poleId;
-
- /**
- *
+ * 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠ヤ笅鍙傛暟涓嶅瓨鍦ㄦ暟鎹簱琛�
+ */
+
+ /**
+ * 缁戝畾鐏潌ID
+ */
+
+ @TableField(exist = false)
+ private Long streetlightId;
/**
* led灞忓箷寮�鍏�
@@ -111,17 +112,10 @@
@TableField(exist = false)
private boolean isOnLine;
- /*
+ /**
* 鐏潌鍚嶇О
*/
@TableField(exist = false)
private String streetlightName;
-
- /*
- * 鐏潌鍚嶇О
- */
- @JsonIgnore
- @TableField(exist = false)
- private String poleName;
}
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
index d03a7c5..cf17fb1 100644
--- a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
+++ b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
@@ -37,8 +37,8 @@
<select id="listLed" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
SELECT
- t1.*, t2.pole_id,
- t3.pole_name , t3.id
+ t1.*, t2.pole_id as streetlight_id,
+ t3.pole_name as streetlight_name, t3.id
FROM
pole_lightemit t1
LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
index 04a2b09..383d07a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -191,8 +191,8 @@
map.put("lightemitName", bean.getLightemitName());
map.put("lightemitControlCode", bean.getLightemitControlCode());
map.put("isOnLine", bean.isOnLine());
- map.put("streetlightId", bean.getPoleId());
- map.put("streetlightName", bean.getPoleName());
+ map.put("streetlightId", bean.getStreetlightId());
+ map.put("streetlightName", bean.getStreetlightName());
mapList.add(map);
}
return ResponseUtil.success(mapList);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 9ee66ea..d1e011d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -239,18 +240,10 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, order, seq, isOnLine);
- poleLightemitEntityList.forEach(led -> {
- led.setStreetlightId(led.getPoleId());
- led.setStreetlightName(led.getPoleName());
- });
- CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
- int size = poleLightemitEntityList.size();
- commonPage.setTotal((long) size);
- commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
- if (size % baseConditionVO.getPageSize() == 0) {
- commonPage.setTotalPage(size / baseConditionVO.getPageSize());
- }
+
+ CommonPage commonPage = ListPagingUtils.pages(poleLightemitEntityList, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
return ResponseUtil.success(commonPage);
}
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