소스 검색

索引树结构变更

raojiang 2 달 전
부모
커밋
34d26bb72a

+ 13 - 0
api/load-transfer-bf-api/src/main/java/com/hdkj/fhzg/optimization/request/FeederRequest.java

@@ -0,0 +1,13 @@
+package com.hdkj.fhzg.optimization.request;
+
+import lombok.Data;
+
+/**
+ * @author rj
+ * @date 2026/5/26 8:49
+ * @description
+ */
+@Data
+public class FeederRequest {
+    private String feederId;
+}

+ 8 - 2
api/load-transfer-bf-api/src/main/java/com/hdkj/fhzg/optimization/response/FeederGroupTreeNode.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class FeederGroupTreeNode {
 
     /**
-     * 类型 1-地市 2-区县 3-接线组 4-线路
+     * 类型 1-地市 2-区县 3-变电站 4-线路 
      */
     private Integer type;
 
@@ -41,7 +41,13 @@ public class FeederGroupTreeNode {
     public static class FileType {
 
         private Long fileId;
-
+        /**
+         * 1-单线图
+         * 2-开关段图
+         * 3-负荷组图
+         * 4-一级联络图
+         * 5-接线组图
+         */
         private String fileType;
     }
 }

+ 3 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/application/FeederGroupApplication.java

@@ -116,8 +116,9 @@ public class FeederGroupApplication {
         return new ArrayList<>(cityMap.values());
     }
 
-    public List<XlRelVO> getFeederGroupContactSwitchList(String feederGroupId) {
-        List<TJxzXl> list = jxzXlService.list(new LambdaQueryWrapper<TJxzXl>().eq(TJxzXl::getJxzId, feederGroupId));
+    public List<XlRelVO> getFeederGroupContactSwitchList(String feederId) {
+        TJxzXl jxzXl = jxzXlService.getOne(new LambdaQueryWrapper<TJxzXl>().eq(TJxzXl::getXlid, feederId));
+        List<TJxzXl> list = jxzXlService.list(new LambdaQueryWrapper<TJxzXl>().eq(TJxzXl::getJxzId, jxzXl.getJxzId()));
         List<String> xlIds = list.stream().map(TJxzXl::getXlid).collect(Collectors.toList());
         List<XlRel> xlRelList = xlRelService.list(new LambdaQueryWrapper<XlRel>().in(XlRel::getXlIdOne, xlIds));
         return EntityToVOConvertor.INSTANCE.toXlRelVOList(xlRelList);

+ 15 - 3
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/controller/optimization/FeederGroupController.java

@@ -1,18 +1,30 @@
 package com.hdkj.lt.bf.controller.optimization;
 
-import com.hdkj.fhzg.optimization.request.FeederGroupRequest;
+import com.alibaba.nacos.common.http.param.MediaType;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hdkj.fhzg.optimization.request.FeederRequest;
 import com.hdkj.fhzg.optimization.response.FeederGroupTreeNode;
 import com.hdkj.hussar.ApiResponse;
 import com.hdkj.lt.bf.application.FeederGroupApplication;
 import com.hdkj.lt.bf.entity.vo.XlRelVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
+import java.io.File;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author rj
@@ -44,8 +56,8 @@ public class FeederGroupController {
      * @return
      */
     @PostMapping("/getFeederGroupContactSwitchList")
-    public ApiResponse<List<XlRelVO>> getFeederGroupContactSwitchList(@RequestBody FeederGroupRequest request) {
-        List<XlRelVO> xlRelList = FeederGroupApplication.getFeederGroupContactSwitchList(request.getFeederGroupId());
+    public ApiResponse<List<XlRelVO>> getFeederGroupContactSwitchList(@RequestBody FeederRequest request) {
+        List<XlRelVO> xlRelList = FeederGroupApplication.getFeederGroupContactSwitchList(request.getFeederId());
         return ApiResponse.success(xlRelList);
     }
 

+ 8 - 0
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/TJxzXl.java

@@ -1,6 +1,7 @@
 package com.hdkj.lt.bf.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -13,6 +14,13 @@ import java.io.Serializable;
 @TableName(value ="t_jxz_xl")
 @Data
 public class TJxzXl implements Serializable {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
     /**
      * 接线组ID
      */