raojiang 6 mesiacov pred
rodič
commit
b05465fcb4

+ 1 - 1
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);
 }

+ 6 - 2
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)) {

+ 5 - 7
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}  #数据源配置

+ 0 - 0
services/load-transfer-mq/src/main/resources/bootstrap-dev.yml → services/load-transfer-mq/src/main/resources/config/dev/bootstrap-dev.yml


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


+ 0 - 0
services/load-transfer-mq/src/main/resources/bootstrap-uat.yml → services/load-transfer-mq/src/main/resources/config/uat/bootstrap-uat.yml