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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.core.common.constant.BusinessConstant;
@@ -26,6 +27,7 @@ import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
@@ -184,7 +186,7 @@ public class SpaceInstitutionDetailService {
                     .map(SpaceInstitutionWellheadEnt::getWellheadId)
                     .collect(Collectors.toList()));
         }
-        List<DynamicQueryBasePowerLineWellheadViewOutput> powerLineWellheadList = ServiceUtil.getPowerLineWellheadList(context, wellheadInput);
+        List<DynamicQueryBasePowerLineWellheadViewOutput> powerLineWellheadList = this.getPowerLineWellheadList(context, wellheadInput);
         if (CollUtil.isNotEmpty(powerLineWellheadList)) {
             powerLineWellheadList.forEach(wellhead -> {
                 SpaceInstitutionWellheadEnt ent = new SpaceInstitutionWellheadEnt();
@@ -370,6 +372,20 @@ public class SpaceInstitutionDetailService {
 
     /*-----------------------------------private-----------------------------------*/
 
+    /**
+     * 条件查询输电线路井口列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
+     */
+    private List<DynamicQueryBasePowerLineWellheadViewOutput> getPowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input) {
+        IBasePowerLineCloudService lineService = context.getBean(IBasePowerLineCloudService.class);
+        XListResult<DynamicQueryBasePowerLineWellheadViewOutput> result = lineService.getPowerLineWellheadList(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 保存策略关联信息
      *

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

@@ -10,12 +10,9 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
-import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
-import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
 import pps.cloud.system.service.SysOrganizationCloudService;
-import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.data.*;
 import pps.core.common.constant.BusinessConstant;
@@ -75,38 +72,6 @@ public class ServiceUtil {
                 .orElse(null);
     }
 
-    /**
-     * 获取区域Map
-     *
-     * @param context 上下文
-     * @return {@link Map}<{@link Integer}, {@link String}>
-     */
-    public static Map<Integer, String> getSysAreaMap(XContext context) {
-        SystemAreaService systemAreaService = context.getBean(SystemAreaService.class);
-        XListResult<GetSysAreaOutput> sysAreaList = systemAreaService.getSysAreaList(context, new GetSysAreaInput());
-        sysAreaList.throwIfFail();
-        return sysAreaList.getResult().stream()
-                .collect(Collectors.toMap(GetSysAreaOutput::getId, GetSysAreaOutput::getName));
-    }
-
-    /**
-     * 获取所有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());
-    }
-
     /**
      * 通过组织机构ID集合获取组织名称
      *
@@ -163,20 +128,6 @@ public class ServiceUtil {
                 );
     }
 
-    /**
-     * 条件查询输电线路井口列表
-     *
-     * @param context 上下文
-     * @param input   输入
-     * @return {@link List}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
-     */
-    public static List<DynamicQueryBasePowerLineWellheadViewOutput> getPowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input) {
-        IBasePowerLineCloudService lineService = context.getBean(IBasePowerLineCloudService.class);
-        XListResult<DynamicQueryBasePowerLineWellheadViewOutput> result = lineService.getPowerLineWellheadList(context, input);
-        result.throwIfFail();
-        return result.getResult();
-    }
-
     /**
      * 条件查询策略配置详情列表
      *