feat(吉林演示): 松原

1.修改实际功率数据获取定时任务,增加接入吉林实际功率数据逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -11,6 +11,8 @@ import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPl
 import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
+import pps.cloud.middle.service.IThirdActivePowerCloudService;
+import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput;
 import pps.cloud.prediction.service.IThirdDataAccessCloudService;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.prediction.constant.ThirdPartyApiConstant;
@@ -26,6 +28,8 @@ import pps.core.prediction.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XServiceResult;
 import xstartup.helper.XTransactionHelper;
 
@@ -56,19 +60,22 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         String oilFieldCode = ServiceUtil.getOilFieldCode(context);
         switch (oilFieldCode) {
             case BusinessConstant.ENV_SY:
-                outputs = new ArrayList<>();
                 //查数据表最新记录数据时间
                 ThirdActivePowerDailyUpdateMapper mapper = context.getBean(ThirdActivePowerDailyUpdateMapper.class);
                 ThirdActivePowerDailyUpdateEnt maxEnt = mapper.selectOne(new QueryWrapper<ThirdActivePowerDailyUpdateEnt>()
                         .select("MAX( create_date ) AS create_date")
                 );
-                if (ObjectUtil.isNull(maxEnt)) {
-
-                } else {
-
+                Date createDate = null;
+                if (ObjectUtil.isNotNull(maxEnt)) {
+                    createDate = maxEnt.getCreateDate();
                 }
                 //条件查询实际功率
-//                context.getBean(IThirdActivePowerCloudService)
+                IThirdActivePowerCloudService service = context.getBean(IThirdActivePowerCloudService.class);
+                XListResult<pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewOutput> result = service.getThirdActivePowerList(context, GetThirdActivePowerViewInput.builder()
+                        .createDate(createDate)
+                        .build());
+                result.throwIfFail();
+                outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdActivePowerViewOutput.class);
                 break;
             case BusinessConstant.ENV_CQ:
                 String resultStr = ServiceUtil.doPostFormCq(context,

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IThirdActivePowerCloudService.java

@@ -4,6 +4,7 @@ import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewI
 import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewOutput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
+import xstartup.base.XContext;
 import xstartup.data.XListResult;
 
 /**
@@ -19,9 +20,10 @@ public interface IThirdActivePowerCloudService {
     /**
      * 实际功率列表
      *
-     * @param input 输入
+     * @param context 上下文
+     * @param input   输入
      * @return {@link XListResult }<{@link GetThirdActivePowerViewOutput }>
      */
     @XText("实际功率列表")
-    XListResult<GetThirdActivePowerViewOutput> getThirdActivePowerList(GetThirdActivePowerViewInput input);
+    XListResult<GetThirdActivePowerViewOutput> getThirdActivePowerList(XContext context, GetThirdActivePowerViewInput input);
 }

C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_active_power/GetThirdActivePowerViewInput.java

 package pps.cloud.middle.service.data.third_active_power;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
@@ -13,6 +16,9 @@ import java.util.Date;
  * @date 2024/10/19
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class GetThirdActivePowerViewInput {
     @XText("ID")
     private Long id;

C13-middle/pps-core-middle/pom.xml

@@ -29,21 +29,11 @@
             <artifactId>pps-cloud-middle</artifactId>
             <version>${pps.version}</version>
         </dependency>
-        <dependency>
-            <groupId>gf</groupId>
-            <artifactId>pps-cloud-system</artifactId>
-            <version>${pps.version}</version>
-        </dependency>
         <dependency>
             <groupId>gf</groupId>
             <artifactId>pps-cloud-base</artifactId>
             <version>${pps.version}</version>
         </dependency>
-        <dependency>
-            <groupId>gf</groupId>
-            <artifactId>pps-cloud-prediction</artifactId>
-            <version>${pps.version}</version>
-        </dependency>
     </dependencies>
 
     <repositories>

C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdActivePowerMapper.java

@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 import pps.core.middle.entity.ThirdActivePowerEnt;
 
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
 @Repository(value = "pps.core.middle.mapper.ThirdActivePowerMapper")
 public interface ThirdActivePowerMapper extends BaseMapper<ThirdActivePowerEnt> {
 }

C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/ThirdActivePowerCloudServiceImpl.java

+package pps.core.middle.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import pps.cloud.middle.service.IThirdActivePowerCloudService;
+import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput;
+import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewOutput;
+import pps.core.middle.entity.ThirdActivePowerEnt;
+import pps.core.middle.mapper.ThirdActivePowerMapper;
+import xstartup.annotation.XService;
+import xstartup.base.XContext;
+import xstartup.base.util.XCopyUtils;
+import xstartup.data.XListResult;
+
+import java.util.List;
+
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19 15:36
+ */
+@XService
+public class ThirdActivePowerCloudServiceImpl implements IThirdActivePowerCloudService {
+
+    @Override
+    public XListResult<GetThirdActivePowerViewOutput> getThirdActivePowerList(XContext context, GetThirdActivePowerViewInput input) {
+        ThirdActivePowerMapper mapper = context.getBean(ThirdActivePowerMapper.class);
+        List<ThirdActivePowerEnt> list = mapper.selectList(new QueryWrapper<ThirdActivePowerEnt>()
+                .select("STATION_NAME", "SUM( PHOTOVOLTAIC_POWER ) AS PHOTOVOLTAIC_POWER", "CREATE_DATE")
+                .groupBy("STATION_NAME", "STATION_ID", "CREATE_DATE")
+                .eq(ObjectUtil.isNotNull(input.getCreateDate()), "CREATE_DATE", input.getCreateDate())
+        );
+        return XListResult.success(XCopyUtils.copyNewList(list, GetThirdActivePowerViewOutput.class));
+    }
+}