From a02f2042cd8332935e192db8eca8642fe35eb03e Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Mon, 3 Jun 2024 09:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=B1=B1=E7=AB=99=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/controller/MeterReadController.java  | 15 +++++++++++++++
 .../analysis/mapper/MeterReadingRecordMapper.java |  1 +
 .../service/MeterReadingRecordService.java        |  1 +
 .../impl/MeterReadingRecordServiceImpl.java       |  5 +++++
 .../modules/analysis/MeterReadingRecordMapper.xml |  9 +++++++++
 device_iec104/pom.xml                             |  4 ++--
 6 files changed, 33 insertions(+), 2 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 fc4698e..2691bae 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
@@ -35,6 +35,21 @@ public class MeterReadController {
         return ipage;
     }
 
+    @RequestMapping("/newestPage")
+    public IPage<MeterReadingRecord> newestPage(MeterReadingRecord readingRecord, HttpServletRequest req){
+        Page<MeterReadingRecord> page = StringFormatterUtil.returnPage(req);
+        QueryWrapper<MeterReadingRecord> query=new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(readingRecord.getMeterName())){
+            query.like("c.meter_name",readingRecord.getMeterName());
+        }
+        if(StringUtils.isNotEmpty(readingRecord.getOwningInterval())){
+            query.like("c.owning_interval",readingRecord.getOwningInterval());
+        }
+        query.eq("c.status",1);
+        IPage<MeterReadingRecord> ipage = meterReadingRecordService.newestPage(page,query);
+        return ipage;
+    }
+
 
 
 }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
index d5b61cc..5b188b0 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterReadingRecordMapper.java
@@ -22,6 +22,7 @@ public interface MeterReadingRecordMapper extends BaseMapper<MeterReadingRecord>
 
     IPage<MeterReadingRecord> pageList(@Param("page") Page page, @Param(Constants.WRAPPER)Wrapper<MeterReadingRecord> wrapper);
 
+    IPage<MeterReadingRecord> newestPage(@Param("page") Page page, @Param(Constants.WRAPPER)Wrapper<MeterReadingRecord> wrapper);
 
 }
 
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
index 7ab19f2..83594ec 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterReadingRecordService.java
@@ -18,4 +18,5 @@ public interface MeterReadingRecordService extends IService<MeterReadingRecord>
 
     IPage<MeterReadingRecord> pageList(Page<MeterReadingRecord> page, QueryWrapper<MeterReadingRecord> query);
 
+    IPage<MeterReadingRecord> newestPage(Page<MeterReadingRecord> page,QueryWrapper<MeterReadingRecord> query);
 }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
index 9d2a1d3..4a6815c 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterReadingRecordServiceImpl.java
@@ -34,6 +34,11 @@ public class MeterReadingRecordServiceImpl extends ServiceImpl<MeterReadingRecor
     public IPage<MeterReadingRecord> pageList(Page<MeterReadingRecord> page, QueryWrapper<MeterReadingRecord> query) {
         return ((MeterReadingRecordMapper)this.baseMapper).pageList(page,query);
     }
+
+    @Override
+    public IPage<MeterReadingRecord> newestPage(Page<MeterReadingRecord> page, QueryWrapper<MeterReadingRecord> query) {
+        return ((MeterReadingRecordMapper)this.baseMapper).newestPage(page,query);
+    }
 }
 
 
diff --git a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
index 8f4b424..221ebff 100644
--- a/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
+++ b/device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml
@@ -40,4 +40,13 @@
         from meter_reading_record a left join meter_config b on a.meter_id=b.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
+        from (select meter_id,max(id) id from meter_reading_record GROUP BY meter_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
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
diff --git a/device_iec104/pom.xml b/device_iec104/pom.xml
index 886e829..24c5c95 100644
--- a/device_iec104/pom.xml
+++ b/device_iec104/pom.xml
@@ -101,8 +101,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>6</source>
-                    <target>6</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>