增加ip查询

device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java

@@ -31,6 +31,9 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getOwningInterval())){
             query.like("b.owning_interval",readingRecord.getOwningInterval());
         }
+        if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
+            query.like("d.device_ip",readingRecord.getDeviceIp());
+        }
         IPage<MeterReadingRecord> ipage = meterReadingRecordService.pageList(page,query);
         return ipage;
     }
@@ -45,6 +48,9 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getOwningInterval())){
             query.like("c.owning_interval",readingRecord.getOwningInterval());
         }
+        if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
+            query.like("d.device_ip",readingRecord.getDeviceIp());
+        }
         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/entity/MeterReadingRecord.java

@@ -35,6 +35,9 @@ public class MeterReadingRecord implements Serializable {
     @TableField(exist = false)
     private String meterName;
 
+    @TableField(exist = false)
+    private String deviceIp;
+
     private String readingUrl;
 
 

device_cars/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     #active: dev     #开发环境
     #    active: test    #测试环境5
-    active: dev    #生产环境
+    active: prod    #生产环境
   #   active: prod    #生产环境
   application:
     name: deviceCars

device_cars/src/main/resources/modules/analysis/MeterReadingRecordMapper.xml

@@ -35,18 +35,20 @@
     </delete>
 
     <select id="pageList" resultType="com.xr.device_car.modules.analysis.entity.MeterReadingRecord">
-        select a.id,a.meter_id,a.meter_code,a.meter_type_name,
-               a.reading_time,a.reading_value,a.reading_url,b.meter_name,b.owning_interval
+        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
         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
         ${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
+        ,c.meter_name,c.owning_interval,d.device_ip
         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
+        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
         ${ew.customSqlSegment}
     </select>
 </mapper>