升级fastjson 版本

优化 修改水表信息功能

@@ -19,7 +19,7 @@
         <druid.version>1.1.9</druid.version>
         <druid.version>1.1.9</druid.version>
         <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
         <spring-cloud.version>Greenwich.BUILD-SNAPSHOT</spring-cloud.version>
         <lombok_sersion>1.18.6</lombok_sersion>
         <lombok_sersion>1.18.6</lombok_sersion>
-        <fastjson_version>1.2.28</fastjson_version>
+        <fastjson_version>1.2.83</fastjson_version>
         <swagger2_version>2.9.2</swagger2_version>
         <swagger2_version>2.9.2</swagger2_version>
     </properties>
     </properties>
 
 

@@ -132,9 +132,12 @@ public class LocationController {
             int i1 = locationMapper.updateByPrimaryKeySelective(location);
             int i1 = locationMapper.updateByPrimaryKeySelective(location);
             log.info("楼层编辑：{}", i1);
             log.info("楼层编辑：{}", i1);
         }else {
         }else {
+            // 修改水表
+            locationMapper.updateByPrimaryKeySelective(location);
             // 查询旧表 实时数据
             // 查询旧表 实时数据
             WaterMeter realTime = waterMeterService.findRealTime(wmId);
             WaterMeter realTime = waterMeterService.findRealTime(wmId);
             log.info("旧表累计充值量:{}",realTime.getWmSacc());
             log.info("旧表累计充值量:{}",realTime.getWmSacc());
+            log.info("旧表累计消费量:{}",realTime.getWmLacc());
             // 充值新表
             // 充值新表
             Map<String, Object> datas = new HashMap<>();
             Map<String, Object> datas = new HashMap<>();
             datas.put("MtId", location.getWmid());
             datas.put("MtId", location.getWmid());
@@ -143,7 +146,7 @@ public class LocationController {
             datas.put("Add_addmode", "3");
             datas.put("Add_addmode", "3");
             String status = HttpsUtils.httpRequest("http://123.56.159.203:8023/mtfmset/allWMadd", datas);
             String status = HttpsUtils.httpRequest("http://123.56.159.203:8023/mtfmset/allWMadd", datas);
             datas.put("status", status);
             datas.put("status", status);
-            log.info("新表充值:{}",status);
+            log.info("新表充值返回状态:{}",status);
             log.info("充值成功更新水表");
             log.info("充值成功更新水表");
         }
         }
         waterMeterSacc.setWmId(location.getWmid());
         waterMeterSacc.setWmId(location.getWmid());