From 12b3967ebefcfc31e8e2eeb4fea6c699f5bd04f4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 25 四月 2022 17:33:43 +0800
Subject: [PATCH] bug修复
---
dao/src/main/resources/mapper/LightMapper.xml | 12 ++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java | 4 ----
dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java | 7 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 7 +++++++
4 files changed, 26 insertions(+), 4 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 b25282a..a2e1728 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
@@ -20,6 +20,13 @@
* @return 璺伅鍒楄〃
*/
List<LightBo> listLight(Long clientId, String keyword);
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鎵�鎷ユ湁鐨勭伅鏉嗕笂鐨勮矾鐏痗ode
+ * @param userId
+ * @return
+ */
+ List<String> listCode(/*int start, int end,*/ Long userId);
}
diff --git a/dao/src/main/resources/mapper/LightMapper.xml b/dao/src/main/resources/mapper/LightMapper.xml
index 98dae03..073d2ca 100644
--- a/dao/src/main/resources/mapper/LightMapper.xml
+++ b/dao/src/main/resources/mapper/LightMapper.xml
@@ -46,4 +46,16 @@
</if>
</where>
</select>
+ <select id="listCode" resultType="java.lang.String">
+ SELECT
+ t1.device_code
+ FROM
+ light t1
+ LEFT JOIN pole t2 USING ( device_code )
+ <where>
+ <if test="clientId != null">
+ AND (t2.user_id = #{clientId} OR t2.client_id = #{clientId})
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
index 8b3bf4c..84f649b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
@@ -16,10 +16,6 @@
private String keyWord;
- private Integer lampPostType;
-
- private Integer lampPostState;
-
private Integer bindState;
private String groupName;
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 58a4ddb..9232559 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
@@ -467,4 +467,11 @@
return lightList;
}
+ /**
+ * 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
+ */
+ public List<String> listDeviceCode(/*int start, int end*/) {
+ return baseMapper.listCode(/*start,end,*/SecurityUtils.getClientId());
+ }
+
}
--
Gitblit v1.9.3