feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;
9.开发当日已优化间开结果列表查询接口,生成对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationService.java

@@ -42,7 +42,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
@@ -464,7 +463,6 @@ public class SysOrganizationService {
      * @param input   输入
      * @return {@link XListResult}<{@link DynamicQuerySysOrganizationOutput}>
      */
-    @XApiAnonymous
     @XText("组织机构管理--查询组织和线路列表")
     @XApiGet
     public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) {

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

@@ -24,7 +24,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
@@ -53,7 +52,6 @@ public class BaseDieselGeneratorService {
      * @return {@link XServiceResult}
      */
     @XText("柴发设备模块--新增")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseDieselGenerator(XContext context, CreateBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
@@ -79,7 +77,6 @@ public class BaseDieselGeneratorService {
      * @return {@link XServiceResult}
      */
     @XText("柴发设备模块--修改")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseDieselGenerator(XContext context, UpdateBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
@@ -109,7 +106,6 @@ public class BaseDieselGeneratorService {
      * @return {@link XServiceResult}
      */
     @XText("柴发设备模块--删除")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseDieselGenerator(XContext context, DeleteBaseDieselGeneratorInput input) {
         String dieselId = input.getId();
@@ -141,7 +137,6 @@ public class BaseDieselGeneratorService {
      * @return {@link XSingleResult}<{@link GetBaseDieselGeneratorOutput}>
      */
     @XText("柴发设备模块--详情")
-    @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseDieselGeneratorOutput> getBaseDieselGenerator(XContext context, GetBaseDieselGeneratorInput input) {
         BaseDieselGeneratorMapper mapper = context.getBean(BaseDieselGeneratorMapper.class);
@@ -164,7 +159,6 @@ public class BaseDieselGeneratorService {
      * @return {@link XPageResult}<{@link QueryBaseDieselGeneratorOutput}>
      */
     @XText("柴发设备模块--分页查询")
-    @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseDieselGeneratorOutput> queryBaseDieselGenerator(XContext context, QueryBaseDieselGeneratorInput input) {
         String ouName = input.getOuName();

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

@@ -24,7 +24,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
@@ -53,7 +52,6 @@ public class BaseEnergyStorageDeviceService {
      * @return {@link XServiceResult}
      */
     @XText("储能设备模块--新增")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseEnergyStorageDevice(XContext context, CreateBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
@@ -79,7 +77,6 @@ public class BaseEnergyStorageDeviceService {
      * @return {@link XServiceResult}
      */
     @XText("储能设备模块--修改")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseEnergyStorageDevice(XContext context, UpdateBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
@@ -109,7 +106,6 @@ public class BaseEnergyStorageDeviceService {
      * @return {@link XServiceResult}
      */
     @XText("储能设备模块--删除")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseEnergyStorageDevice(XContext context, DeleteBaseEnergyStorageDeviceInput input) {
         String storageId = input.getId();
@@ -141,7 +137,6 @@ public class BaseEnergyStorageDeviceService {
      * @return {@link XSingleResult}<{@link GetBaseEnergyStorageDeviceOutput}>
      */
     @XText("储能设备模块--详情")
-    @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseEnergyStorageDeviceOutput> getBaseEnergyStorageDevice(XContext context, GetBaseEnergyStorageDeviceInput input) {
         BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
@@ -164,7 +159,6 @@ public class BaseEnergyStorageDeviceService {
      * @return {@link XPageResult}<{@link QueryBaseEnergyStorageDeviceOutput}>
      */
     @XText("储能设备模块--分页查询")
-    @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseEnergyStorageDeviceOutput> queryBaseEnergyStorageDevice(XContext context, QueryBaseEnergyStorageDeviceInput input) {
         String ouName = input.getOuName();

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

@@ -38,14 +38,16 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
 import xstartup.helper.XTransactionHelper;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 
 /**
@@ -68,7 +70,6 @@ public class BasePhotovoltaicPlantService {
      * @return {@link XServiceResult}
      */
     @XText("光伏电站模块--新增")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult createBasePhotovoltaicPlant(XContext context, CreateBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
@@ -94,7 +95,6 @@ public class BasePhotovoltaicPlantService {
      * @return {@link XServiceResult}
      */
     @XText("光伏电站模块--修改")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult updateBasePhotovoltaicPlant(XContext context, UpdateBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
@@ -124,7 +124,6 @@ public class BasePhotovoltaicPlantService {
      * @return {@link XServiceResult}
      */
     @XText("光伏电站模块--删除")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBasePhotovoltaicPlant(XContext context, DeleteBasePhotovoltaicPlantInput input) {
         String plantId = input.getId();
@@ -156,7 +155,6 @@ public class BasePhotovoltaicPlantService {
      * @return {@link XSingleResult}<{@link GetBasePhotovoltaicPlantOutput}>
      */
     @XText("光伏电站模块--详情")
-    @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBasePhotovoltaicPlantOutput> getBasePhotovoltaicPlant(XContext context, GetBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
@@ -179,12 +177,12 @@ public class BasePhotovoltaicPlantService {
                 .map(GetSysAreaOutput::getName)
                 .orElse(null));
         //20240321 从电站辐照度模拟表中获取精准率
-        if(XStringUtils.isNotEmpty(input.getType())){
+        if (XStringUtils.isNotEmpty(input.getType())) {
             PlantTrainPowerTaskCloudService cloudService = context.getBean(PlantTrainPowerTaskCloudService.class);
             GetPlantTrainPowerTaskCloudInput cloudInput = new GetPlantTrainPowerTaskCloudInput();
             cloudInput.setPlantId(input.getId());
-            switch (input.getType()){
-                case "1" :
+            switch (input.getType()) {
+                case "1":
                     cloudInput.setModelCycle(240);
                     break;
                 case "2":
@@ -194,11 +192,11 @@ public class BasePhotovoltaicPlantService {
                     cloudInput.setModelCycle(4);
                     break;
             }
-            XSingleResult<GetPlantTrainPowerTaskCloudOutput> result = cloudService.getPlantTrainPowerTaskData(context , cloudInput);
-            if(result.isSuccess() && result.getResult() != null && XStringUtils.isNotEmpty(result.getResult().getMetricsScore())){
-                Map<String , Object> map = XJsonUtils.toMap(result.getResult().getMetricsScore());
-                if(map.containsKey("MAPE") && XStringUtils.isNotEmpty(map.get("MAPE").toString())){
-                    output.setMape(new BigDecimal(map.get("MAPE").toString()).setScale(2 , BigDecimal.ROUND_UP).toPlainString() +"%");
+            XSingleResult<GetPlantTrainPowerTaskCloudOutput> result = cloudService.getPlantTrainPowerTaskData(context, cloudInput);
+            if (result.isSuccess() && result.getResult() != null && XStringUtils.isNotEmpty(result.getResult().getMetricsScore())) {
+                Map<String, Object> map = XJsonUtils.toMap(result.getResult().getMetricsScore());
+                if (map.containsKey("MAPE") && XStringUtils.isNotEmpty(map.get("MAPE").toString())) {
+                    output.setMape(new BigDecimal(map.get("MAPE").toString()).setScale(2, BigDecimal.ROUND_UP).toPlainString() + "%");
                 }
             }
         }
@@ -216,7 +214,6 @@ public class BasePhotovoltaicPlantService {
      * @return {@link XPageResult}<{@link QueryBasePhotovoltaicPlantOutput}>
      */
     @XText("光伏电站模块--分页查询")
-    @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBasePhotovoltaicPlantOutput> queryBasePhotovoltaicPlant(XContext context, QueryBasePhotovoltaicPlantInput input) {
         BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);

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

@@ -37,7 +37,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
@@ -62,7 +61,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("输电线路配置--新增")
     public XServiceResult createBasePowerLine(XContext context, CreateBasePowerLineInput input) {
@@ -88,7 +86,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("输电线路配置--修改")
     public XServiceResult updateBasePowerLine(XContext context, UpdateBasePowerLineInput input) {
@@ -138,7 +135,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("输电线路配置--删除")
     public XServiceResult deleteBasePowerLine(XContext context, DeleteBasePowerLineInput input) {
@@ -192,7 +188,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetBasePowerLineViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("输电线路配置--详情")
     public XSingleResult<GetBasePowerLineViewOutput> getBasePowerLineView(XContext context, GetBasePowerLineInput input) {
@@ -264,7 +259,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryBasePowerLineViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("输电线路配置--分页列表")
     public XPageResult<QueryBasePowerLineViewOutput> queryBasePowerLineView(XContext context, QueryBasePowerLineViewInput input) {
@@ -307,7 +301,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XListResult}<{@link DynamicQueryBasePowerLineOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("输电线路配置--列表")
     public XListResult<DynamicQueryBasePowerLineOutput> queryBasePowerLineList(XContext context, DynamicQueryBasePowerLineInput input) {
@@ -342,7 +335,6 @@ public class BasePowerLineService {
      * @param input   输入
      * @return {@link XListResult}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("输电线路配置--井口列表")
     public XListResult<DynamicQueryBasePowerLineWellheadViewOutput> queryBasePowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input) {

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

@@ -32,7 +32,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
@@ -60,7 +59,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("市电峰谷策略--新增")
     public XServiceResult createBasePriceStrategy(XContext context, CreateBasePriceStrategyInput input) {
@@ -87,7 +85,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("市电峰谷策略--修改")
     public XServiceResult updateBasePriceStrategy(XContext context, UpdateBasePriceStrategyInput input) {
@@ -137,7 +134,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("市电峰谷策略--删除")
     public XServiceResult deleteBasePriceStrategy(XContext context, DeleteBasePriceStrategyInput input) {
@@ -180,7 +176,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetBasePriceStrategyOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("市电峰谷策略--详情")
     public XSingleResult<GetBasePriceStrategyOutput> getBasePriceStrategy(XContext context, GetBasePriceStrategyInput input) {
@@ -253,7 +248,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryBasePriceStrategyViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("市电峰谷策略--分页列表")
     public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) {
@@ -281,7 +275,6 @@ public class BasePriceStrategyService {
      * @param input   输入
      * @return {@link XListResult}<{@link DynamicQueryBasePriceStrategyOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("市电峰谷策略--列表")
     public XListResult<DynamicQueryBasePriceStrategyOutput> queryBasePriceStrategyList(XContext context, DynamicQueryBasePriceStrategyInput input) {

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

@@ -25,7 +25,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.feature.mybatis.helper.XMapperHelper;
@@ -55,7 +54,6 @@ public class BaseWellheadService {
      * @return {@link XServiceResult}
      */
     @XText("井口配置模块--新增")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult createBaseWellhead(XContext context, CreateBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
@@ -81,7 +79,6 @@ public class BaseWellheadService {
      * @return {@link XServiceResult}
      */
     @XText("井口配置模块--修改")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult updateBaseWellhead(XContext context, UpdateBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
@@ -111,7 +108,6 @@ public class BaseWellheadService {
      * @return {@link XServiceResult}
      */
     @XText("井口配置模块--删除")
-    @XApiAnonymous
     @XApiPost
     public XServiceResult deleteBaseWellhead(XContext context, DeleteBaseWellheadInput input) {
         String wellheadId = input.getId();
@@ -146,7 +142,6 @@ public class BaseWellheadService {
      * @return {@link XSingleResult}<{@link GetBaseWellheadOutput}>
      */
     @XText("井口配置模块--详情")
-    @XApiAnonymous
     @XApiGet
     public XSingleResult<GetBaseWellheadOutput> getBaseWellhead(XContext context, GetBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
@@ -169,7 +164,6 @@ public class BaseWellheadService {
      * @return {@link XPageResult}<{@link QueryBaseWellheadOutput}>
      */
     @XText("井口配置模块--分页查询")
-    @XApiAnonymous
     @XApiGet
     public XPageResult<QueryBaseWellheadOutput> queryBaseWellhead(XContext context, QueryBaseWellheadInput input) {
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);

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

@@ -34,7 +34,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
@@ -59,7 +58,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("校准周期--新增")
     public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
@@ -108,7 +106,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("校准周期--修改")
     public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
@@ -136,7 +133,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceCalibrationPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("校准周期--详情")
     public XSingleResult<GetSpaceCalibrationPeriodViewOutput> getSpaceCalibrationPeriodView(XContext context, GetSpaceCalibrationPeriodViewInput input) {
@@ -164,7 +160,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceCalibrationHistoryViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("校准历史--分页列表")
     public XPageResult<QuerySpaceCalibrationHistoryViewOutput> querySpaceCalibrationHistoryView(XContext context, QuerySpaceCalibrationHistoryViewInput input) {
@@ -198,7 +193,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link QuerySpaceCalibrationHistoryOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("校准周期--获取线路及井口树")
     public XSingleResult<QuerySpaceCalibrationHistoryOutput> querySpaceCalibrationLineView(XContext context, QuerySpaceCalibrationHistoryInput input) {
@@ -229,7 +223,6 @@ public class SpaceCalibrationService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceInstitutionWellheadOutput}>
      */
-    @XApiAnonymous
     @XApiPost
     @XText("校准周期--间开制度跟踪")
     public XSingleResult<GetSpaceInstitutionWellheadOutput> getSpaceInstitutionTrack(XContext context, GetSpaceInstitutionWellheadInput input) {

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

@@ -37,7 +37,6 @@ import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 import xstartup.helper.XTransactionHelper;
@@ -62,7 +61,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("基础间开配置--新增")
     public XServiceResult createSpaceInstitutionDetail(XContext context, CreateSpaceInstitutionDetailInput input) {
@@ -89,7 +87,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("基础间开配置--修改")
     public XServiceResult updateSpaceInstitutionDetail(XContext context, UpdateSpaceInstitutionDetailInput input) {
@@ -117,7 +114,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("基础间开配置--删除")
     public XServiceResult deleteSpaceInstitutionDetail(XContext context, DeleteSpaceInstitutionDetailInput input) {
@@ -167,7 +163,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceInstitutionDetailViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("基础间开配置--详情")
     public XSingleResult<GetSpaceInstitutionDetailViewOutput> getSpaceInstitutionDetailView(XContext context, GetSpaceInstitutionDetailViewInput input) {
@@ -235,7 +230,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceInstitutionDetailViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("基础间开配置--分页列表")
     public XPageResult<QuerySpaceInstitutionDetailViewOutput> querySpaceInstitutionDetailView(XContext context, QuerySpaceInstitutionDetailViewInput input) {
@@ -251,8 +245,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         );
         PageInfo<SpaceInstitutionDetailEnt> pageInfo = new PageInfo<>(detailEntList);
         List<QuerySpaceInstitutionDetailViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceInstitutionDetailViewOutput.class);
-
-
         if (CollUtil.isNotEmpty(outputs)) {
             List<String> ouIds = new ArrayList<>(outputs.size());
             List<String> lineIds = new ArrayList<>(outputs.size());
@@ -280,7 +272,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("基础间开配置--设为基础制度")
     public XServiceResult updateBasicInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
@@ -331,7 +322,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XServiceResult}
      */
-    @XApiAnonymous
     @XApiPost
     @XText("校准历史--重新优化")
     public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
@@ -371,7 +361,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryOptimizeHistoryViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("间开优化历史--分页列表")
     public XPageResult<QueryOptimizeHistoryViewOutput> queryOptimizeHistoryView(XContext context, QueryOptimizeHistoryViewInput input) {

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

@@ -26,7 +26,6 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.util.*;
@@ -49,7 +48,6 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceOptimizeLongPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("中期间开优化--分页列表")
     public XPageResult<QuerySpaceOptimizeLongPeriodViewOutput> querySpaceOptimizeLongPeriodView(XContext context, QuerySpaceOptimizeLongPeriodViewInput input) {
@@ -84,7 +82,6 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceOptimizeLongPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("中期间开优化--详情")
     public XSingleResult<GetSpaceOptimizeLongPeriodViewOutput> getSpaceOptimizeLongPeriodView(XContext context, GetSpaceOptimizeLongPeriodViewInput input) {

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

@@ -27,7 +27,6 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.util.*;
@@ -50,7 +49,6 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceOptimizeMidPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("短期间开开优化--分页列表")
     public XPageResult<QuerySpaceOptimizeMidPeriodViewOutput> querySpaceOptimizeMidPeriodView(XContext context, QuerySpaceOptimizeMidPeriodViewInput input) {
@@ -85,7 +83,6 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceOptimizeMidPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("短期间开开优化--详情")
     public XSingleResult<GetSpaceOptimizeMidPeriodViewOutput> getSpaceOptimizeMidPeriodView(XContext context, GetSpaceOptimizeMidPeriodViewInput input) {

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

@@ -32,7 +32,6 @@ import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.util.*;
@@ -55,7 +54,6 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceOptimizeShortPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("极短期间开开优化--分页列表")
     public XPageResult<QuerySpaceOptimizeShortPeriodViewOutput> querySpaceOptimizeShortPeriodView(XContext context, QuerySpaceOptimizeShortPeriodViewInput input) {
@@ -90,7 +88,6 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceOptimizeShortPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("极短期间开开优化--详情")
     public XSingleResult<GetSpaceOptimizeShortPeriodViewOutput> getSpaceOptimizeShortPeriodView(XContext context, GetSpaceOptimizeShortPeriodViewInput input) {
@@ -197,7 +194,6 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XListResult}<{@link GetSpaceOptimizeShortWellheadOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("极短期间开开优化--获取当日井口优化列表")
     public XListResult<GetSpaceOptimizeShortWellheadOutput> getOptimizeList(XContext context, GetSpaceOptimizeShortWellheadInput input) {

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

@@ -26,7 +26,6 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.error.XError;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.util.*;
@@ -49,7 +48,6 @@ public class SpaceOptimizeUltraPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QuerySpaceOptimizeUltraPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("长期间开优化--分页列表")
     public XPageResult<QuerySpaceOptimizeUltraPeriodViewOutput> querySpaceOptimizeUltraPeriodView(XContext context, QuerySpaceOptimizeUltraPeriodViewInput input) {
@@ -84,7 +82,6 @@ public class SpaceOptimizeUltraPeriodService extends SpaceOptimizeBaseService {
      * @param input   输入
      * @return {@link XSingleResult}<{@link GetSpaceOptimizeUltraPeriodViewOutput}>
      */
-    @XApiAnonymous
     @XApiGet
     @XText("长期间开优化--详情")
     public XSingleResult<GetSpaceOptimizeUltraPeriodViewOutput> getSpaceOptimizeUltraPeriodView(XContext context, GetSpaceOptimizeUltraPeriodViewInput input) {

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

@@ -24,7 +24,6 @@ import xstartup.base.exception.XServiceException;
 import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.math.BigDecimal;
@@ -50,7 +49,6 @@ public class EnergyConsumptionAnalysisService {
      * @return {@link XSingleResult}<{@link GetEnergyConsumptionAnalysisViewOutput}>
      */
     @XText("能耗分析--能耗概览")
-    @XApiAnonymous
     @XApiGet
     public XSingleResult<GetEnergyConsumptionAnalysisViewOutput> getEnergyConsumptionAnalysisView(XContext context, QueryEnergyConsumptionAnalysisInput input) {
         GetEnergyConsumptionAnalysisViewOutput output = new GetEnergyConsumptionAnalysisViewOutput();
@@ -87,7 +85,6 @@ public class EnergyConsumptionAnalysisService {
      * @return {@link XListResult}<{@link DynamicQueryEnergyConsumptionAnalysisViewOutput}>
      */
     @XText("能耗分析--绿电消纳/用电趋势")
-    @XApiAnonymous
     @XApiGet
     public XListResult<DynamicQueryEnergyConsumptionAnalysisViewOutput> queryEnergyConsumptionAnalysisList(XContext context, QueryEnergyConsumptionAnalysisInput input) {
         List<DynamicQueryEnergyConsumptionAnalysisViewOutput> list = new ArrayList<>(16);
@@ -131,7 +128,6 @@ public class EnergyConsumptionAnalysisService {
      * @return {@link XPageResult}<{@link QueryEnergyConsumptionAnalysisViewOutput}>
      */
     @XText("能耗分析--用电详情")
-    @XApiAnonymous
     @XApiGet
     public XPageResult<QueryEnergyConsumptionAnalysisViewOutput> queryEnergyConsumptionAnalysisView(XContext context, QueryEnergyConsumptionAnalysisPageInput input) {
         List<QueryEnergyConsumptionAnalysisViewOutput> outputs = new ArrayList<>(input.getLimit());

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

@@ -16,7 +16,6 @@ import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.math.BigDecimal;
@@ -44,7 +43,6 @@ public class EnergyConsumptionCurveService extends StatisticAnalysisBaseService
      * @return {@link XListResult}<{@link GetEnergyConsumptionCurveOutput}>
      */
     @XText("用能曲线--发电列表")
-    @XApiAnonymous
     @XApiGet
     public XListResult<GetEnergyConsumptionCurveOutput> queryEnergyConsumptionCurveList(XContext context, GetEnergyConsumptionCurveInput input) {
         //通过线路ID查光伏电站

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

@@ -21,7 +21,6 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.base.util.XHttpUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiPost;
 
 import java.util.List;
@@ -46,7 +45,6 @@ public class ThirdActivePowerService {
      * @param input   输入
      * @return {@link XListResult}<{@link GetThirdActivePowerOutput}>
      */
-    @XApiAnonymous
     @XText("有功功率--用能曲线")
     @XApiPost
     public XListResult<GetThirdActivePowerOutput> getActivePowerList(XContext context, GetThirdActivePowerDailyUpdateInput input) {
@@ -64,7 +62,6 @@ public class ThirdActivePowerService {
      * @param context 上下文
      * @return {@link XSingleResult}<{@link GetThirdSanDieLoginInfoOutput}>
      */
-    @XApiAnonymous
     @XText("第三方--获取三叠登录信息")
     @XApiPost
     public XSingleResult<GetThirdSanDieLoginInfoOutput> getThirdSanDieLoginInfo(XContext context) {

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

@@ -14,7 +14,6 @@ import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiPost;
 
 import java.util.ArrayList;
@@ -41,7 +40,6 @@ public class ThirdCurrentWellConditionService {
      * @param input   输入
      * @return {@link XListResult}<{@link QueryThirdCurrentWellConditionOutput}>
      */
-    @XApiAnonymous
     @XText("井口生产情况--油井状态")
     @XApiPost
     public XListResult<QueryThirdCurrentWellConditionOutput> queryWellRealPvData(XContext context, QueryThirdCurrentWellConditionInput input) {

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

@@ -23,7 +23,6 @@ import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
-import xstartup.feature.api.annotation.XApiAnonymous;
 import xstartup.feature.api.annotation.XApiPost;
 
 import java.math.BigDecimal;
@@ -52,7 +51,6 @@ public class ThirdPhotovoltaicPowerService {
      * @return {@link XSingleResult}<{@link GetThirdPhotovoltaicPowerOutput}>
      */
     @XText("能耗分析--能耗概览")
-    @XApiAnonymous
     @XApiPost
     public XSingleResult<GetThirdPhotovoltaicPowerOutput> getPhotovoltaicPowerOverview(XContext context, GetThirdPhotovoltaicPowerInput input) {
         GetThirdPhotovoltaicPowerOutput output = new GetThirdPhotovoltaicPowerOutput();

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

@@ -52,7 +52,6 @@ public class WellheadDailyProductionSituationService {
      * @param input   输入
      * @return {@link XPageResult}<{@link QueryWellheadDailyProductionSituationOutput}>
      */
-    @XApiAnonymous
     @XText("井口生产情况--分页列表")
     @XApiPost
     public XPageResult<QueryWellheadDailyProductionSituationOutput> queryWellheadDailyProductionSituationView(XContext context, QueryWellheadDailyProductionSituationInput input) {
@@ -84,7 +83,6 @@ public class WellheadDailyProductionSituationService {
      * @param input   输入
      * @return {@link XListResult}<{@link GetWellheadDailyProductionSituationOutput}>
      */
-    @XApiAnonymous
     @XText("井口生产情况--甘特图")
     @XApiPost
     public XListResult<GetWellheadDailyProductionSituationOutput> queryRptSystemStartStop(XContext context, GetWellheadDailyProductionSituationInput input) {
@@ -109,65 +107,65 @@ public class WellheadDailyProductionSituationService {
     @XText("井口生产情况--test")
     @XApiGet
     public XServiceResult test(XContext context) {
-//        context.getLogger().info("---------------------------cqToken---------------------------");
-//        String cqToken = "";
-//        String api;
-//        try {
-//            cqToken = ServiceUtil.getToken(context);
-//            context.getLogger().info("cqToken: " + cqToken);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        String url = XStartup.getCurrent().getProperty("third-party.chang-qing.url");
-//        Map<String, String> header = new HashMap<>(4);
-//        header.put("token", cqToken);
-//        context.getLogger().info("---------------------------CQ_WELL_TECH_DAILY---------------------------");
-//        HttpRequestClient client = new HttpRequestClient(cqToken);
-//        try {
-//            api = url + ThirdPartyApiConstant.CQ_WELL_TECH_DAILY;
-//            Map<String, Object> param = new HashMap<>(4);
-//            param.put("Calc_Date", "2024-03-18");
-//            String s = client.doPostForm(api, param);
-//            context.getLogger().info("CQ_WELL_TECH_DAILY: " + s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        context.getLogger().info("---------------------------CQ_WELL_STATION_PV_DATA---------------------------");
-//        try {
-//            api = url + ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA;
-//            String s = client.doPostForm(api, new HashMap<>(4));
-//            context.getLogger().info("CQ_WELL_STATION_PV_DATA: " + s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        context.getLogger().info("---------------------------CQ_RPT_SYSTEM_START_STOP---------------------------");
-//        try {
-//            api = url + ThirdPartyApiConstant.CQ_RPT_SYSTEM_START_STOP;
-//            Map<String, Object> param = new HashMap<>(4);
-//            param.put("WELL_NAME", "王101-23");
-//            String s = client.doPostForm(api, param);
-//            context.getLogger().info("CQ_RPT_SYSTEM_START_STOP: " + s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        context.getLogger().info("---------------------------CQ_WELL_REAL_PV_DATA---------------------------");
-//        try {
-//            api = url + ThirdPartyApiConstant.CQ_WELL_REAL_PV_DATA;
-//            String s = client.doPostForm(api, new HashMap<>(4));
-//            context.getLogger().info("CQ_WELL_REAL_PV_DATA: " + s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        context.getLogger().info("---------------------------CQ_STATION_DAILY_PV_DATA---------------------------");
-//        try {
-//            api = url + ThirdPartyApiConstant.CQ_STATION_DAILY_PV_DATA;
-//            Map<String, Object> param = new HashMap<>(4);
-//            param.put("Calc_Date", "2024-03-18");
-//            String s = client.doPostForm(api, param);
-//            context.getLogger().info("CQ_STATION_DAILY_PV_DATA: " + s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        context.getLogger().info("---------------------------cqToken---------------------------");
+        String cqToken = "";
+        String api;
+        try {
+            cqToken = ServiceUtil.getToken(context);
+            context.getLogger().info("cqToken: " + cqToken);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        String url = XStartup.getCurrent().getProperty("third-party.chang-qing.url");
+        Map<String, String> header = new HashMap<>(4);
+        header.put("token", cqToken);
+        context.getLogger().info("---------------------------CQ_WELL_TECH_DAILY---------------------------");
+        HttpRequestClient client = new HttpRequestClient(cqToken);
+        try {
+            api = url + ThirdPartyApiConstant.CQ_WELL_TECH_DAILY;
+            Map<String, Object> param = new HashMap<>(4);
+            param.put("Calc_Date", "2024-03-18");
+            String s = client.doPostForm(api, param);
+            context.getLogger().info("CQ_WELL_TECH_DAILY: " + s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        context.getLogger().info("---------------------------CQ_WELL_STATION_PV_DATA---------------------------");
+        try {
+            api = url + ThirdPartyApiConstant.CQ_WELL_STATION_PV_DATA;
+            String s = client.doPostForm(api, new HashMap<>(4));
+            context.getLogger().info("CQ_WELL_STATION_PV_DATA: " + s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        context.getLogger().info("---------------------------CQ_RPT_SYSTEM_START_STOP---------------------------");
+        try {
+            api = url + ThirdPartyApiConstant.CQ_RPT_SYSTEM_START_STOP;
+            Map<String, Object> param = new HashMap<>(4);
+            param.put("WELL_NAME", "王101-23");
+            String s = client.doPostForm(api, param);
+            context.getLogger().info("CQ_RPT_SYSTEM_START_STOP: " + s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        context.getLogger().info("---------------------------CQ_WELL_REAL_PV_DATA---------------------------");
+        try {
+            api = url + ThirdPartyApiConstant.CQ_WELL_REAL_PV_DATA;
+            String s = client.doPostForm(api, new HashMap<>(4));
+            context.getLogger().info("CQ_WELL_REAL_PV_DATA: " + s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        context.getLogger().info("---------------------------CQ_STATION_DAILY_PV_DATA---------------------------");
+        try {
+            api = url + ThirdPartyApiConstant.CQ_STATION_DAILY_PV_DATA;
+            Map<String, Object> param = new HashMap<>(4);
+            param.put("Calc_Date", "2024-03-18");
+            String s = client.doPostForm(api, param);
+            context.getLogger().info("CQ_STATION_DAILY_PV_DATA: " + s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         context.getLogger().info("---------------------------JI_CHENG_TOKEN---------------------------");
         try {
             String t = "http://10.59.249.10:8183/admin-api/system/auth/login";