bug fix

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

@@ -1,5 +1,6 @@
 package com.hdkj.lt.bf.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -24,8 +25,10 @@ public class NoticeListDTO {
 
     private String creatorName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     private Integer isRead;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/DwdShbDsSwitchBaseMapper.java

@@ -32,7 +32,7 @@ public interface DwdShbDsSwitchBaseMapper extends BaseMapper<DwdShbDsSwitchBase>
     List<SwitchInfoVO> getSwitchInfoByCondition(@Param("params") SwitchInfoListRequest request);
 
     List<SwitchOrTransformerVO> getSwitchAndTransformerList(@Param("name") String name, @Param("feeder") String feederId,
-                                                            List<String> psrType);
+                                                            @Param("psrType")List<String> psrType);
 
     SwitchOrTransformerVO getShowSwitch(@Param("feederId") String feederId, @Param("psrId") String psrId);
 

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgGenerateGraphMapper.java

@@ -177,15 +177,15 @@ public interface FhzgGenerateGraphMapper {
 
     List<String> getBreakerPsrId(@Param("startKg") String startKg, @Param("feeder") String feeder, @Param("endKg") String endKg, @Param("kgPsrTypes") List<String> kgPsrTypes);
 
-    List<Map<String, String>> getBreakerPsrIdByPlanId(Long planId);
+    List<Map<String, String>> getBreakerPsrIdByPlanId(@Param("planId") Long planId);
 
-    List<Map<String, String>> getBreakerPsrIdByFaultId(Long faultId);
+    List<Map<String, String>> getBreakerPsrIdByFaultId(@Param("faultId") Long faultId);
 
     Page<SwitchListVO> getSwitchInfoByLoadSwitchId(Page page, @Param("params") UserListQueryDTO dto, List<String> kgType);
 
-    List<Map<String, String>> getOtherSwitchByObjId(String objId, List<String> kgType);
+    List<Map<String, String>> getOtherSwitchByObjId(@Param("objId") String objId, @Param("kgType") List<String> kgType);
 
-    List<String> getBusbarBySwitchIds(List<String> switchIds);
+    List<String> getBusbarBySwitchIds(@Param("switchIds")List<String> switchIds);
 
     String getStationName(@Param("psrId") String psrId, @Param("lineId") String lineId);
 

services/load-transfer-bf/src/main/resources/mapper/DwdShbDsSwitchBaseMapper.xml

@@ -83,7 +83,7 @@
         a.name switchName,
         a.switch_role_name switchRoleName,
         a.feeder_name feederName,
-        s.ORGAN_ALIAS maintOrgName,
+        s.short_name maintOrgName,
         a.station_name stationName,
         c.oc1_value oc1Value,
         c.oc1_delay oc1Delay,
@@ -110,7 +110,7 @@
         from dwd_shb_ds_switch_base a
         left join fhzg_switch_protection_settings c on a.psr_id = c.device_prs_id
         left join t_disable_llkg_config d on a.psr_id= d.llsb_id
-        left join SYS_STRU s on a.maint_org = s.ISC_ORG_ID
+        left join sys_dept s on a.maint_org = s.isc_org_id
         <where>
             a.pub_priv_flag = '0' and a.psr_state = '20'
             <if test="params.feederName != null and params.feederName != ''">

services/load-transfer-bf/src/main/resources/mapper/FhzgGridOperationAbnormalityMapper.xml

@@ -3,17 +3,17 @@
 <mapper namespace="com.hdkj.lt.bf.mapper.FhzgGridOperationAbnormalityMapper">
 
     <select id="getOperationAbnormalityList" resultType="com.hdkj.lt.bf.entity.vo.FhzgGridOperationAbnormalityVO">
-        select t1.*, t3.ORGAN_ALIAS countyName, t4.id schemeId, t4.file_id schemeFileId
+        select t1.*, t3.short_name countyName, t4.id schemeId, t4.file_id schemeFileId
         from fhzg_grid_operation_abnormality t1
         left join dwd_shb_ds_feeder_base t2 on t1.line_id = t2.psr_id
-        left join SYS_STRU t3 on t3.ISC_ORG_ID = t2.maint_org
+        left join sys_dept t3 on t3.isc_org_id = t2.maint_org
         left join fhzg_operation_abnormality_transfer_scheme t4 on t1.id =t4.oa_id
         <where>
             <if test="queryDTO.countyCode != null and queryDTO.countyCode != ''">
-                and t3.stru_id = #{queryDTO.countyCode}
+                and t3.dept_id = #{queryDTO.countyCode}
             </if>
             <if test="queryDTO.countyCodeList != null and queryDTO.countyCodeList.size > 0">
-                AND t3.stru_id IN
+                AND t3.dept_id IN
                 <foreach collection="queryDTO.countyCodeList" open="(" item="item" separator="," close=")">
                     #{item}
                 </foreach>

services/load-transfer-io/src/main/java/com/hdkj/lt/io/service/impl/FileServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import com.hdkj.attachments.client.entity.Attachment;
 import com.hdkj.attachments.client.entity.AttachmentsParam;
 import com.hdkj.attachments.client.facade.IAttachmentFacadeClient;
+import com.hdkj.attachments.client.facade.impl.AttachmentFacadeHttpClientImpl;
 import com.hdkj.attachments.client.response.ResponseData;
 import com.hdkj.lt.io.aop.FileTypeCheckAop;
 import com.hdkj.lt.io.config.FileCheckProperties;

services/load-transfer-io/src/main/resources/bootstrap.yaml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: @environment@

services/load-transfer-io/src/main/resources/bootstrap.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: local

services/pom.xml

@@ -170,6 +170,7 @@
                 <!-- 指定配置文件所在的resources目录 -->
                 <directory>src/main/resources</directory>
                 <includes>
+                    <include>bootstrap.yaml</include>
                     <include>bootstrap.yml</include>
                     <include>kaptcha.properties</include>
                     <include>log4j2.xml</include>