message:

构造树结构

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructStructTreeFormDTO.java

@@ -0,0 +1,8 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+@Data
+public class PowerAxisStructStructTreeFormDTO {
+    private String agencyId;
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructTreeResultDTO.java

@@ -0,0 +1,13 @@
+package com.epmet.plugin.power.dto.axis.result;
+
+import com.epmet.commons.tools.utils.TreeNode;
+import lombok.Data;
+
+@Data
+public class PowerAxisStructTreeResultDTO extends TreeNode {
+    private Long id;
+    private Long pid;
+    private String name;
+    private String leaderId;
+    private String leaderName;
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxisStructViewController.java

@@ -2,8 +2,12 @@ package com.epmet.plugin.power.modules.axis.ViewController;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisLeaderDetailFormDTO;
+
+import com.epmet.plugin.power.dto.axis.form.PowerAxisStructStructTreeFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerAxisStructViewFormDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisStructViewResultDTO;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisLeaderService;
 import com.epmet.plugin.power.modules.axis.service.PowerAxisStructService;
@@ -13,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/data/axis")
 public class PowerAxisStructViewController {
@@ -40,4 +46,13 @@ public class PowerAxisStructViewController {
         PowerAxisLeaderDetailResultDTO dto = powerAxisLeaderService.getLeaderDetail(form);
         return new Result().ok(dto);
     }
+
+    /**
+     *动力主轴结构树
+     */
+    @PostMapping("/structTree")
+    public Result getStructTree(@RequestBody PowerAxisStructStructTreeFormDTO form){
+        List<PowerAxisStructTreeResultDTO> dto = powerAxisStructService.getStructTree(form);
+        return new Result().ok(dto);
+    }
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -75,4 +75,6 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
     int getKernelHouseHold();
 
     int getServiceStation();
+
+    List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -151,4 +151,9 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      * 关键指标统计
      */
     PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form);
+
+    /**
+     * 树结构
+     */
+    List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.TreeUtils;
 import com.epmet.plugin.power.dto.axis.PowerAxisStructDTO;
 import com.epmet.plugin.power.dto.axis.form.*;
 import com.epmet.plugin.power.dto.axis.result.*;
@@ -226,5 +227,11 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         return result;
     }
 
+    @Override
+    public List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form) {
+        List<PowerAxisStructTreeResultDTO> dto = baseDao.getStructTree(form);
+        return TreeUtils.build(dto);
+    }
+
 
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -188,6 +188,21 @@
     <select id="getServiceStation" resultType="java.lang.Integer">
         select count(*) from pli_power_service_station
     </select>
+    <select id="getStructTree"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">
+        SELECT
+            struct.id,
+            struct.NAME,
+            struct.pid,
+            leader.id AS leaderId,
+            leader.NAME AS leaderName
+        FROM
+            pli_power_axis_struct AS struct
+            LEFT JOIN pli_power_axis_struct_leader AS sl ON struct.id = sl.STRUCT_REFERENCE_ID
+            LEFT JOIN pli_power_axis_leader AS leader ON sl.LEADER_ID = leader.id
+        WHERE
+	        struct.id = #{agencyId}
+    </select>
 
 
 </mapper>