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

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
6.修改基础信息配置--间开制度管理模块,设为基础制度/重新优化接口,增加业务逻辑初始化校准周期;
7.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化时间超过一天问题;
8.修改系统管理Cloud模块,查询子集组织列表接口,增加查询逻辑,解决查询出重复数据问题;
9.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化跨月导致数据异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/WellheadDailyProductionSituationService.java

 package pps.core.prediction.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.StringUtils;
 import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
 import pps.core.prediction.mapper.WellheadDailyProductionSituationMapper;
 import pps.core.prediction.service.data.wellhead_daily_production_situation.QueryWellheadDailyProductionSituationInput;
@@ -41,11 +43,17 @@ public class WellheadDailyProductionSituationService {
     public XPageResult<QueryWellheadDailyProductionSituationOutput> queryWellheadDailyProductionSituationView(XContext context, QueryWellheadDailyProductionSituationInput input) {
         WellheadDailyProductionSituationMapper mapper = context.getBean(WellheadDailyProductionSituationMapper.class);
         PageHelper.startPage(input.getPage(), input.getLimit());
-        List<WellheadDailyProductionSituationEnt> list = mapper.selectList(new LambdaQueryWrapper<WellheadDailyProductionSituationEnt>()
+        LambdaQueryWrapper<WellheadDailyProductionSituationEnt> queryWrapper = new LambdaQueryWrapper<WellheadDailyProductionSituationEnt>()
                 .eq(WellheadDailyProductionSituationEnt::getWellheadId, input.getWellheadId())
                 .eq(WellheadDailyProductionSituationEnt::getWellNumber, input.getWellNumber())
-                .orderByDesc(WellheadDailyProductionSituationEnt::getDataDate)
-        );
+                .orderByDesc(WellheadDailyProductionSituationEnt::getDataDate);
+        String executionCycle = input.getExecutionCycle();
+        if (StringUtils.isNotEmpty(executionCycle)) {
+            String[] split = StringUtils.split(executionCycle, "-");
+            queryWrapper.ge(WellheadDailyProductionSituationEnt::getDataDate, DateUtil.parse(split[0], "yyyy年MM月dd日"))
+                    .le(WellheadDailyProductionSituationEnt::getDataDate, DateUtil.parse(split[1], "yyyy年MM月dd日"));
+        }
+        List<WellheadDailyProductionSituationEnt> list = mapper.selectList(queryWrapper);
         PageInfo<WellheadDailyProductionSituationEnt> pageInfo = new PageInfo<>(list);
         List<QueryWellheadDailyProductionSituationOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryWellheadDailyProductionSituationOutput.class);
         return XPageResult.success(outputs, input, pageInfo.getTotal());

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/wellhead_daily_production_situation/QueryWellheadDailyProductionSituationInput.java

@@ -21,4 +21,7 @@ public class QueryWellheadDailyProductionSituationInput extends XPageInput {
     @XText("井号")
     @NotBlank(message = "缺少井号")
     private String wellNumber;
+
+    @XText("周期")
+    private String executionCycle;
 }
\ No newline at end of file