完善 换水表逻辑

@@ -11,6 +11,7 @@ import com.sunyo.energy.location.model.Location;
 import com.sunyo.energy.location.model.WaterMeter;
 import com.sunyo.energy.location.model.WaterMeter;
 import com.sunyo.energy.location.model.WaterMeterSacc;
 import com.sunyo.energy.location.model.WaterMeterSacc;
 import com.sunyo.energy.location.service.WaterMeterService;
 import com.sunyo.energy.location.service.WaterMeterService;
+import com.sunyo.energy.location.utils.AllUtils;
 import com.sunyo.energy.location.utils.HttpsUtils;
 import com.sunyo.energy.location.utils.HttpsUtils;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -120,12 +121,13 @@ public class LocationController {
     public ResultJson editLocation(@RequestBody Location location) throws Exception {
     public ResultJson editLocation(@RequestBody Location location) throws Exception {
 
 
         ResultJson resultJson = new ResultJson();
         ResultJson resultJson = new ResultJson();
+        location.setWmid(AllUtils.wmIdUtils(location.getWmid()));
         // 旧表 表号
         // 旧表 表号
         String wmId = locationMapper.findWmId(location.getAdrname());
         String wmId = locationMapper.findWmId(location.getAdrname());
         // 水表 累计充值量记录表
         // 水表 累计充值量记录表
         WaterMeterSacc waterMeterSacc = new WaterMeterSacc();
         WaterMeterSacc waterMeterSacc = new WaterMeterSacc();
         // 判断是否存在 存在修改楼层 不存在修改水表
         // 判断是否存在 存在修改楼层 不存在修改水表
-        if (!StringUtils.isEmpty(wmId)){
+        if (location.getWmid().equals(wmId)){
             // 修改 房间号
             // 修改 房间号
             int i1 = locationMapper.updateByPrimaryKeySelective(location);
             int i1 = locationMapper.updateByPrimaryKeySelective(location);
             log.info("楼层编辑：{}", i1);
             log.info("楼层编辑：{}", i1);