feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -14,6 +14,7 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutp
 import pps.cloud.middle.service.IThirdActivePowerCloudService;
 import pps.cloud.middle.service.IThirdCurrentWellConditionCloudService;
 import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput;
+import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionInput;
 import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionOutput;
 import pps.cloud.prediction.service.IThirdDataAccessCloudService;
 import pps.core.common.constant.BusinessConstant;
@@ -168,7 +169,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
         switch (oilFieldCode) {
             case BusinessConstant.ENV_SY:
                 IThirdCurrentWellConditionCloudService service = context.getBean(IThirdCurrentWellConditionCloudService.class);
-                XListResult<GetThirdCurrentWellConditionOutput> result = service.getCurrentWellConditionList(context, null);
+                XListResult<GetThirdCurrentWellConditionOutput> result = service.getCurrentWellConditionList(context, GetThirdCurrentWellConditionInput.builder().build());
                 result.throwIfFail();
                 outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdCurrentWellConditionViewOutput.class);
                 break;

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

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

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

 package pps.core.middle.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.middle.service.IThirdCurrentWellConditionCloudService;
 import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionInput;
 import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionOutput;
@@ -11,6 +12,7 @@ import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -25,7 +27,19 @@ public class ThirdCurrentWellConditionCloudServiceImpl implements IThirdCurrentW
     @Override
     public XListResult<GetThirdCurrentWellConditionOutput> getCurrentWellConditionList(XContext context, GetThirdCurrentWellConditionInput input) {
         ThirdCurrentWellConditionMapper mapper = context.getBean(ThirdCurrentWellConditionMapper.class);
-        List<ThirdCurrentWellConditionEnt> list = mapper.selectList(new LambdaQueryWrapper<>());
+        //查最新更新时间
+        ThirdCurrentWellConditionEnt maxEnt = mapper.selectOne(new QueryWrapper<ThirdCurrentWellConditionEnt>()
+                .select("MAX( UPDATE_TIME ) AS UPDATE_TIME")
+        );
+        if (ObjectUtil.isNull(maxEnt)) {
+            return XListResult.success(Collections.emptyList());
+        }
+
+        List<ThirdCurrentWellConditionEnt> list = mapper.selectList(new QueryWrapper<ThirdCurrentWellConditionEnt>()
+                .select("WELL_NUMBER", "NEXT_TIME", "CASE WHEN WELL_STATUS = '1' THEN '开井' ELSE '停井' END WELL_STATUS",
+                        "0 AS CUMULATIVE_PRODUCTION", "0 AS RUNNING_TIME")
+                .eq("UPDATE_TIME", maxEnt.getUpdateTime())
+        );
         return XListResult.success(XCopyUtils.copyNewList(list, GetThirdCurrentWellConditionOutput.class));
     }
 }