/*生产区域管理操作发现的问题修改。*/

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

@@ -107,6 +107,9 @@ public class BasedataPatrolPointController extends BaseController {
                 basedataPatrolPoint2.setAlgSubtypeIds(basedataPatrolPoint.getAlgSubtypeIds());
                 basedataPatrolPoint2.setPatrolContent(basedataPatrolPoint.getPatrolContent());
                 basedataPatrolPoint2.setAreaId(basedataPatrolPoint.getAreaId());
+                basedataPatrolPoint2.setDeviceTypeId(basedataPatrolPoint.getDeviceTypeId());
+                basedataPatrolPoint2.setPatrolTypeId(basedataPatrolPoint.getPatrolTypeId());
+                basedataPatrolPoint2.setPointImptLevel(basedataPatrolPoint.getPointImptLevel());
                 listEx.add(basedataPatrolPoint2);
             }
             return getDataTable(listEx);

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

@@ -33,6 +33,7 @@ public class BasedataPatrolPoint extends BaseEntity {
     @Excel(
             name = "主设备类型ID"
     )
+    @JsonProperty("devicetypeId")
     private Long deviceTypeId;
     @Excel(
             name = "主设备id"

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceTypeController.java

@@ -2,6 +2,7 @@ package com.inspect.metadata.prodevmnt.controller;
 
 import com.inspect.metadata.prodevmnt.domain.BasedataDevice;
 import com.inspect.metadata.prodevmnt.domain.BasedataDeviceType;
+import com.inspect.metadata.prodevmnt.domain.BasedataDeviceTypeEx;
 import com.inspect.metadata.prodevmnt.domain.vo.ProDeviceTypeTreeSelectVO;
 import com.inspect.metadata.prodevmnt.service.IBasedataDeviceService;
 import com.inspect.metadata.prodevmnt.service.IBasedataDeviceTypeService;
@@ -18,6 +19,7 @@ import com.inspect.common.security.utils.SecurityUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +56,29 @@ public class BasedataDeviceTypeController extends BaseController {
     @GetMapping({"/list"})
     public AjaxResult list(BasedataDeviceType basedataDevicetype) {
         List<BasedataDeviceType> list = this.basedataDeviceTypeService.selectBasedataDeviceTypeList(basedataDevicetype);
-        return AjaxResult.success(list);
+        List<BasedataDeviceTypeEx> listEx = new ArrayList<>();
+        for(int i = 0; i < list.size(); i++) {
+            BasedataDeviceType basedataDeviceType = list.get(i);
+            BasedataDeviceTypeEx basedataDeviceTypeEx = new BasedataDeviceTypeEx();
+            basedataDeviceTypeEx.setParentName(basedataDeviceType.getParentName());
+            basedataDeviceTypeEx.setParentId(basedataDeviceType.getParentId());
+            basedataDeviceTypeEx.setOrderNum(basedataDeviceType.getOrderNum());
+            basedataDeviceTypeEx.setAncestors(basedataDeviceType.getAncestors());
+            basedataDeviceTypeEx.setChildren(basedataDeviceType.getChildren());
+            basedataDeviceTypeEx.setDevicetypeId(basedataDeviceType.getDeviceTypeId());
+            basedataDeviceTypeEx.setAncestorsAddr(basedataDeviceType.getAncestorsAddr());
+            basedataDeviceTypeEx.setPowerMainEquFlag(basedataDeviceType.getPowerMainEquFlag());
+            basedataDeviceTypeEx.setDevicetypeName(basedataDeviceType.getDeviceTypeName());
+            basedataDeviceTypeEx.setDevicetypeCode(basedataDeviceType.getDeviceTypeCode());
+            basedataDeviceTypeEx.setPhaseNum(basedataDeviceType.getPhaseNum());
+            basedataDeviceTypeEx.setPhase(basedataDeviceType.getPhase());
+            basedataDeviceTypeEx.setStatus(basedataDeviceType.getStatus());
+            basedataDeviceTypeEx.setDelFlag(basedataDeviceType.getDelFlag());
+            basedataDeviceTypeEx.setProfessionType(basedataDeviceType.getProfessionType());
+            basedataDeviceTypeEx.setLevel(basedataDeviceType.getLevel());
+            listEx.add(basedataDeviceTypeEx);
+        }
+        return AjaxResult.success(listEx);
     }
 
     @RequiresPermissions({"basedata:devicetype:export"})

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

@@ -0,0 +1,61 @@
+package com.inspect.metadata.prodevmnt.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.inspect.base.core.annotation.Excel;
+import com.inspect.base.core.web.domain.TreeEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class BasedataDeviceTypeEx extends TreeEntity {
+    private static final long serialVersionUID = 1L;
+    private Long devicetypeId;
+    @Excel(
+            name = "祖级路径"
+    )
+    private String ancestorsAddr;
+    @Excel(
+            name = "电力主设备标识"
+    )
+    private String powerMainEquFlag;
+    private String devicetypeName;
+    private String ancestors;
+    @Excel(
+            name = "设备编码"
+    )
+    private String devicetypeCode;
+    @Excel(
+            name = "相数"
+    )
+    private String phaseNum;
+    @Excel(
+            name = "相别"
+    )
+    private String phase;
+    private String status;
+    private String delFlag;
+    @Excel(
+            name = "专业类型"
+    )
+    private String professionType;
+    private int level;
+
+    @Override
+    public String toString() {
+        return "BasedataDeviceTypeEx{" +
+                "devicetypeId=" + devicetypeId +
+                ", ancestorsAddr='" + ancestorsAddr + '\'' +
+                ", powerMainEquFlag='" + powerMainEquFlag + '\'' +
+                ", devicetypeName='" + devicetypeName + '\'' +
+                ", ancestors='" + ancestors + '\'' +
+                ", devicetypeCode='" + devicetypeCode + '\'' +
+                ", phaseNum='" + phaseNum + '\'' +
+                ", phase='" + phase + '\'' +
+                ", status='" + status + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", professionType='" + professionType + '\'' +
+                ", level=" + level +
+                '}';
+    }
+}