From 6b7f33d66c45008490faa361cc43b91ef8a95206 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Fri, 26 Jun 2026 09:30:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=82=B9=E4=BD=8D=E8=BF=81=E7=A7=BB1.?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=A8=A1=E5=9E=8B=E5=90=8C=E6=AD=A5=E9=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B5=8B=E5=80=BC=EF=BC=8C=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=202.=E4=BA=8C=E6=AC=A1=E6=A8=A1=E5=9E=8B=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=B8=8D=E6=9B=B4=E6=94=B9=E5=B7=B2=E7=BB=8F=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E5=8C=BA=E5=9F=9F=E8=AE=BE=E5=A4=87=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E5=85=B3=E7=B3=BB=EF=BC=8C=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?3.=E8=BF=81=E7=A7=BB=E7=82=B9=E4=BD=8D=EF=BC=8C=E5=85=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=B7=9F=E9=9A=8F=E7=82=B9=E4=BD=8D=E6=89=80?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E8=AE=BE=E5=A4=87=E9=83=A8=E4=BB=B6=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/BasedataMontPatrolPointHandleComponent.java   | 3 +++
 .../prodevmnt/controller/BasedataDeviceController.java      | 2 +-
 .../src/main/resources/mapper/area/BaseDataAreaMapper.xml   | 6 +++---
 .../resources/mapper/prodevmnt/BasedataDeviceMapper.xml     | 3 ++-
 4 files changed, 9 insertions(+), 5 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 bc1a5c7..4a866cb 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
@@ -179,6 +179,7 @@ public class BasedataMontPatrolPointHandleComponent {
                             patrolPointInsert.setPatrolPointName(device_name);
                             patrolPointInsert.setOriginalMainDeviceId(main_device_id);
                             patrolPointInsert.setDeviceId(device.getDeviceId());
+                            patrolPointInsert.setRelationDeviceId(device.getDeviceId());
                             patrolPointInsert.setCreateTime(DateUtils.getNowDate());
                             patrolPointInsert.setCreateBy("sys");
                             patrolPointInsert.setOriginalAlgSubtypeIds(originalAlgSubtypeIds);
@@ -186,8 +187,10 @@ public class BasedataMontPatrolPointHandleComponent {
                             patrolPointInsert.setAlgSubtypeIds(originalAlgSubtypeIds);
                             patrolPointInsert.setPointImptLevel("Ⅰ");
                             patrolPointInsert.setMainDeviceId(device.getParentId());
+                            patrolPointInsert.setRelationMainDeviceId(device.getParentId());
                             patrolPointInsert.setDeviceTypeId(978L);
                             patrolPointInsert.setAreaId(device.getAreaId());
+                            patrolPointInsert.setRelationAreaId(device.getAreaId());
                             setAlgIdS(patrolPointInsert, sendCode, originalAlgSubtypeIds, algConvertFlag);
                             BasedataPatrolPoint patrolPointInsertRet = basedataPatrolPointService.insertBasedataPatrolPoint(patrolPointInsert);
                             Long patrolPointId = patrolPointInsertRet.getPatrolPointId();
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java
index 9181e13..206eeef 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java
@@ -321,7 +321,7 @@ public class BasedataDeviceController extends BaseController {
                     .collect(Collectors.toList());
             // 查询迁移到哪个设备下的设备信息
             BasedataDevice basedataDevice = basedataDeviceService.selectBasedataDeviceRelationByDeviceId(toDeviceId);
-            toAreaId = basedataDevice.getAreaId();
+            toAreaId = basedataDevice.getRelationAreaId();
             basedataDevice.setParentId(basedataDevice.getParentId() == 0 ? toDeviceId : basedataDevice.getParentId());
             Long toParentId = basedataDevice.getParentId();
             // 更新点位所属区域及设备id等信息
diff --git a/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml b/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml
index 255b985..4aebef2 100644
--- a/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectAreaRelationById" parameterType="Long" resultMap="BaseDataAreaResult">
-		select d.area_id, d.parent_id, d.ancestors, d.area_name, d.area_type, d.order_num, d.status, d.del_flag, d.create_by, d.create_time,d.device_type_code,d.area_addr,d.remark,d.area_code
+		select d.area_id, d.parent_id, d.relation_parent_id, d.ancestors, d.relation_ancestors, d.area_name, d.area_type, d.order_num, d.status, d.del_flag, d.create_by, d.create_time,d.device_type_code,d.area_addr,d.remark,d.area_code
 			 ,d.old_area_id, d.old_parent_id
 		from basedata_area d
 		where area_id = #{areaId}
@@ -215,12 +215,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update basedata_area
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
-			<if test="parentId != null and parentId != 0">relation_parent_id = #{parentId},</if>
+			<if test="relationParentId != null and relationParentId != 0">relation_parent_id = #{relationParentId},</if>
  			<if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
 			<if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
  			<if test="areaType != null and areaType != ''">area_type = #{areaType},</if>
 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
-			<if test="ancestors != null and ancestors != ''">relation_ancestors = #{ancestors},</if>
+			<if test="relationAncestors != null and relationAncestors != ''">relation_ancestors = #{relationAncestors},</if>
  			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
diff --git a/inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml b/inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml
index a15878a..22c66c8 100644
--- a/inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml
@@ -474,6 +474,7 @@
                parent_id,
                ancestors,
                area_id,
+               relation_area_id,
                area_name,
                device_type_id,
                device_type_name,
@@ -592,7 +593,7 @@
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="ancestors != null">ancestors = #{ancestors},</if>
             <if test="areaId != null">area_id = #{areaId},</if>
-            <if test="areaId != null">relation_area_id = #{areaId},</if>
+            <if test="relationAreaId != null">relation_area_id = #{relationAreaId},</if>
             <if test="areaName != null">area_name = #{areaName},</if>
             <if test="deviceTypeId != null">device_type_id = #{deviceTypeId},</if>
             <if test="deviceTypeName != null">device_type_name = #{deviceTypeName},</if>