fix:点位管理，新增字段方案

inspect-metadata/src/main/java/com/inspect/metadata/area/domain/BaseDataArea.java

@@ -40,7 +40,9 @@ public class BaseDataArea extends BaseEntity {
     )
     private String deviceTypeCode;
     private Long parentId;
+    private Long relationParentId ;
     private String ancestors;
+    private String relationAncestors;
     private String orderNum;
     private String status;
     private String delFlag;
@@ -71,6 +73,22 @@ public class BaseDataArea extends BaseEntity {
         return this.ancestors;
     }
 
+    public Long getRelationParentId() {
+        return relationParentId;
+    }
+
+    public void setRelationParentId(Long relationParentId) {
+        this.relationParentId = relationParentId;
+    }
+
+    public String getRelationAncestors() {
+        return relationAncestors;
+    }
+
+    public void setRelationAncestors(String relationAncestors) {
+        this.relationAncestors = relationAncestors;
+    }
+
     @NotBlank(
             message = "部门名称不能为空"
     )
@@ -149,7 +167,9 @@ public class BaseDataArea extends BaseEntity {
                 ", areaType='" + areaType + '\'' +
                 ", deviceTypeCode='" + deviceTypeCode + '\'' +
                 ", parentId=" + parentId +
+                ", relationParentId=" + relationParentId +
                 ", ancestors='" + ancestors + '\'' +
+                ", relationAncestors='" + relationAncestors + '\'' +
                 ", orderNum='" + orderNum + '\'' +
                 ", status='" + status + '\'' +
                 ", delFlag='" + delFlag + '\'' +

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java

@@ -209,6 +209,9 @@ public class BasedataPatrolPointController extends BaseController {
             assert basedataDevice != null;
             basedataPatrolpoint.setMainDeviceId(basedataDevice.getDeviceId());
         }
+        basedataPatrolpoint.setRelationAreaId(basedataPatrolpoint.getAreaId());
+        basedataPatrolpoint.setRelationDeviceId(basedataPatrolpoint.getDeviceId());
+        basedataPatrolpoint.setRelationMainDeviceId(basedataPatrolpoint.getMainDeviceId());
 
         basedataPatrolPointService.insertBasedataPatrolPoint(basedataPatrolpoint);
         return null != basedataPatrolpoint.getPatrolPointId() ? AjaxResult.success(basedataPatrolpoint.getPatrolPointId()) : AjaxResult.error("新增异常");

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/domain/BasedataPatrolPoint.java

@@ -41,10 +41,14 @@ public class BasedataPatrolPoint extends BaseEntity {
             name = "主设备id"
     )
     private Long mainDeviceId;
+
+    private Long relationMainDeviceId;
     @Excel(
             name = "设备id，真正配置点位的主设备id或者部件id"
     )
     private Long deviceId;
+
+    private Long relationDeviceId;
     private String deviceName;
     @Excel(
             name = "巡检内容"
@@ -64,6 +68,7 @@ public class BasedataPatrolPoint extends BaseEntity {
     @JsonProperty("stdparolPointId")
     private Long stdParolPointId;
     private Long areaId;
+    private Long relationAreaId;
     private String patrolTypeId;
     private String pointImptLevel;
     private String alarmThreshold;
@@ -119,6 +124,30 @@ public class BasedataPatrolPoint extends BaseEntity {
         this.patrolpointName = patrolPointName;
     }
 
+    public Long getRelationMainDeviceId() {
+        return relationMainDeviceId;
+    }
+
+    public void setRelationMainDeviceId(Long relationMainDeviceId) {
+        this.relationMainDeviceId = relationMainDeviceId;
+    }
+
+    public Long getRelationDeviceId() {
+        return relationDeviceId;
+    }
+
+    public void setRelationDeviceId(Long relationDeviceId) {
+        this.relationDeviceId = relationDeviceId;
+    }
+
+    public Long getRelationAreaId() {
+        return relationAreaId;
+    }
+
+    public void setRelationAreaId(Long relationAreaId) {
+        this.relationAreaId = relationAreaId;
+    }
+
     public String getPointTypeName() {
         return pointTypeName;
     }
@@ -161,13 +190,16 @@ public class BasedataPatrolPoint extends BaseEntity {
                 ", patrolpointName='" + patrolpointName + '\'' +
                 ", deviceTypeId=" + deviceTypeId +
                 ", mainDeviceId=" + mainDeviceId +
+                ", relationMainDeviceId=" + relationMainDeviceId +
                 ", deviceId=" + deviceId +
+                ", relationDeviceId=" + relationDeviceId +
                 ", deviceName='" + deviceName + '\'' +
                 ", patrolContent='" + patrolContent + '\'' +
                 ", purpose='" + purpose + '\'' +
                 ", deleteFlag='" + deleteFlag + '\'' +
                 ", stdParolPointId=" + stdParolPointId +
                 ", areaId=" + areaId +
+                ", relationAreaId=" + relationAreaId +
                 ", patrolTypeId='" + patrolTypeId + '\'' +
                 ", pointImptLevel='" + pointImptLevel + '\'' +
                 ", alarmThreshold='" + alarmThreshold + '\'' +

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -135,8 +135,8 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
     public List<BasedataPatrolPoint> selectBasedataMonitorRelationList(BasedataPatrolPoint basedataPatrolpoint) {
         List<BasedataPatrolPoint> pointList = basedataPatrolpointMapper.selectBasedataMonitorRelationList(basedataPatrolpoint);
         logger.info("[META] pointList size: {},pointList: {}", pointList.size(), pointList);
-        if (null != basedataPatrolpoint.getDeviceId()) {
-            BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceRelationByDeviceId(basedataPatrolpoint.getDeviceId());
+        if (null != basedataPatrolpoint.getRelationDeviceId()) {
+            BasedataDevice basedataDevice = basedataDeviceMapper.selectBasedataDeviceRelationByDeviceId(basedataPatrolpoint.getRelationDeviceId());
             if(basedataDevice != null) {
                 basedataPatrolpoint.setDeviceTypeId(basedataDevice.getDeviceTypeId());
                 List<BasedataPatrolPoint> stdPointList = basedataPatrolpointMapper.selectBasedataMonitorUnionList(basedataPatrolpoint);

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java

@@ -56,6 +56,7 @@ public class BasedataDevice extends BaseEntity {
     private Long parentId;
     private String ancestors;
     private Long areaId;
+    private Long relationAreaId;
 
     @JsonProperty("devicetypeId")
     private Long deviceTypeId;
@@ -103,6 +104,7 @@ public class BasedataDevice extends BaseEntity {
                 ", parentId=" + parentId +
                 ", ancestors='" + ancestors + '\'' +
                 ", areaId=" + areaId +
+                ", relationAreaId='" + relationAreaId + '\'' +
                 ", deviceTypeId=" + deviceTypeId +
                 ", powerMainEquFlag='" + powerMainEquFlag + '\'' +
                 ", phyAssetId='" + phyAssetId + '\'' +

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java

@@ -461,7 +461,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         List<BasedataPatrolPoint> patrolPoints = basedataPatrolPointMapper.selectBasedataPatrolPointRelationListByDeviceIds(new ArrayList<>(deviceIds));
         // 按设备ID分组
         Map<Long, List<BasedataPatrolPoint>> devicePatrolMap = patrolPoints.stream()
-                .collect(Collectors.groupingBy(BasedataPatrolPoint::getDeviceId));
+                .collect(Collectors.groupingBy(BasedataPatrolPoint::getRelationDeviceId));
 
         // 递归设置统计值
         setPointNumRelation(treeList, devicePatrolMap);
@@ -514,7 +514,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         List<BasedataPatrolPoint> patrolPoints = basedataPatrolPointMapper.selectBasedataPatrolPointRelationListByDeviceIds(new ArrayList<>(deviceIds));
         // 按设备ID分组
         Map<Long, List<BasedataPatrolPoint>> devicePatrolMap = patrolPoints.stream()
-                .collect(Collectors.groupingBy(BasedataPatrolPoint::getDeviceId));
+                .collect(Collectors.groupingBy(BasedataPatrolPoint::getRelationDeviceId));
 
         // 递归设置统计值和点位
         setPointNumAndPatrolPoints(treeList, devicePatrolMap);
@@ -526,15 +526,16 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         HashMap<Long, BasedataDevice> deviceHashMap = new HashMap<>();
         List<AreaDeviceTreeSelect> areaVOS = new ArrayList<>();
 
+        // 根据新的relationParentId和relationAncestors构建树结构
         for (BaseDataArea area : areas) {
             areaIdList.add(area.getAreaId());
             areaMap.put(area.getAreaId(), area);
             AreaDeviceTreeSelect areaVO = new AreaDeviceTreeSelect();
             areaVO.setDataId(String.valueOf(area.getAreaId()));
-            areaVO.setParentId(String.valueOf(area.getParentId()));
+            areaVO.setParentId(String.valueOf(area.getRelationParentId()));
             areaVO.setAreaId(area.getAreaId());
             areaVO.setAreaFlag("Yes");
-            areaVO.setAreaParentId(area.getParentId());
+            areaVO.setAreaParentId(area.getRelationParentId());
             areaVO.setAreaName(area.getAreaName());
             areaVO.setAreaType(area.getAreaType());
             areaVOS.add(areaVO);
@@ -544,6 +545,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         Map<String, Object> params = new HashMap<>();
         params.put("areaIdList", areaIdList);
         basedataDeviceQuery.setParams(params);
+        // 根据新的relation_area_id查询设备信息，构建树结构
         List<BasedataDevice> deviceList = this.basedataDeviceMapper.selectBasedataDeviceRelationList(basedataDeviceQuery);
         Iterator<BasedataDevice> iterator = deviceList.iterator();
 
@@ -560,10 +562,10 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
             AreaDeviceTreeSelect deviceVO = new AreaDeviceTreeSelect();
             StringBuilder idBuilder = new StringBuilder();
             StringBuilder pIdBuilder = new StringBuilder();
-            this.getAreaDeviceTreeDeviceCode(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
+            this.getAreaDeviceTreeDeviceCodeRelation(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
             deviceVO.setDataId(idBuilder.toString());
             deviceVO.setParentId(pIdBuilder.toString());
-            deviceVO.setAreaId(basedataDevice.getAreaId());
+            deviceVO.setAreaId(basedataDevice.getRelationAreaId());
             deviceVO.setDeviceParentId(basedataDevice.getParentId());
             deviceVO.setDeviceId(basedataDevice.getDeviceId());
             deviceVO.setDeviceName(basedataDevice.getDeviceName());
@@ -596,10 +598,10 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
             areaMap.put(area.getAreaId(), area);
             AreaDeviceTreeSelect areaVO = new AreaDeviceTreeSelect();
             areaVO.setDataId(String.valueOf(area.getAreaId()));
-            areaVO.setParentId(String.valueOf(area.getParentId()));
+            areaVO.setParentId(String.valueOf(area.getRelationParentId()));
             areaVO.setAreaId(area.getAreaId());
             areaVO.setAreaFlag("Yes");
-            areaVO.setAreaParentId(area.getParentId());
+            areaVO.setAreaParentId(area.getRelationParentId());
             areaVO.setAreaName(area.getAreaName());
             areaVO.setAreaType(area.getAreaType());
             areaVOS.add(areaVO);
@@ -625,10 +627,10 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
             AreaDeviceTreeSelect deviceVO = new AreaDeviceTreeSelect();
             StringBuilder idBuilder = new StringBuilder();
             StringBuilder pIdBuilder = new StringBuilder();
-            this.getAreaDeviceTreeDeviceCode(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
+            this.getAreaDeviceTreeDeviceCodeRelation(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
             deviceVO.setDataId(idBuilder.toString());
             deviceVO.setParentId(pIdBuilder.toString());
-            deviceVO.setAreaId(basedataDevice.getAreaId());
+            deviceVO.setAreaId(basedataDevice.getRelationAreaId());
             deviceVO.setDeviceParentId(basedataDevice.getParentId());
             deviceVO.setDeviceId(basedataDevice.getDeviceId());
             deviceVO.setDeviceName(basedataDevice.getDeviceName());
@@ -812,6 +814,31 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
 
     }
 
+    private void getAreaDeviceTreeDeviceCodeRelation(Long deviceId, HashMap<Long, BaseDataArea> areaMap, HashMap<Long, BasedataDevice> deviceHashMap, StringBuilder idBuilder, StringBuilder pIdBuilder) {
+        if (deviceHashMap.containsKey(deviceId)) {
+            BasedataDevice device = deviceHashMap.get(deviceId);
+            idBuilder.insert(0, "-" + deviceId);
+            Long parentId = device.getParentId();
+            Long areaId;
+            if (deviceId.longValue() == parentId.longValue()) {
+                areaId = device.getRelationAreaId();
+                idBuilder.insert(0, areaId);
+                pIdBuilder.insert(0, areaId);
+                return;
+            }
+
+            if (deviceHashMap.containsKey(parentId)) {
+                pIdBuilder.insert(0, "-" + parentId);
+                this.getAreaDeviceTreeDeviceCodeRelation(parentId, areaMap, deviceHashMap, idBuilder, pIdBuilder);
+            } else {
+                areaId = device.getRelationAreaId();
+                idBuilder.insert(0, areaId);
+                pIdBuilder.insert(0, areaId);
+            }
+        }
+
+    }
+
     public List<BaseDataAreaProDeviceVO> getAreaDeviceList(List<BaseDataArea> areas) {
         List<BaseDataAreaProDeviceVO> proDeviceVOS = new ArrayList<>();
         List<BasedataDevice> mainDeviceList = this.basedataDeviceMapper.selectBasedataDeviceMainEquBatchByAreas(areas);

inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml

@@ -6,6 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="com.inspect.metadata.area.domain.BaseDataArea" id="BaseDataAreaResult">
 		<id     property="areaId"     column="area_id"     />
 		<result property="parentId"   column="parent_id"   />
+		<result property="relationParentId"   column="relation_parent_id"   />
+		<result property="relationAncestors"   column="relation_ancestors"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="areaName"   column="area_name"   />
 		<result property="areaType"   column="area_type"   />
@@ -74,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 	<select id="selectAreaRelationList" parameterType="com.inspect.metadata.area.domain.BaseDataArea" 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_relation d
+		from basedata_area d
 		where d.del_flag = '0'
 		<if test="areaId != null and areaId != 0">
 			AND area_id = #{areaId}
@@ -135,15 +137,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<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
 			 ,d.old_area_id, d.old_parent_id
-		from basedata_area_relation d
+		from basedata_area d
 		where area_id = #{areaId}
 	</select>
 
 	<update id="updateAreaRelationById">
 		update
-			basedata_area_relation
+			basedata_area
 		set
-			parent_id = #{toAreaId} , ancestors = concat(#{ancestors}, ',', #{toAreaId})
+			relation_parent_id = #{toAreaId} , relation_ancestors = concat(#{ancestors}, ',', #{toAreaId})
 		where area_id = #{areaId}
 	</update>
 

inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml

@@ -10,7 +10,9 @@
         <result property="patrolPointName" column="patrol_point_name"/>
         <result property="deviceTypeId" column="device_type_id"/>
         <result property="mainDeviceId" column="main_device_id"/>
+        <result property="relationMainDeviceId" column="relation_main_device_id"/>
         <result property="deviceId" column="device_id"/>
+        <result property="relationDeviceId" column="relation_device_id"/>
         <result property="patrolContent" column="patrol_content"/>
         <result property="purpose" column="purpose"/>
         <result property="createBy" column="create_by"/>
@@ -20,6 +22,7 @@
         <result property="deleteFlag" column="delete_flag"/>
         <result property="stdParolPointId" column="std_parol_point_id"/>
         <result property="areaId" column="area_id"/>
+        <result property="relationAreaId" column="relation_area_id"/>
         <result property="pointImptLevel" column="point_impt_level"/>
         <result property="patrolTypeId" column="patrol_type_id"/>
         <result property="alarmThreshold" column="alarm_threshold"/>
@@ -161,8 +164,11 @@
         patrol_point_name,
         device_type_id,
         main_device_id,
+        relation_main_device_id,
         device_id,
+        relation_device_id,
         area_id,
+        relation_area_id,
         patrol_content,
         purpose,
         create_by,
@@ -185,8 +191,8 @@
         original_main_device_id,
         alarm_threshold,
         meter_type
-        from basedata_patrolpoint_relation
-        WHERE device_id IN
+        from basedata_patrolpoint
+        WHERE relation_device_id IN
         <foreach item="item" collection="deviceIds" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -236,9 +242,12 @@
         a.patrol_point_id,
         a.patrol_point_code,
         a.area_id,
+        a.relation_area_id,
         a.patrol_point_name,
         a.main_device_id,
+        a.relation_main_device_id,
         a.device_id,
+        a.relation_device_id,
         a.patrol_content,
         a.purpose,
         a.std_parol_point_id,
@@ -253,14 +262,14 @@
         a.dis_ref_picture_path,
         a.alarm_threshold
         FROM
-        basedata_patrolpoint_relation a
+        basedata_patrolpoint a
         <where>
             <if test="patrolPointName != null  and patrolPointName != ''">and a.patrol_point_name like concat('%',
                 #{patrolPointName}, '%')
             </if>
-            <if test="mainDeviceId != null ">and a.main_device_id = #{mainDeviceId}</if>
-            <if test="deviceId != null ">and a.device_id = #{deviceId}</if>
-            <if test="areaId != null ">and a.area_id = #{areaId}</if>
+            <if test="mainDeviceId != null ">and a.relation_main_device_id = #{mainDeviceId}</if>
+            <if test="deviceId != null ">and a.relation_device_id = #{deviceId}</if>
+            <if test="areaId != null ">and a.relation_area_id = #{areaId}</if>
             <if test="pointImptLevel != null  and pointImptLevel != ''">and a.point_impt_level = #{pointImptLevel}</if>
             <if test="patrolTypeId != null  and patrolTypeId != ''">and a.patrol_type_id = #{patrolTypeId}</if>
         </where>
@@ -343,8 +352,11 @@
             <if test="patrolPointName != null and patrolPointName != ''">patrol_point_name,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="mainDeviceId != null">main_device_id,</if>
+            <if test="relationMainDeviceId != null">relation_main_device_id,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="relationDeviceId != null">relation_device_id,</if>
             <if test="areaId != null">area_id,</if>
+            <if test="relationAreaId != null">relation_area_id,</if>
             <if test="patrolContent != null">patrol_content,</if>
             <if test="purpose != null">purpose,</if>
             <if test="createBy != null">create_by,</if>
@@ -373,8 +385,11 @@
             <if test="patrolPointName != null and patrolPointName != ''">#{patrolPointName},</if>
             <if test="deviceTypeId != null">#{deviceTypeId},</if>
             <if test="mainDeviceId != null">#{mainDeviceId},</if>
+            <if test="relationMainDeviceId != null">#{relationMainDeviceId},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="relationDeviceId != null">#{relationDeviceId},</if>
             <if test="areaId != null">#{areaId},</if>
+            <if test="relationAreaId != null">#{relationAreaId},</if>
             <if test="patrolContent != null">#{patrolContent},</if>
             <if test="purpose != null">#{purpose},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -436,11 +451,11 @@
     </update>
 
     <update id="updateBasedataPatrolPointRelation">
-        update basedata_patrolpoint_relation set area_id = #{toAreaId} where device_id in (select device_id from basedata_device where device_id = #{deviceId} or parent_id = #{deviceId})
+        update basedata_patrolpoint set relation_area_id = #{toAreaId} where device_id in (select device_id from basedata_device where device_id = #{deviceId} or parent_id = #{deviceId})
     </update>
 
     <update id="batchUpdateBasedataPatrolPointRelation">
-        update basedata_patrolpoint_relation set area_id = #{toAreaId},device_id = #{toDeviceId},main_device_id = #{toParentId}
+        update basedata_patrolpoint set relation_area_id = #{toAreaId},relation_device_id = #{toDeviceId},relation_main_device_id = #{toParentId}
         where patrol_point_id in
         <foreach item="patrolPointId" collection="patrolPointIds" open="(" separator="," close=")">
             #{patrolPointId}

inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml

@@ -12,6 +12,7 @@
         <result property="parentId" column="parent_id"/>
         <result property="ancestors" column="ancestors"/>
         <result property="areaId" column="area_id"/>
+        <result property="relationAreaId" column="relation_area_id"/>
         <result property="areaName" column="area_name"/>
         <result property="deviceTypeId" column="device_type_id"/>
         <result property="deviceTypeName" column="device_type_name"/>
@@ -144,6 +145,7 @@
         parent_id,
         ancestors,
         area_id,
+        relation_area_id,
         area_name,
         device_type_id,
         device_type_name,
@@ -171,7 +173,7 @@
         old_parent_id,
         old_area_id,
         old_area_name
-        from basedata_device_relation
+        from basedata_device
         <where>
             <if test="deviceId != null  and deviceId != ''">and device_id = #{deviceId}</if>
             <if test="deviceCode != null  and deviceCode != ''">and device_code = #{deviceCode}</if>
@@ -215,7 +217,7 @@
             <!-- 区域数组查询 -->
             <if test="params != null">
                 <if test="params.areaIdList != null">
-                    and area_id in
+                    and relation_area_id in
                     <foreach item="item" collection="params.areaIdList" open="(" separator="," close=")">
                         #{item}
                     </foreach>
@@ -493,12 +495,12 @@
                create_time,
                update_by,
                update_time,
-               order_num
+               order_num,
                    old_device_id,
                old_parent_id,
                old_area_id,
                old_area_name
-        from basedata_device_relation
+        from basedata_device
         where device_id = #{deviceId}
     </select>
 
@@ -616,7 +618,7 @@
     </update>
 
     <update id="updateBasedataDeviceRelation">
-        update basedata_device_relation set area_id = #{toAreaId} where device_id = #{deviceId} or parent_id = #{deviceId}
+        update basedata_device set relation_area_id = #{toAreaId} where device_id = #{deviceId} or parent_id = #{deviceId}
     </update>