From e2e7dc7183aa41e22c4e56e1c7fc4299cffcede2 Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Thu, 4 Jul 2024 16:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8E=86=E5=8F=B2=E8=AF=BB=E6=95=B0?=
 =?UTF-8?q?=E5=88=86=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/controller/MeterReadController.java       | 10 +++++++++-
 .../modules/analysis/entity/MeterReadingRecord.java    |  8 ++++++++
 .../modules/analysis/MeterReadingRecordMapper.xml      | 10 ++++++----
 .../com/xr/device/common/utils/ValueFormatUtil.java    |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
index 88b7e42..fde4c18 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
@@ -40,7 +40,11 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
             query.like("d.device_ip",readingRecord.getDeviceIp());
         }
-        query.orderByDesc("reading_time");
+        if(StringUtils.isNotEmpty(readingRecord.getStationId())){
+            query.eq("a.station_id",readingRecord.getStationId());
+        }
+        query.eq("b.status",1);
+        query.orderByDesc("a.reading_time");
         IPage<MeterReadingRecord> ipage = meterReadingRecordService.pageList(page,query);
         return ipage;
     }
@@ -58,7 +62,11 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
             query.like("d.device_ip",readingRecord.getDeviceIp());
         }
+        if(StringUtils.isNotEmpty(readingRecord.getStationId())){
+            query.eq("a.station_id",readingRecord.getStationId());
+        }
         query.eq("c.status",1);
+        query.orderByAsc("d.device_ip");
         IPage<MeterReadingRecord> ipage = meterReadingRecordService.newestPage(page,query);
         return ipage;
     }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
index 63f348f..1eb3100 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
@@ -27,6 +27,14 @@ public class MeterReadingRecord implements Serializable {
      */
     private Integer meterId;
 
+    /**
+     * 所属站
+     */
+    private Integer stationId;
+
+    @TableField(exist = false)
+    private String substationName;
+
     /**
      * 表计编号
      */
diff --git a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
index 1ab074e..5a41902 100644
--- a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
+++ b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
@@ -36,19 +36,21 @@
 
     <select id="pageList" resultType="com.xr.device_car.modules.analysis.entity.MeterReadingRecord">
         select a.id,a.meter_id,b.meter_code,a.meter_type_name,
-               a.reading_time,a.reading_value,a.reading_url,b.meter_name,b.owning_interval,d.device_ip
+               a.reading_time,a.reading_value,a.reading_url,
+               b.meter_name,b.owning_interval,d.device_ip,e.substation_name
         from meter_reading_record a left join meter_config b on a.meter_id=b.id
                                     left join device_camera d on b.camera_id=d.id
+                                    left join substation e on a.station_id = e.id
         ${ew.customSqlSegment}
     </select>
 
     <select id="newestPage" resultType="com.xr.device_car.modules.analysis.entity.MeterReadingRecord">
         select a.id,c.id meter_id,c.meter_code,b.reading_time,b.reading_value,b.reading_url
-        ,c.meter_name,c.owning_interval,d.device_ip
-        from (select meter_id,max(id) id from meter_reading_record GROUP BY meter_id)
+        ,c.meter_name,c.owning_interval,d.device_ip,e.substation_name
+        from (select meter_id,max(id) id,station_id from meter_reading_record GROUP BY meter_id,station_id)
         a LEFT JOIN (select id,reading_time,reading_value,reading_url from meter_reading_record) b
         on a.id = b.id LEFT JOIN meter_config c on a.meter_id=c.id left join device_camera d
-        on c.camera_id=d.id
+        on c.camera_id=d.id left join substation e on a.station_id = e.id
         ${ew.customSqlSegment}
     </select>
 </mapper>
diff --git a/device_gather/src/main/java/com/xr/device/common/utils/ValueFormatUtil.java b/device_gather/src/main/java/com/xr/device/common/utils/ValueFormatUtil.java
index 9bce9ca..bd1ff83 100644
--- a/device_gather/src/main/java/com/xr/device/common/utils/ValueFormatUtil.java
+++ b/device_gather/src/main/java/com/xr/device/common/utils/ValueFormatUtil.java
@@ -15,8 +15,8 @@ public class ValueFormatUtil {
     * */
     public static String getNumBerJx(float getVal, MeterConfig config, MeterConfigService meterConfigService){
         int s = (int) getVal;
-        Integer jz = Integer.valueOf(config.getJzVal())+1;
         if(StringUtils.isNotEmpty(config.getJzVal())){
+            Integer jz = Integer.valueOf(config.getJzVal())+1;
             if(s==jz){
                 config.setJzVal(jz+"");
                 meterConfigService.updateById(config);