换表管理

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

@@ -179,7 +179,7 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
                 DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(waterMeterMaintenanceLog.getNewDeviceTypeId());
                 if(!device.getDeviceType().equals(waterMeterMaintenanceLog.getNewDeviceTypeId())){
                     if (deviceTypeDto != null && deviceTypeDto.getIsRegister() == 1) {
-                        String udipId = udipUnitService.saveUdipUnit(waterMeterReplaceLog.getNewDeviceNo(),device.getCustomerId(),deviceTypeDto);
+                        String udipId = udipUnitService.updateUdipUnit(device.getUdipId(),waterMeterReplaceLog.getNewDeviceNo(),device.getCustomerId(),deviceTypeDto);
                         newDevice.setUdipId(udipId);
                         newDevice.setRegisterStatus(1);
                     }

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

@@ -174,7 +174,7 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
             DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(waterMeterReplaceInputDto.getNewDeviceTypeId());
             if(!device.getDeviceType().equals(waterMeterReplaceInputDto.getNewDeviceTypeId())){
                 if (deviceTypeDto != null && deviceTypeDto.getIsRegister() == 1) {
-                    String udipId = udipUnitService.saveUdipUnit(waterMeterReplaceLog.getNewDeviceNo(),device.getCustomerId(),deviceTypeDto);
+                    String udipId = udipUnitService.updateUdipUnit(device.getUdipId(),waterMeterReplaceLog.getNewDeviceNo(),device.getCustomerId(),deviceTypeDto);
                     newDevice.setUdipId(udipId);
                     newDevice.setRegisterStatus(1);
                 }

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

@@ -1046,6 +1046,7 @@
         sdt.equipment_type,sdt.model,sdm.name manufacturer_name,sb.name as building_name,sc.channel_name as system_name,
         sb.longitude,sb.latitude,
         sb.province,sb.city,sb.region,sb.community,scom.name as community_name,
+        scus.customer_name,
         sdt.is_valve
         from sc_device sd
         left join sc_device_type sdt on (sdt.id = sd.device_type and sdt.status = 1)