修改告警信息

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/ForecastPowerShortTermHisRepository.java

@@ -4,6 +4,7 @@ import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTermHis;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,6 +16,12 @@ import java.util.List;
  */
 public interface ForecastPowerShortTermHisRepository extends BaseRepository<ForecastPowerShortTermHis, Integer> {
     /**
+     * 根据传入的时间删除之前历史数据
+     * @param time 时间
+     */
+    void deleteByGenDateBefore(Date time);
+
+    /**
      * 根据时间段删除当日凌晨零点以后生成的短期历史期数据
      *
      * @param startTime 开始时间

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/InverterStatusDataRepository.java

@@ -13,8 +13,11 @@ import java.util.List;
  * @since 2019/8/6 13:00
  */
 public interface InverterStatusDataRepository extends BaseRepository<InverterStatusData, Integer> {
-
-
+    /**
+     * 根据传入的时间删除之前历史数据
+     * @param time 时间
+     */
+    void deleteByTimeBefore(Date time);
     List<InverterStatusData> findByTimeBetween(Date startTime, Date endTime);
     List<InverterStatusData> findByTimeBetweenAndEquipmentIdIn(Date startTime, Date endTime, Integer[] no);
     List<InverterStatusData> findByTimeBetweenAndEquipmentId(Date startTime, Date endTime, String no);

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/WeatherStationStatusDataRepository.java

@@ -23,4 +23,9 @@ public interface WeatherStationStatusDataRepository extends BaseRepository<Weath
 	 */
 	List<WeatherStationStatusData> findByStationCodeAndTimeBetweenAndEquipmentId(String stationCode,Date startTime, Date endTime, String no);
 
+	/**
+	 * 根据传入的时间删除之前历史数据
+	 * @param time 时间
+	 */
+	void deleteByTimeBefore(Date time);
 }

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/WindTowerStatusDataRepository.java

@@ -16,6 +16,11 @@ import java.util.List;
  */
 public interface WindTowerStatusDataRepository extends JpaRepository<WindTowerStatusData, Integer>, JpaSpecificationExecutor<WindTowerStatusData> {
 	/**
+	 * 根据传入的时间删除之前历史数据
+	 * @param time 时间
+	 */
+	void deleteByTimeBefore(Date time);
+	/**
 	 * 根据设备号和时间段获取测风塔数据
 	 *
 	 * @param equipmentNo

ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/WindTurbineStatusDataRepository.java

@@ -17,4 +17,9 @@ public interface WindTurbineStatusDataRepository extends BaseRepository<WindTurb
     List<WindTurbineStatusData> findByTimeBetweenAndEquipmentId(Date startTime, Date endTime, String no);
 
     List<WindTurbineStatusData> findByTimeBetweenAndEquipmentIdIn(Date startTime, Date endTime, Integer[] no);
+    /**
+     * 根据传入的时间删除之前历史数据
+     * @param time 时间
+     */
+    void deleteByTimeBefore(Date time);
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/job/DeleteHistoryDataJob.java

@@ -0,0 +1,32 @@
+package com.jiayue.ipfcst.console.job;
+
+import com.jiayue.ipfcst.console.service.DeleteHistoryDataService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 删除前15天的历史数据
+ *
+ * @author whc
+ * @version 3.0
+ */
+@Slf4j
+@Service
+@EnableScheduling
+public class DeleteHistoryDataJob {
+  @Autowired
+  DeleteHistoryDataService deleteHistoryData;
+
+  @Scheduled(fixedRate = 86400000)
+  private void delete(){
+    log.info("开始删除15天前的历史数据");
+
+    deleteHistoryData.deleteData();
+
+    log.info("15天前的历史数据已删除");
+  }
+}

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/DeleteHistoryDataService.java

@@ -0,0 +1,48 @@
+package com.jiayue.ipfcst.console.service;
+
+import com.jiayue.ipfcst.common.core.util.DateMomentUtil;
+import com.jiayue.ipfcst.common.data.repository.*;
+import com.jiayue.ipfcst.common.data.service.BaseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+
+@Service
+@Slf4j
+
+public class DeleteHistoryDataService extends BaseService {
+  @Autowired
+  WeatherStationStatusDataRepository weatherStationStatusDataRepository;
+  @Autowired
+  InverterStatusDataRepository inverterStatusDataRepository;
+  @Autowired
+  WindTowerStatusDataRepository windTowerStatusDataRepository;
+  @Autowired
+  WindTurbineStatusDataRepository windTurbineStatusDataRepository;
+  @Autowired
+  ForecastPowerShortTermHisRepository forecastPowerShortTermHisRepository;
+
+
+  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+  public void deleteData(){
+    try{
+      Date date = new Date();
+      long time = DateMomentUtil.getDayStartTime(date.getTime());
+      long startTime = time - 60 * 60 * 24 * 1000 * 15;
+      Date dateTime = new Date(startTime);
+      forecastPowerShortTermHisRepository.deleteByGenDateBefore(dateTime);
+      weatherStationStatusDataRepository.deleteByTimeBefore(dateTime);
+      inverterStatusDataRepository.deleteByTimeBefore(dateTime);
+      windTowerStatusDataRepository.deleteByTimeBefore(dateTime);
+      windTurbineStatusDataRepository.deleteByTimeBefore(dateTime);
+    }catch (RuntimeException e){
+      log.info("执行删除历史数据定时任务时报错",e);
+    }
+
+  }
+}

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ReceiveDataService.java

@@ -133,6 +133,7 @@ public class ReceiveDataService extends BaseService {
     paramMap.put("startTime", startTime);
     paramMap.put("endTime", endTime);
     String body = httpClient(paramMap,electricField);
+    log.debug(body);
     AnalysisData(body, id, equipmentType, electricField);
   }
 

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/FtpUploadService.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class FtpUploadService extends BaseUploadFileService{
+public class FtpUploadService{
   final
   UploadFileChannelService uploadFileChannelService;
   final