diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 92987958e..5a55368f3 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -331,7 +331,7 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(0); ip.setGroupId(ipGroupId.get(0)); ip.setIsValid(entity.getIsValid()); - ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime()); + ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list1.add(ip); } } @@ -340,7 +340,7 @@ public class ConfigSynchronizationService extends BaseService{ for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应 ip.setIsValid(entity.getIsValid()); - ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime()); + ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list1.add(ip); } } @@ -353,7 +353,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list2.add(str); if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){ if(userRegion.equals("")){ @@ -373,7 +373,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list3.add(str); if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测 String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict()); @@ -396,7 +396,7 @@ public class ConfigSynchronizationService extends BaseService{ num.setGroupId(groupIds.get(0)); groupIds.remove(0); num.setIsValid(entity.getIsValid()); - num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime()); + num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list4.add(num); } } @@ -409,7 +409,7 @@ public class ConfigSynchronizationService extends BaseService{ file.setGroupId(groupIds.get(0)); groupIds.remove(0); file.setIsValid(entity.getIsValid()); - file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime()); + file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list5.add(file); } } @@ -420,7 +420,7 @@ public class ConfigSynchronizationService extends BaseService{ groupCfg.setCompileId(cfg.getCompileId()); groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4())); groupCfg.setIsValid(entity.getIsValid()); - groupCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); groupRelationList.add(groupCfg); ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null)); }else{ @@ -459,7 +459,7 @@ public class ConfigSynchronizationService extends BaseService{ BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -642,7 +642,7 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(0); ip.setGroupId(ipGroupId.get(0)); ip.setIsValid(entity.getIsValid()); - ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime()); + ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list1.add(ip); } } @@ -656,7 +656,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list2.add(str); } } @@ -669,7 +669,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list3.add(str); } } @@ -682,7 +682,7 @@ public class ConfigSynchronizationService extends BaseService{ num.setGroupId(groupIds.get(0)); groupIds.remove(0); num.setIsValid(entity.getIsValid()); - num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime()); + num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list4.add(num); } } @@ -695,7 +695,7 @@ public class ConfigSynchronizationService extends BaseService{ file.setGroupId(groupIds.get(0)); groupIds.remove(0); file.setIsValid(entity.getIsValid()); - file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime()); + file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list5.add(file); } } @@ -736,7 +736,7 @@ public class ConfigSynchronizationService extends BaseService{ BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -898,7 +898,7 @@ public class ConfigSynchronizationService extends BaseService{ regionIds.remove(0); ip.setGroupId(ipGroupId.get(0)); ip.setIsValid(entity.getIsValid()); - ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime()); + ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list1.add(ip); } } @@ -912,7 +912,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list2.add(str); } } @@ -925,7 +925,7 @@ public class ConfigSynchronizationService extends BaseService{ str.setGroupId(groupIds.get(0)); groupIds.remove(0); str.setIsValid(entity.getIsValid()); - str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime()); + str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list3.add(str); } } @@ -938,7 +938,7 @@ public class ConfigSynchronizationService extends BaseService{ num.setGroupId(groupIds.get(0)); groupIds.remove(0); num.setIsValid(entity.getIsValid()); - num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime()); + num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list4.add(num); } } @@ -951,7 +951,7 @@ public class ConfigSynchronizationService extends BaseService{ file.setGroupId(groupIds.get(0)); groupIds.remove(0); file.setIsValid(entity.getIsValid()); - file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime()); + file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); list5.add(file); } } @@ -991,7 +991,7 @@ public class ConfigSynchronizationService extends BaseService{ BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -1141,7 +1141,7 @@ public class ConfigSynchronizationService extends BaseService{ cfg.setRegionId(regionIds.get(i)); cfg.setGroupId(groupIds.get(i)); cfg.setIsValid(entity.getIsValid()); - cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime()); + cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg = new MaatCfg(); maatCfg.initDefaultValue(); groupRelationList = new ArrayList(); @@ -1194,7 +1194,7 @@ public class ConfigSynchronizationService extends BaseService{ } BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList); @@ -1283,7 +1283,7 @@ public class ConfigSynchronizationService extends BaseService{ cfg.setRegionId(regionIds.get(i)); cfg.setGroupId(groupIds.get(i)); cfg.setIsValid(entity.getIsValid()); - cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime()); + cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg = new MaatCfg(); maatCfg.initDefaultValue(); groupRelationList = new ArrayList(); @@ -1349,7 +1349,7 @@ public class ConfigSynchronizationService extends BaseService{ } BeanUtils.copyProperties(cfg, maatCfg); maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime()); + maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime()); maatCfg.setIpRegionList(ipRegionList); maatCfg.setStrRegionList(strRegionList); maatCfg.setNumRegionList(numRegionList);