From 1d43866363b4f3c01fb419b78e250bfb6cc3a637 Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 28 Oct 2025 09:49:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=92=88=E5=AF=B9=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E6=A8=A1=E5=9E=8B=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E6=8F=92=E5=85=A5device=E8=A1=A8=E6=97=B6old?= =?UTF-8?q?AreaId=E5=9C=A8redis=E5=8F=AF=E8=83=BD=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=BB=8E=E8=80=8C=E5=80=BC=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasedataMontPatrolPointHandleComponent.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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);