From 1eecc1f678668ba11b15198be4f0057cf886e7f6 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 29 八月 2023 08:48:40 +0800
Subject: [PATCH] 扬尘监测后端代码

---
 src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml |   59 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
index d4cabc2..73b4a99 100644
--- a/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/Vue3FumeMapper.xml
@@ -6,41 +6,68 @@
 
 <!--   瓒呮爣娌圭儫鏌ヨ-->
     <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 join ea_t_device_info as b on a1.MV_Stat_Code =  b.DI_Code
+        SELECT a1.MV_ID, a1.MV_Stat_Code, b.DI_Name,b.DI_Supplier, a1.MV_Create_Time, a1.MV_Data_Time, a1.MV_Fume_Concentration2
+        FROM exceeding_st_data AS a1
+        INNER JOIN ea_t_device_info AS b ON a1.MV_Stat_Code = b.DI_Code
         <where>
-
             <if test="devId != null and devId != '' ">
-               and a1.MV_Stat_Code = #{devId} and b.DI_Code = #{devId}
+                a1.MV_Stat_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
+        order by a1.MV_Data_Time asc
     </select>
 
     <!--    鍘嗗彶娌圭儫鏌ヨ-->
+<!--    <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">-->
+<!--        SELECT d.DI_Name, c.*-->
+<!--        FROM (-->
+<!--        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 &lt; b.MV_Isduplication-->
+<!--        WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = #{devId})-->
+<!--        as c join ea_t_device_info as d on c.MV_Stat_Code =  d.DI_Code-->
+<!--        <where>-->
+<!--            <if test="devId != null and devId != '' ">-->
+<!--                and c.MV_Stat_Code = #{devId}-->
+<!--            </if>-->
+
+<!--            <if test="beginTime != null and endTime != null">-->
+<!--                AND c.MV_Data_Time between  #{beginTime} AND  #{endTime}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        ORDER BY c.MV_Data_Time ASC;-->
+<!--    </select>-->
+    <!--    鍘嗗彶娌圭儫鏌ヨ 淇敼浜嗚鍙�-->
     <select id="conditionQueryHistory" resultType="com.job.zsc.pojo.FumeHistoryData">
         SELECT d.DI_Name, c.*
         FROM (
         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 &lt; b.MV_Isduplication
-        WHERE b.MV_ID IS NULL AND a.MV_Stat_Code = #{devId})
-        as c join ea_t_device_info as d on c.MV_Stat_Code =  d.DI_Code
+        FROM fd_t_minutevalue AS a
+        INNER JOIN (
+        SELECT MV_Stat_Code,MV_Data_Time, MAX(MV_Isduplication) AS Max_Isduplication
+        FROM fd_t_minutevalue
+        WHERE MV_Stat_Code = #{devId}
+        GROUP BY MV_Data_Time
+        ) AS b ON a.MV_Data_Time = b.MV_Data_Time AND a.MV_Isduplication = b.Max_Isduplication AND a.MV_Stat_Code = b.MV_Stat_Code
+        WHERE a.MV_Stat_Code = #{devId}
+        ) AS c
+        JOIN ea_t_device_info AS d ON c.MV_Stat_Code = d.DI_Code
         <where>
-            <if test="devId != null and devId != '' ">
-                and c.MV_Stat_Code = #{devId}
-            </if>
-
             <if test="beginTime != null and endTime != null">
-                AND c.MV_Data_Time between  #{beginTime} AND  #{endTime}
+                c.MV_Data_Time >= #{beginTime} AND c.MV_Data_Time &lt;= #{endTime}
             </if>
         </where>
         ORDER BY c.MV_Data_Time ASC;
     </select>
+
+
+
+
+
 
 <!--    鏉′欢鏌ヨ寮傚父琛�-->
     <select id="conditonQueryAbnormalData" resultType="com.job.zsc.pojo.FumeAbnormalData">
@@ -120,12 +147,12 @@
 
     <!-- 鏉′欢缁勫悎鏌ヨ寮傚父琛�  寮傚父绫诲瀷閫夐」鏀逛负澶氶��-->
     <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
+        select a1.dev_id,b.DI_Name,b.DI_Supplier,a1.exception,a1.exception_type,a1.region,a1.begin_time,a1.end_time
         from abnormal_data as a1 join ea_t_device_info as b on  a1.dev_id =  b.DI_Code
         <where>
 
             <if test="devId != null and devId != '' ">
-                and a1.dev_id = #{devId} and b.DI_Code = #{devId}
+                and a1.dev_id = #{devId}
             </if>
 
             <if test="exceptionValue != null and exceptionValue != '' ">

--
Gitblit v1.9.3