feat(能源管理系统): 间开优化定时任务

1.开发间开优化长期间开优化定时任务,了解长期并网型流程算法;
2.定时任务模块新增CRON常量类,定义常用表达式;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -10,6 +10,7 @@ import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BaseDieselGeneratorMapper;
 import pps.core.base.mapper.BasePowerLineDieselMapper;
 import pps.core.base.service.data.base_diesel_generator.*;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
@@ -38,7 +39,7 @@ import java.util.Objects;
  * @date 2023/09/08
  */
 @XService
-public class BaseDieselGeneratorService extends BaseService {
+public class BaseDieselGeneratorService {
 
     @XText("新增")
     @XApiAnonymous
@@ -118,7 +119,7 @@ public class BaseDieselGeneratorService extends BaseService {
         String deviceName = input.getDeviceName();
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
-        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
+        List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, ouId);
         QueryWrapper<BaseDieselGeneratorEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_diesel w WHERE w.ou_id = {0} AND base_diesel_generator.id = w.diesel_id AND w.is_deleted = 1", input.getOuId())

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

@@ -10,6 +10,7 @@ import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BaseEnergyStorageDeviceMapper;
 import pps.core.base.mapper.BasePowerLineStorageMapper;
 import pps.core.base.service.data.base_energy_storage_device.*;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
@@ -38,7 +39,7 @@ import java.util.Objects;
  * @date 2023/09/08
  */
 @XService
-public class BaseEnergyStorageDeviceService extends BaseService {
+public class BaseEnergyStorageDeviceService {
 
     @XText("新增")
     @XApiAnonymous
@@ -118,7 +119,7 @@ public class BaseEnergyStorageDeviceService extends BaseService {
         String deviceName = input.getDeviceName();
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
-        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
+        List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, ouId);
         QueryWrapper<BaseEnergyStorageDeviceEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_storage w WHERE w.ou_id = {0} AND base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1", input.getOuId())

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

@@ -11,6 +11,7 @@ import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BasePhotovoltaicPlantMapper;
 import pps.core.base.mapper.BasePowerLinePlantMapper;
 import pps.core.base.service.data.base_photovoltaic_plant.*;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.constant.UserConstant;
 import pps.core.common.entity.BaseModel;
@@ -46,7 +47,7 @@ import java.util.Objects;
  * @date 2023/09/08
  */
 @XService
-public class BasePhotovoltaicPlantService extends BaseService {
+public class BasePhotovoltaicPlantService {
 
     @XText("新增")
     @XApiAnonymous
@@ -133,7 +134,7 @@ public class BasePhotovoltaicPlantService extends BaseService {
         String stationName = input.getStationName();
         String ouId = input.getOuId();
         String excludeIdFlag = input.getExcludeIdFlag();
-        List<String> allListByOuId = this.getAllListByOuId(context, ouId);
+        List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, ouId);
         QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .notExists("1".equals(excludeIdFlag), "SELECT 1 FROM base_power_line_plant w WHERE w.ou_id = {0} AND base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1", input.getOuId())

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

@@ -9,7 +9,10 @@ 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.*;
+import pps.cloud.system.service.data.GetOuListByOuIdsInput;
+import pps.cloud.system.service.data.GetOuListTreeOutput;
+import pps.cloud.system.service.data.GetSysOrganizationViewInput;
+import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
 import pps.core.base.entity.*;
 import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.*;
@@ -270,7 +273,7 @@ public class BasePowerLineService {
         BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class);
         BasePowerLineView lineView = XCopyUtils.copyNewObject(input, BasePowerLineView.class);
         PageMethod.startPage(input.getPage(), input.getLimit());
-        lineView.setOuList(this.getOrgIdsByPath(context, lineView.getOuId()));
+        lineView.setOuList(ServiceUtil.getOrgIdsByPath(context, lineView.getOuId()));
         List<BasePowerLineView> list = mapper.selectList(lineView);
         PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
         List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
@@ -399,24 +402,6 @@ public class BasePowerLineService {
                 .orElse(null);
     }
 
-    /**
-     * 获取所有path包含组织ID的组织
-     *
-     * @param context 上下文
-     * @param ouId    ou id
-     * @return {@link List}<{@link String}>
-     */
-    private List<String> getOrgIdsByPath(XContext context, String ouId) {
-        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
-        GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
-        ouIdInput.setOuId(ouId);
-        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
-        allListByOuId.throwIfFail();
-        return allListByOuId.getResult().stream()
-                .map(GetSysOrganizationViewOutput::getId)
-                .collect(Collectors.toList());
-    }
-
     /**
      * 通过组织机构ID集合获取详情列表
      *

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

-package pps.core.base.service;
-
-import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
-import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
-import xstartup.base.XContext;
-import xstartup.data.XListResult;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description
- * @Author luoxiangyang
- * @Date 2023/8/31 14:13
- **/
-public class BaseService {
-    /**
-     * 根据ouid获取所有子集的ouid
-     * @param context
-     * @param ouId
-     * @return
-     */
-    public  List<String> getAllListByOuId(XContext context,String ouId){
-        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
-        GetAllOuListByOuIdInput ouIdInput=new GetAllOuListByOuIdInput();
-        ouIdInput.setOuId(ouId);
-        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
-        allListByOuId.throwIfFail();
-        List<GetSysOrganizationViewOutput> listByOuIdResult = allListByOuId.getResult();
-        return listByOuIdResult.stream().map(GetSysOrganizationViewOutput::getId).collect(Collectors.toList());
-    }
-}

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

@@ -12,6 +12,7 @@ import pps.core.base.enums.BusinessError;
 import pps.core.base.mapper.BasePowerLineWellheadMapper;
 import pps.core.base.mapper.BaseWellheadMapper;
 import pps.core.base.service.data.base_wellhead.*;
+import pps.core.base.utils.ServiceUtil;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
@@ -41,7 +42,7 @@ import java.util.Objects;
  * @date 2023/09/08
  */
 @XService
-public class BaseWellheadService extends BaseService {
+public class BaseWellheadService {
 
     @XText("新增")
     @XApiAnonymous
@@ -122,7 +123,7 @@ public class BaseWellheadService extends BaseService {
         String excludeIdFlag = input.getExcludeIdFlag();
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         QueryWrapper<BaseWellheadEnt> queryWrapper = new QueryWrapper<>();
-        List<String> allListByOuId = this.getAllListByOuId(context, input.getOuId());
+        List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
         queryWrapper.lambda()
                 .notExists(StringUtils.equals("1", excludeIdFlag), "SELECT 1 FROM base_power_line_wellhead w WHERE w.ou_id = {0} AND base_wellhead.id = w.wellhead_id AND w.is_deleted = 1", input.getOuId())
                 .eq(BaseWellheadEnt::getIsDeleted, BusinessConstant.ONE)

C09-base/pps-core-base/src/main/java/pps/core/base/utils/ServiceUtil.java

 package pps.core.base.utils;
 
+import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
+import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
 import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
 import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -37,4 +41,22 @@ public class ServiceUtil {
         return dictPageResult.getResult().stream()
                 .collect(Collectors.toMap(QuerySysDictionaryViewOutput::getDicKey, QuerySysDictionaryViewOutput::getDicName));
     }
+
+    /**
+     * 获取所有path包含组织ID的组织
+     *
+     * @param context 上下文
+     * @param ouId    ou id
+     * @return {@link List}<{@link String}>
+     */
+    public static List<String> getOrgIdsByPath(XContext context, String ouId) {
+        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
+        GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
+        ouIdInput.setOuId(ouId);
+        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
+        allListByOuId.throwIfFail();
+        return allListByOuId.getResult().stream()
+                .map(GetSysOrganizationViewOutput::getId)
+                .collect(Collectors.toList());
+    }
 }
\ No newline at end of file