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