From 7004f3c103e3a80c40afc5d5ffef7ed77aabe9a4 Mon Sep 17 00:00:00 2001
From: Gaoby <15617898668@163.com>
Date: Fri, 29 Mar 2024 13:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E5=8D=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   4 +-
 .../analysis/MeterReadingRecordMapper.xml     | 184 +++++++++++-------
 2 files changed, 111 insertions(+), 77 deletions(-)

diff --git a/device_display/src/main/resources/application.yml b/device_display/src/main/resources/application.yml
index 8bb9aaf..0e4d97e 100644
--- a/device_display/src/main/resources/application.yml
+++ b/device_display/src/main/resources/application.yml
@@ -22,8 +22,8 @@ spring:
     basename: i18n/messages
   profiles:
 #    active: prod     #开发环境
-#        active: dev    #测试环境5
-    active: prod    #生产环境
+        active: dev    #测试环境5
+#    active: prod    #生产环境
   #   active: prod    #生产环境
   application:
     name: deviceDisplay
diff --git a/device_display/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml b/device_display/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
index d410ae5..b22583f 100644
--- a/device_display/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
+++ b/device_display/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
@@ -121,82 +121,16 @@
     <select id="getPresentReadingPage"
             parameterType="com.xr.device_display.modules.analysis.vo.MeterReadingRecordQueryVo"
             resultType="com.xr.device_display.modules.analysis.dto.PresentReadingQueryDto">
-        SELECT
-        *
-        FROM
-        (
-        SELECT
-        mc.id,
-        mrr.meter_code,
-        mrr.meter_type_name,
-        mrr.reading_value,
-        mrr.meter_type_id,
-        t1.reading_time,
-        '1' AS "queryType",
-        mc.voltage_class,
-        mc.owning_interval,
+        SELECT mrr.*,
         mc.device_name
-        FROM
-        ( SELECT meter_id, MAX( reading_time ) AS reading_time FROM meter_reading_record WHERE reading_type = 1 GROUP BY
-        meter_id ) AS t1
-        LEFT JOIN meter_reading_record AS mrr ON t1.meter_id = mrr.meter_id
-        AND t1.reading_time = mrr.reading_time
-        LEFT JOIN meter_config AS mc ON t1.meter_id = mc.id UNION ALL
-        SELECT
-        mc.id,
-        mc.meter_code,
-        lds5000.lds_desc AS meter_type_name,
-        lds5000.f AS reading_value,
-        mc.type_id AS meter_type_id,
-        lds5000.t AS reading_time,
-        '2' AS "queryType",
-        mc.voltage_class,
-        mc.owning_interval,
-        mc.device_name
-        FROM
-        meter_config AS mc
-        LEFT JOIN lds5000 ON mc.ids5000_id = lds5000.id
-        WHERE
-        lds5000.f IS NOT NULL UNION ALL
-        SELECT
-        "12" AS "id",
-        "meter010" AS "meter_code",
-        lds5000.lds_desc AS meter_type_name,
-        lds5000.f AS reading_value,
-        mc.type_id AS "meter_type_id",
-        lds5000.t AS reading_time,
-        '3' AS "queryType",
-        mc.voltage_class,
-        mc.owning_interval,
-        mc.device_name
-        FROM
-        lds5000
-        LEFT JOIN meter_config AS mc ON mc.meter_code = "meter010"
-        WHERE
-        type = '1'
-        AND fc = "MX" UNION ALL
-        SELECT
-        "12" AS "id",
-        "meter010" AS "meter_code",
-        lds5000.lds_desc AS meter_type_name,
-        lds5000.st_val AS reading_value,
-        mc.type_id AS "meter_type_id",
-        lds5000.t AS reading_time,
-        '4' AS "queryType",
-        mc.voltage_class,
-        mc.owning_interval,
-        mc.device_name
-        FROM
-        lds5000
-        LEFT JOIN meter_config AS mc ON mc.meter_code = "meter010"
-        WHERE
-        type = '1'
-        AND fc = "ST"
-        ) AS C1
+        FROM meter_reading_record AS mrr
+        JOIN (
+        SELECT meter_id, MAX(create_time) AS max_create_time
+        FROM meter_reading_record
+        GROUP BY meter_id
+        ) AS max_times ON mrr.meter_id = max_times.meter_id AND mrr.create_time = max_times.max_create_time
+        LEFT JOIN meter_config AS mc ON mrr.meter_id = mc.id
         <where>
