sprint21 bug

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

@@ -250,7 +250,7 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
             newDevice.setDeviceType(waterMeterReplaceInputDto.getNewDeviceTypeId());
 
         }
-        if (device.getRegisterStatus() != null && device.getRegisterStatus() == 1) {
+        if (device.getRegisterStatus() != null && device.getRegisterStatus() == 1 && !remoteMeterFlag) {
             DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
             String udipId = udipUnitService.updateUdipUnit(device.getUdipId(),waterMeterReplaceLog.getNewDeviceNo(),device.getCustomerId(),deviceTypeDto);
             if (udipId != null) {

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

@@ -127,7 +127,13 @@ public class InstallManagerServiceImpl implements InstallManagerService, Initial
 
 	private void checkInstallAbnormal(DeviceDto device) {
 		log.info("begin checkInstallAbnormal device = {}",JSON.toJSON(device));
-		List<Long> deviceNoSameList = deviceMapper.findDeviceIdByDeviceNo(device.getId(),device.getDeviceNo());
+
+		List<Long> deviceNoSameList = newArrayList();
+		if(!StringUtils.equals("",device.getDeviceNo())){
+			deviceNoSameList = deviceMapper.findDeviceIdByDeviceNo(device.getId(),device.getDeviceNo());
+		}
+
+
 		List<Long> waterMeterNoSameList = deviceMapper.findDeviceIdByWaterMeterNo(device.getId(),device.getWaterMeterNo());
 
 		int result = checkDeviceSameType(deviceNoSameList, waterMeterNoSameList);
@@ -213,7 +219,10 @@ public class InstallManagerServiceImpl implements InstallManagerService, Initial
 	@Override
 	public Integer checkDevice(String deviceNo, String waterMeterNo) {
 
-		List<Long> deviceNoSameList = deviceMapper.findDeviceIdByDeviceNo(null, deviceNo);
+		List<Long> deviceNoSameList = newArrayList();
+		if(!StringUtils.equals("",deviceNo)){
+			deviceNoSameList = deviceMapper.findDeviceIdByDeviceNo(null, deviceNo);
+		}
 		List<Long> waterMeterNoSameList = deviceMapper.findDeviceIdByWaterMeterNo(null, waterMeterNo);
 
 		return checkDeviceSameType(deviceNoSameList,waterMeterNoSameList);

smart-city-platform/src/main/resources/application-dev.properties

@@ -42,7 +42,7 @@ spring.redis.port=26379
 spring.redis.password=zoniot
 #spring.redis.port=6379
 #spring.redis.password=100Zone@123
-spring.redis.database=7
+spring.redis.database=1
 init.data.cache = 0
 spring.redis.timeout=10000ms
 spring.redis.jedis.pool.max-active=8