中能融合生产增加定时任务，取消多数据源，通过二维码回传短期、超短期等数据，超短期在提前14分钟基础上在提前30秒

ipp-client/pom.xml

@@ -21,7 +21,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <hutool.version>5.2.5</hutool.version>
+        <hutool.version>5.3.5</hutool.version>
         <java.version>1.8</java.version>
         <druid.version>1.1.14</druid.version>
     </properties>

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

@@ -71,7 +71,7 @@ public class ParsingJob {
     /**
      * 超短期生成定时任务
      */
-    @Scheduled(cron = "30 10,25,40,55 * * * ? ")
+    @Scheduled(cron = "35 0,15,30,45 * * * ? ")
 //    @Scheduled(fixedRate = 60000)
     public void ultraShortTermApi() {
         jiaYueWindPowerCdqResultCoverFD0001Service.executeForecast();

ipp-client/src/main/java/com/jiayue/ipfcst/client/config/DataSourceNames.java

@@ -5,7 +5,7 @@ package com.jiayue.ipfcst.client.config;
  */
 public class DataSourceNames {
         public static final String FIRST = "W";
-        public static final String SECOND = "R";
-        public static final String Third = "Y";
+//        public static final String SECOND = "R";
+//        public static final String Third = "Y";
     }
 

ipp-client/src/main/java/com/jiayue/ipfcst/client/config/DynamicDataSourceConfig.java

@@ -19,25 +19,25 @@ public class DynamicDataSourceConfig {
         return  DruidDataSourceBuilder.create().build();
     }
 
-    @Bean
-    @ConfigurationProperties("spring.datasource.datasource2")
-    public DataSource secondDataSource(){
-        return  DruidDataSourceBuilder.create().build();
-    }
-
-    @Bean
-    @ConfigurationProperties("spring.datasource.datasource3")
-    public DataSource thirdDataSource(){
-        return  DruidDataSourceBuilder.create().build();
-    }
+//    @Bean
+//    @ConfigurationProperties("spring.datasource.datasource2")
+//    public DataSource secondDataSource(){
+//        return  DruidDataSourceBuilder.create().build();
+//    }
+//
+//    @Bean
+//    @ConfigurationProperties("spring.datasource.datasource3")
+//    public DataSource thirdDataSource(){
+//        return  DruidDataSourceBuilder.create().build();
+//    }
 
     @Bean
     @Primary
     public DynamicDataSource dataSource(DataSource firstDataSource, DataSource secondDataSource,DataSource thirdDataSource) {
         Map<Object, Object> targetDataSources = new HashMap<>(5);
         targetDataSources.put(DataSourceNames.FIRST, firstDataSource);
-        targetDataSources.put(DataSourceNames.SECOND, secondDataSource);
-        targetDataSources.put(DataSourceNames.Third, thirdDataSource);
+//        targetDataSources.put(DataSourceNames.SECOND, secondDataSource);
+//        targetDataSources.put(DataSourceNames.Third, thirdDataSource);
         return new DynamicDataSource(firstDataSource, targetDataSources);
     }
 }

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

@@ -2,7 +2,6 @@ package com.jiayue.ipfcst.client.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0001;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0002;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,4 +32,7 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0001 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0001_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0001> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0001_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0001 selectByDataDate(@Param("dateSubString") String dateSubString);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerCdqResultCoverMapperFD0002.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.JiaYueWindPowerCdqResultCover;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0002;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +32,7 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0002 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0002_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0002> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0002_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0002 selectByDataDate(@Param("dateSubString") String dateSubString);
+
 }

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

@@ -1,8 +1,6 @@
 package com.jiayue.ipfcst.client.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCover;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0003;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -34,4 +32,8 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0003 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0003_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0003> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0003_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0003 selectByDataDate(@Param("dateSubString") String dateSubString);
+
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerCdqResultCoverMapperFD0005.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.JiaYueWindPowerCdqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0005;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +32,7 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0005 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0005_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0005> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0005_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0005 selectByDataDate(@Param("dateSubString") String dateSubString);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerCdqResultCoverMapperFD0006.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.JiaYueWindPowerCdqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0006;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +32,7 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0006 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0006_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0006> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0006_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0006 selectByDataDate(@Param("dateSubString") String dateSubString);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerCdqResultCoverMapperFD0007.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.JiaYueWindPowerCdqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0007;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +32,7 @@ public interface JiaYueWindPowerCdqResultCoverMapperFD0007 extends BaseMapper<Ji
     @Select("SELECT * FROM jiayue_FD0007_zdata_wind_power_cdq_result WHERE DATA_TIME BETWEEN #{startTime} AND #{endTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerCdqResultCoverFD0007> selectByTimeAndObjId(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0007_zdata_wind_power_cdq_result WHERE PRE_DATE_TIME = #{dateSubString} ORDER BY CREATE_TIME DESC LIMIT 1")
+    JiaYueWindPowerCdqResultCoverFD0007 selectByDataDate(@Param("dateSubString") String dateSubString);
+
 }

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

@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.sql.Time;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

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

@@ -2,7 +2,6 @@ package com.jiayue.ipfcst.client.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0001;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0002;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,4 +45,8 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0001 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0001_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0001> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+
+    @Select("SELECT * FROM jiayue_FD0001_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 96")
+    List<JiaYueWindPowerDqResultCoverFD0001> selectByDataDate(@Param("date") String date);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0002.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.JiaYueWindPowerDqResultCover;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0002;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +45,6 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0002 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0002_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0002> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0002_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 960")
+    List<JiaYueWindPowerDqResultCoverFD0002> selectByDataDate(@Param("date") String date);
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0003.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.JiaYueWindPowerDqResultCover;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0003;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +45,7 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0003 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0003_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0003> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0003_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 960")
+    List<JiaYueWindPowerDqResultCoverFD0003> selectByDataDate(@Param("date") String date);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0005.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.JiaYueWindPowerDqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0005;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +45,8 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0005 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0005_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0005> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+
+    @Select("SELECT * FROM jiayue_FD0005_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 96")
+    List<JiaYueWindPowerDqResultCoverFD0005> selectByDataDate(@Param("date") String date);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0006.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.JiaYueWindPowerDqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0006;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +45,7 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0006 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0006_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0006> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+    @Select("SELECT * FROM jiayue_FD0006_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 96")
+    List<JiaYueWindPowerDqResultCoverFD0006> selectByDataDate(@Param("date") String date);
+
 }

ipp-client/src/main/java/com/jiayue/ipfcst/client/mapper/JiaYueWindPowerDqResultCoverMapperFD0007.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.JiaYueWindPowerDqResultCoverFD0002;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCoverFD0007;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,4 +45,8 @@ public interface JiaYueWindPowerDqResultCoverMapperFD0007 extends BaseMapper<Jia
     @Select("SELECT * FROM jiayue_FD0007_zdata_wind_power_dq_result WHERE DATA_DATE = #{fileDate} AND DATA_TIME = #{fileTime} AND OBJ_ID = #{objId}")
     List<JiaYueWindPowerDqResultCoverFD0007> selectByDataDateDateTime(@Param("fileDate") String fileDate, @Param("fileTime") String fileTime, @Param("objId") String objId);
 
+
+    @Select("SELECT * FROM jiayue_FD0007_zdata_wind_power_dq_result WHERE DATA_TIME = '05:00:00' AND  DATA_DATE = #{date} ORDER BY CREATE_TIME LIMIT 96")
+    List<JiaYueWindPowerDqResultCoverFD0007> selectByDataDate(@Param("date") String date);
+
 }

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

@@ -0,0 +1,24 @@
+package com.jiayue.ipfcst.client.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.OverhaulPlan;
+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.List;
+
+/**
+ * zdata_overhaul_plan (OverhaulPlan)表数据库访问层
+ *
+ * @author fxy
+ * @date 2023-08-01 15:48:48
+ */
+@Mapper
+public interface OverhaulPlanMapper extends BaseMapper<OverhaulPlan> {
+
+    @Select("SELECT * FROM zdata_overhaul_plan WHERE START_TIME <= #{startTime} AND END_TIME >= #{startTime} AND FARM_ID = #{objId} AND STATUS = 1")
+    List<OverhaulPlan> selectByTimeAndObjIdAndStatus(@Param("startTime") LocalDateTime startTime, @Param("objId") String objId);
+
+}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.ipp.common.data.entity.WindFarmInfoEncryption;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 
 /**
@@ -18,4 +20,7 @@ public interface WindFarmInfoEncryptionMapper extends BaseMapper<WindFarmInfoEnc
     @Delete("DELETE FROM zbase_wind_farm_info_encryption")
     int deleteAll();
 
+    @Select("SELECT * FROM zbase_wind_farm_info_encryption WHERE FARM_ID = #{objId}")
+    WindFarmInfoEncryption selectCap(@Param("objId") String objId);
+
 }

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

@@ -5,6 +5,7 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0001;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -24,11 +25,6 @@ public interface JiaYueWindPowerCdqResultCoverFD0001Service extends IService<Jia
      */
     int put(List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCovers);
 
