mq-fix

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

@@ -5,7 +5,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
@@ -20,7 +19,6 @@ 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, SystemGlobalConstant.BIZMS_MAPPER_PACKAGE})
 @EnableCaching
-@EnableCircuitBreaker
 public class LoadTransferMQApplication {
 
     public static void main(String[] args) {

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/listener/RocketConsumerSimulationPlatformListener.java

@@ -46,6 +46,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -125,7 +126,7 @@ public class RocketConsumerSimulationPlatformListener implements MessageListener
             startBreakerDTO.setSwitchId(planPowerCutSwitchPO.getStartSwitch());
             //动态切换表名
             //*ztj ArgTableNameHandler.setArgument(fhzgOrganSuffixMapper.getOrganSuffixByPlanIdOrLineId(planId, null));
-            List<DeviceTypeDto> deviceType = feederTopoMapper.getDeviceType(Arrays.asList(planPowerCutSwitchPO.getStartSwitch()));
+            List<DeviceTypeDto> deviceType = feederTopoMapper.getDeviceType(Collections.singletonList(planPowerCutSwitchPO.getStartSwitch()));
             if (CollectionUtils.isNotEmpty(deviceType)) {
                 if (CommonUnitEnum.ONE.getCode().equals(deviceType.get(0).getIsStartKg())) {
                     startBreakerDTO.setDistribution(1);

services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/mapper/base/FeederTopoMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Mapper
 public interface FeederTopoMapper extends BaseMapper<FeederTopo> {
 
-    List<DeviceTypeDto> getDeviceType(List<String> psrIds);
+    List<DeviceTypeDto> getDeviceType(@Param("psrIds") List<String> psrIds);
 
     void deleteDistLineSwitchSectionByLineId(String feeder);
 

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

@@ -36,5 +36,5 @@ spring:
         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-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
           - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置