feat(能源管理系统): 测试问题修复

1.修改间开制度管理-长期/中短期/短期间开优化定时任务,修改代码结构,处理部分未优化数据无法初始化问题;
2.修改间开制度管理-长期/中短期定时任务,修改离网型算法逻辑,优化代码;
3.修改间开制度管理-短期间开优化详情接口,优化代码;
4.修改间开制度管理-间开优化模块间开制度跟踪接口,解决短期间开制度查询多条导致程序报错问题;
5.修改间开制度管理-短期间开优化定时任务,解决重复添加短期优化记录问题;
6.修改光伏预测-查询预测列表接口,解决缺少电量值问题;
7.修改基础信息管理-井口配置模块分页列表接口,增加线路ID入参字段,修改查询逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadService.java

@@ -132,9 +132,9 @@ public class BaseWellheadService {
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.equals(BusinessConstant.STRING_ONE, input.getExcludeIdFlag())) {
+        if (StringUtils.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists("SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1")
+                    .notExists("SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
                     .eq(BaseWellheadEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());

C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_wellhead/QueryBaseWellheadInput.java

@@ -35,6 +35,6 @@ public class QueryBaseWellheadInput extends XPageInput {
     @XText("运行功率(KW)")
     private BigDecimal serviceRating;
 
-    @XText("排除已绑定线路标识")
-    private String excludeIdFlag;
+    @XText("线路ID")
+    private String lineId;
 }
\ No newline at end of file