-//    /**
-//     * 查询所有数据(本地)
-//     * @return
-//     */
-//    List<JiaYueWindPowerCdqResultCover> getAll();
 
     /**
      * 删除所有数据(本地)
@@ -50,4 +46,5 @@ public interface JiaYueWindPowerCdqResultCoverFD0001Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0001> findByDataDate(Date startTime);
 }

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

@@ -5,6 +5,7 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0002;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,4 +48,5 @@ public interface JiaYueWindPowerCdqResultCoverFD0002Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0002> findByDataDate(Date startTime);
 }

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

@@ -5,6 +5,7 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0003;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,4 +48,5 @@ public interface JiaYueWindPowerCdqResultCoverFD0003Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0003> findByDataDate(Date startTime);
 }

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

@@ -5,6 +5,7 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0005;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,4 +48,5 @@ public interface JiaYueWindPowerCdqResultCoverFD0005Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0005> findByDataDate(Date startTime);
 }

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

@@ -5,6 +5,7 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0006;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,4 +48,5 @@ public interface JiaYueWindPowerCdqResultCoverFD0006Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0006> findByDataDate(Date startTime);
 }

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

@@ -2,9 +2,11 @@ package com.jiayue.ipfcst.client.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0007;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,4 +49,6 @@ public interface JiaYueWindPowerCdqResultCoverFD0007Service extends IService<Jia
 
     void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode);
 
+    List<JiaYueWindPowerCdqResultCoverFD0007> findByDataDate(Date startTime);
+
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0001Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0001> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0001> findByDataDate(Date startTime);
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0002Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0002> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0002> findByDataDate(Date startTime);
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0003Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0003> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0003> findByDataDate(Date startTime);
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0005Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0005> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0005> findByDataDate(Date startTime);
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0006Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0006> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0006> findByDataDate(Date startTime);
 }

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

@@ -58,4 +58,6 @@ public interface JiaYueWindPowerDqResultCoverFD0007Service extends IService<JiaY
      * @return
      */
     List<JiaYueWindPowerDqResultCoverFD0007> findByObjIdAndStartTimeAndEndTime(String stationCode, Date startTime, Date endTime);
+
+    List<JiaYueWindPowerDqResultCoverFD0007> findByDataDate(Date startTime);
 }

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

@@ -0,0 +1,21 @@
+package com.jiayue.ipfcst.client.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.JiaYueWindPowerCdqResultCoverFD0001;
+import com.jiayue.ipp.common.data.entity.OverhaulPlan;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public interface OverhaulPlanService extends IService<OverhaulPlan> {
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<OverhaulPlan> getOverhaulPlan(LocalDateTime startTime, String farmID);
+
+}

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

@@ -8,28 +8,37 @@ import java.util.List;
 
 @Service
 public interface WindFarmInfoEncryptionService extends IService<WindFarmInfoEncryption> {
-     /**
-      * 查询所有数据(远端)
-      * @return
-      */
-     List<WindFarmInfoEncryption> get();
+    /**
+     * 查询所有数据(远端)
+     *
+     * @return
+     */
+    List<WindFarmInfoEncryption> get();
 
     /**
      * 查询所有数据插入到本地
-      * @param windFarmInfoEncryptionList
+     *
+     * @param windFarmInfoEncryptionList
      * @return
      */
-     int put(List<WindFarmInfoEncryption> windFarmInfoEncryptionList);
+    int put(List<WindFarmInfoEncryption> windFarmInfoEncryptionList);
 
     /**
      * 查询所有数据(本地)
+     *
      * @return
      */
     List<WindFarmInfoEncryption> getAll();
 
     /**
-     *  删除所有数据(本地)
+     * 删除所有数据(本地)
+     *
      * @return
      */
     int deleteAll();
+
+
+    WindFarmInfoEncryption getCap(String objId);
+
+
 }

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

@@ -51,9 +51,9 @@ public class DownloadService {
         ParsingUrl parsingUrl1 = new ParsingUrl();
         parsingUrl1.setCId("722af308253fcd6eff67959c7f76eaf8");
         parsingUrl1.setForecastManufactor("SYJY");
-        parsingUrl1.setUrl("/home/syjy/F_data/new/J00771");
+        parsingUrl1.setUrl("/home/syjy/F_data/new/J00941");
         parsingUrl1.setUrlStatus("1");
-        parsingUrl1.setStationCode("J00771");
+        parsingUrl1.setStationCode("J00941");
         parsingUrl1.setId("1a1259492519b44474a7bf947b35dcdc");
         parsingUrl1.setDelFlag("0");
 
@@ -69,9 +69,9 @@ public class DownloadService {
         ParsingUrl parsingUrl3 = new ParsingUrl();
         parsingUrl3.setCId("722af308253fcd6eff67959c7f76eaf8");
         parsingUrl3.setForecastManufactor("SYJY");
-        parsingUrl3.setUrl("/home/syjy/F_data/new/J00772");
+        parsingUrl3.setUrl("/home/syjy/F_data/new/J00942");
         parsingUrl3.setUrlStatus("1");
-        parsingUrl3.setStationCode("J00772");
+        parsingUrl3.setStationCode("J00942");
         parsingUrl3.setId("722af308253fcd6eff67959c7f76eaf8");
         parsingUrl3.setDelFlag("0");
 

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

@@ -23,7 +23,7 @@ public class DataTypeInfoServiceImpl extends ServiceImpl<DataTypeInfoMapper, Dat
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<DataTypeInfo> dataTypeInfo) {
         this.saveBatch(dataTypeInfo,dataTypeInfo.size());
         return dataTypeInfo.size();
@@ -31,14 +31,14 @@ public class DataTypeInfoServiceImpl extends ServiceImpl<DataTypeInfoMapper, Dat
 
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<DataTypeInfo> getAll() {
         List<DataTypeInfo> dataTypeInfoList =  dataTypeInfoMapper.selectList(null);
         return  dataTypeInfoList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return dataTypeInfoMapper.deleteAll();
     }

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

@@ -21,8 +21,7 @@ import java.util.List;
 @Data
 @Service
 public class ElectricFieldServiceImpl extends ServiceImpl<ElectricFieldMapper, ElectricField> implements ElectricFieldService {
-    //    @Autowired
-//    RemoteUnitService remoteUnitService;
+
     @Resource
     ElectricFieldMapper electricFieldMapper;
     @Autowired
@@ -74,10 +73,10 @@ public class ElectricFieldServiceImpl extends ServiceImpl<ElectricFieldMapper, E
             case "J00770":
                 sign = "FD0001";
                 break;
-            case "J00771":
+            case "J00941":
                 sign = "FD0002";
                 break;
-            case "J00772":
+            case "J00942":
                 sign = "FD0003";
                 break;
             case "J00929":

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

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverFD0001List) {
         if (jiaYueWindPowerCdqResultCoverFD0001List != null && jiaYueWindPowerCdqResultCoverFD0001List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0001List, jiaYueWindPowerCdqResultCoverFD0001List.size());
@@ -62,16 +59,9 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
         return jiaYueWindPowerCdqResultCoverFD0001List.size();
     }
 
-//    @Override
-//    public List<JiaYueWindPowerCdqResultCover> getAll() {
-//        List<JiaYueWindPowerCdqResultCover> jiaYueWindPowerCdqResultCovers =  jiaYueWindPowerCdqResultCoverMapper.selectList(null);
-//        return  jiaYueWindPowerCdqResultCovers;
-//    }
-
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
-
         return jiaYueWindPowerCdqResultCoverMapperFD0001.deleteAll();
     }
 
@@ -80,33 +70,10 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
      * 执行超短期预测
      */
     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(12.0000));
-//        electricField2.setElectricFieldTypeEnum("2");
-//        electricField2.setForecastManufactor("SYJY");
-//        electricField2.setId("30a9f02678beb7101e628d7c7e22c5d6");
-//        electricField2.setName("天津中能融合测试站C");
-//        electricField2.setStationCode("J00772");
-//        electricField2.setSign("FD0003");
-//        electricField2.setNetSubstationName("J00772");
-
         ElectricField electricField3 = new ElectricField();
         electricField3.setBelongForecastManufactor("SYJY");
-        electricField3.setCapacity(new BigDecimal(20.0000));
+        electricField3.setCapacity(new BigDecimal(30.0000));
         electricField3.setElectricFieldTypeEnum("2");
         electricField3.setForecastManufactor("SYJY");
         electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
@@ -114,9 +81,6 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
         electricField3.setStationCode("J00770");
         electricField3.setSign("FD0001");
         electricField3.setNetSubstationName("J00770");
-
-//        electricFieldList.add(electricField1);
-//        electricFieldList.add(electricField2);
         electricFieldList.add(electricField3);
 
         electricFieldList.forEach(e -> {
@@ -185,7 +149,7 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
     @WR("W")
     public void executeForecastForWind(final List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCoverList, final BigDecimal capacity, String stationCode) {
 
-        List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverFD0002List = new ArrayList<>();
+        List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverFD0001List = new ArrayList<>();
         JiaYueWindPowerCdqResultCoverFD0001 jiaYueWindPowerCdqResultCoverFD0001;
         //获取系统参数cdqjsfs，超短期计算方式，0为默认乘系数的方式，1为根据可用功率计算的方式
         String cdqjsfs = sysParameterService.getSysParameterAndStationCode("cdqjsfs", "1", stationCode);
@@ -225,7 +189,7 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0001 = new JiaYueWindPowerCdqResultCoverFD0001();
-                jiaYueWindPowerCdqResultCoverFD0001.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
+
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,6 +197,14 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0001.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0001.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0001.setDataTime(nowTime);
@@ -240,6 +212,7 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
                 jiaYueWindPowerCdqResultCoverFD0001.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0001.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0001.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0001.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0001.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));                //短期
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 //短期*系数
@@ -268,7 +241,7 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
                         }
                     }
                 }
