Merge branch 'rj-test' of http://27.54.100.1:8801/pwfhzg/application/pwfhzg-backend-service into rj-test

common/common-core/src/main/java/com/hdkj/lt/core/bizms/modle/po/voltageLimitViolation/FhzgInfoLimitTransferScheme.java

@@ -62,6 +62,11 @@ public class FhzgInfoLimitTransferScheme implements Serializable {
      */
     @ApiModelProperty(value = "方案选定状态")
     private String schemeState;
+    /**
+     * 电压治理条转id
+     */
+    @ApiModelProperty(value = "电压越限id")
+    private String schemeNo;
 
     /**
      * 创建人

common/common-core/src/main/java/com/hdkj/lt/modle/dto/voltageLimitViolation/XferPlanDTO.java

@@ -27,7 +27,8 @@ public class XferPlanDTO {
     private Double transferRate;
     // 可行公变和中压用户接入点额定容量之和
     private Double transferCapacity;
-//
+    //
     private List<AllSwitchInfoListDTO> allSwitchInfoList;
+    private String id;
 
 }

common/common-core/src/main/resources/mapper/SysStruMapper.xml

@@ -117,10 +117,10 @@
 
 
     <select id="getStruByChildId" resultType="com.hdkj.lt.core.sys.model.po.SysStru">
-        SELECT su.stru_Id    struId,
+        SELECT su.dept_id    struId,
                su.stru_type  struType,
                sn.short_name name
-        from SYS_STRU su
+        from sys_dept su
                  left join SYS_ORGAN sn on su.ORGAN_ID = sn.ORGAN_ID
         where su.stru_id = (select p.parent_id from SYS_STRU p where p.stru_id = #{struId} and p.DEL_FLAG = '0') and su.DEL_FLAG = '0'
     </select>
@@ -137,11 +137,11 @@
     </select>
 
     <select id="getCountyByPsrId" resultType="com.hdkj.lt.core.sys.model.dto.OrgInfoDto">
-        select t.STRU_ID struId,
-               t.ORGAN_ALIAS organName
+        select t.dept_id struId,
+               t.dept_name organName
         from dwd_shb_ds_feeder_base b
-                 left join SYS_STRU t
-                           on t.ISC_ORG_ID = b.maint_org
+                 left join sys_dept t
+                           on t.isc_org_id = b.maint_org
         where b.psr_id = #{psrId}
     </select>
 

common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/RuoyiGlobalExceptionHandler.java → common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -27,9 +27,9 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
  * @author ruoyi
  */
 @RestControllerAdvice
-public class RuoyiGlobalExceptionHandler
+public class GlobalExceptionHandler
 {
-    private static final Logger log = LoggerFactory.getLogger(RuoyiGlobalExceptionHandler.class);
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 
     /**
      * 权限码异常

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/entity/dto/VolLimitViolationSchemeDetailDTO.java

@@ -14,4 +14,6 @@ public class VolLimitViolationSchemeDetailDTO {
     private String lineId;
     @ApiModelProperty(value = "电压越限调优事件id")
     private String limitId;
+    @ApiModelProperty(value = "电压越限调优事件编号")
+    private String limitNo;
 }

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

@@ -40,7 +40,11 @@ public class VolPowerCutDTO {
      */
     @ApiModelProperty(value = "所属区县")
     private String countyCode;
-
+    /**
+     * 推演平台json时间id
+     */
+    @ApiModelProperty(value = "全口径低电压id")
+    private String limitNo;
     /**
      * 越限开始时间
      */

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/FhzgFaultGenerateGraphMapper.java

@@ -47,7 +47,7 @@ public interface FhzgFaultGenerateGraphMapper {
             "and t.normal_open !='true'\n" +
             ") select psr_id switch_id, `name` switch_name, start_kg_id from res_tab where psr_id not in (#{startSwitchId}, '-')" +
             "</script>")
-    List<FhzgPlanTransferSchemePathDetailDTO> getSwitchSectionInfo(String lineId, String startSwitchId, List<String> endSwitchIds, List<String> switchTypes);
+    List<FhzgPlanTransferSchemePathDetailDTO> getSwitchSectionInfo(@Param("lineId")String lineId, @Param("startSwitchId")String startSwitchId, @Param("endSwitchIds")List<String> endSwitchIds, @Param("switchTypes")List<String> switchTypes);
 
     String selectSwitchByCustomerId(@Param("customerId") String customerId);
 }

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/java/com/hdkj/lt/bf/mapper/FhzgGridOperationAbnormalityMapper.java

@@ -24,21 +24,21 @@ public interface FhzgGridOperationAbnormalityMapper extends BaseMapper<FhzgGridO
 //    @MybatisLikeInterceptorMethod
     List<FhzgGridOperationAbnormalityVO> getOperationAbnormalityList( @Param("queryDTO") FhzgGridOperationAbnormalityDTO queryDTO);
 
-    List<FeederDeviceVO> getBreakerAreaInfo(Long oaId, List<String> kgPsrTypes);
+    List<FeederDeviceVO> getBreakerAreaInfo(@Param("oaId")Long oaId, @Param("kgPsrTypes")List<String> kgPsrTypes);
 
-    List<FeederDeviceVO> getDefaultBreakerAreaInfo(String feederId, List<String> kgPsrTypes);
+    List<FeederDeviceVO> getDefaultBreakerAreaInfo(@Param("feederId")String feederId, @Param("kgPsrTypes")List<String> kgPsrTypes);
 
-    DynamicSvgDirectVO getDistLineDynamicSvgDirectCurrent(String objId);
+    DynamicSvgDirectVO getDistLineDynamicSvgDirectCurrent(@Param("objId")String objId);
 
-    List<FeederDeviceVO> getFeederSwitchBusbar(List<String> feederList);
+    List<FeederDeviceVO> getFeederSwitchBusbar(@Param("feederList")List<String> feederList);
 
-    List<FeederSwitchVO> getFeederSwitchByPsrId(List<String> psrIdList);
+    List<FeederSwitchVO> getFeederSwitchByPsrId(@Param("psrIdList")List<String> psrIdList);
 
-    List<DirectCurrentSwitchVO> getDistDynamicSvgDirectCurrentInfo(DirectCurrentDTO queryDTO, List<String> kgPsrTypes);
+    List<DirectCurrentSwitchVO> getDistDynamicSvgDirectCurrentInfo(@Param("queryDTO")DirectCurrentDTO queryDTO, @Param("kgPsrTypes")List<String> kgPsrTypes);
 
-    List<String> getFilterDirectCurrentSwitchInfo(List<FilterLineSwitchVO> filterLineSwitch, List<String> kgPsrTypes);
+    List<String> getFilterDirectCurrentSwitchInfo(@Param("filterLineSwitch")List<FilterLineSwitchVO> filterLineSwitch, @Param("kgPsrTypes")List<String> kgPsrTypes);
 
-    LocalDateTime getPlanCreateTimeById(Long id);
+    LocalDateTime getPlanCreateTimeById(@Param("id")Long id);
 }
 
 

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgInfoLimitTransferSchemeMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeResultMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgInfoLimitTransferSchemeResultMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeResult;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequence;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemePathDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemePathDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemePathDetail;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingFinalCheckMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingFinalCheckMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheck;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheck;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetail;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetail;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationPowerCutMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgVoltageLimitViolationPowerCutMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.base.annotations.MybatisLikeInterceptorMethod;

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/FhzgVoltageLimitViolationTransferSchemeDetailMapper.java → services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/FhzgVoltageLimitViolationTransferSchemeDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hdkj.lt.bf.mapper.voltageLimitViolation;
+package com.hdkj.lt.bf.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetail;

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

