换表和设备编辑BUG修复

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/WaterDeviceResolverExcelTemplate.java

@@ -166,7 +166,7 @@ public class WaterDeviceResolverExcelTemplate extends AbstractResolverExcelTempl
                     device.setUpdateBy("system");
                     device.setDateUpdate(LocalDateTime.now());
 
-                    if(device.getCustomerId().equals(linheCustomerId)){
+                    if(linheCustomerId.equals(device.getCustomerId())){
                         Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
                         if (syncStatus) {
                             device.setSyncStatus(1);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -455,7 +455,7 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setWaterMeterNo(deviceDataDto.getWaterMeterNo());
         device.setRegisterStatus(0);
 
-        if(device.getCustomerId().equals(linheCustomerId)){
+        if(linheCustomerId.equals(device.getCustomerId())){
             Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
             if (syncStatus) {
                 device.setSyncStatus(1);
@@ -659,7 +659,7 @@ public  class DeviceServiceImpl implements DeviceService {
             device.setRegisterStatus(1);
         }
 
-        if(device.getCustomerId().equals(linheCustomerId)){
+        if(linheCustomerId.equals(device.getCustomerId())){
             Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
             if (syncStatus) {
                 device.setSyncStatus(1);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WaterMeterMaintenanceLogServiceImpl.java

@@ -225,6 +225,12 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
                 newDevice.setDeviceType(waterMeterMaintenanceLog.getNewDeviceTypeId());
 
             }
+
+            if (device.getUdipId() != null) {
+                DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
+                String udipId = udipUnitService.updateUdipUnit(device.getUdipId(),device.getDeviceNo(),device.getCustomerId(),deviceTypeDto);
+                newDevice.setUdipId(udipId);
+            }
             newDevice.setDateUpdate(LocalDateTime.now());
             deviceMapper.updateByPrimaryKeySelective(newDevice);
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WaterMeterReplaceLogServiceImpl.java

@@ -246,6 +246,11 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
             newDevice.setDeviceType(waterMeterReplaceInputDto.getNewDeviceTypeId());
 
         }
+        if (device.getUdipId() != null) {
+            DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
+            String udipId = udipUnitService.updateUdipUnit(device.getUdipId(),device.getDeviceNo(),device.getCustomerId(),deviceTypeDto);
+            newDevice.setUdipId(udipId);
+        }
         newDevice.setDateUpdate(LocalDateTime.now());
         deviceMapper.updateByPrimaryKeySelective(newDevice);
 

smart-city-platform/src/main/resources/mapper/WaterMeterReplaceLogMapper.xml

@@ -403,7 +403,7 @@
             from sc_water_meter_replace_log rl
             left join sc_device sd on(sd.id = rl.device_id)
             <if test="isAccepted != null">left join sc_install_list sil on(sil.device_id = rl.device_id)</if>
-            <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = d.id and sdd.status = 1)</if>
+            <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
             where rl.status = 1 and sd.status = 1
             <if test="siteId != null"> and sd.site_id = #{siteId}</if>
             <if test="deviceId != null"> and rl.device_id = #{deviceId}</if>