-                jiaYueWindPowerCdqResultCoverFD0002List.add(jiaYueWindPowerCdqResultCoverFD0001);
+                jiaYueWindPowerCdqResultCoverFD0001List.add(jiaYueWindPowerCdqResultCoverFD0001);
             }
         } else {
             log.info("库中没有可用，本次可用计算数据采用短期*系数的方式生成数据");
@@ -277,13 +250,21 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0001 = new JiaYueWindPowerCdqResultCoverFD0001();
-                jiaYueWindPowerCdqResultCoverFD0001.setDataDate(new Date());
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0001.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0001.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0001.setDataTime(nowTime);
@@ -292,13 +273,14 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
 //                jiaYueWindPowerCdqResultCoverFD0001.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0001.setActivePower(ustPower.floatValue());
                 jiaYueWindPowerCdqResultCoverFD0001.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0001.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0001.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
-                jiaYueWindPowerCdqResultCoverFD0002List.add(jiaYueWindPowerCdqResultCoverFD0001);
+                jiaYueWindPowerCdqResultCoverFD0001List.add(jiaYueWindPowerCdqResultCoverFD0001);
             }
         }
 
-        if (jiaYueWindPowerCdqResultCoverFD0002List.size() > 0) {
-            this.saveCdq(jiaYueWindPowerCdqResultCoverFD0002List, stationCode);
+        if (jiaYueWindPowerCdqResultCoverFD0001List.size() > 0) {
+            this.saveCdq(jiaYueWindPowerCdqResultCoverFD0001List, stationCode);
         }
     }
 
@@ -314,6 +296,38 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
     public void deleteByDateTime(LocalDateTime startTime, LocalDateTime endTime, String stationCode) {
         jiaYueWindPowerCdqResultCoverMapperFD0001.deleteByDateTime(startTime, endTime, stationCode);
     }
