feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -164,10 +164,11 @@ public class BaseEnergyStorageDeviceService {
         String deviceName = input.getDeviceName();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
+        boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
         if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists(!CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
-                    .notExists(CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1")
+                    .notExists(!equals, "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
+                    .notExists(equals, "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1")
                     .eq(BaseEnergyStorageDeviceEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());

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

@@ -249,10 +249,11 @@ public class BasePhotovoltaicPlantService {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
         String stationName = input.getStationName();
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
+        boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
         if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists(!CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
-                    .notExists(CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1")
+                    .notExists(!equals, "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
+                    .notExists(equals, "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1")
                     .eq(BasePhotovoltaicPlantEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());

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

@@ -168,10 +168,11 @@ public class BaseWellheadService {
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
+        boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
         if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists(!CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "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())
-                    .notExists(CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId()), "SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1")
+                    .notExists(!equals, "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())
+                    .notExists(equals, "SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1")
                     .eq(BaseWellheadEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());