-            <if test="vo.queryType != null and vo.queryType != ''">
-                AND C1.queryType = #{vo.queryType}
-            </if>
             <if test="vo.meterCode != null and vo.meterCode != ''">
                 AND meter_code LIKE CONCAT('%',#{vo.meterCode},'%')
             </if>
@@ -213,8 +147,108 @@
                 AND device_name LIKE CONCAT('%',#{vo.deviceName},'%')
             </if>
         </where>
-        ORDER BY meter_code
+        ORDER BY mrr.owning_interval DESC
+
+
     </select>
 
+<!--    <select id="getPresentReadingPage"-->
+<!--            parameterType="com.xr.device_display.modules.analysis.vo.MeterReadingRecordQueryVo"-->
+<!--            resultType="com.xr.device_display.modules.analysis.dto.PresentReadingQueryDto">-->
+<!--        SELECT-->
+<!--        *-->
+<!--        FROM-->
+<!--        (-->
+<!--        SELECT-->
+<!--        mc.id,-->
+<!--        mrr.meter_code,-->
+<!--        mrr.meter_type_name,-->
+<!--        mrr.reading_value,-->
+<!--        mrr.meter_type_id,-->
+<!--        t1.reading_time,-->
+<!--        '1' AS "queryType",-->
+<!--        mc.voltage_class,-->
+<!--        mc.owning_interval,-->
+<!--        mc.device_name-->
+<!--        FROM-->
+<!--        ( SELECT meter_id, MAX( reading_time ) AS reading_time FROM meter_reading_record WHERE reading_type = 1 GROUP BY-->
+<!--        meter_id ) AS t1-->
+<!--        LEFT JOIN meter_reading_record AS mrr ON t1.meter_id = mrr.meter_id-->
+<!--        AND t1.reading_time = mrr.reading_time-->
+<!--        LEFT JOIN meter_config AS mc ON t1.meter_id = mc.id UNION ALL-->
+<!--        SELECT-->
+<!--        mc.id,-->
+<!--        mc.meter_code,-->
+<!--        lds5000.lds_desc AS meter_type_name,-->
+<!--        lds5000.f AS reading_value,-->
+<!--        mc.type_id AS meter_type_id,-->
+<!--        lds5000.t AS reading_time,-->
+<!--        '2' AS "queryType",-->
+<!--        mc.voltage_class,-->
+<!--        mc.owning_interval,-->
+<!--        mc.device_name-->
+<!--        FROM-->
+<!--        meter_config AS mc-->
+<!--        LEFT JOIN lds5000 ON mc.ids5000_id = lds5000.id-->
+<!--        WHERE-->
+<!--        lds5000.f IS NOT NULL UNION ALL-->
+<!--        SELECT-->
+<!--        "12" AS "id",-->
+<!--        "meter010" AS "meter_code",-->
+<!--        lds5000.lds_desc AS meter_type_name,-->
+<!--        lds5000.f AS reading_value,-->
+<!--        mc.type_id AS "meter_type_id",-->
+<!--        lds5000.t AS reading_time,-->
+<!--        '3' AS "queryType",-->
+<!--        mc.voltage_class,-->
+<!--        mc.owning_interval,-->
+<!--        mc.device_name-->
+<!--        FROM-->
+<!--        lds5000-->
+<!--        LEFT JOIN meter_config AS mc ON mc.meter_code = "meter010"-->
+<!--        WHERE-->
+<!--        type = '1'-->
+<!--        AND fc = "MX" UNION ALL-->
+<!--        SELECT-->
+<!--        "12" AS "id",-->
+<!--        "meter010" AS "meter_code",-->
+<!--        lds5000.lds_desc AS meter_type_name,-->
+<!--        lds5000.st_val AS reading_value,-->
+<!--        mc.type_id AS "meter_type_id",-->
+<!--        lds5000.t AS reading_time,-->
+<!--        '4' AS "queryType",-->
+<!--        mc.voltage_class,-->
+<!--        mc.owning_interval,-->
+<!--        mc.device_name-->
+<!--        FROM-->
+<!--        lds5000-->
+<!--        LEFT JOIN meter_config AS mc ON mc.meter_code = "meter010"-->
+<!--        WHERE-->
+<!--        type = '1'-->
+<!--        AND fc = "ST"-->
+<!--        ) AS C1-->
+<!--        <where>-->
+<!--            <if test="vo.queryType != null and vo.queryType != ''">-->
+<!--                AND C1.queryType = #{vo.queryType}-->
+<!--            </if>-->
+<!--            <if test="vo.meterCode != null and vo.meterCode != ''">-->
+<!--                AND meter_code LIKE CONCAT('%',#{vo.meterCode},'%')-->
+<!--            </if>-->
+<!--            <if test="vo.meterTypeId != null and vo.meterTypeId != ''">-->
+<!--                AND meter_type_id = #{vo.meterTypeId}-->
+<!--            </if>-->
+<!--            <if test="vo.voltageClass != null and vo.voltageClass != ''">-->
+<!--                AND voltage_class = #{vo.voltageClass}-->
+<!--            </if>-->
+<!--            <if test="vo.owningInterval != null and vo.owningInterval !=''">-->
+<!--                AND owning_interval LIKE CONCAT('%',#{vo.owningInterval},'%')-->
+<!--            </if>-->
+<!--            <if test="vo.deviceName != null and vo.deviceName !=''">-->
+<!--                AND device_name LIKE CONCAT('%',#{vo.deviceName},'%')-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        ORDER BY meter_code-->
+<!--    </select>-->
+
 </mapper>