mq si -fix

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