@@ -97,8 +97,12 @@ public class DwdShbDsSwitchBaseServiceImpl extends ServiceImpl<DwdShbDsSwitchBas
             throw new BusinessException("参数不合法");
         }
         switchInfoUpdateRequest.setLastTime(new Date());
-        //todo:需要修改
-//        switchProtectionSettingsService.saveOrUpdate(switchInfoUpdateRequest, new LambdaUpdateWrapper<FhzgSwitchProtectionSettings>().eq(FhzgSwitchProtectionSettings::getDevicePrsId, switchInfoUpdateRequest.getDevicePrsId()));
+        FhzgSwitchProtectionSettings switchProtectionSettings = switchProtectionSettingsService.getOne(new LambdaQueryWrapper<FhzgSwitchProtectionSettings>().eq(FhzgSwitchProtectionSettings::getDevicePrsId, switchInfoUpdateRequest.getDevicePrsId()));
+        if(switchProtectionSettings != null) {
+            switchProtectionSettingsService.update(switchInfoUpdateRequest, new LambdaUpdateWrapper<FhzgSwitchProtectionSettings>().eq(FhzgSwitchProtectionSettings::getDevicePrsId, switchInfoUpdateRequest.getDevicePrsId()));
+        }else {
+            switchProtectionSettingsService.save(switchInfoUpdateRequest);
+        }
         //更新联络开关是否有效字段
         String contactEffective = request.getContactEffective();
         if (StrUtil.isNotBlank(contactEffective)) {

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

@@ -125,11 +125,9 @@ public class StruServiceImpl implements StruService {
     }
 
     /**
-     *
      * @author luorui
      * @date 2025/6/25 17:01
      * @discription 从缓存中查询组织树
-     *
      * @discription 根据登录用户所属的组织机构，查询出对应的三级信息。根据用户所属单位类型返回结果集合不一致.
      * 示例：
      * 用户为“湖北”，返回 地市-区县-线路 n-n-n
@@ -155,19 +153,19 @@ public class StruServiceImpl implements StruService {
         }
         //2.获取线路缓存
         Map<String, Object> cacheMap = dwdShbDsFeederBaseService.getAllFeederCache();
-        if(CollUtil.isEmpty(cacheMap)){
+        if (CollUtil.isEmpty(cacheMap)) {
             throw new BusinessException("线路缓存信息为空！");
         }
         Map<String, FeederCacheDTO> resultMap = cacheMap.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), e -> (FeederCacheDTO) e.getValue()));
 
         //K->区县的 ISC组织机构ID ,V->线路信息集合
-        Map<String, List<FeederCacheDTO>> maintOrgFeederMap = resultMap.values().parallelStream().filter(e->StrUtil.isNotBlank(e.getMaintOrg())).collect(Collectors.groupingByConcurrent((FeederCacheDTO::getMaintOrg)));
+        Map<String, List<FeederCacheDTO>> maintOrgFeederMap = resultMap.values().parallelStream().filter(e -> StrUtil.isNotBlank(e.getMaintOrg())).collect(Collectors.groupingByConcurrent((FeederCacheDTO::getMaintOrg)));
 
         //将线路信息再按照变压器分组，K->区县ISC组织机构ID,V->变电站信息集合，（变电站信息保护信息信息）
         Map<String, List<StationDTO>> stationFeedMap = maintOrgFeederMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
                 entry -> {
                     //对同一个区县下的线路按 变电站分组, 过滤掉变电站信息为空的数据
-                    Map<String, List<FeederCacheDTO>> stationMap = entry.getValue().stream().filter(e->StrUtil.isNotBlank(e.getStartStation())).collect(Collectors.groupingBy(FeederCacheDTO::getStartStation));
+                    Map<String, List<FeederCacheDTO>> stationMap = entry.getValue().stream().filter(e -> StrUtil.isNotBlank(e.getStartStation())).collect(Collectors.groupingBy(FeederCacheDTO::getStartStation));
                     //将数据构建成  变电站数据
                     return stationMap.entrySet().stream().map(e -> StationDTO.builder()
                             .station(e.getKey())
@@ -211,21 +209,21 @@ public class StruServiceImpl implements StruService {
     }
 
     //省份的数据构建
-    private void buildProvinceByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache,  Map<String, List<StationDTO>> stationFeedMap) {
+    private void buildProvinceByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache, Map<String, List<StationDTO>> stationFeedMap) {
         StruDTO struDTO = cloneTree(struTreeByCache, stationFeedMap);
         //省份的话，取 市->区县->线路，去除根节点
         departmentList.addAll(struDTO.getChildren());
     }
 
     //市的数据构建
-    private void buildCityByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache,  Map<String, List<StationDTO>> stationFeedMap) {
+    private void buildCityByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache, Map<String, List<StationDTO>> stationFeedMap) {
         StruDTO struDTO = cloneTree(struTreeByCache, stationFeedMap);
         //市的话直接返回重构树
         departmentList.add(struDTO);
     }
 
     //区县的数据构建，向上找到他的父节点
-    private void buildCountyByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache,  Map<String, List<StationDTO>> stationFeedMap) {
+    private void buildCountyByCache(List<StruDTO> departmentList, StruTreeCacheDTO struTreeByCache, Map<String, List<StationDTO>> stationFeedMap) {
         //构建子节点
         StruDTO childDTO = cloneTree(struTreeByCache, stationFeedMap);
         //构建父节点
@@ -248,7 +246,7 @@ public class StruServiceImpl implements StruService {
     }
 
     //复制树结构转换成目标结构类型，递归遍历每个节点，拷贝属性，如果是区县则添加上变电站、线路信息
-    private StruDTO cloneTree(StruTreeCacheDTO originalRoot,  Map<String, List<StationDTO>> stationFeedMap) {
+    private StruDTO cloneTree(StruTreeCacheDTO originalRoot, Map<String, List<StationDTO>> stationFeedMap) {
         if (originalRoot == null) {
             return null;
         }
@@ -355,7 +353,6 @@ public class StruServiceImpl implements StruService {
     }
 
 
-
     /**
      * @author luorui
      * @date 2025/5/13 11:49
@@ -416,7 +413,7 @@ public class StruServiceImpl implements StruService {
         List<String> psrIdList = feederBaseList.stream().map(FeederBase::getPsrId).collect(Collectors.toList());
         List<FhzgDistMappingFileDTO> fhzgDistMappingFileDTOList = fhzgDistMappingFileMapper.getMappingFileById(psrIdList);
         //K->psrId V->图形文件集合
-        Map<String,List<FhzgDistMappingFileDTO>>  psrIdMap = fhzgDistMappingFileDTOList.stream().collect(Collectors.groupingBy(FhzgDistMappingFileDTO::getLineId));
+        Map<String, List<FhzgDistMappingFileDTO>> psrIdMap = fhzgDistMappingFileDTOList.stream().collect(Collectors.groupingBy(FhzgDistMappingFileDTO::getLineId));
         List<FeederDTO> feederList = new ArrayList<>();
         if (CollUtil.isNotEmpty(feederBaseList)) {
             feederBaseList.forEach(e -> {
@@ -490,6 +487,7 @@ public class StruServiceImpl implements StruService {
 
     /**
      * 查询省，市，区县的组织树（根据用户所属组织机构，从缓存中取）
+     *
      * @param
      * @return
      */
@@ -507,11 +505,9 @@ public class StruServiceImpl implements StruService {
     }
 
     /**
-     *
      * @author luorui
      * @date 2025/7/17 15:44
      * @discription 根据struId获取其下级所有区县id
-     *
      **/
     @Override
     public List<Long> getCountyCodeListByStruId(Long struId) {
@@ -557,16 +553,14 @@ public class StruServiceImpl implements StruService {
     }
 
     /**
-     *
      * @author luorui
      * @date 2025/7/17 15:01
-     * @discription
-     *  根据StruId 查询市->区县两级结构
-     *  1.用户如果是省公司，返回->市-区县,
-     *  2.用户如果是市公司，返回->所属市->区县，
-     *   3.用户如果是区县，返回上级市->当前区县。
+     * @discription 根据StruId 查询市->区县两级结构
+     * 1.用户如果是省公司，返回->市-区县,
+     * 2.用户如果是市公司，返回->所属市->区县，
+     * 3.用户如果是区县，返回上级市->当前区县。
      **/
-    private List<StruTreeVO> getStruTreeById(Long struId){
+    private List<StruTreeVO> getStruTreeById(Long struId) {
         //查询所属机构的组织结构
         StruTreeCacheDTO struTreeCacheDTO = sysStruService.getStruTreeByCache(struId);
         List<StruTreeVO> result = new ArrayList<>();
@@ -613,10 +607,32 @@ public class StruServiceImpl implements StruService {
         } else {
             log.info("查询组织机构信息不存在struId:{}", struId);//返回空数据
         }
+        removeSecondChildNode(result);
         setEmptyArr(result);//将子节点为空的数据去掉
         return result;
     }
 
+    //删除第二层后组织机构数据
+    private void removeSecondChildNode(List<StruTreeVO> list) {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        for (StruTreeVO parent : list) {
+            if (!Objects.equals(parent.getStruType(), CITY)) {
+                continue;
+            }
+            List<StruTreeVO> children = parent.getChildren();
+            if (children == null || children.isEmpty()) {
+                continue;
+            }
+            for (StruTreeVO child : children) {
+                if (child.getChildren() != null) {
+                    child.getChildren().clear();
+                }
+            }
+        }
+    }
+
     private void setEmptyArr(List<StruTreeVO> struTreeVOList) {
         if (struTreeVOList == null || struTreeVOList.isEmpty()) {
             return;

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

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.bf.entity.dto.OperationAbnormalityQueryDTO;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeMapper;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeResultMapper;
+import com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeMapper;
+import com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeResultMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgInfoLimitTransferSchemeResultService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeResult;

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

@@ -2,7 +2,7 @@ package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeMapper;
+import com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgInfoLimitTransferSchemeService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme;
 import org.springframework.stereotype.Service;

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

@@ -2,7 +2,7 @@ package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequenceMapper;
+import com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeSwitchingSequenceMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequenceService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequence;
 import org.springframework.stereotype.Service;

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

@@ -2,7 +2,7 @@ package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemePathDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemePathDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemePathDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemePathDetail;
 import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheckMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalCheckMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheckService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheck;
 import org.springframework.stereotype.Service;

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

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.base.exception.BusinessException;
 import com.hdkj.lt.bf.entity.dto.FhzgLimitTransferSchemeFinalSegmentCurrentDetailDTO;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetail;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.base.exception.BusinessException;
 import com.hdkj.lt.bf.entity.dto.FhzgLimitTransferSchemeFinalSwitchCurrentDetailDTO;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetail;
 import org.springframework.stereotype.Service;

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

@@ -2,7 +2,7 @@ package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheckMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopCheckMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheckService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheck;
 import org.springframework.stereotype.Service;

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

@@ -2,7 +2,7 @@ package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetail;
 import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
 package com.hdkj.lt.bf.service.voltageLimitViolation.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetail;
 import org.springframework.stereotype.Service;

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

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.hdkj.lt.bf.entity.dto.VolPowerCutDTO;
-import com.hdkj.lt.bf.entity.vo.FhzgGridOperationAbnormalityVO;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgVoltageLimitViolationPowerCutMapper;
+import com.hdkj.lt.bf.mapper.FhzgVoltageLimitViolationPowerCutMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgVoltageLimitViolationPowerCutService;
-import com.hdkj.lt.core.bizms.modle.po.fault.FaultPowerCut;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hdkj.lt.bf.entity.dto.VolLimitViolationSchemeDetailDTO;
 import com.hdkj.lt.bf.entity.vo.LimitTransferSchemeDetailVO;
 import com.hdkj.lt.bf.entity.vo.VolSchemeCheckNumVO;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeMapper;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemePathDetailMapper;
-import com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeMapper;
+import com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemePathDetailMapper;
+import com.hdkj.lt.bf.mapper.FhzgVoltageLimitViolationTransferSchemeDetailMapper;
 import com.hdkj.lt.bf.service.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetailService;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme;
 import com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemePathDetail;
@@ -87,6 +87,7 @@ public class FhzgVoltageLimitViolationTransferSchemeDetailServiceImpl extends Se
     public List<FhzgInfoLimitTransferScheme> getVolLimitSchemeList(VolLimitViolationSchemeDetailDTO dto) {
         LambdaQueryWrapper<FhzgInfoLimitTransferScheme> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(FhzgInfoLimitTransferScheme::getId,
+                        FhzgInfoLimitTransferScheme::getSchemeNo,
                         FhzgInfoLimitTransferScheme::getCheckState,
                         FhzgInfoLimitTransferScheme::getSchemeName,
                         FhzgInfoLimitTransferScheme::getEvaluationScore,
@@ -95,8 +96,8 @@ public class FhzgVoltageLimitViolationTransferSchemeDetailServiceImpl extends Se
                         FhzgInfoLimitTransferScheme::getSchemeState,
                         FhzgInfoLimitTransferScheme::getSwitchNum,
                         FhzgInfoLimitTransferScheme::getNonAutoSwitchNum)
-                .eq(FhzgInfoLimitTransferScheme::getLimitId, dto.getLimitId())
-                .eq(FhzgInfoLimitTransferScheme::getCheckState, dto.getType());
+                .eq(FhzgInfoLimitTransferScheme::getLimitId, dto.getLimitId());
+        //.eq(FhzgInfoLimitTransferScheme::getCheckState, dto.getType());
         List<FhzgInfoLimitTransferScheme> list = transferSchemeMapper.selectList(queryWrapper);
         list.forEach(e -> {
             if (e.getEvaluationScore() != null) {

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-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgInfoLimitTransferSchemeMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgInfoLimitTransferSchemeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferScheme">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgInfoLimitTransferSchemeResultMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgInfoLimitTransferSchemeResultMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeResultMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeResultMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeResult">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgInfoLimitTransferSchemeSwitchingSequenceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequenceMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgInfoLimitTransferSchemeSwitchingSequenceMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgInfoLimitTransferSchemeSwitchingSequence">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemePathDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemePathDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemePathDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemePathDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemePathDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingFinalCheckMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingFinalCheckMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheckMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalCheckMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalCheck">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSegCurrentDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingFinalSwCurrentDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingLoopCheckMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheckMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopCheckMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopCheck">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSegCurrentDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgLimitTransferSchemeSwitchingLoopSwCurrentDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgVoltageLimitViolationPowerCutMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgVoltageLimitViolationPowerCutMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgVoltageLimitViolationPowerCutMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgVoltageLimitViolationPowerCutMapper">
 
     <resultMap id="BaseResultMap"
                type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut">
@@ -49,16 +49,16 @@
     </sql>
     <select id="getVolPowerCutList"
             resultType="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationPowerCut">
-        select t1.*, t3.ORGAN_ALIAS countyName
+        select t1.*, t3.short_name countyName
         from fhzg_voltage_limit_violation_power_cut 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
         <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>
@@ -75,6 +75,9 @@
             <if test="queryDTO.volType != null and queryDTO.volType != ''">
                 and t1.event_type = #{queryDTO.volType}
             </if>
+            <if test="queryDTO.limitNo != null and queryDTO.limitNo != ''">
+                and t1.limit_no = #{queryDTO.limitNo}
+            </if>
         </where>
         order by t1.event_create_time desc
     </select>

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/mapper/voltageLimitViolation/mapping/FhzgVoltageLimitViolationTransferSchemeDetailMapper.xml → services/load-transfer-bf/src/main/resources/mapper/FhzgVoltageLimitViolationTransferSchemeDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hdkj.lt.bf.mapper.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetailMapper">
+<mapper namespace="com.hdkj.lt.bf.mapper.FhzgVoltageLimitViolationTransferSchemeDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.hdkj.lt.core.bizms.modle.po.voltageLimitViolation.FhzgVoltageLimitViolationTransferSchemeDetail">
             <id property="id" column="id" jdbcType="BIGINT"/>

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/load-transfer-io/src/main/resources/config/test/bootstrap-test.yml

@@ -2,7 +2,7 @@
 NACOS_HOST: 192.168.10.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: b0a462af-0f3b-4b67-b181-3de6f4b5d07d
+NAMESPACE: pwfhzg-test
 
 server:
   servlet:
@@ -32,10 +32,8 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - hussar-cloud-oss-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - application.${spring.cloud.nacos.config.file-extension} #公共配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置
+          - common-core.${spring.cloud.nacos.config.file-extension}  #数据源配置

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/controller/AcceptPlanPowerCutController.java

@@ -49,8 +49,8 @@ public class AcceptPlanPowerCutController {
      **/
     @PostMapping("/acceptPlanPowerCut")
     @ApiOperation(value = "接收计划停电数据")
-    public ApiResponse<Boolean> acceptPlanPowerCut(@RequestBody AcceptPlanPowerCutDTO AcceptPlanPowerCutDTO) {
-        boolean result = acceptPlanPowerCutService.acceptPlanPowerCut(AcceptPlanPowerCutDTO);
+    public ApiResponse<Boolean> acceptPlanPowerCut(@RequestBody AcceptPlanPowerCutDTO acceptPlanPowerCutDTO) {
+        boolean result = acceptPlanPowerCutService.acceptPlanPowerCut(acceptPlanPowerCutDTO);
         return ApiResponse.success(result);
     }
 

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/entity/dto/AcceptPlanPowerCutDTO.java

@@ -3,6 +3,7 @@ package com.hdkj.lt.mq.entity.dto;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,6 +20,8 @@ import java.util.List;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class AcceptPlanPowerCutDTO implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long planId;
@@ -35,14 +38,16 @@ public class AcceptPlanPowerCutDTO implements Serializable {
     @ApiModelProperty(value = "计划状态")
     private String planStatus;
     //计划开始时间
-    @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+
+   // @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "计划开始时间")
+    @JsonFormat(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")
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+
+   // @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "计划结束时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
     //计划停电的馈线列表
     @ApiModelProperty(value = "计划停电的馈线列表")

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/service/plan/impl/AnalysisTransferResultServiceImpl.java

@@ -181,7 +181,7 @@ public class AnalysisTransferResultServiceImpl implements IAnalysisTransferResul
                     List<FhzgPlanTransferSchemeUsers> transferSchemeUsers = Lists.newArrayList();
                     // 转供方案可转用户
                     List<FhzgPlanTransferableSchemeUsers> transferableSchemeUsers = Lists.newArrayList();
-                    Snowflake snowflake = IdUtil.getSnowflake(1,1);
+                    Snowflake snowflake = IdUtil.getSnowflake(1, 1);
                     //转供前开关信息
                     LambdaQueryWrapper<FhzgPlanSwitchInfoList> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                     lambdaQueryWrapper.eq(FhzgPlanSwitchInfoList::getPlanId, planId);
@@ -337,7 +337,7 @@ public class AnalysisTransferResultServiceImpl implements IAnalysisTransferResul
                 BigDecimal rateCapacity = StringToBigDecimal(powerTransformerInfo.getRateCapacity());
                 powerTransferInfo.setRateCapacity(rateCapacity);
                 powerTransferInfo.setVoltLevel(getVolLevelByEnum(powerTransformerInfo.getVoltLevel()));
-                if (powerTransformerPAfter != null && rateCapacity != null&& rateCapacity.compareTo(BigDecimal.valueOf(0))!=0) {
+                if (powerTransformerPAfter != null && rateCapacity != null && rateCapacity.compareTo(BigDecimal.valueOf(0)) != 0) {
                     powerTransferInfo.setLoadRate(powerTransformerPAfter.divide(rateCapacity, 5, RoundingMode.HALF_UP).multiply(new BigDecimal("100")));
                 }
                 powerTransferInfoList.add(powerTransferInfo);
@@ -480,7 +480,12 @@ public class AnalysisTransferResultServiceImpl implements IAnalysisTransferResul
         // 获取最大电流信息负载计算等信息
         stateEstimationEquip.setPsrIds(dataList.stream().map(e -> e.getLineId()).collect(Collectors.toList()));
         // 调用实时量测接口获取七天最大电流值，判断接口返回情况，错误时防止解析中断
-        ApiResponse<Map<String, BigDecimal>> lineIResp = IMeasurementApiClient.queryPeriodByCommonQuery(stateEstimationEquip);
+        ApiResponse<Map<String, BigDecimal>> lineIResp = new ApiResponse<>();
+        try {
+            lineIResp = IMeasurementApiClient.queryPeriodByCommonQuery(stateEstimationEquip);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 //        HashMap hashMap = new HashMap();
 //        hashMap.put("15DKX-5837", new BigDecimal("160"));
 //        lineIResp.setData(hashMap);
@@ -609,7 +614,7 @@ public class AnalysisTransferResultServiceImpl implements IAnalysisTransferResul
                                                       List<XferSupplyAreaDTO> supplyAreaList, Long schemeId, AtomicReference<Integer> powerOnSuccess
             , Map<String, FeederCheckRuleDTO> feederCheckRuleDTOMap) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Snowflake snowflake = IdUtil.getSnowflake(1,1);
+        Snowflake snowflake = IdUtil.getSnowflake(1, 1);
         supplyAreaList.forEach(e -> {
             if (Integer.compare(powerOnSuccess.get(), 0) == 0) {
                 powerOnSuccess.set(Objects.equals(e.getPowerOnSuccess(), Boolean.TRUE) ? 1 : 0);
@@ -832,7 +837,7 @@ public class AnalysisTransferResultServiceImpl implements IAnalysisTransferResul
                             .tag("1")
                             .body(message).build();
                     com.aliyun.openservices.ons.api.Message message1 = buildMessage(messageEntity);
-                   // log.info("计划停电消息推送：{}", JSON.toJSONString(message1));
+                    // log.info("计划停电消息推送：{}", JSON.toJSONString(message1));
                     message1.setTag("1");
                     message1.setTopic(RocketMQConstants.TOPIC_ID_SOLUTION_OPERATION_TICKET);
                     producerBean.sendAsync(message1, messageEntity.getSendCallback());

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/service/voltageLimitViolation/impl/FhzgVoltageLimitViolationPowerCutServiceImpl.java

@@ -141,7 +141,7 @@ public class FhzgVoltageLimitViolationPowerCutServiceImpl extends ServiceImpl<Fh
                         data.getXferPlanList().forEach(p -> {
                             Long schemeId = IdUtil.getSnowflakeNextId();
                             FhzgInfoLimitTransferScheme transferScheme = new FhzgInfoLimitTransferScheme();
-                            transferScheme.setId(schemeId).setLimitId(limitId)
+                            transferScheme.setId(schemeId).setLimitId(limitId).setSchemeNo(p.getId())
                                     .setSchemeState("0").setCheckState(1).setSchemeJson(JSON.toJSONString(p));
                             //保存方案基本信息
                             schemeMapper.insert(transferScheme);

services/load-transfer-mq/src/main/resources/bootstrap-local.yml → services/load-transfer-mq/src/main/resources/config/local/bootstrap-local.yml

@@ -34,5 +34,5 @@ spring:
         namespace: ${spring.cloud.nacos.discovery.namespace}
         file-extension: yaml
         shared-configs:
-          - application.${spring.cloud.nacos.config.file-extension} #公共配置
+          - application-local.${spring.cloud.nacos.config.file-extension} #公共配置
           - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

services/load-transfer-si/src/main/java/com/hdkj/lt/si/LoadTransferSIApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 /**
  * @Description:
@@ -19,6 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication(scanBasePackages = {SystemGlobalConstant.HUSSAR_BASE_PACKAGE, SystemGlobalConstant.BIZMS_BASE_PACKAGE})
 @MapperScan(basePackages = {SystemGlobalConstant.HUSSAR_DAO_PACKAGE, SystemGlobalConstant.BIZMS_DAO_PACKAGE})
 @EnableCaching
+@EnableSwagger2WebMvc
 public class LoadTransferSIApplication {
 
     public static void main(String[] args) {

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/estimation/impl/StateEstimationServiceImpl.java

@@ -41,10 +41,10 @@ public class StateEstimationServiceImpl implements StateEstimationService {
     @Resource(type = SateEstimationRemoteCallServiceImpl.class)
     private IRemoteCallService remoteCallService;
 
-    @Value("${lt.remote.stateEstimation.queryPeriodByFeeder-uri}")
+    @Value("${remote.stateEstimation.queryPeriodByFeeder-uri}")
     private String periodByFeederUri;
 
-    @Value("${lt.remote.stateEstimation.queryPeriodByEquip-uri}")
+    @Value("${remote.stateEstimation.queryPeriodByEquip-uri}")
     private String periodByEquipUri;
 
     @Autowired

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/remote/impl/CityFeederTopoRemoteCallServiceImpl.java

@@ -25,7 +25,7 @@ public class CityFeederTopoRemoteCallServiceImpl extends AbstractDefaultRemoteCa
 
     private static final String SUCCESS_CODE = "200";
 
-    @Value("${lt.remote.topo.request-uri}")
+    @Value("${remote.topo.request-uri}")
     private String requestUri;
 
     @Override

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/remote/impl/SateEstimationRemoteCallServiceImpl.java

@@ -22,7 +22,7 @@ public class SateEstimationRemoteCallServiceImpl extends AbstractDefaultRemoteCa
 
     private static final String SUCCESS_CODE = "200";
 
-    @Value("${lt.remote.stateEstimation.request-uri}")
+    @Value("${remote.stateEstimation.request-uri}")
     private String requestUri;
 
     @Override

services/load-transfer-si/src/main/java/com/hdkj/lt/si/service/svg/impl/CityFeederTopoServiceImpl.java

@@ -44,7 +44,7 @@ public class CityFeederTopoServiceImpl implements ICityFeederTopoService {
     @Qualifier("simpleLongTimeRestTemplate")
     private RestTemplate restTemplate;
 
-    @Value("${lt.remote.topo.request-uri}")
+    @Value("${remote.topo.request-uri}")
     private String requestUri;
 
     @Resource

services/load-transfer-si/src/main/resources/config/local/bootstrap-local.yml

@@ -2,7 +2,7 @@
 NACOS_HOST: 27.54.100.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: 682eb787-7279-47d8-8516-79b521f96690
+NAMESPACE: 88b0baca-b7b1-496c-8ebd-bbfea7959c49
 
 server:
   servlet:
@@ -32,9 +32,7 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

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>
@@ -228,6 +229,9 @@
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>