nocommit

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_wellhead/DynamicQueryBaseWellheadInput.java

@@ -25,4 +25,7 @@ public class DynamicQueryBaseWellheadInput {
 
     @XText("井口ID集合")
     private List<String> wellheadIds;
+
+    @XText("井号名称集合")
+    private List<String> wellNumbers;
 }

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

@@ -38,12 +38,14 @@ public class BaseWellheadCloudServiceImpl implements IBaseWellheadCloudService {
     public XListResult<DynamicQueryBaseWellheadOutput> queryBaseWellheadListByParam(XContext context, DynamicQueryBaseWellheadInput input) {
         String wellheadId = input.getWellheadId();
         List<String> wellheadIds = input.getWellheadIds();
+        List<String> wellNumbers = input.getWellNumbers();
         BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
         List<BaseWellheadEnt> list = mapper.selectList(
                 new LambdaQueryWrapper<BaseWellheadEnt>()
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                         .eq(StringUtils.isNotBlank(wellheadId), BaseModel::getId, wellheadId)
                         .in(CollUtil.isNotEmpty(wellheadIds), BaseModel::getId, wellheadIds)
+                        .in(CollUtil.isNotEmpty(wellNumbers), BaseWellheadEnt::getWellNumber, wellNumbers)
         );
         List<DynamicQueryBaseWellheadOutput> outputs;
         if (CollUtil.isEmpty(list)) {

C10-task/pps-core-task/src/main/java/pps/core/task/job/WellTechDailyJob.java

@@ -27,7 +27,7 @@ public class WellTechDailyJob implements XJob {
      * @param xContext x上下文
      * @return {@link XServiceResult}
      */
-    @XCronTrigger(value = TaskConstant.EVERY_DAY_ZERO)
+    @XCronTrigger(value = XCronTrigger.PRE_10S)
     @Override
     public XServiceResult execute(XContext xContext) {
         xContext.getLogger().info("------ WellTechDailyJob start:{}", System.currentTimeMillis());

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationEnt.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.io.Serializable;
@@ -18,6 +21,9 @@ import java.util.Date;
  * @date 2023/09/27
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @TableName("wellhead_daily_production_situation")
 public class WellheadDailyProductionSituationEnt implements Serializable {
     @XText("ID")

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/WellheadDailyProductionSituationView.java

 package pps.core.prediction.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 2023/09/27
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class WellheadDailyProductionSituationView implements Serializable {
     @XText("ID")
     @TableField

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/WellheadDailyProductionSituationViewMapper.java

 package pps.core.prediction.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import pps.core.prediction.entity.WellheadDailyProductionSituationView;
 
@@ -17,4 +18,12 @@ public interface WellheadDailyProductionSituationViewMapper {
     WellheadDailyProductionSituationView selectOne(WellheadDailyProductionSituationView record);
 
     List<WellheadDailyProductionSituationView> selectList(WellheadDailyProductionSituationView record);
+
+    /**
+     * 批量新增
+     *
+     * @param list 列表
+     * @return int
+     */
+    int batchInsertList(@Param(value = "list") List<WellheadDailyProductionSituationView> list);
 }

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/WellheadDailyProductionSituationViewMapper.xml

@@ -36,4 +36,20 @@
         where
         id=#{id}
     </select>
+
+    <insert id="batchInsertList" parameterType="list">
+        INSERT INTO wellhead_daily_production_situation ( wellhead_id, well_number, data_date, production_time,
+        daily_electricity_consumption, daily_liquid_production )
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.wellheadId},
+            #{item.wellNumber},
+            #{item.dataDate},
+            #{item.productionTime},
+            #{item.dailyElectricityConsumption},
+            #{item.dailyLiquidProduction}
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file