+//
+//    @Override
+//    @WR("W")
+//    public List<JiaYueWindPowerCdqResultCoverFD0001> 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<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerCdqResultCoverMapperFD0001.selectByTimeAndObjId(startTimeStr, endTimeStr, stationCode);
+//        return jiaYueWindPowerDqResultCoverList;
+//
+//    }
+
+
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0001> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0001> jiaYueWindPowerCdqResultCoverFD0001List = 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);
+            JiaYueWindPowerCdqResultCoverFD0001 jiaYueWindPowerCdqResultCoverFD0001 = jiaYueWindPowerCdqResultCoverMapperFD0001.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0001){
+                jiaYueWindPowerCdqResultCoverFD0001List.add(jiaYueWindPowerCdqResultCoverFD0001);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0001List;
+    }
 
     /**
      * 将Date格式转换为Time格式
@@ -329,4 +343,28 @@ public class JiaYueWindPowerCdqResultCoverFD0001ServiceImpl extends ServiceImpl<
         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/JiaYueWindPowerCdqResultCoverFD0002ServiceImpl.java

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0002> jiaYueWindPowerCdqResultCoverFD0002List) {
         if (jiaYueWindPowerCdqResultCoverFD0002List != null && jiaYueWindPowerCdqResultCoverFD0002List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0002List, jiaYueWindPowerCdqResultCoverFD0002List.size());
@@ -69,7 +66,7 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
 //    }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return jiaYueWindPowerCdqResultCoverMapperFD0002.deleteAll();
@@ -106,14 +103,14 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
 
         ElectricField electricField3 = new ElectricField();
         electricField3.setBelongForecastManufactor("SYJY");
-        electricField3.setCapacity(new BigDecimal(20.0000));
+        electricField3.setCapacity(new BigDecimal(12.0000));
         electricField3.setElectricFieldTypeEnum("2");
         electricField3.setForecastManufactor("SYJY");
         electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
         electricField3.setName("中能融合测试站B");
-        electricField3.setStationCode("J00771");
+        electricField3.setStationCode("J00941");
         electricField3.setSign("FD0002");
-        electricField3.setNetSubstationName("J00771");
+        electricField3.setNetSubstationName("J00941");
 
 //        electricFieldList.add(electricField1);
 //        electricFieldList.add(electricField2);
@@ -225,7 +222,8 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0002 = new JiaYueWindPowerCdqResultCoverFD0002();
-                jiaYueWindPowerCdqResultCoverFD0002.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
+
+
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,9 +231,19 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0002.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0002.setDataDate(new Date());
+                }
+
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0002.setDataTime(nowTime);
+                jiaYueWindPowerCdqResultCoverFD0002.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
 //                jiaYueWindPowerCdqResultCoverFD0002.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
                 jiaYueWindPowerCdqResultCoverFD0002.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0002.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
@@ -277,13 +285,22 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0002 = new JiaYueWindPowerCdqResultCoverFD0002();
-                jiaYueWindPowerCdqResultCoverFD0002.setDataDate(new Date());
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0002.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0002.setDataDate(new Date());
+                }
+
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0002.setDataTime(nowTime);
@@ -292,6 +309,7 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
 //                jiaYueWindPowerCdqResultCoverFD0002.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0002.setActivePower(ustPower.floatValue());
                 jiaYueWindPowerCdqResultCoverFD0002.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0002.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0002.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
                 jiaYueWindPowerCdqResultCoverFD0002List.add(jiaYueWindPowerCdqResultCoverFD0002);
             }
@@ -315,6 +333,23 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
         jiaYueWindPowerCdqResultCoverMapperFD0002.deleteByDateTime(startTime, endTime, stationCode);
     }
 
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0002> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0002> jiaYueWindPowerCdqResultCoverFD0002List = 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);
+            JiaYueWindPowerCdqResultCoverFD0002 jiaYueWindPowerCdqResultCoverFD0002 = jiaYueWindPowerCdqResultCoverMapperFD0002.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0002){
+                jiaYueWindPowerCdqResultCoverFD0002List.add(jiaYueWindPowerCdqResultCoverFD0002);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0002List;
+    }
     /**
      * 将Date格式转换为Time格式
      *
@@ -329,4 +364,29 @@ public class JiaYueWindPowerCdqResultCoverFD0002ServiceImpl extends ServiceImpl<
         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/JiaYueWindPowerCdqResultCoverFD0003ServiceImpl.java

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0003> jiaYueWindPowerCdqResultCoverFD0003List) {
         if (jiaYueWindPowerCdqResultCoverFD0003List != null && jiaYueWindPowerCdqResultCoverFD0003List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0003List, jiaYueWindPowerCdqResultCoverFD0003List.size());
@@ -69,7 +66,7 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
 //    }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return jiaYueWindPowerCdqResultCoverMapperFD0003.deleteAll();
@@ -95,14 +92,14 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
 
         ElectricField electricField2 = new ElectricField();
         electricField2.setBelongForecastManufactor("SYJY");
-        electricField2.setCapacity(new BigDecimal(12.0000));
+        electricField2.setCapacity(new BigDecimal(20.0000));
         electricField2.setElectricFieldTypeEnum("2");
         electricField2.setForecastManufactor("SYJY");
         electricField2.setId("30a9f02678beb7101e628d7c7e22c5d6");
         electricField2.setName("天津中能融合测试站C");
-        electricField2.setStationCode("J00772");
+        electricField2.setStationCode("J00942");
         electricField2.setSign("FD0003");
-        electricField2.setNetSubstationName("J00772");
+        electricField2.setNetSubstationName("J00942");
 
 //        ElectricField electricField3 = new ElectricField();
 //        electricField3.setBelongForecastManufactor("SYJY");
@@ -225,7 +222,7 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0003 = new JiaYueWindPowerCdqResultCoverFD0003();
-                jiaYueWindPowerCdqResultCoverFD0003.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
+
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,9 +230,19 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0003.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0003.setDataDate(new Date());
+                }
+
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0003.setDataTime(nowTime);
+                jiaYueWindPowerCdqResultCoverFD0003.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
 //                jiaYueWindPowerCdqResultCoverFD0003.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
                 jiaYueWindPowerCdqResultCoverFD0003.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0003.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
@@ -277,13 +284,22 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0003 = new JiaYueWindPowerCdqResultCoverFD0003();
-                jiaYueWindPowerCdqResultCoverFD0003.setDataDate(new Date());
+
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0003.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0003.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0003.setDataTime(nowTime);
@@ -292,6 +308,7 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
 //                jiaYueWindPowerCdqResultCoverFD0003.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0003.setActivePower(ustPower.floatValue());
                 jiaYueWindPowerCdqResultCoverFD0003.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0003.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0003.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
                 jiaYueWindPowerCdqResultCoverFD0003List.add(jiaYueWindPowerCdqResultCoverFD0003);
             }
@@ -315,6 +332,25 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
         jiaYueWindPowerCdqResultCoverMapperFD0003.deleteByDateTime(startTime, endTime, stationCode);
     }
 
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0003> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0003> jiaYueWindPowerCdqResultCoverFD0003List = 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);
+            JiaYueWindPowerCdqResultCoverFD0003 jiaYueWindPowerCdqResultCoverFD0003 = jiaYueWindPowerCdqResultCoverMapperFD0003.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0003){
+                jiaYueWindPowerCdqResultCoverFD0003List.add(jiaYueWindPowerCdqResultCoverFD0003);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0003List;
+    }
+
+
     /**
      * 将Date格式转换为Time格式
      *
@@ -329,4 +365,28 @@ public class JiaYueWindPowerCdqResultCoverFD0003ServiceImpl extends ServiceImpl<
         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

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0005> jiaYueWindPowerCdqResultCoverFD0005List) {
         if (jiaYueWindPowerCdqResultCoverFD0005List != null && jiaYueWindPowerCdqResultCoverFD0005List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0005List, jiaYueWindPowerCdqResultCoverFD0005List.size());
@@ -69,7 +66,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
 //    }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return jiaYueWindPowerCdqResultCoverMapperFD0005.deleteAll();
@@ -106,7 +103,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
 
         ElectricField electricField3 = new ElectricField();
         electricField3.setBelongForecastManufactor("SYJY");
-        electricField3.setCapacity(new BigDecimal(20.0000));
+        electricField3.setCapacity(new BigDecimal(99.0000));
         electricField3.setElectricFieldTypeEnum("2");
         electricField3.setForecastManufactor("SYJY");
         electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
@@ -225,7 +222,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0005 = new JiaYueWindPowerCdqResultCoverFD0005();
-                jiaYueWindPowerCdqResultCoverFD0005.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
+
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,6 +230,15 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0005.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0005.setDataDate(new Date());
+                }
+
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0005.setDataTime(nowTime);
@@ -240,6 +246,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
                 jiaYueWindPowerCdqResultCoverFD0005.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0005.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0005.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0005.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0005.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));                //短期
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 //短期*系数
@@ -277,13 +284,22 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0005 = new JiaYueWindPowerCdqResultCoverFD0005();
-                jiaYueWindPowerCdqResultCoverFD0005.setDataDate(new Date());
+
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0005.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0005.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0005.setDataTime(nowTime);
@@ -291,6 +307,7 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
                 jiaYueWindPowerCdqResultCoverFD0005.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0005.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0005.setActivePower(ustPower.floatValue());
+                jiaYueWindPowerCdqResultCoverFD0005.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0005.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
                 jiaYueWindPowerCdqResultCoverFD0005.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
                 jiaYueWindPowerCdqResultCoverFD0005List.add(jiaYueWindPowerCdqResultCoverFD0005);
@@ -315,6 +332,25 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
         jiaYueWindPowerCdqResultCoverMapperFD0005.deleteByDateTime(startTime, endTime, stationCode);
     }
 
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0005> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0005> jiaYueWindPowerCdqResultCoverFD0005List = 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);
+            JiaYueWindPowerCdqResultCoverFD0005 jiaYueWindPowerCdqResultCoverFD0005 = jiaYueWindPowerCdqResultCoverMapperFD0005.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0005){
+                jiaYueWindPowerCdqResultCoverFD0005List.add(jiaYueWindPowerCdqResultCoverFD0005);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0005List;
+    }
+
+
     /**
      * 将Date格式转换为Time格式
      *
@@ -329,4 +365,28 @@ public class JiaYueWindPowerCdqResultCoverFD0005ServiceImpl extends ServiceImpl<
         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/JiaYueWindPowerCdqResultCoverFD0006ServiceImpl.java

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0006> jiaYueWindPowerCdqResultCoverFD0006List) {
         if (jiaYueWindPowerCdqResultCoverFD0006List != null && jiaYueWindPowerCdqResultCoverFD0006List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0006List, jiaYueWindPowerCdqResultCoverFD0006List.size());
@@ -69,7 +66,7 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
 //    }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return jiaYueWindPowerCdqResultCoverMapperFD0006.deleteAll();
@@ -106,7 +103,7 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
 
         ElectricField electricField3 = new ElectricField();
         electricField3.setBelongForecastManufactor("SYJY");
-        electricField3.setCapacity(new BigDecimal(20.0000));
+        electricField3.setCapacity(new BigDecimal(50.0000));
         electricField3.setElectricFieldTypeEnum("2");
         electricField3.setForecastManufactor("SYJY");
         electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
@@ -225,7 +222,6 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0006 = new JiaYueWindPowerCdqResultCoverFD0006();
-                jiaYueWindPowerCdqResultCoverFD0006.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,11 +229,20 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0006.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0006.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0006.setDataTime(nowTime);
 //                jiaYueWindPowerCdqResultCoverFD0006.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
                 jiaYueWindPowerCdqResultCoverFD0006.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
+                jiaYueWindPowerCdqResultCoverFD0006.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
 //                jiaYueWindPowerCdqResultCoverFD0006.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0006.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
                 jiaYueWindPowerCdqResultCoverFD0006.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));                //短期
@@ -277,13 +282,21 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0006 = new JiaYueWindPowerCdqResultCoverFD0006();
-                jiaYueWindPowerCdqResultCoverFD0006.setDataDate(new Date());
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0006.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0006.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0006.setDataTime(nowTime);
@@ -292,6 +305,7 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
 //                jiaYueWindPowerCdqResultCoverFD0006.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0006.setActivePower(ustPower.floatValue());
                 jiaYueWindPowerCdqResultCoverFD0006.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0006.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0006.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
                 jiaYueWindPowerCdqResultCoverFD0006List.add(jiaYueWindPowerCdqResultCoverFD0006);
             }
@@ -329,4 +343,49 @@ public class JiaYueWindPowerCdqResultCoverFD0006ServiceImpl extends ServiceImpl<
         return Time.valueOf(timeString);
     }
 
+
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0006> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0006> jiaYueWindPowerCdqResultCoverFD0006List = 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);
+            JiaYueWindPowerCdqResultCoverFD0006 jiaYueWindPowerCdqResultCoverFD0006 = jiaYueWindPowerCdqResultCoverMapperFD0006.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0006){
+                jiaYueWindPowerCdqResultCoverFD0006List.add(jiaYueWindPowerCdqResultCoverFD0006);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0006List;
+    }
+
+
+
+    /**
+     * 判断时间戳是否是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/JiaYueWindPowerCdqResultCoverFD0007ServiceImpl.java

@@ -18,10 +18,7 @@ import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -54,7 +51,7 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerCdqResultCoverFD0007> jiaYueWindPowerCdqResultCoverFD0007List) {
         if (jiaYueWindPowerCdqResultCoverFD0007List != null && jiaYueWindPowerCdqResultCoverFD0007List.size() > 0) {
             this.saveBatch(jiaYueWindPowerCdqResultCoverFD0007List, jiaYueWindPowerCdqResultCoverFD0007List.size());
@@ -69,7 +66,7 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
 //    }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return jiaYueWindPowerCdqResultCoverMapperFD0007.deleteAll();
@@ -106,14 +103,14 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
 
         ElectricField electricField3 = new ElectricField();
         electricField3.setBelongForecastManufactor("SYJY");
-        electricField3.setCapacity(new BigDecimal(20.0000));
+        electricField3.setCapacity(new BigDecimal(50.0000));
         electricField3.setElectricFieldTypeEnum("2");
         electricField3.setForecastManufactor("SYJY");
         electricField3.setId("d712c1ef348714a5afafcf130c256cc9");
         electricField3.setName("天津中能融合测试站F");
-        electricField3.setStationCode("J00391");
+        electricField3.setStationCode("J00931");
         electricField3.setSign("FD0007");
-        electricField3.setNetSubstationName("J00391");
+        electricField3.setNetSubstationName("J00931");
 
 //        electricFieldList.add(electricField1);
 //        electricFieldList.add(electricField2);
@@ -225,7 +222,6 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
             BigDecimal deviationValue = averageAbleValue.subtract(new BigDecimal(currentForecastPowerValue));
             for (int i = 0; i < jiaYueWindPowerDqResultCoverList.size(); i++) {
                 jiaYueWindPowerCdqResultCoverFD0007 = new JiaYueWindPowerCdqResultCoverFD0007();
-                jiaYueWindPowerCdqResultCoverFD0007.setDataDate(DateMomentUtil.convertLocalDateTimeToDate(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime()));
                 Long date = null;
                 try {
                     date = DateMomentUtil.getMomentTime(System.currentTimeMillis(), 2, 15 * 60 * 1000L);
@@ -233,11 +229,20 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
                     throw new RuntimeException(e);
                 }
 
+                Boolean is = this.isMidnight(date);
+
+                if (is == true) {
+                    jiaYueWindPowerCdqResultCoverFD0007.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0007.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0007.setDataTime(nowTime);
 //                jiaYueWindPowerCdqResultCoverFD0007.setDataType(jiaYueWindPowerDqResultCoverList.get(i).getDataType());
                 jiaYueWindPowerCdqResultCoverFD0007.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
+                jiaYueWindPowerCdqResultCoverFD0007.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
 //                jiaYueWindPowerCdqResultCoverFD0007.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0007.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
                 jiaYueWindPowerCdqResultCoverFD0007.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));                //短期
@@ -277,13 +282,21 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
                 stPower = new BigDecimal(jiaYueWindPowerDqResultCoverList.get(i).getActivePower());
                 ustPower = stPower.multiply(new BigDecimal(coe)).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jiaYueWindPowerCdqResultCoverFD0007 = new JiaYueWindPowerCdqResultCoverFD0007();
-                jiaYueWindPowerCdqResultCoverFD0007.setDataDate(new Date());
                 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) {
+                    jiaYueWindPowerCdqResultCoverFD0007.setDataDate(this.nextDay(new Date()));
+                } else {
+                    jiaYueWindPowerCdqResultCoverFD0007.setDataDate(new Date());
+                }
+
                 Date nowDate = DateTimeUtil.getMomentTimeFor15Minute(date);
                 Time nowTime = this.convertUtilDateToMySQLTime(nowDate);
                 jiaYueWindPowerCdqResultCoverFD0007.setDataTime(nowTime);
@@ -291,7 +304,8 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
                 jiaYueWindPowerCdqResultCoverFD0007.setPreDateTime(jiaYueWindPowerDqResultCoverList.get(i).getPreDateTime());
 //                jiaYueWindPowerCdqResultCoverFD0007.setDataFlg(jiaYueWindPowerDqResultCoverList.get(i).getDataFlg());
                 jiaYueWindPowerCdqResultCoverFD0007.setActivePower(ustPower.floatValue());
-                jiaYueWindPowerCdqResultCoverFD0007.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());
+                jiaYueWindPowerCdqResultCoverFD0007.setObjId(jiaYueWindPowerDqResultCoverList.get(i).getObjId());                jiaYueWindPowerCdqResultCoverFD0007.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
+                jiaYueWindPowerCdqResultCoverFD0007.setOpenCap(jiaYueWindPowerDqResultCoverList.get(i).getOpenCap());
                 jiaYueWindPowerCdqResultCoverFD0007.setCreateTime(LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
                 jiaYueWindPowerCdqResultCoverFD0007List.add(jiaYueWindPowerCdqResultCoverFD0007);
             }
@@ -329,4 +343,48 @@ public class JiaYueWindPowerCdqResultCoverFD0007ServiceImpl extends ServiceImpl<
         return Time.valueOf(timeString);
     }
 
+    @Override
+    public List<JiaYueWindPowerCdqResultCoverFD0007> findByDataDate(Date startTime) {
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<JiaYueWindPowerCdqResultCoverFD0007> jiaYueWindPowerCdqResultCoverFD0007List = 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);
+            JiaYueWindPowerCdqResultCoverFD0007 jiaYueWindPowerCdqResultCoverFD0007 = jiaYueWindPowerCdqResultCoverMapperFD0007.selectByDataDate(dateSubString);
+            if (null != jiaYueWindPowerCdqResultCoverFD0007){
+                jiaYueWindPowerCdqResultCoverFD0007List.add(jiaYueWindPowerCdqResultCoverFD0007);
+            }
+        }
+        return jiaYueWindPowerCdqResultCoverFD0007List;
+    }
+
+
+
+    /**
+     * 判断时间戳是否是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/JiaYueWindPowerDqResultCoverServiceImpl.java

@@ -10,8 +10,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -36,7 +34,7 @@ public class JiaYueWindPowerDqResultCoverServiceImpl extends ServiceImpl<JiaYueW
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCover> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -45,14 +43,14 @@ public class JiaYueWindPowerDqResultCoverServiceImpl extends ServiceImpl<JiaYueW
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCover> getAll() {
         List<JiaYueWindPowerDqResultCover> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapper.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapper.deleteAll();
     }

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0001CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0001CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0001> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0001.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0001.deleteAll();
     }
@@ -82,4 +82,12 @@ public class JiaYueWindPowerDqResultFD0001CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0001> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0001> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0001.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
 }

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0002CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0002CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0002> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0002.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0002.deleteAll();
     }
@@ -82,4 +82,11 @@ public class JiaYueWindPowerDqResultFD0002CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
-}
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0002> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0002.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+}

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0003CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0003CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0003> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0003.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0003.deleteAll();
     }
@@ -82,4 +82,13 @@ public class JiaYueWindPowerDqResultFD0003CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0003> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0003> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0003.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
+
 }

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0005CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0005> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0005CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0005> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0005> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0005.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0005.deleteAll();
     }
@@ -82,4 +82,13 @@ public class JiaYueWindPowerDqResultFD0005CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0005> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0005> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0005.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
+
 }

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0006CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0006> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0006CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0006> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0006> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0006.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0006.deleteAll();
     }
@@ -82,4 +82,13 @@ public class JiaYueWindPowerDqResultFD0006CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
+
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0006> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0006> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0006.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
 }

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

@@ -34,7 +34,7 @@ public class JiaYueWindPowerDqResultFD0007CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerDqResultCoverFD0007> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -43,14 +43,14 @@ public class JiaYueWindPowerDqResultFD0007CoverServiceImpl extends ServiceImpl<J
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerDqResultCoverFD0007> getAll() {
         List<JiaYueWindPowerDqResultCoverFD0007> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverMapperFD0007.selectList(null);
         return jiaYueWindPowerDqResultCovers;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerDqResultCoverMapperFD0007.deleteAll();
     }
@@ -82,4 +82,12 @@ public class JiaYueWindPowerDqResultFD0007CoverServiceImpl extends ServiceImpl<J
         return jiaYueWindPowerDqResultCoverList;
     }
 
+    @Override
+    public List<JiaYueWindPowerDqResultCoverFD0007> findByDataDate(Date startTime) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String startTimeStr = simpleDateFormat.format(startTime);
+        List<JiaYueWindPowerDqResultCoverFD0007> jiaYueWindPowerDqResultCoverList = jiaYueWindPowerDqResultCoverMapperFD0007.selectByDataDate(startTimeStr);
+        return jiaYueWindPowerDqResultCoverList;
+    }
+
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.ipfcst.client.aop.WR;
 import com.jiayue.ipfcst.client.mapper.JiaYueWindPowerNwpResultCoverMapper;
 import com.jiayue.ipfcst.client.service.JiaYueWindPowerNwpResultCoverService;
-import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCover;
 import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCover;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +27,7 @@ public class JiaYueWindPowerNwpResultCoverServiceImpl extends ServiceImpl<JiaYue
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerNwpResultCover> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -37,14 +36,14 @@ public class JiaYueWindPowerNwpResultCoverServiceImpl extends ServiceImpl<JiaYue
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerNwpResultCover> getAll() {
         List<JiaYueWindPowerNwpResultCover> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapper.selectList(null);
         return jiaYueWindPowerNwpResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerNwpResultCoverMapper.deleteAll();
     }

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

@@ -26,7 +26,7 @@ public class JiaYueWindPowerNwpResultFD0001CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerNwpResultCoverFD0001> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -35,14 +35,14 @@ public class JiaYueWindPowerNwpResultFD0001CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerNwpResultCoverFD0001> getAll() {
         List<JiaYueWindPowerNwpResultCoverFD0001> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0001.selectList(null);
         return jiaYueWindPowerNwpResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerNwpResultCoverMapperFD0001.deleteAll();
     }

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

@@ -26,7 +26,7 @@ public class JiaYueWindPowerNwpResultFD0002CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerNwpResultCoverFD0002> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -35,14 +35,14 @@ public class JiaYueWindPowerNwpResultFD0002CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerNwpResultCoverFD0002> getAll() {
         List<JiaYueWindPowerNwpResultCoverFD0002> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0002.selectList(null);
         return jiaYueWindPowerNwpResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerNwpResultCoverMapperFD0002.deleteAll();
     }

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

@@ -8,8 +8,6 @@ import com.jiayue.ipp.common.data.entity.JiaYueWindPowerNwpResultCoverFD0003;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.sql.Time;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -26,7 +24,7 @@ public class JiaYueWindPowerNwpResultFD0003CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerNwpResultCoverFD0003> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -35,14 +33,14 @@ public class JiaYueWindPowerNwpResultFD0003CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerNwpResultCoverFD0003> getAll() {
         List<JiaYueWindPowerNwpResultCoverFD0003> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0003.selectList(null);
         return jiaYueWindPowerNwpResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerNwpResultCoverMapperFD0003.deleteAll();
     }

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

@@ -26,7 +26,7 @@ public class JiaYueWindPowerNwpResultFD0005CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<JiaYueWindPowerNwpResultCoverFD0005> jiaYueWindPowerDqResultCovers) {
         if (jiaYueWindPowerDqResultCovers != null && jiaYueWindPowerDqResultCovers.size() > 0) {
             this.saveBatch(jiaYueWindPowerDqResultCovers, jiaYueWindPowerDqResultCovers.size());
@@ -35,14 +35,14 @@ public class JiaYueWindPowerNwpResultFD0005CoverServiceImpl extends ServiceImpl<
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<JiaYueWindPowerNwpResultCoverFD0005> getAll() {
         List<JiaYueWindPowerNwpResultCoverFD0005> jiaYueWindPowerNwpResultCoverList = jiaYueWindPowerNwpResultCoverMapperFD0005.selectList(null);
         return jiaYueWindPowerNwpResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return jiaYueWindPowerNwpResultCoverMapperFD0005.deleteAll();
     }

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

@@ -0,0 +1,28 @@
+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.OverhaulPlanMapper;
+import com.jiayue.ipfcst.client.service.*;
+import com.jiayue.ipp.common.data.entity.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Service
+@Slf4j
+public class OverhaulPlanServiceImpl extends ServiceImpl<OverhaulPlanMapper, OverhaulPlan> implements OverhaulPlanService {
+
+    @Autowired
+    private OverhaulPlanMapper overhaulPlanMapper;
+    @Override
+    @WR("W")
+    public List<OverhaulPlan> getOverhaulPlan(LocalDateTime startTime, String farmId) {
+        List<OverhaulPlan> overhaulPlanList = overhaulPlanMapper.selectByTimeAndObjIdAndStatus(startTime,farmId);
+        return  overhaulPlanList;
+    }
+}

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

@@ -48,14 +48,14 @@ public class SysParameterServiceImpl extends ServiceImpl<SysParameterMapper, Sys
         sysParameter1.setId("fdbe737a8eff1ad6f37fcf887d307fe5");
         sysParameter1.setSysKey("zxgl_config");
         sysParameter1.setSysValue("/home/syjy/ipp/zxgl/new");
-        sysParameter1.setStationCode("J00772");
+        sysParameter1.setStationCode("J00942");
         sysParameter1.setDelFlag("0");
 
         SysParameter sysParameter2 = new SysParameter();
         sysParameter2.setId("fdbe737a8eff1ad6f37fcf887d307fe5");
         sysParameter2.setSysKey("zxgl_config");
         sysParameter2.setSysValue("/home/syjy/ipp/zxgl/new");
-        sysParameter2.setStationCode("J00771");
+        sysParameter2.setStationCode("J00941");
         sysParameter2.setDelFlag("0");
 
         SysParameter sysParameter5 = new SysParameter();

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

@@ -23,21 +23,29 @@ public class WindFarmInfoEncryptionServiceImpl extends ServiceImpl<WindFarmInfoE
     }
 
     @Override
-    @WR("R")
+    @WR("W")
+    public WindFarmInfoEncryption getCap(String objId) {
+        WindFarmInfoEncryption windFarmInfoEncryption =  windFarmInfoEncryptionMapper.selectCap(objId);
+        return  windFarmInfoEncryption;
+    }
+
+
+    @Override
+//    @WR("R")
     public int put(List<WindFarmInfoEncryption> windFarmInfoEncryptions) {
         this.saveBatch(windFarmInfoEncryptions,windFarmInfoEncryptions.size());
         return windFarmInfoEncryptions.size();
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindFarmInfoEncryption> getAll() {
         List<WindFarmInfoEncryption> windFarmInfoEncryptionList =  windFarmInfoEncryptionMapper.selectList(null);
         return  windFarmInfoEncryptionList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windFarmInfoEncryptionMapper.deleteAll();
     }

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

@@ -24,7 +24,7 @@ public class WindPowerCdqResultCoverServiceImpl extends ServiceImpl<WindPowerCdq
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerCdqResultCover> windPowerCdqResultCoverList) {
         if (windPowerCdqResultCoverList != null && windPowerCdqResultCoverList.size() > 0){
             this.saveBatch(windPowerCdqResultCoverList,windPowerCdqResultCoverList.size());
@@ -33,14 +33,14 @@ public class WindPowerCdqResultCoverServiceImpl extends ServiceImpl<WindPowerCdq
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerCdqResultCover> getAll() {
         List<WindPowerCdqResultCover> windPowerCdqResultCoverList =  windPowerCdqResultCoverMapper.selectList(null);
         return  windPowerCdqResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
         return windPowerCdqResultCoverMapper.deleteAll();

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

@@ -8,7 +8,6 @@ import com.jiayue.ipp.common.data.entity.WindPowerDqResultCover;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +24,7 @@ public class WindPowerDqResultCoverServiceImpl extends ServiceImpl<WindPowerDqRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerDqResultCover> windPowerDqResultCoverList) {
         if (windPowerDqResultCoverList != null && windPowerDqResultCoverList.size() > 0){
             this.saveBatch(windPowerDqResultCoverList,windPowerDqResultCoverList.size());
@@ -34,14 +33,14 @@ public class WindPowerDqResultCoverServiceImpl extends ServiceImpl<WindPowerDqRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerDqResultCover> getAll() {
         List<WindPowerDqResultCover> windPowerDqResultCoverList =  windPowerDqResultCoverMapper.selectList(null);
         return  windPowerDqResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
        return windPowerDqResultCoverMapper.deleteAll();
     }

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

@@ -3,11 +3,8 @@ 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.WindPowerReal15MinFD0001Mapper;
-import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinFD0002Mapper;
 import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0001Service;
-import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0002Service;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0001;
-import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0002;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,7 +24,7 @@ public class WindPowerReal15MinFD0001ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0001> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -36,21 +33,21 @@ public class WindPowerReal15MinFD0001ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0001> getAll() {
         List<WindPowerReal15MinFD0001> windPowerReal15MinList =  windPowerReal15MinFD0001Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0001> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0001> windPowerReal15MinList =  windPowerReal15MinFD0001Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
-    @Override
-    @WR("R")
+//    @Override
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0001Mapper.deleteAll();

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

@@ -24,7 +24,7 @@ public class WindPowerReal15MinFD0002ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0002> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -33,21 +33,21 @@ public class WindPowerReal15MinFD0002ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0002> getAll() {
         List<WindPowerReal15MinFD0002> windPowerReal15MinList =  windPowerReal15MinFD0002Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0002> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0002> windPowerReal15MinList =  windPowerReal15MinFD0002Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0002Mapper.deleteAll();

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

@@ -3,10 +3,7 @@ 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.WindPowerReal15MinFD0003Mapper;
-import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinMapper;
 import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0003Service;
-import com.jiayue.ipfcst.client.service.WindPowerReal15MinService;
-import com.jiayue.ipp.common.data.entity.WindPowerReal15Min;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0003;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +24,7 @@ public class WindPowerReal15MinFD0003ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0003> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -36,21 +33,21 @@ public class WindPowerReal15MinFD0003ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0003> getAll() {
         List<WindPowerReal15MinFD0003> windPowerReal15MinList =  windPowerReal15MinFD0003Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0003> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0003> windPowerReal15MinList =  windPowerReal15MinFD0003Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0003Mapper.deleteAll();

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

@@ -2,11 +2,8 @@ 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.WindPowerReal15MinFD0002Mapper;
 import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinFD0005Mapper;
-import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0002Service;
 import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0005Service;
-import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0002;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0005;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +24,7 @@ public class WindPowerReal15MinFD0005ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0005> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -36,21 +33,21 @@ public class WindPowerReal15MinFD0005ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0005> getAll() {
         List<WindPowerReal15MinFD0005> windPowerReal15MinList =  windPowerReal15MinFD0005Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0005> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0005> windPowerReal15MinList =  windPowerReal15MinFD0005Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0005Mapper.deleteAll();

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

@@ -2,11 +2,8 @@ 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.WindPowerReal15MinFD0002Mapper;
 import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinFD0006Mapper;
-import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0002Service;
 import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0006Service;
-import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0002;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0006;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +24,7 @@ public class WindPowerReal15MinFD0006ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0006> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -36,21 +33,21 @@ public class WindPowerReal15MinFD0006ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0006> getAll() {
         List<WindPowerReal15MinFD0006> windPowerReal15MinList =  windPowerReal15MinFD0006Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0006> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0006> windPowerReal15MinList =  windPowerReal15MinFD0006Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0006Mapper.deleteAll();

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

@@ -2,11 +2,8 @@ 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.WindPowerReal15MinFD0002Mapper;
 import com.jiayue.ipfcst.client.mapper.WindPowerReal15MinFD0007Mapper;
-import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0002Service;
 import com.jiayue.ipfcst.client.service.WindPowerReal15MinFD0007Service;
-import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0002;
 import com.jiayue.ipp.common.data.entity.WindPowerReal15MinFD0007;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +24,7 @@ public class WindPowerReal15MinFD0007ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15MinFD0007> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -36,21 +33,21 @@ public class WindPowerReal15MinFD0007ServiceImpl extends ServiceImpl<WindPowerRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0007> getAll() {
         List<WindPowerReal15MinFD0007> windPowerReal15MinList =  windPowerReal15MinFD0007Mapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15MinFD0007> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15MinFD0007> windPowerReal15MinList =  windPowerReal15MinFD0007Mapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinFD0007Mapper.deleteAll();

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

@@ -24,7 +24,7 @@ public class WindPowerReal15MinServiceImpl extends ServiceImpl<WindPowerReal15Mi
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindPowerReal15Min> windPowerReal15MinList) {
         if (windPowerReal15MinList != null && windPowerReal15MinList.size() > 0){
             this.saveBatch(windPowerReal15MinList,windPowerReal15MinList.size());
@@ -33,21 +33,21 @@ public class WindPowerReal15MinServiceImpl extends ServiceImpl<WindPowerReal15Mi
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15Min> getAll() {
         List<WindPowerReal15Min> windPowerReal15MinList =  windPowerReal15MinMapper.selectList(null);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindPowerReal15Min> getAll(Date startTime, Date endTime) {
         List<WindPowerReal15Min> windPowerReal15MinList =  windPowerReal15MinMapper.selectByTime(startTime,endTime);
         return  windPowerReal15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
 
        return windPowerReal15MinMapper.deleteAll();

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

@@ -26,7 +26,7 @@ public class WindTower15MinServiceImpl extends ServiceImpl<WindTower15MinMapper,
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindTower15Min> windTower15MinList) {
         if (windTower15MinList != null && windTower15MinList.size()>0){
             this.saveBatch(windTower15MinList,windTower15MinList.size());
@@ -35,14 +35,14 @@ public class WindTower15MinServiceImpl extends ServiceImpl<WindTower15MinMapper,
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindTower15Min> getAll() {
         List<WindTower15Min> windTower15MinList =  windTower15MinMapper.selectList(null);
         return  windTower15MinList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windTower15MinMapper.deleteAll();
     }

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

@@ -24,7 +24,7 @@ public class WindTowerCdqResultCoverServiceImpl extends ServiceImpl<WindTowerCdq
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindTowerCdqResultCover> windTowerCdqResultCoverList) {
         if (windTowerCdqResultCoverList != null && windTowerCdqResultCoverList.size() > 0) {
             this.saveBatch(windTowerCdqResultCoverList, windTowerCdqResultCoverList.size());
@@ -34,14 +34,14 @@ public class WindTowerCdqResultCoverServiceImpl extends ServiceImpl<WindTowerCdq
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindTowerCdqResultCover> getAll() {
         List<WindTowerCdqResultCover> windTowerCdqResultCoverList = windTowerCdqResultCoverMapper.selectList(null);
         return windTowerCdqResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windTowerCdqResultCoverMapper.deleteAll();
     }

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

@@ -24,7 +24,7 @@ public class WindTowerDqResultCoverServiceImpl extends ServiceImpl<WindTowerDqRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindTowerDqResultCover> windTowerDqResultCoverList) {
         if (windTowerDqResultCoverList != null && windTowerDqResultCoverList.size() > 0){
             this.saveBatch(windTowerDqResultCoverList,windTowerDqResultCoverList.size());
@@ -33,14 +33,14 @@ public class WindTowerDqResultCoverServiceImpl extends ServiceImpl<WindTowerDqRe
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindTowerDqResultCover> getAll() {
         List<WindTowerDqResultCover> windTowerDqResultCoverList =  windTowerDqResultCoverMapper.selectList(null);
         return  windTowerDqResultCoverList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windTowerDqResultCoverMapper.deleteAll();
     }

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

@@ -23,7 +23,7 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindTowerInfo> windTowerInfoList) {
         if (windTowerInfoList != null && windTowerInfoList.size() > 0){
             this.saveBatch(windTowerInfoList,windTowerInfoList.size());
@@ -32,14 +32,14 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindTowerInfo> getAll() {
         List<WindTowerInfo> windTowerInfoList =  windTowerInfoMapper.selectList(null);
         return  windTowerInfoList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windTowerInfoMapper.deleteAll();
     }

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

@@ -23,7 +23,7 @@ public class WindUnitInfoServiceImpl extends ServiceImpl<WindUnitInfoMapper, Win
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindUnitInfo> windUnitInfoList) {
         if (windUnitInfoList != null && windUnitInfoList.size() > 0){
             this.saveBatch(windUnitInfoList,windUnitInfoList.size());
@@ -32,14 +32,14 @@ public class WindUnitInfoServiceImpl extends ServiceImpl<WindUnitInfoMapper, Win
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindUnitInfo> getAll() {
         List<WindUnitInfo> windUnitInfoList =  windUnitInfoMapper.selectList(null);
         return  windUnitInfoList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windUnitInfoMapper.deleteAll();
     }

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

@@ -23,7 +23,7 @@ public class WindUnitModelInfoServiceImpl extends ServiceImpl<WindUnitModelInfoM
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindUnitModelInfo> windUnitModelInfoList) {
         if (windUnitModelInfoList != null && windUnitModelInfoList.size() >0){
             this.saveBatch(windUnitModelInfoList,windUnitModelInfoList.size());
@@ -32,14 +32,14 @@ public class WindUnitModelInfoServiceImpl extends ServiceImpl<WindUnitModelInfoM
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindUnitModelInfo> getAll() {
         List<WindUnitModelInfo> windUnitModelInfoList =  windUnitModelInfoMapper.selectList(null);
         return  windUnitModelInfoList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
         return windUnitModelInfoMapper.deleteAll();
     }

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

@@ -23,7 +23,7 @@ public class WindUnitModelWsAndPowerServiceImpl extends ServiceImpl<WindUnitMode
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int put(List<WindUnitModelWsAndPower> windUnitModelWsAndPowerList) {
         if (windUnitModelWsAndPowerList != null && windUnitModelWsAndPowerList.size() >0){
             this.saveBatch(windUnitModelWsAndPowerList,windUnitModelWsAndPowerList.size());
@@ -32,14 +32,14 @@ public class WindUnitModelWsAndPowerServiceImpl extends ServiceImpl<WindUnitMode
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public List<WindUnitModelWsAndPower> getAll() {
         List<WindUnitModelWsAndPower> windUnitModelWsAndPowerList =  windUnitModelWsAndPowerMapper.selectList(null);
         return  windUnitModelWsAndPowerList;
     }
 
     @Override
-    @WR("R")
+//    @WR("R")
     public int deleteAll() {
        return windUnitModelWsAndPowerMapper.deleteAll();
     }

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

@@ -25,7 +25,7 @@ public class ParsingChannelServiceImpl extends ServiceImpl<ParsingChannelMapper,
     private ParsingChannelMapper parsingChannelMapper;
 
     @Override
-    @WR(DataSourceNames.Third)
+//    @WR(DataSourceNames.Third)
     public List<ParsingChannel> get() {
         List<ParsingChannel> parsingChannelList =  parsingChannelMapper.getAll();
         return  parsingChannelList;

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

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -46,9 +47,7 @@ import java.util.List;
 @AllArgsConstructor
 public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, ParsingDqInfo> implements ParsingDqInfoService, ParsingInterface {
 
-    private final ForecastPowerShortTermHisService forecastPowerShortTermHisService;
-
-    private final JiaYueWindPowerDqResultCoverService jiaYueWindPowerDqResultCoverService;
+    private final OverhaulPlanService overhaulPlanService;
 
     private final JiaYueWindPowerDqResultCoverFD0001Service jiaYueWindPowerDqResultCoverFD0001Service;
 
@@ -66,6 +65,8 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 
     JiaYueWindPowerDqResultCoverMapper jiaYueWindPowerDqResultCoverMapper;
 
+    private final WindFarmInfoEncryptionService windFarmInfoEncryptionService;
+
     @Override
     public boolean save(ParsingInfo parsingInfo) {
         return save((ParsingDqInfo) parsingInfo);
@@ -93,7 +94,7 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
             parsingDqInfo.setDataType("m");
             parsingDqInfo.setFileName("DQ_");
             parsingDqInfo.setGenDate("");
-            parsingDqInfo.setStationCode("J00770,J00771,J00772,J00929,J00930,J00931");
+            parsingDqInfo.setStationCode("J00770,J00941,J00942,J00929,J00930,J00931");
             parsingDqInfo.setDelFlag("0");
             parsingDqInfo.setForecastTime("1<=>2<=>date=<=>yyyy-MM-dd");
             parsingDqInfo.setFpValue("3-1538<=>5");
@@ -135,10 +136,10 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                 if (parsingUrl.getStationCode().equals("J00770")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0001Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
-                if (parsingUrl.getStationCode().equals("J00771")) {
+                if (parsingUrl.getStationCode().equals("J00941")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0002Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
-                if (parsingUrl.getStationCode().equals("J00772")) {
+                if (parsingUrl.getStationCode().equals("J00942")) {
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0003Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
                 if (parsingUrl.getStationCode().equals("J00929")) {
@@ -151,7 +152,6 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                     jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0007Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
 
-//                    List<JiaYueWindPowerDqResultCoverFD0002> jiaYueWindPowerDqResultCovers = jiaYueWindPowerDqResultCoverFD0002Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 if (jiaYueWindPowerDqResultCovers == null || jiaYueWindPowerDqResultCovers.size() == 0) {
                     List<String> fileContent = FileUtil.getFileContent(file);
                     if (parsingDqInfo.getDataType().equals(FieldUtil.MULTI)) {
@@ -188,11 +188,11 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                                         jiaYueWindPowerDqResultCoverFD0001List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
                                                 new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0001()));
                                     }
-                                    if (parsingUrl.getStationCode().equals("J00771")) {
+                                    if (parsingUrl.getStationCode().equals("J00941")) {
                                         jiaYueWindPowerDqResultCoverFD0002List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
                                                 new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0002()));
                                     }
-                                    if (parsingUrl.getStationCode().equals("J00772")) {
+                                    if (parsingUrl.getStationCode().equals("J00942")) {
                                         jiaYueWindPowerDqResultCoverFD0003List.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
                                                 new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString, new JiaYueWindPowerDqResultCoverFD0003()));
                                     }
@@ -214,11 +214,11 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
                                     jiaYueWindPowerDqResultCoverFD0001Service.saveDq(jiaYueWindPowerDqResultCoverFD0001List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
 
                                 }
-                                if (parsingUrl.getStationCode().equals("J00771")) {
+                                if (parsingUrl.getStationCode().equals("J00941")) {
                                     jiaYueWindPowerDqResultCoverFD0002Service.saveDq(jiaYueWindPowerDqResultCoverFD0002List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
 
                                 }
-                                if (parsingUrl.getStationCode().equals("J00772")) {
+                                if (parsingUrl.getStationCode().equals("J00942")) {
                                     jiaYueWindPowerDqResultCoverFD0003Service.saveDq(jiaYueWindPowerDqResultCoverFD0003List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
 
                                 }
@@ -384,15 +384,40 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
 
     public <T extends Serializable> T jiaYueWindPowerDqResultCover(LocalDateTime localDateTime, String objId, Float bigDecimal, LocalDateTime creatTime, Date date, Time time, T targetType) {
 
+        // 查询场站并网容量
+        WindFarmInfoEncryption windFarmInfoEncryption = windFarmInfoEncryptionService.getCap(objId);
+        float cap = windFarmInfoEncryption.getCap();
+        BigDecimal capValue = new BigDecimal(cap);
+        Instant incomingTime = localDateTime.atZone(ZoneId.systemDefault()).toInstant();
+        Instant queryTime = null;
+
+        // 查询检修计划
+        List<OverhaulPlan> overhaulPlanList = overhaulPlanService.getOverhaulPlan(localDateTime, objId);
+        if (null != overhaulPlanList && overhaulPlanList.size() > 0) {
+            for (OverhaulPlan overhaulPlan : overhaulPlanList) {
+                // 判断手动停止时间是否在预测数据时间之后
+                if (null != overhaulPlan.getMcTime()) {
+                    queryTime = overhaulPlan.getMcTime().atZone(ZoneId.systemDefault()).toInstant();
+                    if (queryTime.isAfter(incomingTime)){
+                        BigDecimal bigDecimal1 = overhaulPlan.getOverhaulCapactity().divide(capValue, 2, RoundingMode.HALF_UP);
+                        bigDecimal =  new BigDecimal(bigDecimal).subtract(bigDecimal1.multiply(new BigDecimal(bigDecimal))).setScale(2,RoundingMode.HALF_UP).floatValue();
+                        cap = cap - overhaulPlan.getOverhaulCapactity().floatValue();
+                    }
+                }else {
+                    BigDecimal bigDecimal1 = overhaulPlan.getOverhaulCapactity().divide(capValue, 2, RoundingMode.HALF_UP);
+                    bigDecimal =  new BigDecimal(bigDecimal).subtract(bigDecimal1.multiply(new BigDecimal(bigDecimal))).setScale(2,RoundingMode.HALF_UP).floatValue();
+                    cap = cap - overhaulPlan.getOverhaulCapactity().floatValue();
+                }
+            }
+        }
         try {
             // 使用反射创建实体对象
             PropertyUtils.setProperty(targetType, "preDateTime", localDateTime);
             PropertyUtils.setProperty(targetType, "objId", objId);
-//            PropertyUtils.setProperty(targetType, "dataType", "ACTIVE_POWER");
-//            PropertyUtils.setProperty(targetType, "dataFlg", "OTHER");
             PropertyUtils.setProperty(targetType, "activePower", bigDecimal);
             PropertyUtils.setProperty(targetType, "dataDate", date);
             PropertyUtils.setProperty(targetType, "dataTime", time);
+            PropertyUtils.setProperty(targetType, "openCap", cap);
             PropertyUtils.setProperty(targetType, "createTime", LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault()));
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -87,7 +87,7 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
             parsingNwpInfo1.setId("a6bef32fab9fb298528851f1d85c77f2");
             parsingNwpInfo1.setDataType("m");
             parsingNwpInfo1.setFileName("NWP_");
-            parsingNwpInfo1.setStationCode("J00770,J00771,J00772,J00929,J00930,J00931");
+            parsingNwpInfo1.setStationCode("J00770,J00941,J00942,J00929,J00930,J00931");
             parsingNwpInfo1.setDelFlag("0");
             parsingNwpInfo1.setPreTime("1<=>2<=>date=<=>yyyy-MM-dd");
 //            parsingNwpInfo1.setScDate();
@@ -165,10 +165,10 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                 if (parsingUrl.getStationCode().equals("J00770")) {
                     jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0001Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
-                if (parsingUrl.getStationCode().equals("J00771")) {
+                if (parsingUrl.getStationCode().equals("J00941")) {
                     jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0002Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
-                if (parsingUrl.getStationCode().equals("J00772")) {
+                if (parsingUrl.getStationCode().equals("J00942")) {
                     jiaYueWindPowerNwpResultCovers = jiaYueWindPowerNwpResultCoverFD0003Service.getByDataDateAndDateTime(fileDate, fileTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                 }
                 if (parsingUrl.getStationCode().equals("J00929")) {
@@ -232,11 +232,11 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                                     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()));
                                 }
-                                if (parsingUrl.getStationCode().equals("J00771")) {
+                                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()));
                                 }
-                                if (parsingUrl.getStationCode().equals("J00772")) {
+                                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()));
                                 }
@@ -257,10 +257,10 @@ public class ParsingNwpInfoServiceImpl extends ServiceImpl<ParsingNwpInfoMapper,
                             if (parsingUrl.getStationCode().equals("J00770")) {
                                 jiaYueWindPowerNwpResultCoverFD0001Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0001List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                             }
-                            if (parsingUrl.getStationCode().equals("J00771")) {
+                            if (parsingUrl.getStationCode().equals("J00941")) {
                                 jiaYueWindPowerNwpResultCoverFD0002Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0002List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                             }
-                            if (parsingUrl.getStationCode().equals("J00772")) {
+                            if (parsingUrl.getStationCode().equals("J00942")) {
                                 jiaYueWindPowerNwpResultCoverFD0003Service.saveNwp(jiaYueWindPowerNwpResultCoverFD0003List, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
                             }
                             if (parsingUrl.getStationCode().equals("J00929")) {

ipp-client/src/main/java/com/jiayue/ipfcst/client/utils/EfileUtil.java

@@ -2,6 +2,8 @@
 package com.jiayue.ipfcst.client.utils;
 
 import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author tl
@@ -204,6 +206,54 @@ public class EfileUtil {
     }
 
 
+    public static List<String> getFileContent(File file) throws Exception {
+        String encodingType = EfileUtil.getCharset(file);
+        List<String> strList = new ArrayList();
+
+        InputStreamReader inputStreamReader = null;
+        BufferedReader bufferedReader = null;
+        FileInputStream fileInputStream = null;
+        try {
+            fileInputStream = new FileInputStream(file);
+            //将字节流向字符流转换
+            inputStreamReader = new InputStreamReader(fileInputStream, encodingType);
+            //创建字符流缓冲区
+            bufferedReader = new BufferedReader(inputStreamReader);
+            String line;
+            //按⾏读取
+            while ((line = bufferedReader.readLine()) != null) {
+                strList.add(line);
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (bufferedReader != null) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (inputStreamReader != null) {
+                try {
+                    inputStreamReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fileInputStream != null) {
+                try {
+                    fileInputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return strList;
+        }
+    }
+
     public static void main(String[] args) {
         File file = new File("D:\\code\\elanguage\\data\\单列式.txt");
         String encode = EfileUtil.getCharset(file);

ipp-client/src/main/java/com/jiayue/ipfcst/client/utils/GzipUtil.java

@@ -1,6 +1,5 @@
 package com.jiayue.ipfcst.client.utils;
 
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64OutputStream;
 
@@ -20,6 +19,29 @@ public class GzipUtil {
 
     private static int packSize = 800;
 
+    public static List<String> pubZipList(String result, int packSize) throws IOException {
+
+        String zipResult = zip(result);
+        zipResult = zipResult.replace("\r\n", "");
+
+        double length = zipResult.length();
+        int packageNumber = (int) Math.ceil(length / packSize);
+
+        List<String> list = new ArrayList<String>();
+
+        for (int i = 0; i < packageNumber; i++) {
+            if (i == packageNumber - 1) {
+                list.add(zipResult.substring(i * packSize, (int) length));
+            } else if (i == 0) {
+                list.add(zipResult.substring(0, packSize));
+            } else {
+                list.add(zipResult.substring(i * packSize, (i + 1) * packSize));
+            }
+        }
+
+
+        return list;
+    }
     public static List<String> zipList(String result) throws IOException {
         return zipList(result, packSize);
     }

ipp-client/src/main/java/com/jiayue/ipfcst/client/utils/TimeUtils.java

@@ -744,4 +744,15 @@ public class TimeUtils {
         return dayBefore;
     }
 
+
+    public static long getDayStartTime(Long dateTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTimeInMillis(dateTime);
+        date.set(Calendar.HOUR_OF_DAY, 0);
+        date.set(Calendar.MINUTE, 0);
+        date.set(Calendar.SECOND, 0);
+        date.set(Calendar.MILLISECOND, 0);
+        return date.getTimeInMillis();
+    }
+
 }

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

@@ -75,5 +75,10 @@ public class JiaYueWindPowerCdqResultCoverFD0001 {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
+
 
 }

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

@@ -74,5 +74,9 @@ public class JiaYueWindPowerCdqResultCoverFD0002 {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 
 }

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

@@ -75,4 +75,8 @@ public class JiaYueWindPowerCdqResultCoverFD0003 {
     private LocalDateTime updateTime;
 
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -75,4 +75,8 @@ public class JiaYueWindPowerCdqResultCoverFD0005 {
     private LocalDateTime updateTime;
 
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -75,4 +75,8 @@ public class JiaYueWindPowerCdqResultCoverFD0006 {
     private LocalDateTime updateTime;
 
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -74,5 +74,8 @@ public class JiaYueWindPowerCdqResultCoverFD0007 {
      */
     private LocalDateTime updateTime;
 
