From d57d96ce51231734aa0b4979abeea17271660c1e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 17:10:46 +0800
Subject: [PATCH] bug修复
---
dao/src/main/resources/mapper/LightMapper.xml | 8 ++++----
dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java | 5 +++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 6 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 4 ++++
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
index dd71d27..709704b 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java
@@ -16,17 +16,18 @@
* 鏈嶅姟鍣ㄨ幏鍙栬矾鐏垪琛�
*
* @param clientId 瀹㈡埛id
- * @param keyword 鍏抽敭瀛�
+ * @param keyword 鍏抽敭瀛�
* @return 璺伅鍒楄〃
*/
List<LightBo> listLight(Long clientId, String keyword);
/**
* 鑾峰彇鐢ㄦ埛鎵�鎷ユ湁鐨勭伅鏉嗕笂鐨勮矾鐏痗ode
+ *
* @param userId
* @return
*/
- List<String> listCode( Long userId,String keyword, String deviceCode);
+ List<String> listCode(Long userId, String keyword, String deviceCode);
}
diff --git a/dao/src/main/resources/mapper/LightMapper.xml b/dao/src/main/resources/mapper/LightMapper.xml
index b7cea6f..93770f4 100644
--- a/dao/src/main/resources/mapper/LightMapper.xml
+++ b/dao/src/main/resources/mapper/LightMapper.xml
@@ -53,10 +53,10 @@
t1.device_code
FROM
light t1
- LEFT JOIN pole t2 USING ( device_code )
+ LEFT JOIN pole t2 ON t1.device_code = t2.device_code
<where>
- <if test="clientId != null">
- AND (t2.user_id = #{clientId} OR t2.client_id = #{clientId})
+ <if test="userId != null">
+ AND (t2.user_id = #{userId} OR t2.client_id = #{userId})
</if>
<if test="keyword != null and keyword != ''">
AND (
@@ -64,7 +64,7 @@
OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
)
</if>
- <if test="deviceCode != null">
+ <if test="deviceCode != null and deviceCode!= ''">
AND t2.device_code = #{deviceCode}
</if>
</where>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 940439b..b27bcc6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -18,6 +18,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -71,6 +72,9 @@
CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();
+ if(lightReportDataBos == null){
+ return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
+ }
CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
commonPage1.setTotal(commonPage.getTotal());
commonPage1.setTotalPage(commonPage.getTotalPage());
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index ec675c3..bc087e1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -471,15 +471,15 @@
/**
* 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
*/
- public CommonPage<String> listDeviceCode(int pageNo, int pageSize,String keyword, String deviceCode) {
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
List<String> list;
if (SecurityUtils.getClientId() != null) {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(SecurityUtils.getUserId(),keyword,deviceCode);
+ list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
} else {
PageHelper.startPage(pageNo, pageSize);
- list = baseMapper.listCode(null,keyword,deviceCode);
+ list = baseMapper.listCode(null, keyword, deviceCode);
}
return CommonPage.restPage(list);
--
Gitblit v1.9.3