From d95f78488e734c1defcad4af8b7e79c712937111 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 15 八月 2023 16:00:26 +0800
Subject: [PATCH] 多表联查改为用join on
---
src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml | 60 +++++++-----------------------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
index c3abbaf..d4cabc2 100644
--- a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
@@ -7,12 +7,8 @@
<!-- 瓒呮爣娌圭儫鏌ヨ-->
<select id="conditionQuery" resultType="com.job.zsc.pojo.FumeHistoryData">
select a1.MV_ID,a1.MV_Stat_Code,b.DI_Name,a1.MV_Create_Time,a1.MV_Data_Time,a1.MV_Fume_Concentration2
- from exceeding_st_data as a1 , ea_t_device_info as b
+ from exceeding_st_data as a1 join ea_t_device_info as b on a1.MV_Stat_Code = b.DI_Code
<where>
- <!-- 鏉′欢涓虹┖鏃舵煡璇㈠叏閮�-->
- <if test="(devId ==null or devId == '') and (beginTime ==null and endTime == null)">
- a1.MV_Stat_Code = b.DI_Code
- </if>
<if test="devId != null and devId != '' ">
and a1.MV_Stat_Code = #{devId} and b.DI_Code = #{devId}
@@ -25,25 +21,6 @@
order by MV_Data_Time asc
</select>
-<!-- 鍘嗗彶娌圭儫鏌ヨ-->
-<!-- <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">-->
-<!-- select a1.MV_ID,a1.MV_Stat_Code,b.DI_Name,a1.MV_Data_Time,a1.MV_Fume_Concentration2,a1.MV_Fan_Electricity,a1.MV_Purifier_Electricity-->
-<!-- from fd_t_minutevalue as a1 , ea_t_device_info as b-->
-<!-- <where>-->
-<!-- <!– 鏉′欢涓虹┖鏃舵煡璇㈠叏閮�–>-->
-<!-- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">-->
-<!-- a1.MV_Stat_Code = b.DI_Code-->
-<!-- </if>-->
-<!-- <if test="devId != null and devId != '' ">-->
-<!-- and a1.MV_Stat_Code = #{devId} and b.DI_Code = #{devId}-->
-<!-- </if>-->
-
-<!-- <if test="beginTime != null and endTime != null">-->
-<!-- and a1.MV_Data_Time between #{beginTime} and #{endTime}-->
-<!-- </if>-->
-<!-- </where>-->
-<!-- order by MV_Data_Time asc-->
-<!-- </select>-->
<!-- 鍘嗗彶娌圭儫鏌ヨ-->
<select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">
SELECT d.DI_Name, c.*
@@ -52,20 +29,10 @@
FROM fd_t_minutevalue as a
LEFT JOIN fd_t_minutevalue as b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication < b.MV_Isduplication
WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = #{devId})
- as c,ea_t_device_info as d
-
-<!-- CREATE TEMPORARY TABLE IF NOT EXISTS temp_table AS-->
-<!-- SELECT a.*-->
-<!-- FROM fd_t_minutevalue AS a-->
-<!-- LEFT JOIN fd_t_minutevalue AS b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication < b.MV_Isduplication WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = 'GLHB00000000016004'-->
-
+ as c join ea_t_device_info as d on c.MV_Stat_Code = d.DI_Code
<where>
- <!-- 鏉′欢涓虹┖鏃舵煡璇㈠叏閮�-->
- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">
- c.MV_Stat_Code = d.DI_Code
- </if>
<if test="devId != null and devId != '' ">
- and c.MV_Stat_Code = #{devId} and d.DI_Code = #{devId}
+ and c.MV_Stat_Code = #{devId}
</if>
<if test="beginTime != null and endTime != null">
@@ -78,11 +45,8 @@
<!-- 鏉′欢鏌ヨ寮傚父琛�-->
<select id="conditonQueryAbnormalData" resultType="com.job.zsc.pojo.FumeAbnormalData">
select a1.dev_id,b.DI_Name,a1.exception_type,a1.region,a1.begin_time,a1.end_time
- from abnormal_data as a1,ea_t_device_info as b
+ from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id = b.DI_Code
<where>
- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">
- a1.dev_id = b.DI_Code
- </if>
<if test="devId != null and devId != '' ">
and a1.dev_id = #{devId} and b.DI_Code = #{devId}
@@ -99,11 +63,8 @@
<!-- 鏉′欢鏌ヨ寮傚父琛� 澧炲姞浜嗗紓甯哥被鍨嬮�夐」-->
<select id="conditonQueryAbnormalData1" resultType="com.job.zsc.pojo.FumeAbnormalData">
select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
- from abnormal_data as a1,ea_t_device_info as b
+ from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id = b.DI_Code
<where>
- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">
- a1.dev_id = b.DI_Code
- </if>
<if test="devId != null and devId != '' ">
and a1.dev_id = #{devId} and b.DI_Code = #{devId}
@@ -160,11 +121,8 @@
<!-- 鏉′欢缁勫悎鏌ヨ寮傚父琛� 寮傚父绫诲瀷閫夐」鏀逛负澶氶��-->
<select id="conditonQueryAbnormalData2" resultType="com.job.zsc.pojo.FumeAbnormalData">
select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
- from abnormal_data as a1,ea_t_device_info as b
+ from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id = b.DI_Code
<where>
- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">
- a1.dev_id = b.DI_Code
- </if>
<if test="devId != null and devId != '' ">
and a1.dev_id = #{devId} and b.DI_Code = #{devId}
@@ -187,12 +145,8 @@
<!-- 鏉′欢缁勫悎鏌ヨ寮傚父琛� 寮傚父绫诲瀷閫夐」鏀逛负澶氶��-->
<select id="conditonQueryAbnormalData3" resultType="com.job.zsc.pojo.FumeAbnormalData">
select a1.dev_id,b.DI_Name,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
- from abnormal_data as a1,ea_t_device_info as b
+ from abnormal_data as a1 join ea_t_device_info as b on a1.dev_id = b.DI_Code
<where>
- <if test="(devId ==null or devId == '') or (beginTime ==null and endTime == null)">
- a1.dev_id = b.DI_Code
- </if>
-
<if test="devId != null and devId != '' ">
and a1.dev_id = #{devId} and b.DI_Code = #{devId}
</if>
--
Gitblit v1.9.3