中山站优化配置

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

@@ -258,6 +258,21 @@ public class MeterConfigController {
 
     }
 
+    @RequestMapping("/saveCalibration")
+    public Result<?> saveCalibration(MeterConfig config){
+        if(StringUtils.isEmpty(config.getJzVal())){
+            return Result.error("保存失败，校准值不能为空");
+        }
+        UpdateWrapper<MeterConfig> update = new UpdateWrapper<>();
+        if(StringUtils.isNotEmpty(config.getIsJz())){
+            update.set("is_jz",config.getIsJz());
+        }
+        update.set("jz_val",config.getJzVal());
+        update.eq("id",config.getId());
+        meterConfigService.update(update);
+        return Result.OK("保存成功！");
+    }
+
     //同步配置文件到udp主机
     @RequestMapping("/sendSynchronizationUdp")
     public Result<?> sendSynchronizationUdp(){

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

@@ -34,6 +34,7 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
             query.like("d.device_ip",readingRecord.getDeviceIp());
         }
+        query.orderByDesc("reading_time");
         IPage<MeterReadingRecord> ipage = meterReadingRecordService.pageList(page,query);
         return ipage;
     }

device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java

@@ -123,6 +123,10 @@ public class MeterConfig implements Serializable {
      */
     private String remarks;
 
+    private String jzVal;
+
+    private Integer isJz;
+
     /**
      * 初始化状态
      */

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

@@ -41,7 +41,7 @@
         a.type_id,a.status,a.first_time,
         a.algorithm_type,a.interval_time,a.focal_number,
         a.parameter_config,a.remarks,a.init_status,a.create_user,
-        a.create_time,a.update_user,a.update_time,
+        a.create_time,a.update_user,a.update_time,jz_val,is_jz,
     </sql>
     <select id="selectConfigByPage" resultType="com.xr.device_car.modules.analysis.entity.MeterConfig">
         select