中山站部署内容

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;
+    }
+
 
 
 }

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);
 
 }
 

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);
 }

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);
+    }
 }
 
 

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>

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>