Merge remote-tracking branch 'origin/dev-0' into dev-0

common/common-core/src/main/java/com/hdkj/lt/core/sys/model/dto/StruTreeCacheDTO.java

@@ -35,7 +35,6 @@ public class StruTreeCacheDTO implements TreeNode<StruTreeCacheDTO>,Serializable
     //简称
     private String name;
     //子节点
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<StruTreeCacheDTO> children;
 
     @Override

common/common-core/src/main/java/com/hdkj/lt/modle/dto/plan/PlanCreateSwitchDTO.java

@@ -1,5 +1,6 @@
 package com.hdkj.lt.modle.dto.plan;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -25,8 +26,10 @@ public class PlanCreateSwitchDTO {
 
     private String workContent;
 
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
+    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
 }

common/common-core/src/main/java/com/hdkj/lt/utils/tree/TreeBuilder.java

@@ -74,6 +74,10 @@ public class TreeBuilder {
                 if (parentNode.getChildren() == null) {
                     parentNode.setChildren(new ArrayList<>());
                 }
+                //没有children的也加上空集合
+                if(node.getChildren()==null){
+                    node.setChildren(new ArrayList<>());
+                }
                 parentNode.getChildren().add(node);
             }
         }

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/dto/StruDTO.java

@@ -2,6 +2,7 @@ package com.hdkj.lt.bf.entity.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.util.List;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/StruServiceImpl.java

@@ -255,7 +255,8 @@ public class StruServiceImpl implements StruService {
 
         if (StrUtil.equals(originalRoot.getStruType(), COUNTY)) {
             //如果节点是区县的话，将线路节点添加到区县子节点中
-            nowRoot.setChildren(stationFeedMap.get(originalRoot.getIscOrgId()));
+            List<StationDTO> stationDTOS = stationFeedMap.get(originalRoot.getIscOrgId());
+            nowRoot.setChildren(stationDTOS == null ? new ArrayList<>() : stationDTOS);
         } else {
             //如果节点是区县的话 递归复制子节点，如果节点是区县终止递归
             if (originalRoot.getChildren() != null) {
@@ -269,12 +270,12 @@ public class StruServiceImpl implements StruService {
 
     //复制节点属性
     private StruDTO convertNode(StruTreeCacheDTO originalRoot) {
-        StruDTO nowRoot = new StruDTO<>();
+        StruDTO<StruDTO> nowRoot = new StruDTO<>();
         nowRoot.setName(originalRoot.getName());
         nowRoot.setStruId(originalRoot.getStruId());
         nowRoot.setType(originalRoot.getStruType());
         nowRoot.setParentId(originalRoot.getParentId());
-        nowRoot.setChildren(new ArrayList());
+        nowRoot.setChildren(new ArrayList<>());
         return nowRoot;
     }
 

services/load-transfer-mq/src/main/resources/mapper/FhzgFaultAnalyzeCalculateDecudeMapper.xml

@@ -72,7 +72,7 @@
         </foreach>
     </select>
     <select id="getLineVoltageByLineId" resultType="com.hdkj.lt.mq.entity.vo.FeederDeviceVO">
-        select t.psr_id,t.name,t.feeder_rate_capacity,s.LABEL volt_value
+        select t.psr_id,t.name,t.feeder_rate_capacity,s.dict_label volt_value
         from dwd_shb_ds_feeder_base t
         join sys_dict_data s on t.voltage_level=s.dict_value
         join sys_dict_type d on d.dict_type = s.dict_type

services/load-transfer-mq/src/main/resources/mapper/FhzgPlanAnalyzeCalculateDecudeMapper.xml

@@ -72,7 +72,7 @@
         </foreach>
     </select>
     <select id="getLineVoltageByLineId" resultType="com.hdkj.lt.mq.entity.vo.FeederDeviceVO">
-        select t.psr_id,t.name,t.feeder_rate_capacity,s.LABEL volt_value
+        select t.psr_id,t.name,t.feeder_rate_capacity,s.dict_label volt_value
         from dwd_shb_ds_feeder_base t
         join sys_dict_data s on t.voltage_level=s.dict_value
         join sys_dict_type d on d.dict_type = s.dict_type