feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang3.StringUtils;
 import pps.core.base.entity.BaseEnergyStorageDeviceEnt;
 import pps.core.base.entity.BasePowerLineStorageEnt;
 import pps.core.base.enums.BusinessError;
@@ -165,10 +164,10 @@ public class BaseEnergyStorageDeviceService {
         String deviceName = input.getDeviceName();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(input.getLineId())) {
+        if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists(!StringUtils.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(StringUtils.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(!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")
                     .eq(BaseEnergyStorageDeviceEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
@@ -226,7 +225,7 @@ public class BaseEnergyStorageDeviceService {
         Long count = mapper.selectCount(new LambdaQueryWrapper<BaseEnergyStorageDeviceEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .eq(BaseEnergyStorageDeviceEnt::getMakerNumber, makerNumber)
-                .ne(StringUtils.isNotEmpty(id), BaseModel::getId, id)
+                .ne(CharSequenceUtil.isNotEmpty(id), BaseModel::getId, id)
         );
         return count > 0;
     }

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

@@ -2,11 +2,11 @@ package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.UUID;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
-import org.apache.commons.lang3.StringUtils;
 import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
 import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.data.sys_organization.GetOuListByOuIdsInput;
@@ -304,13 +304,13 @@ public class BasePowerLineService {
         BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
         List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
                 .select(BaseModel::getId, BasePowerLineEnt::getLineName)
-                .eq(StringUtils.isNotBlank(lineId), BaseModel::getId, lineId)
-                .eq(StringUtils.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
-                .eq(StringUtils.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
-                .like(StringUtils.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
-                .eq(StringUtils.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
-                .eq(StringUtils.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
-                .eq(StringUtils.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
+                .eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId)
+                .eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
+                .eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
+                .like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
+                .eq(CharSequenceUtil.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
+                .eq(CharSequenceUtil.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
+                .eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .orderByAsc(BasePowerLineEnt::getLineTypeKey, BasePowerLineEnt::getLineName)
         );
@@ -332,7 +332,7 @@ public class BasePowerLineService {
         BasePowerLineWellheadView basePowerLineWellheadView = new BasePowerLineWellheadView();
         basePowerLineWellheadView.setLineId(input.getLineId());
         String wellheadId = input.getWellheadId();
-        if (StringUtils.isNotBlank(wellheadId)) {
+        if (CharSequenceUtil.isNotBlank(wellheadId)) {
             basePowerLineWellheadView.setWellheadId(wellheadId);
         }
         List<BasePowerLineWellheadView> selectList = wellheadViewMapper.selectList(basePowerLineWellheadView);

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

 package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
-import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
 import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
@@ -279,8 +279,8 @@ public class BasePriceStrategyService {
         BasePriceStrategyMapper mapper = context.getBean(BasePriceStrategyMapper.class);
         List<BasePriceStrategyEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePriceStrategyEnt>()
                 .select(BaseModel::getId, BasePriceStrategyEnt::getPolicyName)
-                .eq(StringUtils.isNotBlank(id), BaseModel::getId, id)
-                .like(StringUtils.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
+                .eq(CharSequenceUtil.isNotBlank(id), BaseModel::getId, id)
+                .like(CharSequenceUtil.isNotBlank(policyName), BasePriceStrategyEnt::getPolicyName, policyName)
                 .eq(Objects.nonNull(areaCode), BasePriceStrategyEnt::getAreaCode, areaCode)
                 .eq(Objects.nonNull(strategyYear), BasePriceStrategyEnt::getStrategyYear, strategyYear)
                 .eq(Objects.nonNull(isFixedPrice), BasePriceStrategyEnt::getIsFixedPrice, isFixedPrice)

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang3.StringUtils;
 import pps.cloud.space.service.ISpaceInstitutionDetailCloudService;
 import pps.core.base.entity.BaseDieselGeneratorEnt;
 import pps.core.base.entity.BasePowerLineWellheadEnt;
@@ -169,10 +168,10 @@ public class BaseWellheadService {
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(input.getLineId())) {
+        if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
             queryWrapper.lambda()
-                    .notExists(!StringUtils.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(StringUtils.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(!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")
                     .eq(BaseWellheadEnt::getOuId, input.getOuId());
         } else {
             List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
@@ -243,7 +242,7 @@ public class BaseWellheadService {
         Long count = mapper.selectCount(new LambdaQueryWrapper<BaseWellheadEnt>()
                 .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                 .eq(BaseWellheadEnt::getWellNumber, wellNumber)
-                .ne(StringUtils.isNotEmpty(id), BaseModel::getId, id)
+                .ne(CharSequenceUtil.isNotEmpty(id), BaseModel::getId, id)
         );
         return count > 0;
     }

C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import org.apache.commons.lang3.StringUtils;
+import cn.hutool.core.text.CharSequenceUtil;
 import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
 import pps.cloud.base.service.IBaseWellheadCloudService;
@@ -214,7 +214,7 @@ public class ServiceUtil {
             optimize.setIsOpen(BusinessConstant.ONE);
             if (i == 0) {
                 //如果开始时间不是从00:00开始,初始化开始时间为关井时间
-                if (!StringUtils.equals(BusinessConstant.START_OF_DAY_TIME, openWellTime)) {
+                if (!CharSequenceUtil.equals(BusinessConstant.START_OF_DAY_TIME, openWellTime)) {
                     allList.add(
                             SpaceOptimizeDateDuration.builder()
                                     .openWellTime(BusinessConstant.START_OF_DAY_TIME)
@@ -225,7 +225,7 @@ public class ServiceUtil {
                 }
             }
             //将当前时段添加到新集合
-            if (!StringUtils.equals(openWellTime, closeWellTime)) {
+            if (!CharSequenceUtil.equals(openWellTime, closeWellTime)) {
                 allList.add(optimize);
             }
             //判断当前时段到下一时段间是否有关井时段
@@ -234,7 +234,7 @@ public class ServiceUtil {
             if (next <= last) {
                 SpaceOptimizeDateDuration nextOptimize = optimizeList.get(next);
                 String nextOpenWellTime = nextOptimize.getOpenWellTime();
-                if (!StringUtils.equals(closeWellTime, nextOpenWellTime)) {
+                if (!CharSequenceUtil.equals(closeWellTime, nextOpenWellTime)) {
                     allList.add(
                             SpaceOptimizeDateDuration.builder()
                                     .openWellTime(closeWellTime)
@@ -246,7 +246,7 @@ public class ServiceUtil {
             }
             if (i == last) {
                 //如果结束时间不是24:00,初始化最终关井时间
-                if (!StringUtils.equals(BusinessConstant.END_OF_DAY_TIME, closeWellTime)) {
+                if (!CharSequenceUtil.equals(BusinessConstant.END_OF_DAY_TIME, closeWellTime)) {
                     allList.add(
                             SpaceOptimizeDateDuration.builder()
                                     .openWellTime(closeWellTime)

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

 package pps.core.prediction.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.apache.commons.lang3.StringUtils;
 import pps.cloud.prediction.service.IStoragePredictedPowerCloudService;
 import pps.cloud.prediction.service.data.storage_predicted_power_data.DynamicQueryStoragePredictedPowerInput;
 import pps.cloud.prediction.service.data.storage_predicted_power_data.DynamicQueryStoragePredictedPowerOutput;
@@ -48,11 +48,11 @@ public class StoragePredictedPowerCloudServiceImpl implements IStoragePredictedP
                                 "min_time",
                                 "AVG( power ) AS power")
                         .lambda()
-                        .eq(StringUtils.isNotBlank(storageId), StoragePredictedPowerDataEnt::getStorageId, storageId)
+                        .eq(CharSequenceUtil.isNotBlank(storageId), StoragePredictedPowerDataEnt::getStorageId, storageId)
                         .in(CollUtil.isNotEmpty(storageIds), StoragePredictedPowerDataEnt::getStorageId, storageIds)
-                        .eq(StringUtils.isNotBlank(yearTime), StoragePredictedPowerDataEnt::getYearTime, yearTime)
-                        .eq(StringUtils.isNotBlank(monthTime), StoragePredictedPowerDataEnt::getMonthTime, monthTime)
-                        .between(!StringUtils.isAnyBlank(startTime, endTime), StoragePredictedPowerDataEnt::getDataDate, startTime, endTime)
+                        .eq(CharSequenceUtil.isNotBlank(yearTime), StoragePredictedPowerDataEnt::getYearTime, yearTime)
+                        .eq(CharSequenceUtil.isNotBlank(monthTime), StoragePredictedPowerDataEnt::getMonthTime, monthTime)
+                        .between(CharSequenceUtil.isAllNotBlank(startTime, endTime), StoragePredictedPowerDataEnt::getDataDate, startTime, endTime)
                         .groupBy(StoragePredictedPowerDataEnt::getHourTime,
                                 StoragePredictedPowerDataEnt::getMinTime)
                         .orderByAsc(StoragePredictedPowerDataEnt::getHourTime, StoragePredictedPowerDataEnt::getMinTime)

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

@@ -2,17 +2,18 @@ package pps.core.prediction.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
-import org.apache.commons.lang3.StringUtils;
 import pps.cloud.base.service.IBaseWellheadCloudService;
 import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
 import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
 import pps.core.auth.HttpRequestClient;
+import pps.core.common.constant.BusinessConstant;
 import pps.core.prediction.constant.ThirdPartyApiConstant;
 import pps.core.prediction.entity.WellheadDailyProductionSituationEnt;
 import pps.core.prediction.excel.listener.ThirdActivePowerDataListener;
@@ -67,10 +68,10 @@ public class WellheadDailyProductionSituationService {
                 .eq(WellheadDailyProductionSituationEnt::getWellNumber, input.getWellNumber())
                 .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日"));
+        if (CharSequenceUtil.isNotEmpty(executionCycle)) {
+            String[] split = CharSequenceUtil.splitToArray(executionCycle, "-");
+            queryWrapper.ge(WellheadDailyProductionSituationEnt::getDataDate, DateUtil.parse(split[0], BusinessConstant.DATE_FORMAT_DAY_C))
+                    .le(WellheadDailyProductionSituationEnt::getDataDate, DateUtil.parse(split[1], BusinessConstant.DATE_FORMAT_DAY_C));
         }
         List<WellheadDailyProductionSituationEnt> list = mapper.selectList(queryWrapper);
         PageInfo<WellheadDailyProductionSituationEnt> pageInfo = new PageInfo<>(list);