feat(吉林演示): 松原

1.修改实际功率数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
2.修改实际井口状态数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
3.修改天气数据接收处理定时任务功能,在光伏数据处理完成插入后,添加预测功能远程调用逻辑,完成功能验证;
4.开发光伏预测结果集训练定时任务,完成定时任务配置及功能验证;
5.修改井场日累计数据数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/ThirdActivePowerEnt.java

@@ -18,7 +18,7 @@ import java.util.Date;
  * @date 2024/10/18
  */
 @Data
-@TableName("third_active_power")
+@TableName("THIRD_ACTIVE_POWER")
 public class ThirdActivePowerEnt implements Serializable {
     @XText("ID")
     @TableId(type = IdType.AUTO)

C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/ThirdActivePowerView.java

 package pps.core.middle.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
@@ -15,6 +18,9 @@ import java.util.Date;
  * @date 2024/10/18
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class ThirdActivePowerView implements Serializable {
     @XText("ID")
     @TableField

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

@@ -5,9 +5,17 @@ import pps.core.middle.entity.ThirdActivePowerView;
 
 import java.util.List;
 
+/**
+ * 实际功率
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
 @Repository(value = "pps.core.middle.mapper.ThirdActivePowerViewMapper")
 public interface ThirdActivePowerViewMapper {
     ThirdActivePowerView selectOne(ThirdActivePowerView record);
 
     List<ThirdActivePowerView> selectList(ThirdActivePowerView record);
+
+    List<ThirdActivePowerView> selectThirdActivePowerList(ThirdActivePowerView record);
 }

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

@@ -5,6 +5,12 @@ import pps.core.middle.entity.ThirdDailyAccumulationView;
 
 import java.util.List;
 
+/**
+ * 日累积数据
+ *
+ * @author ZWT
+ * @date 2024/10/19
+ */
 @Repository(value = "pps.core.middle.mapper.ThirdDailyAccumulationViewMapper")
 public interface ThirdDailyAccumulationViewMapper {
     ThirdDailyAccumulationView selectOne(ThirdDailyAccumulationView record);

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 pps.core.middle.entity.ThirdActivePowerView;
+import pps.core.middle.mapper.ThirdActivePowerViewMapper;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
@@ -25,12 +23,10 @@ public class ThirdActivePowerCloudServiceImpl implements IThirdActivePowerCloudS
 
     @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())
-        );
+        ThirdActivePowerViewMapper mapper = context.getBean(ThirdActivePowerViewMapper.class);
+        List<ThirdActivePowerView> list = mapper.selectThirdActivePowerList(ThirdActivePowerView.builder()
+                .createDate(input.getCreateDate())
+                .build());
         return XListResult.success(XCopyUtils.copyNewList(list, GetThirdActivePowerViewOutput.class));
     }
 }

C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdActivePowerViewMapper.xml

@@ -40,4 +40,19 @@
         where
         id=#{id}
     </select>
+
+    <select id="selectThirdActivePowerList" parameterType="pps.core.middle.entity.ThirdActivePowerView" resultMap="BaseResultMap">
+        SELECT T.STATION_NAME,
+        SUM(T.PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER,
+        T.CREATE_DATE
+        FROM STATION_MAPPING S
+        LEFT JOIN THIRD_ACTIVE_POWER T ON S.SYSTEM_STATION_NAME = T.STATION_NAME
+        WHERE T.STATION_NAME IS NOT NULL
+        <if test="createDate != null">
+            AND T.CREATE_DATE > #{createDate}
+        </if>
+        GROUP BY T.STATION_NAME,
+        T.STATION_ID,
+        T.CREATE_DATE
+    </select>
 </mapper>
\ No newline at end of file