中能融合最新代码，新增FD0004

ipp-client/src/main/java/com/jiayue/ipfcst/client/Schedule/ParsingJob.java

@@ -8,37 +8,48 @@ import com.jiayue.ipp.common.data.entity.an.ParsingChannel;
 import com.jiayue.ipp.common.data.enums.an.AnChannelType;
 import com.jiayue.ipp.common.data.enums.an.UseStatusEnum;
 import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-@Service
-@AllArgsConstructor
+@Component
+@Configuration
+@EnableScheduling
+@Slf4j
+@EnableAsync
 public class ParsingJob {
 
-    @Autowired
-    private final ParsingChannelService parsingChannelService;
-    @Autowired
-    private final DownloadService downloadService;
+    private  final ParsingChannelService parsingChannelService;
+    private  final DownloadService downloadService;
     //    @Autowired
 //    private final JiaYueWindPowerCdqResultCoverService jiaYueWindPowerCdqResultCoverService;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service;
-    @Autowired
-    private final JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0004Service jiaYueWindPowerCdqResultCoverFD0004Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service;
+    private  final JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service;
 
+    public ParsingJob(ParsingChannelService parsingChannelService,DownloadService downloadService,JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service,JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service,JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service,JiaYueWindPowerCdqResultCoverFD0004Service jiaYueWindPowerCdqResultCoverFD0004Service,JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service,JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service,JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service){
+        this.parsingChannelService = parsingChannelService;
+        this.downloadService = downloadService;
+        this.jiaYueWindPowerCdqResultCoverFD0001Service = jiaYueWindPowerCdqResultCoverFD0001Service;
+        this.jiaYueWindPowerCdqResultCoverFD0002Service = jiaYueWindPowerCdqResultCoverFD0002Service;
+        this.jiaYueWindPowerCdqResultCoverFD0003Service = jiaYueWindPowerCdqResultCoverFD0003Service;
+        this.jiaYueWindPowerCdqResultCoverFD0004Service = jiaYueWindPowerCdqResultCoverFD0004Service;
+        this.jiaYueWindPowerCdqResultCoverFD0005Service = jiaYueWindPowerCdqResultCoverFD0005Service;
+        this.jiaYueWindPowerCdqResultCoverFD0006Service = jiaYueWindPowerCdqResultCoverFD0006Service;
+        this.jiaYueWindPowerCdqResultCoverFD0007Service = jiaYueWindPowerCdqResultCoverFD0007Service;
+    }
 
     //    @Scheduled(fixedRate = 900000)
     @Scheduled(fixedRate = 60000)
@@ -77,6 +88,7 @@ public class ParsingJob {
         jiaYueWindPowerCdqResultCoverFD0001Service.executeForecast();
         jiaYueWindPowerCdqResultCoverFD0002Service.executeForecast();
         jiaYueWindPowerCdqResultCoverFD0003Service.executeForecast();
+        jiaYueWindPowerCdqResultCoverFD0004Service.executeForecast();
         jiaYueWindPowerCdqResultCoverFD0005Service.executeForecast();
         jiaYueWindPowerCdqResultCoverFD0006Service.executeForecast();
         jiaYueWindPowerCdqResultCoverFD0007Service.executeForecast();

ipp-client/src/main/java/com/jiayue/ipfcst/client/aop/DynamicDataSourceAspect.java

@@ -12,7 +12,6 @@ public class DynamicDataSourceAspect {
     // 前置通知
     @Before("within(com.jiayue.ipfcst.client.service..*) && @annotation(wr)")
     public void before(JoinPoint joinPoint, WR wr){
-        System.out.println(wr.value());
         DynamicDataSource.setDataSource(wr.value());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerCdqResultCoverMapperFD0004.java

@@ -0,0 +1,40 @@
+package com.jiayue.ipfcst.client.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0003;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0004;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * jiayue_zdata_wind_power_cdq_result
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Mapper
+public interface JiaYueWindPowerCdqResultCoverMapperFD0004 extends BaseMapper<JiaYueWindPowerCdqResultCoverFD0004> {
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_wind_power_cdq_result")
+    int deleteAll();
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_cdq_result WHERE DATE_TIME BETWEEN #{startTime} AND #{endTime}")
+    List<JiaYueWindPowerCdqResultCoverFD0003> selectByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_wind_power_cdq_result where DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
+    int deleteByDateTime(@Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, @Param("objId") String objId);
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
+    List<JiaYueWindPowerCdqResultCoverFD0004> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0004 selectByDataDate(@Param("dateSubString") String dateSubString);
+
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0004.java

@@ -0,0 +1,52 @@
+package com.jiayue.ipfcst.client.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0003;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0004;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.sql.Time;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * jiayue_zdata_wind_power_dq_result
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Mapper
+public interface JiaYueWindPowerDqResultCoverMapperFD0004 extends BaseMapper<JiaYueWindPowerDqResultCoverFD0004> {
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_wind_power_dq_result")
+    int deleteAll();
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_dq_result WHERE DATE_TIME BETWEEN #{startTime} AND #{endTime}")
+    List<JiaYueWindPowerDqResultCoverFD0003> selectByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_wind_power_dq_result where DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId} AND DATA_DATE BETWEEN #{dateDateStart} AND #{dateDateEnd}")
+    int deleteByDateTime(@Param("startTime") Time startTime, @Param("endTime") Time endTime, @Param("objId") String objId,@Param("dateDateStart") Date dateDateStart, @Param("dateDateEnd") Date dateDateEnd);
+
+    @Select("SELECT *\n" +
+            "FROM (\n" +
+            "    SELECT *\n" +
+            "    FROM jiayue_FD0004_zdata_wind_power_dq_result\n" +
+            "    WHERE PRE_DATE_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}\n" +
+            "    ORDER BY CREATE_TIME DESC\n" +
+            "    LIMIT 40\n" +
+            ") AS subquery\n" +
+            "ORDER BY PRE_DATE_TIME ASC;")
+    List<JiaYueWindPowerDqResultCoverFD0004> selectByTimeAndObjId(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("objId") String objId);
+
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
+    List<JiaYueWindPowerDqResultCoverFD0004> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 960")
+    List<JiaYueWindPowerDqResultCoverFD0004> selectByDataDate(@Param("date") String date);
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerNwpResultCoverMapperFD0004.java

@@ -0,0 +1,38 @@
+package com.jiayue.ipfcst.client.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0003;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0004;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.sql.Time;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * jiayue_FD0001_zdata_nwp_result
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Mapper
+public interface JiaYueWindPowerNwpResultCoverMapperFD0004 extends BaseMapper<JiaYueWindPowerNwpResultCoverFD0004> {
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_nwp_result")
+    int deleteAll();
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_nwp_result WHERE DATE_TIME BETWEEN #{startTime} AND #{endTime}")
+    List<JiaYueWindPowerNwpResultCoverFD0004> selectByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    @Delete("DELETE FROM jiayue_FD0004_zdata_nwp_result where DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId} AND DATA_DATE BETWEEN #{dateDateStart} AND #{dateDateEnd}")
+    int deleteByDateTime(@Param("startTime") Time startTime, @Param("endTime") Time endTime, @Param("objId") String objId,@Param("dateDateStart") Date dateDateStart, @Param("dateDateEnd") Date dateDateEnd);
+
+
+    @Select("SELECT * FROM jiayue_FD0004_zdata_nwp_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
+    List<JiaYueWindPowerNwpResultCoverFD0004> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime,@Param("objId") String objId);
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerNwpResultCoverMapperFD0005.java

@@ -1,7 +1,6 @@
 package com.jiayue.ipfcst.client.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0001;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0005;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerNwpResultCoverMapperFD0007.java

@@ -1,7 +1,6 @@
 package com.jiayue.ipfcst.client.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0001;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0007;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/WindPowerReal15MinFD0004Mapper.java

@@ -0,0 +1,32 @@
+package com.jiayue.ipfcst.client.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0003;
+import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0004;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * zdata_wind_power_real_15min
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Mapper
+public interface WindPowerReal15MinFD0004Mapper extends BaseMapper<WindPowerReal15MinFD0004> {
+
+    @Delete("DELETE FROM zdata_FD0004_wind_power_real_15min")
+    int deleteAll();
+
+    @Select("SELECT * FROM zdata_FD0004_wind_power_real_15min WHERE DATE_TIME BETWEEN #{startTime} AND #{endTime}")
+    List<WindPowerReal15MinFD0004> selectByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    @Select("SELECT * FROM zdata_FD0004_wind_power_real_15min WHERE DATE_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
+    List<WindPowerReal15MinFD0004> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/GenerateBackPassDataService.java

@@ -43,6 +43,8 @@ public class GenerateBackPassDataService {
 
     private final WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service;
 
+    private final WindPowerReal15MinFD0004Service windPowerReal15MinFD0004Service;
+
     private final WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service;
 
     private final WindPowerReal15MinFD0006Service windPowerReal15MinFD0006Service;
@@ -60,6 +62,8 @@ public class GenerateBackPassDataService {
 
     private final JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service;
 
+    private final JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service;
+
     private final JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service;
 
     private final JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service;
@@ -72,6 +76,8 @@ public class GenerateBackPassDataService {
 
     private final JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service;
 
+    private final JiaYueWindPowerCdqResultCoverFD0004Service jiaYueWindPowerCdqResultCoverFD0004Service;
+
     private final JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service;
 
     private final JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service;
@@ -79,21 +85,23 @@ public class GenerateBackPassDataService {
     private final JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service;
 
 
-    public GenerateBackPassDataService(WindPowerReal15MinFD0001Service windPowerReal15MinFD0001Service,WindPowerReal15MinFD0002Service windPowerReal15MinFD0002Service,WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service,WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service,
+    public GenerateBackPassDataService(WindPowerReal15MinFD0001Service windPowerReal15MinFD0001Service,WindPowerReal15MinFD0002Service windPowerReal15MinFD0002Service,WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service,WindPowerReal15MinFD0004Service windPowerReal15MinFD0004Service,WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service,
                                        WindPowerReal15MinFD0006Service windPowerReal15MinFD0006Service,WindPowerReal15MinFD0007Service windPowerReal15MinFD0007Service,JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service,JiaYueWindPowerDqResultCoverFD0002Service jiaYueWindPowerDqResultCoverFD0002Service,
-                                       JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service,JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service,JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service,
+                                       JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service,JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service,JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service,JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service,
                                        JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service,JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service,JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service,
-                                       JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service,JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service,JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service,
+                                       JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service,JiaYueWindPowerCdqResultCoverFD0004Service jiaYueWindPowerCdqResultCoverFD0004Service,JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service,JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service,
                                        JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service){
         this.windPowerReal15MinFD0001Service = windPowerReal15MinFD0001Service;
         this.windPowerReal15MinFD0002Service = windPowerReal15MinFD0002Service;
         this.windPowerReal15MinFD0003Service = windPowerReal15MinFD0003Service;
+        this.windPowerReal15MinFD0004Service = windPowerReal15MinFD0004Service;
         this.windPowerReal15MinFD0005Service = windPowerReal15MinFD0005Service;
         this.windPowerReal15MinFD0006Service = windPowerReal15MinFD0006Service;
         this.windPowerReal15MinFD0007Service = windPowerReal15MinFD0007Service;
         this.jiaYueWindPowerDqResultCoverFD0001Service = jiaYueWindPowerDqResultCoverFD0001Service;
         this.jiaYueWindPowerDqResultCoverFD0002Service = jiaYueWindPowerDqResultCoverFD0002Service;
         this.jiaYueWindPowerDqResultCoverFD0003Service = jiaYueWindPowerDqResultCoverFD0003Service;
+        this.jiaYueWindPowerDqResultCoverFD0004Service = jiaYueWindPowerDqResultCoverFD0004Service;
         this.jiaYueWindPowerDqResultCoverFD0005Service = jiaYueWindPowerDqResultCoverFD0005Service;
         this.jiaYueWindPowerDqResultCoverFD0006Service = jiaYueWindPowerDqResultCoverFD0006Service;
         this.jiaYueWindPowerDqResultCoverFD0007Service = jiaYueWindPowerDqResultCoverFD0007Service;
@@ -101,6 +109,7 @@ public class GenerateBackPassDataService {
         this.jiaYueWindPowerCdqResultCoverFD0002Service = jiaYueWindPowerCdqResultCoverFD0002Service;
         this.jiaYueWindPowerCdqResultCoverFD0003Service = jiaYueWindPowerCdqResultCoverFD0003Service;
         this.jiaYueWindPowerCdqResultCoverFD0005Service = jiaYueWindPowerCdqResultCoverFD0005Service;
+        this.jiaYueWindPowerCdqResultCoverFD0004Service = jiaYueWindPowerCdqResultCoverFD0004Service;
         this.jiaYueWindPowerCdqResultCoverFD0006Service = jiaYueWindPowerCdqResultCoverFD0006Service;
         this.jiaYueWindPowerCdqResultCoverFD0007Service = jiaYueWindPowerCdqResultCoverFD0007Service;
     }
@@ -465,8 +474,9 @@ public class GenerateBackPassDataService {
         stringBuilder.append(electricField.getStationCode()).append("-").append("rp").append("|").append(sdf.format(startTime)).append("|");
 
         List<WindPowerReal15MinFD0001> windPowerReal15MinFD0001List = windPowerReal15MinFD0001Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
-//        List<WindPowerReal15MinFD0002> windPowerReal15MinFD0002List = windPowerReal15MinFD0002Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
-//        List<WindPowerReal15MinFD0003> windPowerReal15MinFD0003List = windPowerReal15MinFD0003Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
+        List<WindPowerReal15MinFD0002> windPowerReal15MinFD0002List = windPowerReal15MinFD0002Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
+        List<WindPowerReal15MinFD0003> windPowerReal15MinFD0003List = windPowerReal15MinFD0003Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
+        List<WindPowerReal15MinFD0004> windPowerReal15MinFD0004List = windPowerReal15MinFD0004Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
         List<WindPowerReal15MinFD0005> windPowerReal15MinFD0005List = windPowerReal15MinFD0005Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
         List<WindPowerReal15MinFD0006> windPowerReal15MinFD0006List = windPowerReal15MinFD0006Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
         List<WindPowerReal15MinFD0007> windPowerReal15MinFD0007List = windPowerReal15MinFD0007Service.getAll(new Date(startTime), new Date(startTime + 24 * 60 * 60 * 1000L - 1000));
@@ -482,22 +492,30 @@ public class GenerateBackPassDataService {
                     content.append(PLACE);
                 }
             }
-//            if (electricField.getSign().equals("FD0002")) {
-//                List<WindPowerReal15MinFD0002> filterList = windPowerReal15MinFD0002List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getValue()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
-//            if (electricField.getSign().equals("FD0003")) {
-//                List<WindPowerReal15MinFD0003> filterList = windPowerReal15MinFD0003List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getValue()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
+            if (electricField.getSign().equals("FD0002")) {
+                List<WindPowerReal15MinFD0002> filterList = windPowerReal15MinFD0002List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getValue()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0003")) {
+                List<WindPowerReal15MinFD0003> filterList = windPowerReal15MinFD0003List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getValue()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0004")) {
+                List<WindPowerReal15MinFD0004> filterList = windPowerReal15MinFD0004List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getValue()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
             if (electricField.getSign().equals("FD0005")) {
                 List<WindPowerReal15MinFD0005> filterList = windPowerReal15MinFD0005List.stream().filter(p -> p.getDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
                 if (!filterList.isEmpty()) {
@@ -571,8 +589,9 @@ public class GenerateBackPassDataService {
         }
 
         List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCoverFD0001List = jiaYueWindPowerDqResultCoverFD0001Service.findByDataDate(new Date(startTime));
-//        List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCoverFD0002List = jiaYueWindPowerDqResultCoverFD0002Service.findByDataDate(new Date(startTime));
-//        List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCoverFD0003List = jiaYueWindPowerDqResultCoverFD0003Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCoverFD0002List = jiaYueWindPowerDqResultCoverFD0002Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCoverFD0003List = jiaYueWindPowerDqResultCoverFD0003Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverFD0004List = jiaYueWindPowerDqResultCoverFD0004Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerDqResultCoverFD0005> jiaYueWindPowerDqResultCoverFD0005List = jiaYueWindPowerDqResultCoverFD0005Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerDqResultCoverFD0006> jiaYueWindPowerDqResultCoverFD0006List = jiaYueWindPowerDqResultCoverFD0006Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerDqResultCoverFD0007> jiaYueWindPowerDqResultCoverFD0007List = jiaYueWindPowerDqResultCoverFD0007Service.findByDataDate(new Date(startTime));
@@ -588,22 +607,30 @@ public class GenerateBackPassDataService {
                     content.append(PLACE);
                 }
             }
-//            if (electricField.getSign().equals("FD0002")) {
-//                List<JiaYueWindPowerDqResultCoverFD0002> filterList = jiaYueWindPowerDqResultCoverFD0002List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getActivePower()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
-//            if (electricField.getSign().equals("FD0003")) {
-//                List<JiaYueWindPowerDqResultCoverFD0003> filterList = jiaYueWindPowerDqResultCoverFD0003List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getActivePower()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
+            if (electricField.getSign().equals("FD0002")) {
+                List<JiaYueWindPowerDqResultCoverFD0002> filterList = jiaYueWindPowerDqResultCoverFD0002List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0003")) {
+                List<JiaYueWindPowerDqResultCoverFD0003> filterList = jiaYueWindPowerDqResultCoverFD0003List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0004")) {
+                List<JiaYueWindPowerDqResultCoverFD0004> filterList = jiaYueWindPowerDqResultCoverFD0004List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
             if (electricField.getSign().equals("FD0005")) {
                 List<JiaYueWindPowerDqResultCoverFD0005> filterList = jiaYueWindPowerDqResultCoverFD0005List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
                 if (!filterList.isEmpty()) {
@@ -676,8 +703,9 @@ public class GenerateBackPassDataService {
             }
         }
         List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverFD0001List = jiaYueWindPowerCdqResultCoverFD0001Service.findByDataDate(new Date(startTime));
-//        List<JiaYueWindPowerCdqResultCoverFD0002> jiaYueWindPowerCdqResultCoverFD0002List = jiaYueWindPowerCdqResultCoverFD0002Service.findByDataDate(new Date(startTime));
-//        List<JiaYueWindPowerCdqResultCoverFD0003> jiaYueWindPowerCdqResultCoverFD0003List = jiaYueWindPowerCdqResultCoverFD0003Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerCdqResultCoverFD0002> jiaYueWindPowerCdqResultCoverFD0002List = jiaYueWindPowerCdqResultCoverFD0002Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerCdqResultCoverFD0003> jiaYueWindPowerCdqResultCoverFD0003List = jiaYueWindPowerCdqResultCoverFD0003Service.findByDataDate(new Date(startTime));
+        List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverFD0004List = jiaYueWindPowerCdqResultCoverFD0004Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerCdqResultCoverFD0005> jiaYueWindPowerCdqResultCoverFD0005List = jiaYueWindPowerCdqResultCoverFD0005Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerCdqResultCoverFD0006> jiaYueWindPowerCdqResultCoverFD0006List = jiaYueWindPowerCdqResultCoverFD0006Service.findByDataDate(new Date(startTime));
         List<JiaYueWindPowerCdqResultCoverFD0007> jiaYueWindPowerCdqResultCoverFD0007List = jiaYueWindPowerCdqResultCoverFD0007Service.findByDataDate(new Date(startTime));
@@ -692,22 +720,30 @@ public class GenerateBackPassDataService {
                     content.append(PLACE);
                 }
             }
-//            if (electricField.getSign().equals("FD0002")) {
-//                List<JiaYueWindPowerCdqResultCoverFD0002> filterList = jiaYueWindPowerCdqResultCoverFD0002List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getActivePower()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
-//            if (electricField.getSign().equals("FD0003")) {
-//                List<JiaYueWindPowerCdqResultCoverFD0003> filterList = jiaYueWindPowerCdqResultCoverFD0003List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
-//                if (!filterList.isEmpty()) {
-//                    content.append(filterList.get(0).getActivePower()).append("|");
-//                } else {
-//                    content.append(PLACE);
-//                }
-//            }
+            if (electricField.getSign().equals("FD0002")) {
+                List<JiaYueWindPowerCdqResultCoverFD0002> filterList = jiaYueWindPowerCdqResultCoverFD0002List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0003")) {
+                List<JiaYueWindPowerCdqResultCoverFD0003> filterList = jiaYueWindPowerCdqResultCoverFD0003List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
+            if (electricField.getSign().equals("FD0004")) {
+                List<JiaYueWindPowerCdqResultCoverFD0004> filterList = jiaYueWindPowerCdqResultCoverFD0004List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
+                if (!filterList.isEmpty()) {
+                    content.append(filterList.get(0).getActivePower()).append("|");
+                } else {
+                    content.append(PLACE);
+                }
+            }
             if (electricField.getSign().equals("FD0005")) {
                 List<JiaYueWindPowerCdqResultCoverFD0005> filterList = jiaYueWindPowerCdqResultCoverFD0005List.stream().filter(p -> p.getPreDateTime().atZone(ZoneId.systemDefault()).toEpochSecond() * 1000L == finalTime).collect(Collectors.toList());
                 if (!filterList.isEmpty()) {
@@ -789,6 +825,20 @@ public class GenerateBackPassDataService {
             electricField.setStationCode("J00770");
             electricField.setSign("FD0001");
 
+            ElectricField electricField2 = new ElectricField();
+            electricField2.setStationCode("J00941");
+            electricField2.setSign("FD0002");
+
+            ElectricField electricField3 = new ElectricField();
+            electricField3.setStationCode("J00942");
+            electricField3.setSign("FD0003");
+
+
+            // 新增宁夏吴忠石窖沟电站
+            ElectricField electricField4 = new ElectricField();
+            electricField4.setStationCode("J00988");
+            electricField4.setSign("FD0004");
+
             ElectricField electricField5 = new ElectricField();
             electricField5.setStationCode("J00929");
             electricField5.setSign("FD0005");
@@ -797,11 +847,15 @@ public class GenerateBackPassDataService {
             electricField6.setStationCode("J00930");
             electricField6.setSign("FD0006");
 
+
             ElectricField electricField7 = new ElectricField();
             electricField7.setStationCode("J00931");
             electricField7.setSign("FD0007");
 
             electricFieldList.add(electricField);
+            electricFieldList.add(electricField2);
+            electricFieldList.add(electricField3);
+            electricFieldList.add(electricField4);
             electricFieldList.add(electricField5);
             electricFieldList.add(electricField6);
             electricFieldList.add(electricField7);

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/JiaYueWindPowerCdqResultCoverFD0004Service.java

@@ -0,0 +1,52 @@
+package com.jiayue.ipfcst.client.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0004;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public interface JiaYueWindPowerCdqResultCoverFD0004Service extends IService<JiaYueWindPowerCdqResultCoverFD0004> {
+     /**
+      * 查询所有数据(远端)
+      * @return
+      */
+     List<JiaYueWindPowerCdqResultCoverFD0004> get();
+
+    /**
+     * 查询所有数据插入到本地
+      * @param jiaYueWindPowerCdqResultCovers
+     * @return
+     */
+     int put(List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCovers);
+
+//    /**
+//     * 查询所有数据(本地)
+//     * @return
+//     */
+//    List<JiaYueWindPowerCdqResultCover> getAll();
+
+    /**
+     *  删除所有数据(本地)
+     * @return
+     */
+    int deleteAll();
+
+    /**
+     *  储存解析超短期数据
+     */
+
+    void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverList, String stationCode);
+
+    /**
+     *  执行超短期数据预测
+     */
+    void executeForecast();
+
+    void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
+
+    List<JiaYueWindPowerCdqResultCoverFD0004> findByDataDate(Date startTime);
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/JiaYueWindPowerDqResultCoverFD0004Service.java

@@ -0,0 +1,63 @@
+package com.jiayue.ipfcst.client.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0004;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public interface JiaYueWindPowerDqResultCoverFD0004Service extends IService<JiaYueWindPowerDqResultCoverFD0004> {
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerDqResultCoverFD0004> get();
+
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerDqResultCoverFD0004> getByDataDateAndDateTime(String fileDate, String fileTime, String objId);
+
+    /**
+     * 查询所有数据插入到本地
+     *
+     * @param jiaYueWindPowerDqResultCovers
+     * @return
+     */
+    int put(List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCovers);
+
+    /**
+     * 查询所有数据(本地)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerDqResultCoverFD0004> getAll();
+
+    /**
+     * 删除所有数据(本地)
+     *
+     * @return
+     */
+    int deleteAll();
+
+    /**
+     * 储存解析短期数据
+     */
+
+    void saveDq(List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList, String stationCode);
+
+    /**
+     * @param stationCode
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<JiaYueWindPowerDqResultCoverFD0004> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0004> findByDataDate(Date startTime);
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/JiaYueWindPowerNwpResultCoverFD0004Service.java

@@ -0,0 +1,52 @@
+package com.jiayue.ipfcst.client.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0004;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public interface JiaYueWindPowerNwpResultCoverFD0004Service extends IService<JiaYueWindPowerNwpResultCoverFD0004> {
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerNwpResultCoverFD0004> get();
+
+    /**
+     * 查询所有数据插入到本地
+     *
+     * @param jiaYueWindPowerNwpResultCoverList
+     * @return
+     */
+    int put(List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList);
+
+    /**
+     * 查询所有数据(本地)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerNwpResultCoverFD0004> getAll();
+
+    /**
+     * 删除所有数据(本地)
+     *
+     * @return
+     */
+    int deleteAll();
+
+    /**
+     * 储存解析nwp数据
+     */
+
+    void saveNwp(List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList, String stationCode);
+
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<JiaYueWindPowerNwpResultCoverFD0004> getByDataDateAndDateTime(String fileDate, String fileTime, String objId);
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/WindPowerReal15MinFD0004Service.java

@@ -0,0 +1,51 @@
+package com.jiayue.ipfcst.client.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0004;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public interface WindPowerReal15MinFD0004Service extends IService<WindPowerReal15MinFD0004> {
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<WindPowerReal15MinFD0004> get(Date startTime, Date endTime);
+
+    /**
+     * 查询所有数据插入到本地
+     *
+     * @param windPowerReal15MinList
+     * @return
+     */
+    int put(List<WindPowerReal15MinFD0004> windPowerReal15MinList);
+
+    /**
+     * 查询所有数据(本地)
+     *
+     * @return
+     */
+    List<WindPowerReal15MinFD0004> getAll();
+
+    /**
+     * 查询所有数据(本地)
+     *
+     * @return
+     */
+    List<WindPowerReal15MinFD0004> getAll(Date startTime, Date endTime);
+
+    /**
+     * 删除所有数据(本地)
+     *
+     * @return
+     */
+    int deleteAll();
+
+    List<WindPowerReal15MinFD0004> findByObjIdAndDateTime(String ObjId, Date startTime, Date endTime);
+
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/an/DownloadService.java

@@ -75,6 +75,15 @@ public class DownloadService {
         parsingUrl3.setId("722af308253fcd6eff67959c7f76eaf8");
         parsingUrl3.setDelFlag("0");
 
+        ParsingUrl parsingUrl4 = new ParsingUrl();
+        parsingUrl4.setCId("722af308253fcd6eff67959c7f76eaf8");
+        parsingUrl4.setForecastManufactor("SYJY");
+        parsingUrl4.setUrl("/home/syjy/F_data/new/J00988");
+        parsingUrl4.setUrlStatus("1");
+        parsingUrl4.setStationCode("J00988");
+        parsingUrl4.setId("722af308253fcd6eff67959c7f76eaf8");
+        parsingUrl4.setDelFlag("0");
+
         ParsingUrl parsingUrl5 = new ParsingUrl();
         parsingUrl5.setCId("722af308253fcd6eff67959c7f76eaf5");
         parsingUrl5.setForecastManufactor("SYJY");
@@ -106,6 +115,7 @@ public class DownloadService {
         parsingUrls.add(parsingUrl1);
         parsingUrls.add(parsingUrl2);
         parsingUrls.add(parsingUrl3);
+        parsingUrls.add(parsingUrl4);
         parsingUrls.add(parsingUrl5);
         parsingUrls.add(parsingUrl6);
         parsingUrls.add(parsingUrl7);

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/ElectricFieldServiceImpl.java

@@ -79,6 +79,9 @@ public class ElectricFieldServiceImpl extends ServiceImpl<ElectricFieldMapper, E
             case "J00942":
                 sign = "FD0003";
                 break;
+            case "J00988":
+                sign = "FD0004";
+                break;
             case "J00929":
                 sign = "FD0005";
                 break;

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0001ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,25 +22,24 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0001, JiaYueWindPowerCdqResultCoverFD0001> implements JiaYueWindPowerCdqResultCoverFD0001Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0001 jiaYueWindPowerCdqResultCoverMapperFD0001;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0001 jiaYueWindPowerCdqResultCoverMapperFD0001;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0001Service windPowerReal15MinFD0001Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0001Service windPowerReal15MinFD0001Service;
+    private final JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service;
 
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service;
-
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0001Service jiaYueWindPowerCdqResultCoverFD0001Service;
 
+    public JiaYueWindPowerCdqResultCoverFD0001ServiceImpl(JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service, JiaYueWindPowerCdqResultCoverMapperFD0001 jiaYueWindPowerCdqResultCoverMapperFD0001, ElectricFieldService electricFieldService, SysParameterService sysParameterService, WindPowerReal15MinFD0001Service windPowerReal15MinFD0001Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0001 = jiaYueWindPowerCdqResultCoverMapperFD0001;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0001Service = windPowerReal15MinFD0001Service;
+        this.jiaYueWindPowerDqResultCoverFD0001Service = jiaYueWindPowerDqResultCoverFD0001Service;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerCdqResultCoverFD0001> get() {
@@ -287,8 +284,6 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0001Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0002ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,25 +22,24 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0002, JiaYueWindPowerCdqResultCoverFD0002> implements JiaYueWindPowerCdqResultCoverFD0002Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0002 jiaYueWindPowerCdqResultCoverMapperFD0002;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0002 jiaYueWindPowerCdqResultCoverMapperFD0002;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0002Service windPowerReal15MinFD0002Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0002Service windPowerReal15MinFD0002Service;
+    private final JiaYueWindPowerDqResultCoverFD0002Service jiaYueWindPowerDqResultCoverFD0002Service;
 
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0002Service jiaYueWindPowerDqResultCoverFD0002Service;
-
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0002Service jiaYueWindPowerCdqResultCoverFD0002Service;
 
+    public JiaYueWindPowerCdqResultCoverFD0002ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0002 jiaYueWindPowerCdqResultCoverMapperFD0002,ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0002Service windPowerReal15MinFD0002Service,JiaYueWindPowerDqResultCoverFD0002Service jiaYueWindPowerDqResultCoverFD0002Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0002 = jiaYueWindPowerCdqResultCoverMapperFD0002;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0002Service = windPowerReal15MinFD0002Service;
+        this.jiaYueWindPowerDqResultCoverFD0002Service = jiaYueWindPowerDqResultCoverFD0002Service;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerCdqResultCoverFD0002> get() {
@@ -323,8 +320,6 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0002> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0002Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0003ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,25 +22,24 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0003, JiaYueWindPowerCdqResultCoverFD0003> implements JiaYueWindPowerCdqResultCoverFD0003Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0003 jiaYueWindPowerCdqResultCoverMapperFD0003;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0003 jiaYueWindPowerCdqResultCoverMapperFD0003;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service;
+    private final JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service;
 
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service;
-
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0003Service jiaYueWindPowerCdqResultCoverFD0003Service;
 
+    public JiaYueWindPowerCdqResultCoverFD0003ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0003 jiaYueWindPowerCdqResultCoverMapperFD0003,ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0003Service windPowerReal15MinFD0003Service,JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0003 = jiaYueWindPowerCdqResultCoverMapperFD0003;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0003Service = windPowerReal15MinFD0003Service;
+        this.jiaYueWindPowerDqResultCoverFD0003Service = jiaYueWindPowerDqResultCoverFD0003Service;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerCdqResultCoverFD0003> get() {
@@ -322,8 +319,6 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0003> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0003Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0004ServiceImpl.java

@@ -0,0 +1,393 @@
+package com.jiayue.ipfcst.client.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jiayue.ipfcst.client.aop.WR;
+import com.jiayue.ipfcst.client.mapper.JiaYueWindPowerCdqResultCoverMapperFD0004;
+import com.jiayue.ipfcst.client.service.*;
+import com.jiayue.ipfcst.common.core.util.DateMomentUtil;
+import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
+import com.jiayue.ipp.common.data.entity.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class JiaYueWindPowerCdqResultCoverFD0004ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0004, JiaYueWindPowerCdqResultCoverFD0004> implements JiaYueWindPowerCdqResultCoverFD0004Service {
+
+    private final JiaYueWindPowerCdqResultCoverMapperFD0004 jiaYueWindPowerCdqResultCoverMapperFD0004;
+
+    private final ElectricFieldService electricFieldService;
+
+    private final SysParameterService sysParameterService;
+
+    private final WindPowerReal15MinFD0004Service windPowerReal15MinFD0004Service;
+
+    private final JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service;
+
+
+
+
+    public JiaYueWindPowerCdqResultCoverFD0004ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0004 jiaYueWindPowerCdqResultCoverMapperFD0004,ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0004Service windPowerReal15MinFD0004Service,JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0004 = jiaYueWindPowerCdqResultCoverMapperFD0004;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0004Service = windPowerReal15MinFD0004Service;
+        this.jiaYueWindPowerDqResultCoverFD0004Service = jiaYueWindPowerDqResultCoverFD0004Service;
+
+    }
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerCdqResultCoverFD0004> get() {
+        List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCovers = jiaYueWindPowerCdqResultCoverMapperFD0004.selectList(null);
+        return jiaYueWindPowerCdqResultCovers;
+    }
+
+    @Override
+//    @WR("R")
+    public int put(List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverFD0004List) {
+        if (jiaYueWindPowerCdqResultCoverFD0004List != null && jiaYueWindPowerCdqResultCoverFD0004List.size() > 0) {
+            this.saveBatch(jiaYueWindPowerCdqResultCoverFD0004List, jiaYueWindPowerCdqResultCoverFD0004List.size());
+        }
+        return jiaYueWindPowerCdqResultCoverFD0004List.size();
+    }
+
+//    @Override
+//    public List<JiaYueWindPowerCdqResultCover> getAll() {
+//        List<JiaYueWindPowerCdqResultCover> jiaYueWindPowerCdqResultCovers =  jiaYueWindPowerCdqResultCoverMapper.selectList(null);
+//        return  jiaYueWindPowerCdqResultCovers;
+//    }
+
+    @Override
+//    @WR("R")
+    public int deleteAll() {
+
+        return jiaYueWindPowerCdqResultCoverMapperFD0004.deleteAll();
+    }
+
+
+    /**
+     * 执行超短期预测
+     */
+    public void executeForecast() {
+
+        List<ElectricField> electricFieldList = new ArrayList<>();
+//        ElectricField electricField1 = new ElectricField();
+//        electricField1.setBelongForecastManufactor("SYJY");
+//        electricField1.setCapacity(new BigDecimal(30.0000));
+//        electricField1.setElectricFieldTypeEnum("2");
+//        electricField1.setForecastManufactor("SYJY");
+//        electricField1.setId("138c6aebdf6ddc792495bc35fa3e4adb");
+//        electricField1.setName("天津中能融合测试站A");
+//        electricField1.setStationCode("J00770");
+//        electricField1.setSign("FD0001");
+//        electricField1.setNetSubstationName("J00770");
+
+        ElectricField electricField2 = new ElectricField();
+        electricField2.setBelongForecastManufactor("SYJY");
+        electricField2.setCapacity(new BigDecimal(80.0000));
+        electricField2.setElectricFieldTypeEnum("2");
+        electricField2.setForecastManufactor("SYJY");
+        electricField2.setId("30a9f02678beb7101e628d7c7e22c5d4");
+        electricField2.setName("宁夏吴忠市青铜峡市石窖沟80MW风电项目");
+        electricField2.setStationCode("J00988");
+        electricField2.setSign("FD0004");
+        electricField2.setNetSubstationName("J00988");
+
+//        ElectricField electricField3 = new ElectricField();
+//        electricField3.setBelongForecastManufactor("SYJY");
+//        electricField3.setCapacity(new BigDecimal(20.0000));
+//        electricField3.setElectricFieldTypeEnum("2");
+//        electricField2.setForecastManufactor("SYJY");
+//        electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
+//        electricField3.setName("中能融合测试站B");
+//        electricField3.setStationCode("J00771");
+//        electricField3.setSign("FD0002");
+//        electricField3.setNetSubstationName("J00771");
+
+//        electricFieldList.add(electricField1);
+        electricFieldList.add(electricField2);
+//        electricFieldList.add(electricField3);
+
+        electricFieldList.forEach(e -> {
+            String stationCode = e.getSign();
+            // 根据场站类型执行相应超短期预测
+            try {
+                // 获取查询时间，从当前时间所处时间点标记时间开始查询，截至到96个时间点对应的标记时间
+                String cdqUpMin = sysParameterService.getSysParameterAndStationCode("CDQ_UP_MIN", "0", stationCode);
+                Long calTime = DateMomentUtil.getMomentTime(System.currentTimeMillis() + Integer.parseInt(cdqUpMin) * 1000 * 60, 2, 15 * 60 * 1000L);
+                Long startTime = calTime + 15 * 1000 * 60L;
+                String llcdq_point = sysParameterService.getSysParameterAndStationCode("FILE_LLCDQ_POINT", "40", stationCode);
+                Integer forecastPoints = Integer.parseInt(llcdq_point);
+                Integer forecastMinutes = (forecastPoints - 1) * 15;
+                // 结束时间增加15分钟为了防止文件先生成，实时表中最后一个时间点没有点位的问题
+                Long endTime = DateUtils.addMinutes(new Date(startTime), forecastMinutes + 1).getTime();
+
+                // 查询该时间段内的短期预测功率
+                List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverFD0004List = jiaYueWindPowerDqResultCoverFD0004Service.findByObjIdAndStartTimeAndEndTime(stationCode, new Date(startTime), new Date(endTime));
+
+
+//            List<ForecastPowerShortTerm> addForecastPowerShortTermList = new ArrayList<>();
+//            // 判断短期数据是否缺点
+//            for (Long tempTime = startTime; tempTime <= endTime; tempTime = tempTime + 15 * 60 * 1000L) {
+//                if (forecastPowerShortTermsMap.get(tempTime) == null) {
+//                    // 缺失时间点
+//                    ForecastPowerShortTerm forecastPowerShortTerms = null;
+//                    if (ElectricFieldTypeEnum.E1.compareTo(electricField.getElectricFieldTypeEnum()) == 0) {
+//                        forecastPowerShortTerms = forecastPowerShortTermService.generateSolarPowerShortTerm(tempTime, openCapacityMap.get(tempTime), electricField);
+//                    } else {
+//                        forecastPowerShortTerms = forecastPowerShortTermService.generateWindPowerShortTerm(tempTime, openCapacityMap.get(tempTime));
+//                    }
+//                    addForecastPowerShortTermList.add(forecastPowerShortTerms);
+//                }
+//            }
+//            if (!addForecastPowerShortTermList.isEmpty()) {
+//                // 保存短期预测
+//                this.forecastPowerShortTermRepository.saveAll(addForecastPowerShortTermList);
+//                // 将补齐的预测功率追加到查询预测功率结果集中
+//                forecastPowerShortTermList.addAll(addForecastPowerShortTermList);
+//            }
+
+                log.info("执行超短期预测生成。。。。。。{}", stationCode);
+//                if (ElectricFieldTypeEnum.E1.compareTo(electricField.getElectricFieldTypeEnum()) == 0) {
+//                    // 光伏电站
+//                    this.executeForecastForlight(forecastPowerShortTermList, electricField.getCapacity());
+//                } else if (ElectricFieldTypeEnum.E2.compareTo(electricField.getElectricFieldTypeEnum()) == 0) {
+                // 风力电场
+                this.executeForecastForWind(jiaYueWindPowerDqResultCoverFD0004List, e.getCapacity(), e.getStationCode());
+//                } else {
+//                    log.error("场站类型非法！");
+//                }
+
+            } catch (Exception ex) {
+                log.error("系统运行错误！", ex);
+            }
+        });
+    }
+
+
+    /**
+     * 执行风电场超短期预测
+     *
+     * @param jiaYueWindPowerDqResultCoverList 短期预测结果集
+     * @param capacity                         装机容量
+     */
+    @WR("W")
+    public void executeForecastForWind(final List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList, final BigDecimal capacity, String stationCode) {
+
+        List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverFD0004List = new ArrayList<>();
+        JiaYueWindPowerCdqResultCoverFD0004 jiaYueWindPowerCdqResultCoverFD0004;
+        //获取系统参数cdqjsfs，超短期计算方式，0为默认乘系数的方式，1为根据可用功率计算的方式
+        String cdqjsfs = sysParameterService.getSysParameterAndStationCode("cdqjsfs", "1", stationCode);
+        log.info("参数cdqjsfs值为：" + cdqjsfs + "，超短期计算方式，0为默认乘系数的方式，1为根据可用功率计算的方式。");
+        BigDecimal stPower, ustPower, ustPowers;
+        // 查询当前时间点标记时间前10分钟的可用功率
+        Date currentTime = new Date(System.currentTimeMillis());
+        Date startTime = DateUtils.addMinutes(currentTime, -10);
+        Date endTime = DateUtils.addMinutes(currentTime, 1);
+        // 场站编号转换为FD000?
+        String objId = electricFieldService.numberToIdentification(stationCode);
+        List<WindPowerReal15MinFD0004> windPowerReal15MinList = windPowerReal15MinFD0004Service.findByObjIdAndDateTime(objId, startTime, endTime);
+        List<WindPowerReal15MinFD0004> filterList = windPowerReal15MinList.stream().filter(t -> Float.compare(Float.valueOf(t.getValue()), Float.valueOf("-1")) > 0).collect(Collectors.toList());
+        String coe = sysParameterService.getSysParameterAndStationCode("CDQ_COE", "1.05", stationCode);
+
+        if (filterList.size() > 0) {
+            // 获取当前时刻对应的短期
+            List<JiaYueWindPowerDqResultCoverFD0004> currentForecastPowerShortTermList;
+            Float currentForecastPowerValue = 0f;
+            try {
+                Long currentMoment = DateMomentUtil.getMomentTime(currentTime.getTime(), 1, 15 * 60 * 1000L);
+                currentForecastPowerShortTermList = jiaYueWindPowerDqResultCoverFD0004Service.findByObjIdAndStartTimeAndEndTime(stationCode, new Date(currentMoment), new Date(currentMoment));
+                if (currentForecastPowerShortTermList.size() > 0) {
+                    currentForecastPowerValue = currentForecastPowerShortTermList.get(0).getActivePower();
+                } else {
+                    // 当前时间没有对应的短期，用实际功率最近的一个替换
+                    filterList.sort(Comparator.comparing(WindPowerReal15MinFD0004::getDateTime).reversed());
+                    currentForecastPowerValue = filterList.get(0).getValue().floatValue();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            BigDecimal sumAbleValue = filterList.stream().map(s -> new BigDecimal(s.getValue())).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal averageAbleValue = sumAbleValue.divide(new BigDecimal(filterList.size()), 2, BigDecimal.ROUND_HALF_UP);
+            //可用-短期差值
+            BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
+            for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
+                jiaYueWindPowerCdqResultCoverFD0004 = new JiaYueWindPowerCdqResultCoverFD0004();
+
+                Long date = null;
+                try {
+                    date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0004.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0004.setDataDate(new Date());
+                }
+
+
+                Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
+                Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
+                jiaYueWindPowerCdqResultCoverFD0004.setDataTime(nowTime);
+                jiaYueWindPowerCdqResultCoverFD0004.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
+//                jiaYueWindPowerCdqResultCoverFD0003.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
+                jiaYueWindPowerCdqResultCoverFD0004.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
+//                jiaYueWindPowerCdqResultCoverFD0003.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
+                jiaYueWindPowerCdqResultCoverFD0004.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0004.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));                //短期
+                stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
+                //短期*系数
+                ustPowers = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
+                // 如果短期预测小于等于0，则超短期为0
+                if (stPower.floatValue() <= 0) {
+                    jiaYueWindPowerCdqResultCoverFD0004.setActivePower(0.0f);
+                } else {
+                    BigDecimal xzjdq = deviationValue.add(stPower).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    String cdqjsfsZbxz = sysParameterService.getSysParameterAndStationCode("cdqjsfsZbxz", "0.4", stationCode);
+                    log.debug("参数cdqjsfsZbxz值为：" + cdqjsfsZbxz + "，超短期计算方式，可用和短期的差值加短期占比。");
+                    String cdqjsfsZbdq = sysParameterService.getSysParameterAndStationCode("cdqjsfsZbdq", "0.6", stationCode);
+                    log.debug("参数cdqjsfsZbdq值为：" + cdqjsfsZbdq + "，超短期计算方式，短期占比。");
+                    ustPower = xzjdq.multiply(new BigDecimal(cdqjsfsZbxz)).setScale(2, BigDecimal.ROUND_HALF_UP).add(stPower.multiply(new BigDecimal(cdqjsfsZbdq)).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    if (ustPower.doubleValue() > capacity.doubleValue()) {
+                        // 如果超短期结果超出装机容量，则超短期结果为装机容量
+                        jiaYueWindPowerCdqResultCoverFD0004.setActivePower(capacity.floatValue());
+                    } else if (ustPower.doubleValue() < 0) {
+                        // 如果超短期结果小于0，则超短期结果为0
+                        jiaYueWindPowerCdqResultCoverFD0004.setActivePower(0f);
+                    } else {
+                        if (cdqjsfs.equals("1")) {
+                            jiaYueWindPowerCdqResultCoverFD0004.setActivePower(ustPower.floatValue());
+                        } else {
+                            jiaYueWindPowerCdqResultCoverFD0004.setActivePower(ustPowers.floatValue());
+                        }
+                    }
+                }
+                jiaYueWindPowerCdqResultCoverFD0004List.add(jiaYueWindPowerCdqResultCoverFD0004);
+            }
+        } else {
+            log.info("库中没有可用，本次可用计算数据采用短期*系数的方式生成数据");
+            // 短期乘以系数
+            for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
+                stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
+                ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
+                jiaYueWindPowerCdqResultCoverFD0004 = new JiaYueWindPowerCdqResultCoverFD0004();
+
+                Long date = null;
+                try {
+                    date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0004.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0004.setDataDate(new Date());
+                }
+
+                Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
+                Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
+                jiaYueWindPowerCdqResultCoverFD0004.setDataTime(nowTime);
+//                jiaYueWindPowerCdqResultCoverFD0003.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
+                jiaYueWindPowerCdqResultCoverFD0004.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
+//                jiaYueWindPowerCdqResultCoverFD0003.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
+                jiaYueWindPowerCdqResultCoverFD0004.setActivePower(ustPower.floatValue());
+                jiaYueWindPowerCdqResultCoverFD0004.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0004.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
+                jiaYueWindPowerCdqResultCoverFD0004.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
+                jiaYueWindPowerCdqResultCoverFD0004List.add(jiaYueWindPowerCdqResultCoverFD0004);
+            }
+        }
+
+        if (jiaYueWindPowerCdqResultCoverFD0004List.size() > 0) {
+            this.saveCdq(jiaYueWindPowerCdqResultCoverFD0004List, stationCode);
+        }
+    }
+
+    @Override
+    @WR("W")
+    public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverList, String stationCode) {
+        this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
+    }
+
+    @Override
+    public void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode) {
+        jiaYueWindPowerCdqResultCoverMapperFD0004.deleteByDateTime(startTime, endTime, stationCode);
+    }
+
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0004> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0004> jiaYueWindPowerCdqResultCoverFD0004List = new ArrayList<>();
+
+        for ( long time = startTime.getTime(); time < startTime.getTime() + 24 * 60 * 60 * 1000L - 1000;  time = time + 15 * 60 * 1000L) {
+            Date date = new Date(time);
+            String dateSubString = simpleDateFormat.format(date);
+            JiaYueWindPowerCdqResultCoverFD0004 jiaYueWindPowerCdqResultCoverFD0004 = jiaYueWindPowerCdqResultCoverMapperFD0004.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0004){
+                jiaYueWindPowerCdqResultCoverFD0004List.add(jiaYueWindPowerCdqResultCoverFD0004);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0004List;
+    }
+
+
+    /**
+     * 将Date格式转换为Time格式
+     *
+     * @param utilDate
+     * @return
+     */
+    public static Time convertUtilDateToMySQLTime(Date utilDate) {
+        // 使用 SimpleDateFormat 提取时间部分
+        SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+        String timeString = timeFormat.format(utilDate);
+        // 将提取的时间部分转换为 MySQL TIME 类型
+        return Time.valueOf(timeString);
+    }
+
+    /**
+     * 判断时间戳是否是0点0分
+     *
+     * @param timestamp
+     * @return
+     */
+    public boolean isMidnight(long timestamp) {
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("Asia/Shanghai"));
+        calendar.setTimeInMillis(timestamp);
+
+        boolean isMidnight = // 小时为0
+                calendar.get(Calendar.HOUR_OF_DAY) == 0&&
+                        calendar.get(Calendar.MINUTE) == 0 // 分钟为0
+                        && calendar.get(Calendar.SECOND) == 0; // 秒为0
+        return isMidnight;
+    }
+
+    public Date nextDay(Date date){
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.add(calendar.DATE, 1);
+        date = calendar.getTime();
+        return date;
+    }
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0005ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,25 +22,23 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0005, JiaYueWindPowerCdqResultCoverFD0005> implements JiaYueWindPowerCdqResultCoverFD0005Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0005 jiaYueWindPowerCdqResultCoverMapperFD0005;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0005 jiaYueWindPowerCdqResultCoverMapperFD0005;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service;
-
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service;
-
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0005Service jiaYueWindPowerCdqResultCoverFD0005Service;
+    private final JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service;
 
+    public JiaYueWindPowerCdqResultCoverFD0005ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0005 jiaYueWindPowerCdqResultCoverMapperFD0005,ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0005Service windPowerReal15MinFD0005Service,JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0005 = jiaYueWindPowerCdqResultCoverMapperFD0005;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0005Service = windPowerReal15MinFD0005Service;
+        this.jiaYueWindPowerDqResultCoverFD0005Service = jiaYueWindPowerDqResultCoverFD0005Service;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerCdqResultCoverFD0005> get() {
@@ -322,8 +318,6 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0005> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0005Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0006ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,25 +22,24 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0006, JiaYueWindPowerCdqResultCoverFD0006> implements JiaYueWindPowerCdqResultCoverFD0006Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0006 jiaYueWindPowerCdqResultCoverMapperFD0006;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0006 jiaYueWindPowerCdqResultCoverMapperFD0006;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0006Service windPowerReal15MinFD0006Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0006Service windPowerReal15MinFD0006Service;
+    private final JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service;
 
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service;
-
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0006Service jiaYueWindPowerCdqResultCoverFD0006Service;
 
+    public JiaYueWindPowerCdqResultCoverFD0006ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0006 jiaYueWindPowerCdqResultCoverMapperFD0006,ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0006Service windPowerReal15MinFD0006Service,JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service){
+        this.electricFieldService = electricFieldService;
+        this.jiaYueWindPowerCdqResultCoverMapperFD0006 = jiaYueWindPowerCdqResultCoverMapperFD0006;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0006Service = windPowerReal15MinFD0006Service;
+        this.jiaYueWindPowerDqResultCoverFD0006Service = jiaYueWindPowerDqResultCoverFD0006Service;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerCdqResultCoverFD0006> get() {
@@ -319,8 +316,6 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0006> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0006Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerCdqResultCoverFD0007ServiceImpl.java

@@ -9,10 +9,8 @@ import com.jiayue.ipfcst.common.core.util.DateTimeUtil;
 import com.jiayue.ipp.common.data.entity.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
@@ -24,24 +22,24 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<JiaYueWindPowerCdqResultCoverMapperFD0007, JiaYueWindPowerCdqResultCoverFD0007> implements JiaYueWindPowerCdqResultCoverFD0007Service {
-    @Resource
-    private JiaYueWindPowerCdqResultCoverMapperFD0007 jiaYueWindPowerCdqResultCoverMapperFD0007;
+    private final JiaYueWindPowerCdqResultCoverMapperFD0007 jiaYueWindPowerCdqResultCoverMapperFD0007;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
+    private final ElectricFieldService electricFieldService;
 
-    @Autowired
-    private SysParameterService sysParameterService;
+    private final SysParameterService sysParameterService;
 
+    private final WindPowerReal15MinFD0007Service windPowerReal15MinFD0007Service;
 
-    @Autowired
-    private WindPowerReal15MinFD0007Service windPowerReal15MinFD0007Service;
+    private final JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service;
 
-    @Autowired
-    private JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service;
 
-    @Autowired
-    private JiaYueWindPowerCdqResultCoverFD0007Service jiaYueWindPowerCdqResultCoverFD0007Service;
+    public JiaYueWindPowerCdqResultCoverFD0007ServiceImpl(JiaYueWindPowerCdqResultCoverMapperFD0007 jiaYueWindPowerCdqResultCoverMapperFD0007, ElectricFieldService electricFieldService,SysParameterService sysParameterService,WindPowerReal15MinFD0007Service windPowerReal15MinFD0007Service,JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service){
+        this.jiaYueWindPowerCdqResultCoverMapperFD0007 = jiaYueWindPowerCdqResultCoverMapperFD0007;
+        this.electricFieldService = electricFieldService;
+        this.sysParameterService = sysParameterService;
+        this.windPowerReal15MinFD0007Service = windPowerReal15MinFD0007Service;
+        this.jiaYueWindPowerDqResultCoverFD0007Service = jiaYueWindPowerDqResultCoverFD0007Service;
+    }
 
     @Override
     @WR("W")
@@ -319,8 +317,6 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
     @Override
     @WR("W")
     public void saveCdq(List<JiaYueWindPowerCdqResultCoverFD0007> jiaYueWindPowerCdqResultCoverList, String stationCode) {
-
-        jiaYueWindPowerCdqResultCoverFD0007Service.get();
         this.saveBatch(jiaYueWindPowerCdqResultCoverList, jiaYueWindPowerCdqResultCoverList.size());
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0001CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0001Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0001;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,9 +14,11 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0001CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0001, JiaYueWindPowerDqResultCoverFD0001> implements JiaYueWindPowerDqResultCoverFD0001Service {
-    @Resource
-    private JiaYueWindPowerDqResultCoverMapperFD0001 jiaYueWindPowerDqResultCoverMapperFD0001;
+    private final JiaYueWindPowerDqResultCoverMapperFD0001 jiaYueWindPowerDqResultCoverMapperFD0001;
 
+    public JiaYueWindPowerDqResultFD0001CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0001 jiaYueWindPowerDqResultCoverMapperFD0001){
+        this.jiaYueWindPowerDqResultCoverMapperFD0001 = jiaYueWindPowerDqResultCoverMapperFD0001;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0002CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0002Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0002;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,9 +14,10 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0002CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0002, JiaYueWindPowerDqResultCoverFD0002> implements JiaYueWindPowerDqResultCoverFD0002Service {
-    @Resource
-    private JiaYueWindPowerDqResultCoverMapperFD0002 jiaYueWindPowerDqResultCoverMapperFD0002;
-
+    private final JiaYueWindPowerDqResultCoverMapperFD0002 jiaYueWindPowerDqResultCoverMapperFD0002;
+    public JiaYueWindPowerDqResultFD0002CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0002 jiaYueWindPowerDqResultCoverMapperFD0002){
+        this.jiaYueWindPowerDqResultCoverMapperFD0002 = jiaYueWindPowerDqResultCoverMapperFD0002;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0003CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0003Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0003;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,9 +14,11 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0003CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0003, JiaYueWindPowerDqResultCoverFD0003> implements JiaYueWindPowerDqResultCoverFD0003Service {
-    @Resource
     private JiaYueWindPowerDqResultCoverMapperFD0003 jiaYueWindPowerDqResultCoverMapperFD0003;
 
+    public JiaYueWindPowerDqResultFD0003CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0003 jiaYueWindPowerDqResultCoverMapperFD0003){
+        this.jiaYueWindPowerDqResultCoverMapperFD0003 = jiaYueWindPowerDqResultCoverMapperFD0003;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0004CoverServiceImpl.java

@@ -0,0 +1,96 @@
+package com.jiayue.ipfcst.client.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jiayue.ipfcst.client.aop.WR;
+import com.jiayue.ipfcst.client.mapper.JiaYueWindPowerDqResultCoverMapperFD0004;
+import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0004Service;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0004;
+import org.springframework.stereotype.Service;
+
+import java.sql.Time;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class JiaYueWindPowerDqResultFD0004CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0004, JiaYueWindPowerDqResultCoverFD0004> implements JiaYueWindPowerDqResultCoverFD0004Service {
+    private JiaYueWindPowerDqResultCoverMapperFD0004 jiaYueWindPowerDqResultCoverMapperFD0004;
+
+    public  JiaYueWindPowerDqResultFD0004CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0004 jiaYueWindPowerDqResultCoverMapperFD0004){
+        this.jiaYueWindPowerDqResultCoverMapperFD0004 = jiaYueWindPowerDqResultCoverMapperFD0004;
+    }
+
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerDqResultCoverFD0004> get() {
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0004.selectList(null);
+        return jiaYueWindPowerDqResultCovers;
+    }
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerDqResultCoverFD0004> getByDataDateAndDateTime(String fileDate, String fileTime, String objId) {
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0004.selectByDataDateDateTime(fileDate, fileTime, objId);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
+    @Override
+//    @WR("R")
+    public int put(List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCovers) {
+        if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
+            this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
+        }
+        return jiaYueWindPowerDqResultCovers.size();
+    }
+
+    @Override
+//    @WR("R")
+    public List<JiaYueWindPowerDqResultCoverFD0004> getAll() {
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0004.selectList(null);
+        return jiaYueWindPowerDqResultCovers;
+    }
+
+    @Override
+//    @WR("R")
+    public int deleteAll() {
+        return jiaYueWindPowerDqResultCoverMapperFD0004.deleteAll();
+    }
+
+
+    @Override
+    @WR("W")
+    public void saveDq(List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList, String stationCode) {
+        Time startTime = jiaYueWindPowerDqResultCoverList.get(0).getDataTime();
+        Time endTime = jiaYueWindPowerDqResultCoverList.get(jiaYueWindPowerDqResultCoverList.size() - 1).getDataTime();
+
+        Date dateDateStart = jiaYueWindPowerDqResultCoverList.get(0).getDataDate();
+        Date dateDateEnd = jiaYueWindPowerDqResultCoverList.get(jiaYueWindPowerDqResultCoverList.size() - 1).getDataDate();
+
+//        jiaYueWindPowerDqResultCoverMapper.deleteByDateTime(startTime,endTime,stationCode,dateDateStart,dateDateEnd);
+        this.saveBatch(jiaYueWindPowerDqResultCoverList, jiaYueWindPowerDqResultCoverList.size());
+    }
+
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerDqResultCoverFD0004> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        String endTimeStr = simpleDateFormat.format(endTime);
+
+
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0004.selectByTimeAndObjId(startTimeStr, endTimeStr, stationCode);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0004> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0004.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0005CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0005Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0005;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,10 +14,12 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0005CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0005, JiaYueWindPowerDqResultCoverFD0005> implements JiaYueWindPowerDqResultCoverFD0005Service {
-    @Resource
-    private JiaYueWindPowerDqResultCoverMapperFD0005 jiaYueWindPowerDqResultCoverMapperFD0005;
 
+    private final JiaYueWindPowerDqResultCoverMapperFD0005 jiaYueWindPowerDqResultCoverMapperFD0005;
 
+    public JiaYueWindPowerDqResultFD0005CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0005 jiaYueWindPowerDqResultCoverMapperFD0005){
+        this.jiaYueWindPowerDqResultCoverMapperFD0005 = jiaYueWindPowerDqResultCoverMapperFD0005;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerDqResultCoverFD0005> get() {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0006CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0006Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0006;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,10 +14,11 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0006CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0006, JiaYueWindPowerDqResultCoverFD0006> implements JiaYueWindPowerDqResultCoverFD0006Service {
-    @Resource
-    private JiaYueWindPowerDqResultCoverMapperFD0006 jiaYueWindPowerDqResultCoverMapperFD0006;
-
+    private final JiaYueWindPowerDqResultCoverMapperFD0006 jiaYueWindPowerDqResultCoverMapperFD0006;
 
+    public JiaYueWindPowerDqResultFD0006CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0006 jiaYueWindPowerDqResultCoverMapperFD0006){
+        this.jiaYueWindPowerDqResultCoverMapperFD0006 = jiaYueWindPowerDqResultCoverMapperFD0006;
+    }
     @Override
     @WR("W")
     public List<JiaYueWindPowerDqResultCoverFD0006> get() {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerDqResultFD0007CoverServiceImpl.java

@@ -7,7 +7,6 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerDqResultCoverFD0007Servic
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0007;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,8 +14,11 @@ import java.util.List;
 
 @Service
 public class JiaYueWindPowerDqResultFD0007CoverServiceImpl extends ServiceImpl<JiaYueWindPowerDqResultCoverMapperFD0007, JiaYueWindPowerDqResultCoverFD0007> implements JiaYueWindPowerDqResultCoverFD0007Service {
-    @Resource
-    private JiaYueWindPowerDqResultCoverMapperFD0007 jiaYueWindPowerDqResultCoverMapperFD0007;
+    private final JiaYueWindPowerDqResultCoverMapperFD0007 jiaYueWindPowerDqResultCoverMapperFD0007;
+
+    public JiaYueWindPowerDqResultFD0007CoverServiceImpl(JiaYueWindPowerDqResultCoverMapperFD0007 jiaYueWindPowerDqResultCoverMapperFD0007){
+        this.jiaYueWindPowerDqResultCoverMapperFD0007 = jiaYueWindPowerDqResultCoverMapperFD0007;
+    }
 
 
     @Override

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0001CoverServiceImpl.java

@@ -7,16 +7,18 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0001Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0001;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0001CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0001, JiaYueWindPowerNwpResultCoverFD0001> implements JiaYueWindPowerNwpResultCoverFD0001Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0001 jiaYueWindPowerNwpResultCoverMapperFD0001;
 
+    private final JiaYueWindPowerNwpResultCoverMapperFD0001 jiaYueWindPowerNwpResultCoverMapperFD0001;
+
+    public JiaYueWindPowerNwpResultFD0001CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0001 jiaYueWindPowerNwpResultCoverMapperFD0001){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0001 = jiaYueWindPowerNwpResultCoverMapperFD0001;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0002CoverServiceImpl.java

@@ -7,16 +7,18 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0002Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0002;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0002CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0002, JiaYueWindPowerNwpResultCoverFD0002> implements JiaYueWindPowerNwpResultCoverFD0002Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0002 jiaYueWindPowerNwpResultCoverMapperFD0002;
 
+    private final JiaYueWindPowerNwpResultCoverMapperFD0002 jiaYueWindPowerNwpResultCoverMapperFD0002;
+
+    public JiaYueWindPowerNwpResultFD0002CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0002 jiaYueWindPowerNwpResultCoverMapperFD0002){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0002 = jiaYueWindPowerNwpResultCoverMapperFD0002;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0003CoverServiceImpl.java

@@ -7,13 +7,15 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0003Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0003;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0003CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0003, JiaYueWindPowerNwpResultCoverFD0003> implements JiaYueWindPowerNwpResultCoverFD0003Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0003 jiaYueWindPowerNwpResultCoverMapperFD0003;
+    private final JiaYueWindPowerNwpResultCoverMapperFD0003 jiaYueWindPowerNwpResultCoverMapperFD0003;
+
+    public JiaYueWindPowerNwpResultFD0003CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0003 jiaYueWindPowerNwpResultCoverMapperFD0003){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0003 = jiaYueWindPowerNwpResultCoverMapperFD0003;
+    }
 
 
     @Override

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0004CoverServiceImpl.java

@@ -0,0 +1,72 @@
+package com.jiayue.ipfcst.client.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jiayue.ipfcst.client.aop.WR;
+import com.jiayue.ipfcst.client.mapper.JiaYueWindPowerNwpResultCoverMapperFD0004;
+import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0004Service;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0004;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class JiaYueWindPowerNwpResultFD0004CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0004, JiaYueWindPowerNwpResultCoverFD0004> implements JiaYueWindPowerNwpResultCoverFD0004Service {
+
+    private final JiaYueWindPowerNwpResultCoverMapperFD0004 jiaYueWindPowerNwpResultCoverMapperFD0004;
+
+    public JiaYueWindPowerNwpResultFD0004CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0004 jiaYueWindPowerNwpResultCoverMapperFD0004){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0004 = jiaYueWindPowerNwpResultCoverMapperFD0004;
+    }
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerNwpResultCoverFD0004> get() {
+        List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0004.selectList(null);
+        return jiaYueWindPowerNwpResultCoverList;
+    }
+
+    @Override
+//    @WR("R")
+    public int put(List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerDqResultCovers) {
+        if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
+            this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
+        }
+        return jiaYueWindPowerDqResultCovers.size();
+    }
+
+    @Override
+//    @WR("R")
+    public List<JiaYueWindPowerNwpResultCoverFD0004> getAll() {
+        List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0004.selectList(null);
+        return jiaYueWindPowerNwpResultCoverList;
+    }
+
+    @Override
+//    @WR("R")
+    public int deleteAll() {
+        return jiaYueWindPowerNwpResultCoverMapperFD0004.deleteAll();
+    }
+
+
+    @Override
+    @WR("W")
+    public void saveNwp(List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList, String stationCode) {
+
+//        Time startTime = jiaYueWindPowerNwpResultCoverList.get(0).getDataTime();
+//        Time endTime = jiaYueWindPowerNwpResultCoverList.get(jiaYueWindPowerNwpResultCoverList.size() - 1).getDataTime();
+//
+//        Date dateDateStart = jiaYueWindPowerNwpResultCoverList.get(0).getDataDate();
+//        Date dateDateEnd = jiaYueWindPowerNwpResultCoverList.get(jiaYueWindPowerNwpResultCoverList.size() - 1).getDataDate();
+
+//        jiaYueWindPowerNwpResultCoverMapper.deleteByDateTime(startTime,endTime,stationCode,dateDateStart,dateDateEnd);
+        this.saveBatch(jiaYueWindPowerNwpResultCoverList, jiaYueWindPowerNwpResultCoverList.size());
+    }
+
+    @Override
+    @WR("W")
+    public List<JiaYueWindPowerNwpResultCoverFD0004> getByDataDateAndDateTime(String fileDate, String fileTime, String objId) {
+        List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0004.selectByDataDateDateTime(fileDate, fileTime, objId);
+        return jiaYueWindPowerNwpResultCoverList;
+    }
+
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0005CoverServiceImpl.java

@@ -7,16 +7,17 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0005Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0005;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0005CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0005, JiaYueWindPowerNwpResultCoverFD0005> implements JiaYueWindPowerNwpResultCoverFD0005Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0005 jiaYueWindPowerNwpResultCoverMapperFD0005;
+    private final JiaYueWindPowerNwpResultCoverMapperFD0005 jiaYueWindPowerNwpResultCoverMapperFD0005;
 
+    public  JiaYueWindPowerNwpResultFD0005CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0005 jiaYueWindPowerNwpResultCoverMapperFD0005){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0005 = jiaYueWindPowerNwpResultCoverMapperFD0005;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0006CoverServiceImpl.java

@@ -7,16 +7,17 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0006Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0006;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0006CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0006, JiaYueWindPowerNwpResultCoverFD0006> implements JiaYueWindPowerNwpResultCoverFD0006Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0006 jiaYueWindPowerNwpResultCoverMapperFD0006;
+    private final JiaYueWindPowerNwpResultCoverMapperFD0006 jiaYueWindPowerNwpResultCoverMapperFD0006;
 
+    public JiaYueWindPowerNwpResultFD0006CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0006 jiaYueWindPowerNwpResultCoverMapperFD0006){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0006 = jiaYueWindPowerNwpResultCoverMapperFD0006;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/JiaYueWindPowerNwpResultFD0007CoverServiceImpl.java

@@ -7,16 +7,18 @@ import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverFD0007Servi
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0007;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.sql.Time;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class JiaYueWindPowerNwpResultFD0007CoverServiceImpl extends ServiceImpl<JiaYueWindPowerNwpResultCoverMapperFD0007, JiaYueWindPowerNwpResultCoverFD0007> implements JiaYueWindPowerNwpResultCoverFD0007Service {
-    @Resource
-    private JiaYueWindPowerNwpResultCoverMapperFD0007 jiaYueWindPowerNwpResultCoverMapperFD0007;
 
+    private final JiaYueWindPowerNwpResultCoverMapperFD0007 jiaYueWindPowerNwpResultCoverMapperFD0007;
+
+    public JiaYueWindPowerNwpResultFD0007CoverServiceImpl(JiaYueWindPowerNwpResultCoverMapperFD0007 jiaYueWindPowerNwpResultCoverMapperFD0007){
+        this.jiaYueWindPowerNwpResultCoverMapperFD0007 = jiaYueWindPowerNwpResultCoverMapperFD0007;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0001ServiceImpl.java

@@ -7,14 +7,17 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0001Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0001;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0001ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0001Mapper, WindPowerReal15MinFD0001> implements WindPowerReal15MinFD0001Service {
-    @Resource
-    private WindPowerReal15MinFD0001Mapper windPowerReal15MinFD0001Mapper;
+
+    private final WindPowerReal15MinFD0001Mapper windPowerReal15MinFD0001Mapper;
+
+    public WindPowerReal15MinFD0001ServiceImpl(WindPowerReal15MinFD0001Mapper windPowerReal15MinFD0001Mapper){
+        this.windPowerReal15MinFD0001Mapper = windPowerReal15MinFD0001Mapper;
+    }
 
     @Override
     @WR("W")

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0002ServiceImpl.java

@@ -7,15 +7,16 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0002Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0002;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0002ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0002Mapper, WindPowerReal15MinFD0002> implements WindPowerReal15MinFD0002Service {
-    @Resource
-    private WindPowerReal15MinFD0002Mapper windPowerReal15MinFD0002Mapper;
+    private final WindPowerReal15MinFD0002Mapper windPowerReal15MinFD0002Mapper;
 
+    public WindPowerReal15MinFD0002ServiceImpl(WindPowerReal15MinFD0002Mapper windPowerReal15MinFD0002Mapper){
+        this.windPowerReal15MinFD0002Mapper =windPowerReal15MinFD0002Mapper;
+    }
     @Override
     @WR("W")
     public List<WindPowerReal15MinFD0002> get(Date startTime, Date endTime) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0003ServiceImpl.java

@@ -7,15 +7,16 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0003Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0003;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0003ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0003Mapper, WindPowerReal15MinFD0003> implements WindPowerReal15MinFD0003Service {
-    @Resource
-    private WindPowerReal15MinFD0003Mapper windPowerReal15MinFD0003Mapper;
+    private final WindPowerReal15MinFD0003Mapper windPowerReal15MinFD0003Mapper;
 
+    public WindPowerReal15MinFD0003ServiceImpl(WindPowerReal15MinFD0003Mapper windPowerReal15MinFD0003Mapper){
+        this.windPowerReal15MinFD0003Mapper =windPowerReal15MinFD0003Mapper;
+    }
     @Override
     @WR("W")
     public List<WindPowerReal15MinFD0003> get(Date startTime, Date endTime) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0004ServiceImpl.java

@@ -0,0 +1,63 @@
+package com.jiayue.ipfcst.client.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jiayue.ipfcst.client.aop.WR;
+import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinFD0004Mapper;
+import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0004Service;
+import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0004;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class WindPowerReal15MinFD0004ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0004Mapper, WindPowerReal15MinFD0004> implements WindPowerReal15MinFD0004Service {
+    private final WindPowerReal15MinFD0004Mapper windPowerReal15MinFD0004Mapper;
+
+    public WindPowerReal15MinFD0004ServiceImpl(WindPowerReal15MinFD0004Mapper windPowerReal15MinFD0004Mapper){
+        this.windPowerReal15MinFD0004Mapper = windPowerReal15MinFD0004Mapper;
+    }
+    @Override
+    @WR("W")
+    public List<WindPowerReal15MinFD0004> get(Date startTime, Date endTime) {
+     List<WindPowerReal15MinFD0004> windPowerReal15MinList =  windPowerReal15MinFD0004Mapper.selectByTime(startTime, endTime);
+         return  windPowerReal15MinList;
+    }
+
+    @Override
+//    @WR("R")
+    public int put(List<WindPowerReal15MinFD0004> windPowerReal15MinList) {
+        if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
+            this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
+        }
+        return windPowerReal15MinList.size();
+    }
+
+    @Override
+//    @WR("R")
+    public List<WindPowerReal15MinFD0004> getAll() {
+        List<WindPowerReal15MinFD0004> windPowerReal15MinList =  windPowerReal15MinFD0004Mapper.selectList(null);
+        return  windPowerReal15MinList;
+    }
+
+    @Override
+//    @WR("R")
+    public List<WindPowerReal15MinFD0004> getAll(Date startTime, Date endTime) {
+        List<WindPowerReal15MinFD0004> windPowerReal15MinList =  windPowerReal15MinFD0004Mapper.selectByTime(startTime,endTime);
+        return  windPowerReal15MinList;
+    }
+
+    @Override
+//    @WR("R")
+    public int deleteAll() {
+
+       return windPowerReal15MinFD0004Mapper.deleteAll();
+    }
+
+    @Override
+    @WR("W")
+    public List<WindPowerReal15MinFD0004> findByObjIdAndDateTime(String objId, Date startTime, Date endTime) {
+        List<WindPowerReal15MinFD0004> windPowerReal15MinList = windPowerReal15MinFD0004Mapper.selectByTimeAndObjId(startTime,endTime,objId);
+        return windPowerReal15MinList;
+    }
+}

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0005ServiceImpl.java

@@ -7,15 +7,16 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0005Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0005;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0005ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0005Mapper, WindPowerReal15MinFD0005> implements WindPowerReal15MinFD0005Service {
-    @Resource
-    private WindPowerReal15MinFD0005Mapper windPowerReal15MinFD0005Mapper;
+    private final WindPowerReal15MinFD0005Mapper windPowerReal15MinFD0005Mapper;
 
+    public WindPowerReal15MinFD0005ServiceImpl(WindPowerReal15MinFD0005Mapper windPowerReal15MinFD0005Mapper){
+        this.windPowerReal15MinFD0005Mapper = windPowerReal15MinFD0005Mapper;
+    }
     @Override
     @WR("W")
     public List<WindPowerReal15MinFD0005> get(Date startTime, Date endTime) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0006ServiceImpl.java

@@ -7,15 +7,16 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0006Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0006;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0006ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0006Mapper, WindPowerReal15MinFD0006> implements WindPowerReal15MinFD0006Service {
-    @Resource
-    private WindPowerReal15MinFD0006Mapper windPowerReal15MinFD0006Mapper;
+    private final WindPowerReal15MinFD0006Mapper windPowerReal15MinFD0006Mapper;
 
+    public WindPowerReal15MinFD0006ServiceImpl(WindPowerReal15MinFD0006Mapper windPowerReal15MinFD0006Mapper){
+        this.windPowerReal15MinFD0006Mapper = windPowerReal15MinFD0006Mapper;
+    }
     @Override
     @WR("W")
     public List<WindPowerReal15MinFD0006> get(Date startTime, Date endTime) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/WindPowerReal15MinFD0007ServiceImpl.java

@@ -7,15 +7,16 @@ import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0007Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0007;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 
 @Service
 public class WindPowerReal15MinFD0007ServiceImpl extends ServiceImpl<WindPowerReal15MinFD0007Mapper, WindPowerReal15MinFD0007> implements WindPowerReal15MinFD0007Service {
-    @Resource
-    private WindPowerReal15MinFD0007Mapper windPowerReal15MinFD0007Mapper;
+    private final WindPowerReal15MinFD0007Mapper windPowerReal15MinFD0007Mapper;
 
+    public WindPowerReal15MinFD0007ServiceImpl(WindPowerReal15MinFD0007Mapper windPowerReal15MinFD0007Mapper){
+        this.windPowerReal15MinFD0007Mapper = windPowerReal15MinFD0007Mapper;
+    }
     @Override
     @WR("W")
     public List<WindPowerReal15MinFD0007> get(Date startTime, Date endTime) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/an/ParsingChannelServiceImpl.java

@@ -21,9 +21,11 @@ import java.util.List;
 @Service
 public class ParsingChannelServiceImpl extends ServiceImpl<ParsingChannelMapper, ParsingChannel> implements ParsingChannelService {
 
-    @Resource
-    private ParsingChannelMapper parsingChannelMapper;
+    private final ParsingChannelMapper parsingChannelMapper;
 
+    public ParsingChannelServiceImpl(ParsingChannelMapper parsingChannelMapper){
+        this.parsingChannelMapper = parsingChannelMapper;
+    }
     @Override
 //    @WR(DataSourceNames.Third)
     public List<ParsingChannel> get() {

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/an/ParsingDqInfoServiceImpl.java

@@ -44,7 +44,6 @@ import java.util.List;
  */
 @Service
 @Slf4j
-@AllArgsConstructor
 public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, ParsingDqInfo> implements ParsingDqInfoService, ParsingInterface {
 
     private final OverhaulPlanService overhaulPlanService;
@@ -55,6 +54,8 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 
     private final JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service;
 
+    private final JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service;
+
     private final JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service;
 
     private final JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service;
@@ -63,10 +64,24 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 
     private final ElectricFieldService electricFieldService;
 
-    JiaYueWindPowerDqResultCoverMapper jiaYueWindPowerDqResultCoverMapper;
+    private final JiaYueWindPowerDqResultCoverMapper jiaYueWindPowerDqResultCoverMapper;
 
     private final WindFarmInfoEncryptionService windFarmInfoEncryptionService;
 
+    public ParsingDqInfoServiceImpl(OverhaulPlanService overhaulPlanService,JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service,JiaYueWindPowerDqResultCoverFD0002Service jiaYueWindPowerDqResultCoverFD0002Service,JiaYueWindPowerDqResultCoverFD0003Service jiaYueWindPowerDqResultCoverFD0003Service,JiaYueWindPowerDqResultCoverFD0004Service jiaYueWindPowerDqResultCoverFD0004Service,JiaYueWindPowerDqResultCoverFD0005Service jiaYueWindPowerDqResultCoverFD0005Service,JiaYueWindPowerDqResultCoverFD0006Service jiaYueWindPowerDqResultCoverFD0006Service,JiaYueWindPowerDqResultCoverFD0007Service jiaYueWindPowerDqResultCoverFD0007Service,ElectricFieldService electricFieldService,JiaYueWindPowerDqResultCoverMapper jiaYueWindPowerDqResultCoverMapper,WindFarmInfoEncryptionService windFarmInfoEncryptionService){
+        this.overhaulPlanService = overhaulPlanService;
+        this.jiaYueWindPowerDqResultCoverFD0001Service = jiaYueWindPowerDqResultCoverFD0001Service;
+        this.jiaYueWindPowerDqResultCoverFD0002Service = jiaYueWindPowerDqResultCoverFD0002Service;
+        this.jiaYueWindPowerDqResultCoverFD0003Service = jiaYueWindPowerDqResultCoverFD0003Service;
+        this.jiaYueWindPowerDqResultCoverFD0004Service = jiaYueWindPowerDqResultCoverFD0004Service;
+        this.jiaYueWindPowerDqResultCoverFD0005Service = jiaYueWindPowerDqResultCoverFD0005Service;
+        this.jiaYueWindPowerDqResultCoverFD0006Service = jiaYueWindPowerDqResultCoverFD0006Service;
+        this.jiaYueWindPowerDqResultCoverFD0007Service = jiaYueWindPowerDqResultCoverFD0007Service;
+        this.electricFieldService = electricFieldService;
+        this.jiaYueWindPowerDqResultCoverMapper = jiaYueWindPowerDqResultCoverMapper;
+        this.windFarmInfoEncryptionService = windFarmInfoEncryptionService;
+    }
+
     @Override
     public boolean save(ParsingInfo parsingInfo) {
         return save((ParsingDqInfo) parsingInfo);
@@ -85,6 +100,7 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
             List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCoverFD0001List = new ArrayList<>();
             List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCoverFD0002List = new ArrayList<>();
             List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCoverFD0003List = new ArrayList<>();
+            List<JiaYueWindPowerDqResultCoverFD0004> jiaYueWindPowerDqResultCoverFD0004List = new ArrayList<>();
             List<JiaYueWindPowerDqResultCoverFD0005> jiaYueWindPowerDqResultCoverFD0005List = new ArrayList<>();
             List<JiaYueWindPowerDqResultCoverFD0006> jiaYueWindPowerDqResultCoverFD0006List = new ArrayList<>();
             List<JiaYueWindPowerDqResultCoverFD0007> jiaYueWindPowerDqResultCoverFD0007List = new ArrayList<>();
@@ -94,7 +110,7 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
             parsingDqInfo.setDataType("m");
             parsingDqInfo.setFileName("DQ_");
             parsingDqInfo.setGenDate("");
-            parsingDqInfo.setStationCode("J00770,J00941,J00942,J00929,J00930,J00931");
+            parsingDqInfo.setStationCode("J00770,J00941,J00942,J00988,J00929,J00930,J00931");
             parsingDqInfo.setDelFlag("0");
             parsingDqInfo.setForecastTime("1<=>2<=>date=<=>yyyy-MM-dd");
             parsingDqInfo.setFpValue("3-1538<=>5");
@@ -129,9 +145,7 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
             String fileDate = fileYear + "-" + fileMonth + "-" + fileDay;
 
             //判断文件名是否符合配置
-
             if (file.getName().contains(parsingDqInfo.getFileName())) {
-                // 根据文件名日期时间进行查询,看数据库中是否已存在相同的解析文件
                 List<? extends Serializable> jiaYueWindPowerDqResultCovers = new ArrayList<>();
                 if (parsingUrl.getStationCode().equals("J00770")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0001Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
@@ -142,6 +156,9 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                 if (parsingUrl.getStationCode().equals("J00942")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0003Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
+                if (parsingUrl.getStationCode().equals("J00988")) {
+                    jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0004Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
+                }
                 if (parsingUrl.getStationCode().equals("J00929")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0005Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
@@ -196,6 +213,10 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                                         jiaYueWindPowerDqResultCoverFD0003List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
                                                 new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0003()));
                                     }
+                                    if (parsingUrl.getStationCode().equals("J00988")) {
+                                        jiaYueWindPowerDqResultCoverFD0004List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
+                                                new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0004()));
+                                    }
                                     if (parsingUrl.getStationCode().equals("J00929")) {
                                         jiaYueWindPowerDqResultCoverFD0005List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
                                                 new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0005()));
@@ -222,6 +243,10 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                                     jiaYueWindPowerDqResultCoverFD0003Service.saveDq(jiaYueWindPowerDqResultCoverFD0003List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
 
                                 }
+                                if (parsingUrl.getStationCode().equals("J00988")) {
+                                    jiaYueWindPowerDqResultCoverFD0004Service.saveDq(jiaYueWindPowerDqResultCoverFD0004List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
+
+                                }
                                 if (parsingUrl.getStationCode().equals("J00929")) {
                                     jiaYueWindPowerDqResultCoverFD0005Service.saveDq(jiaYueWindPowerDqResultCoverFD0005List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
 
@@ -233,8 +258,6 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                                 if (parsingUrl.getStationCode().equals("J00931")) {
                                     jiaYueWindPowerDqResultCoverFD0007Service.saveDq(jiaYueWindPowerDqResultCoverFD0007List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                                 }
-
-
                                 log.info("解析DQ文件：{} 成功！ O(∩_∩)O", file.getName());
                                 parsingStatus = FileTypeEnum.DQ.name();
                             } else {
@@ -421,7 +444,6 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
             PropertyUtils.setProperty(targetType, "createTime", LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
         } catch (Exception e) {
             e.printStackTrace();
-            // 处理异常，例如日志记录或其他操作
         }
 
         return targetType;

ipp-client/src/main/java/com/jiayue/ipfcst/client/service/impl/an/ParsingNwpInfoServiceImpl.java

@@ -34,6 +34,7 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * NWP解析业务层实现类
@@ -55,6 +56,8 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
 
     private final JiaYueWindPowerNwpResultCoverFD0003Service jiaYueWindPowerNwpResultCoverFD0003Service;
 
+    private final JiaYueWindPowerNwpResultCoverFD0004Service jiaYueWindPowerNwpResultCoverFD0004Service;
+
     private final JiaYueWindPowerNwpResultCoverFD0005Service jiaYueWindPowerNwpResultCoverFD0005Service;
 
     private final JiaYueWindPowerNwpResultCoverFD0006Service jiaYueWindPowerNwpResultCoverFD0006Service;
@@ -87,7 +90,7 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
             parsingNwpInfo1.setId("a6bef32fab9fb298528851f1d85c77f2");
             parsingNwpInfo1.setDataType("m");
             parsingNwpInfo1.setFileName("NWP_");
-            parsingNwpInfo1.setStationCode("J00770,J00941,J00942,J00929,J00930,J00931");
+            parsingNwpInfo1.setStationCode("J00770,J00941,J00942,J00988,J00929,J00930,J00931");
             parsingNwpInfo1.setDelFlag("0");
             parsingNwpInfo1.setPreTime("1<=>2<=>date=<=>yyyy-MM-dd");
 //            parsingNwpInfo1.setScDate();
@@ -122,6 +125,7 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
             List<JiaYueWindPowerNwpResultCoverFD0001> jiaYueWindPowerNwpResultCoverFD0001List = new ArrayList<>();
             List<JiaYueWindPowerNwpResultCoverFD0002> jiaYueWindPowerNwpResultCoverFD0002List = new ArrayList<>();
             List<JiaYueWindPowerNwpResultCoverFD0003> jiaYueWindPowerNwpResultCoverFD0003List = new ArrayList<>();
+            List<JiaYueWindPowerNwpResultCoverFD0004> jiaYueWindPowerNwpResultCoverFD0004List = new ArrayList<>();
             List<JiaYueWindPowerNwpResultCoverFD0005> jiaYueWindPowerNwpResultCoverFD0005List = new ArrayList<>();
             List<JiaYueWindPowerNwpResultCoverFD0006> jiaYueWindPowerNwpResultCoverFD0006List = new ArrayList<>();
             List<JiaYueWindPowerNwpResultCoverFD0007> jiaYueWindPowerNwpResultCoverFD0007List = new ArrayList<>();
@@ -171,6 +175,9 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                 if (parsingUrl.getStationCode().equals("J00942")) {
                     jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0003Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
+                if (parsingUrl.getStationCode().equals("J00988")) {
+                    jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0004Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
+                }
                 if (parsingUrl.getStationCode().equals("J00929")) {
                     jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0005Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
@@ -215,7 +222,10 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                             List<BigDecimal> pressures = parsingNwpValue(parsingNwpInfo1.getPressure(), fileContent);
                             List<BigDecimal> swrs = parsingNwpValue(parsingNwpInfo1.getSwr(), fileContent);
                             List<BigDecimal> ts = parsingNwpValue(parsingNwpInfo1.getT(), fileContent);
-
+                            // 处理温度单位变为摄氏度
+                            List<BigDecimal> result = ts.stream()
+                                    .map(value -> value.subtract(new BigDecimal(273.15)))
+                                    .collect(Collectors.toList());
 
                             //以十米风速为基准
                             for (int i = 0; i < ws10s.size(); i++) {
@@ -230,27 +240,31 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                                 // 存入默认数据库(远端)
                                 if (parsingUrl.getStationCode().equals("J00770")) {
                                     jiaYueWindPowerNwpResultCoverFD0001List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0001()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0001()));
                                 }
                                 if (parsingUrl.getStationCode().equals("J00941")) {
                                     jiaYueWindPowerNwpResultCoverFD0002List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0002()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0002()));
                                 }
                                 if (parsingUrl.getStationCode().equals("J00942")) {
                                     jiaYueWindPowerNwpResultCoverFD0003List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0003()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0003()));
+                                }
+                                if (parsingUrl.getStationCode().equals("J00988")) {
+                                    jiaYueWindPowerNwpResultCoverFD0004List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0004()));
                                 }
                                 if (parsingUrl.getStationCode().equals("J00929")) {
                                     jiaYueWindPowerNwpResultCoverFD0005List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0005()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0005()));
                                 }
                                 if (parsingUrl.getStationCode().equals("J00930")) {
                                     jiaYueWindPowerNwpResultCoverFD0006List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0006()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0006()));
                                 }
                                 if (parsingUrl.getStationCode().equals("J00931")) {
                                     jiaYueWindPowerNwpResultCoverFD0007List.add(this.jiaYueWindPowerNwpResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), da, timeStr, pressures, rhs
-                                            , swrs, ts, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0007()));
+                                            , swrs, result, ws10s, wd10s, ws30s, wd30s, ws50s, wd50s, ws70s, wd70s, ws80s, wd80s, ws90s, wd90s, ws100s, wd100s, ws170s, wd170s, i, new JiaYueWindPowerNwpResultCoverFD0007()));
                                 }
                                 time += Constant.INTERVALTIME;
                             }
@@ -263,6 +277,9 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                             if (parsingUrl.getStationCode().equals("J00942")) {
                                 jiaYueWindPowerNwpResultCoverFD0003Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0003List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                             }
+                            if (parsingUrl.getStationCode().equals("J00988")) {
+                                jiaYueWindPowerNwpResultCoverFD0004Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0004List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
+                            }
                             if (parsingUrl.getStationCode().equals("J00929")) {
                                 jiaYueWindPowerNwpResultCoverFD0005Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0005List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                             }

ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/JiaYueWindPowerCdqResultCoverFD0004.java

@@ -0,0 +1,83 @@
+package com.jiayue.ipp.common.data.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.sql.Time;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * jiayue_FD0004_zdata_wind_power_cdq_result
+ *
+ *  @author fxy
+ *  @date 2023-08-01 15:48:48
+ */
+@Data
+@TableName("jiayue_FD0004_zdata_wind_power_cdq_result")
+public class JiaYueWindPowerCdqResultCoverFD0004 {
+    private static final long serialVersionUID = 1L;
+
+
+//    /**
+//     * 主键ID
+//     */
+//    @TableId(value = "id",type = IdType.INPUT)
+//    private BigInteger id;
+
+
+    /**
+     *  对象标识
+     */
+    private String objId;
+
+
+//    /**
+//     *  数据类型
+//     */
+//    private String dataType;
+//
+//
+//    /**
+//     *  预测类型
+//     */
+//    private String dataFlg;
+
+    /**
+     *  起报日期
+     */
+    private Date dataDate;
+
+
+    /**
+     *  起报时间
+     */
+    private Time dataTime;
+
+    /**
+     *  预测时间
+     */
+    private LocalDateTime preDateTime;
+
+    /**
+     *  值
+     */
+    private Float activePower;
+
+    /**
+     *  入库时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     *  更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+    /**
+     *  开机容量
+     */
+    private Float openCap;
+}

ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/JiaYueWindPowerDqResultCoverFD0004.java

@@ -0,0 +1,84 @@
+package com.jiayue.ipp.common.data.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Time;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * jiayue_FD0004_zdata_wind_power_dq_result
+ *
+ *  @author fxy
+ *  @date 2023-08-01 15:48:48
+ */
+@Data
+@TableName("jiayue_FD0004_zdata_wind_power_dq_result")
+public class JiaYueWindPowerDqResultCoverFD0004 implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+//    /**
+//     * 主键ID
+//     */
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private BigInteger id;
+
+
+    /**
+     *  对象标识
+     */
+    private String objId;
+
+
+//    /**
+//     *  数据类型
+//     */
+//    private String dataType;
+//
+//
+//    /**
+//     *  预测类型
+//     */
+//    private String dataFlg;
+
+    /**
+     *  起报日期
+     */
+    private Date dataDate;
+
+
+    /**
+     *  起报时间
+     */
+    private Time dataTime;
+
+    /**
+     *  预测时间
+     */
+    private LocalDateTime preDateTime;
+
+    /**
+     *  值
+     */
+    private Float activePower;
+
+    /**
+     *  入库时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     *  更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     *  开机容量
+     */
+    private Float openCap;
+}

ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/JiaYueWindPowerNwpResultCoverFD0004.java

@@ -0,0 +1,179 @@
+package com.jiayue.ipp.common.data.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * jiayue_FD0004_zdata_nwp_result
+ *
+ *  @author fxy
+ *  @date 2023-08-01 15:48:48
+ */
+@Data
+@TableName("jiayue_FD0004_zdata_nwp_result")
+public class JiaYueWindPowerNwpResultCoverFD0004 implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+//    /**
+//     * 主键ID
+//     */
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private BigInteger id;
+
+
+    /**
+     *  对象标识
+     */
+    private String objId;
+
+
+//    /**
+//     *  数据类型
+//     */
+//    private String dataType;
+
+
+//    /**
+//     *  预测类型
+//     */
+//    private String dataFlg;
+
+    /**
+     *  起报日期
+     */
+    private Date dataDate;
+
+
+    /**
+     *  起报时间
+     */
+    private Time dataTime;
+
+    /**
+     *  预测时间
+     */
+    private LocalDateTime preDateTime;
+
+    /**
+     *  温度
+     */
+    private BigDecimal t;
+
+    /**
+     *  湿度
+     */
+    private BigDecimal h;
+
+    /**
+     *  短波辐射
+     */
+    private BigDecimal swr;
+
+    /**
+     *  气压
+     */
+    private BigDecimal p;
+
+
+    /**
+     *  10米风速
+     */
+    private BigDecimal ws_10;
+
+    /**
+     *  30米风速
+     */
+    private BigDecimal ws_30;
+
+    /**
+     *  50米风速
+     */
+    private BigDecimal ws_50;
+
+    /**
+     *  70米风速
+     */
+    private BigDecimal ws_70;
+
+    /**
+     *  80米风速
+     */
+    private BigDecimal ws_80;
+
+    /**
+     *  90米风速
+     */
+    private BigDecimal ws_90;
+
+    /**
+     *  100米风速
+     */
+    private BigDecimal ws_100;
+
+    /**
+     *  170米风速
+     */
+    private BigDecimal ws_170;
+
+    /**
+     *  10米风向
+     */
+    private BigDecimal wd_10;
+
+    /**
+     *  30米风向
+     */
+    private BigDecimal wd_30;
+
+    /**
+     *  50米风向
+     */
+    private BigDecimal wd_50;
+
+    /**
+     *  70米风向
+     */
+    private BigDecimal wd_70;
+
+    /**
+     *  80米风向
+     */
+    private BigDecimal wd_80;
+
+    /**
+     *  90米风向
+     */
+    private BigDecimal wd_90;
+
+    /**
+     *  100米风向
+     */
+    private BigDecimal wd_100;
+
+    /**
+     *  170米风向
+     */
+    private BigDecimal wd_170;
+
+
+
+    /**
+     *  入库时间
+     */
+    private LocalDateTime createTime;
+
+
+    /**
+     *  更新时间
+     */
+    private LocalDateTime updateTime;
+
+}

ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/WindPowerReal15MinFD0004.java

@@ -0,0 +1,63 @@
+package com.jiayue.ipp.common.data.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * zdata_FD0004_wind_power_real_15min
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Data
+@TableName("zdata_FD0004_wind_power_real_15min")
+public class WindPowerReal15MinFD0004 implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+//
+//    /**
+//     * 主键ID
+//     */
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    private BigInteger id;
+
+
+    /**
+     *  对象标识
+     */
+    private String objId;
+
+
+    /**
+     *  数据类型
+     */
+    private String dataType;
+
+
+    /**
+     *  日期
+     */
+    private LocalDateTime dateTime;
+
+    /**
+     *  值
+     */
+    private Float value;
+
+    /**
+     *  入库时间
+     */
+    private LocalDateTime createTime;
+
+
+//    /**
+//     *  更新时间
+//     */
+//    private LocalDateTime updateTime;
+
+}