diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java index 6d6606a..bc1a5c7 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java @@ -602,10 +602,16 @@ public class BasedataMontPatrolPointHandleComponent { String areaName = deviceKey.split(StringUtils.COLON)[3]; device.setOldDeviceId(sendCode + "_main_" + deviceId); List basedataDeviceList = this.basedataDeviceService.selectBasedataDeviceList(device); - Long pid; + Long pid = 0L; if (CollectionUtils.isEmpty(basedataDeviceList)) { ++count1; - pid = (Long) this.redisTemplate.opsForValue().get(oldAreaId); + BaseDataArea area = new BaseDataArea(); + area.setOldAreaId(sendCode + "_" + oldAreaId); + List areaList = this.baseDataAreaService.selectAreaList(area); + if (!CollectionUtils.isEmpty(areaList)) { + BaseDataArea baseDataArea = areaList.get(0); + pid = baseDataArea.getAreaId(); + } device.setParentId(0L); device.setOldAreaName(areaName); device.setOldAreaId(sendCode + "_" + oldAreaId); @@ -699,7 +705,7 @@ public class BasedataMontPatrolPointHandleComponent { bayData.setOldParentId(sendCode + "_" + oldPid); this.baseDataAreaService.insertArea(bayData); } else { - if(baseDataAreaList.size() > 0) { + if (baseDataAreaList.size() > 0) { bayData = baseDataAreaList.get(0); bayData.setAreaName(bayName); this.baseDataAreaService.updateArea(bayData);