소스 검색

topo解析完成后重新成图代码注释沿用原mq流程成图

张同佳 5 달 전
부모
커밋
e1a31fa82e

+ 4 - 4
services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/listener/RocketConsumerCityFeederTopoListener.java

@@ -57,10 +57,10 @@ public class RocketConsumerCityFeederTopoListener implements MessageListener {
                 log.info("===== 处理拓扑数据完成 =====");
             }
             //解析完成后重新成图
-            SvgGenerationDTO svgGenerationDTO = new SvgGenerationDTO();
-            svgGenerationDTO.setSvgType("1");
-            svgGenerationDTO.setFeederList(lineIds);
-            lineSvgFileApiClient.lineDynamicSvgSave(svgGenerationDTO);
+//            SvgGenerationDTO svgGenerationDTO = new SvgGenerationDTO();
+//            svgGenerationDTO.setSvgType("1");
+//            svgGenerationDTO.setFeederList(lineIds);
+//            lineSvgFileApiClient.lineDynamicSvgSave(svgGenerationDTO);
             /* // 连接响应时间无法保证,废弃此方式改成topo服务主动触发
             if (objectApiResponse.isSuccess() && rocketMQProperties.getEnabled()) {
                 log.info("===== 处理拓扑数据完成 =====");

+ 1 - 0
services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/listener/RocketConsumerDistLineFileListener.java

@@ -44,6 +44,7 @@ public class RocketConsumerDistLineFileListener implements MessageListener {
             String type = message.getTag();
             String value = new String(message.getBody(), StandardCharsets.UTF_8);
             // 调用业务层操作
+            value = value.replaceAll("\"","");
             this.executeFunc(value, type);
             return Action.CommitMessage;
         } catch (Exception e) {

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

@@ -430,7 +430,7 @@ public class SvgGenerationServiceImpl implements ISvgGenerationService {
     private DynamicSvgVO getDynamicSvgInfo(SvgGenerationDTO svgGeneration, FeederBaseVO feederBase, List<FeederBaseVO> feederList,
                                            List<StateEstimation.StateEstimationSwitchResult> list, List<AppendSwitchDTO> details, String switchId) {
         String appendLogInfo = Optional.ofNullable(details).filter(ObjectUtils::isNotEmpty).map(e -> "-负荷点").orElse("");
-        SvgObjectDTO svgObject = svgGeneration.getSvgObject();
+        SvgObjectDTO svgObject = Optional.ofNullable(svgGeneration.getSvgObject()).orElse(SvgObjectDTO.builder().build());
         String feeder = feederBase.getPsrId(); // 主线路ID
         String objId = Optional.ofNullable(svgObject.getObjId()).map(String::valueOf).orElse(feeder); // 动态成图参数关联ID
         String objType = Optional.ofNullable(svgObject.getObjType()).orElse(ZERO); // 动态成图参数关联类型