-
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0001 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0002 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0003 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0005 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0006 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -76,4 +76,8 @@ public class JiaYueWindPowerDqResultCoverFD0007 implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     *  开机容量
+     */
+    private Float openCap;
 }

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

@@ -0,0 +1,93 @@
+package com.jiayue.ipp.common.data.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+
+/**
+ *  检修计划实体
+ */
+@Data
+@TableName("zdata_overhaul_plan")
+public class OverhaulPlan implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id",type = IdType.INPUT)
+    private BigInteger id;
+
+    /**
+     *  场站编号
+     */
+    private String farmId;
+
+    /**
+     *  名称
+     */
+    private String name;
+
+    /**
+     *  描述
+     */
+    private String describe;
+
+    /**
+     *  开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     *  结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     *  生效时间
+     */
+    private LocalDateTime finalEntryTime;
+
+    /**
+     *  手动结束时间
+     */
+    private LocalDateTime mcTime;
+
+    /**
+     *  检修容量（MW）
+     */
+    private BigDecimal overhaulCapactity;
+
+    /**
+     *  状态（0：关闭中，1：进行中）
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    private String infoCreator;
+
+    /**
+     *  创建时间
+     */
+    @TableField( fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 最后修改者
+     */
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String lastModifier;
+
+    /**
+     *  最后修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime lastModifyTime;
+
+}