From e525cffa5ae93048d0ac1208d100e08bc69a4a3a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 06 一月 2022 14:52:51 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 39 +++---------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java | 7 -
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 7 -
dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java | 4 -
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 7 --
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 12 +---
dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java | 4 -
dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml | 34 ++--------
dao/src/main/resources/mapper/MonitorMapper.xml | 33 ++---------
9 files changed, 34 insertions(+), 113 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
index 3de24eb..8358148 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
@@ -12,9 +12,7 @@
*/
@Mapper
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
- List<Long> listAirEquipmentId(String keyword, Long clientId);
-
- List<AirEquipmentBo> listAirEquipmentByIds(List<Long> airEquipmentIdList);
+ List<AirEquipmentBo> listAirEquipmentByIds(String keyword, Long clientId);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index f0fb2e5..8667ec6 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -15,12 +15,7 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
-
-
-
- List<Long> listMonitorId(String keyword, Long clientId, int bindingState);
-
- List<MonitorBo> listMonitorByIds(List<Long> airEquipmentIdList);
+ List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState);
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
index 3047427..2aa6a10 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
@@ -11,7 +11,5 @@
public interface WaterQualityEquipmentMapper extends BaseMapper<WaterQualityEquipment> {
List<WaterQualityEquipmentBo> listWaterQualityEquipment();
- List<Long> WaterQualityEquipmentId(String keyword, Long clientId);
-
- List<WaterQualityEquipmentBo> listWaterQualityEquipmentByIds(List<Long> waterQualityEquipmentIdList);
+ List<WaterQualityEquipmentBo> listWaterQualityEquipmentByIds(String keyword, Long clientId);
}
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
index 485d81a..8885f98 100644
--- a/dao/src/main/resources/mapper/AirEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
@@ -5,9 +5,9 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipment">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="mac" column="mac" jdbcType="VARCHAR"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -15,28 +15,6 @@
create_time,user_id,light_pole_id,
mac
</sql>
-
- <select id="listAirEquipmentId" resultType="java.lang.Long">
- SELECT
- MAX(t1.id) AS air_equipment_id
- FROM
- air_equipment t1
- <if test="keyword != null and keyword != ''">
- LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
- AND t2.device_type = 3
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- </if>
- <where>
- <if test="keyword != null and keyword != ''">
- AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- </if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
- </if>
- </where>
- GROUP BY
- t1.mac
- </select>
<select id="listAirEquipmentByIds" resultType="com.sandu.ximon.dao.bo.AirEquipmentBo">
SELECT
@@ -48,10 +26,13 @@
AND t2.device_type = 3
LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
- t1.id IN
- <foreach collection="airEquipmentIdList" open="(" close=")" item="airId" separator=",">
- #{airId}
- </foreach>
+ <if test="keyword != null and keyword != ''">
+ AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ </if>
+ <if test="clientId != null">
+ AND t3.client_id = #{clientId}
+ </if>
</where>
</select>
+
</mapper>
diff --git a/dao/src/main/resources/mapper/MonitorMapper.xml b/dao/src/main/resources/mapper/MonitorMapper.xml
index a0ef0c1..874f61f 100644
--- a/dao/src/main/resources/mapper/MonitorMapper.xml
+++ b/dao/src/main/resources/mapper/MonitorMapper.xml
@@ -46,16 +46,15 @@
t1.id DESC
</select>
- <select id="listMonitorId" resultType="java.lang.Long">
+ <select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
SELECT
- MAX(t1.id) AS monitor_id
+ t1.*, t2.pole_id,
+ t3.pole_name
FROM
monitor t1
- <if test="keyword != null and keyword != ''">
- LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
- AND t2.device_type = 7
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- </if>
+ LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
+ AND t2.device_type = 7
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
<where>
<if test="keyword != null and keyword != ''">
AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
@@ -67,26 +66,6 @@
AND t1.binding_state = #{bindingState}
</if>
</where>
- GROUP BY
- t1.device_serial
</select>
-
- <select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
- SELECT
- t1.*, t2.pole_id,
- t3.pole_name
- FROM
- monitor t1
- LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
- AND t2.device_type = 7
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- <where>
- t1.id IN
- <foreach collection="airEquipmentIdList" open="(" close=")" item="airId" separator=",">
- #{airId}
- </foreach>
- </where>
- </select>
-
</mapper>
diff --git a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
index dede1cf..6fe2d84 100644
--- a/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml
@@ -26,28 +26,6 @@
</select>
- <select id="WaterQualityEquipmentId" resultType="java.lang.Long">
- SELECT
- MAX(t1.id) AS water_quality_equipment_id
- FROM
- water_quality_equipment t1
- <if test="keyword != null and keyword != ''">
- LEFT JOIN pole_binding t2 ON t1.water_quality_equipment_code = t2.device_code
- AND t2.device_type = 4
- LEFT JOIN pole t3 ON t3.id = t2.pole_id
- </if>
- <where>
- <if test="keyword != null and keyword != ''">
- AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
- </if>
- <if test="clientId != null">
- AND t3.client_id = #{clientId}
- </if>
- </where>
- GROUP BY
- t1.water_quality_equipment_code
- </select>
-
<select id="listWaterQualityEquipmentByIds" resultType="com.sandu.ximon.dao.bo.WaterQualityEquipmentBo">
SELECT
t1.*, t2.pole_id,
@@ -57,12 +35,16 @@
LEFT JOIN pole_binding t2 ON t1.water_quality_equipment_code = t2.device_code
AND t2.device_type = 4
LEFT JOIN pole t3 ON t3.id = t2.pole_id
+
<where>
- t1.id IN
- <foreach collection="waterQualityEquipmentIdList" open="(" close=")" item="airId" separator=",">
- #{airId}
- </foreach>
+ <if test="keyword != null and keyword != ''">
+ AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
+ </if>
+ <if test="clientId != null">
+ AND t3.client_id = #{clientId}
+ </if>
</where>
</select>
+
</mapper>
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
index 2bb2a4b..10868e2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java
@@ -33,11 +33,8 @@
public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId = airEquipmentMapper.listAirEquipmentId(keyword,clientId);
- if(CollUtil.isEmpty(listAirEquipmentId)){
- return CollUtil.newArrayList();
- }
- List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(listAirEquipmentId);
+
+ List<AirEquipmentBo> airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(keyword,clientId);
return airEquipmentBos;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 2ccd48e..7e9cbd8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -56,21 +56,15 @@
public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId;
-
+ List<MonitorBo> monitorList;
//缁戝畾鐘舵�侊細宸茬粦瀹�/鏈粦瀹�/鍏ㄩ儴
if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
//鍏ㄩ儴
int bindingState = 2;
- listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, bindingState);
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
} else {
- listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
+ monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
}
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
- }
-
- List<MonitorBo> monitorList = monitorMapper.listMonitorByIds(listAirEquipmentId);
return monitorList;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index a8ba748..e08ac9e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -40,11 +40,8 @@
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
Long clientId = SecurityUtils.getClientId();
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Long> listAirEquipmentId = waterQualityEquipmentMapper.WaterQualityEquipmentId(keyword, clientId);
- if (CollUtil.isEmpty(listAirEquipmentId)) {
- return CollUtil.newArrayList();
- }
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(listAirEquipmentId);
+
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
return waterQualityEquipmentBoList;
}
--
Gitblit v1.9.3