修改event功能

realtime/generation-service/src/main/java/com/gyee/generation/model/auto/Shutdownevent.java

@@ -2,9 +2,13 @@ package com.gyee.generation.model.auto;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.springframework.data.annotation.Id;
 
 /**
  * <p>
@@ -19,7 +23,7 @@ import lombok.EqualsAndHashCode;
 public class Shutdownevent extends Model {
 
     private static final long serialVersionUID = 1L;
-
+    @TableId(value = "id",type = IdType.INPUT)
     private String id;
 
     private String windpowerstationid;

realtime/generation-service/src/main/java/com/gyee/generation/service/FiveLossesService.java

@@ -107,7 +107,7 @@ public class FiveLossesService {
                         Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
                         if (first.isPresent()){
                             Shutdownevent shutdownevent = first.get();
-                            Date starttime = new Date(sectionData.getPointTime());
+                            Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
                             shutdownevent.setStarttime(starttime);
                             Date stoptime = shutdownevent.getStoptime();
                             double hour = DateUtils.hoursDiff1(stoptime, starttime);
@@ -139,13 +139,14 @@ public class FiveLossesService {
                         shutdownevent.setId(CommonUtils.getUUID());
                         shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
                         shutdownevent.setWindturbineid(wt.getId());
-                        shutdownevent.setStoptime(new Date(sectionData.getPointTime()));
+                        shutdownevent.setStoptime(DateUtils.parseLongToDate(sectionData.getPointTime()*1000));
                         shutdownevent.setProjectid(wt.getProjectid());
                         if (fjzt == 6){
                             shutdownevent.setStatuscode(2);
                         }else {
                             shutdownevent.setStatuscode(4);
                         }
+                        shutdowneventService.save(shutdownevent);
                     }
                 }
             }else if(StringUtils.isNotEmpty(finalMainWinturbines)){    //维护不为空
@@ -155,7 +156,7 @@ public class FiveLossesService {
                         Optional<Shutdownevent> first = shutdownevents.stream().filter(i -> i.getWindturbineid().equals(wt.getId())).findFirst();
                         if (first.isPresent()){
                             Shutdownevent shutdownevent = first.get();
-                            Date starttime = new Date(sectionData.getPointTime());
+                            Date starttime = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
                             shutdownevent.setStarttime(starttime);
                             Date stoptime = shutdownevent.getStoptime();
                             double hour = DateUtils.hoursDiff1(stoptime, starttime);
@@ -187,13 +188,14 @@ public class FiveLossesService {
                         shutdownevent.setId(CommonUtils.getUUID());
                         shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
                         shutdownevent.setWindturbineid(wt.getId());
-                        shutdownevent.setStoptime(new Date(sectionData.getPointTime()));
+                        shutdownevent.setStoptime(DateUtils.parseLongToDate(sectionData.getPointTime()*1000));
                         shutdownevent.setProjectid(wt.getProjectid());
                         if (fjzt == 6){
                             shutdownevent.setStatuscode(2);
                         }else {
                             shutdownevent.setStatuscode(4);
                         }
+                        shutdowneventService.save(shutdownevent);
                     }
                 }
             }else {    //没有没结束的故障维护事件
@@ -202,13 +204,15 @@ public class FiveLossesService {
                     shutdownevent.setId(CommonUtils.getUUID());
                     shutdownevent.setWindpowerstationid(wt.getWindpowerstationid());
                     shutdownevent.setWindturbineid(wt.getId());
-                    shutdownevent.setStoptime(new Date(sectionData.getPointTime()));
+                    Date date = DateUtils.parseLongToDate(sectionData.getPointTime()*1000);
+                    shutdownevent.setStoptime(date);
                     shutdownevent.setProjectid(wt.getProjectid());
                     if (fjzt == 6){
                         shutdownevent.setStatuscode(2);
                     }else {
                         shutdownevent.setStatuscode(4);
                     }
+                    shutdowneventService.save(shutdownevent);
                 }
             }
         });

realtime/generation-service/src/main/java/com/gyee/generation/task/SaticScheduleTask.java

@@ -186,6 +186,17 @@ public class SaticScheduleTask {
         XxlJobHelper.log("安全天数调度程序执行完成!........");
     }
 
+    /**
+     * 保存shutdownevent
+     * 2分钟执行一次
+     */
+    @XxlJob("shutdownevent-realtime")
+    public void shutdownevent(){
+        XxlJobHelper.log("故障事件调度程序执行开始!........");
+        fiveLossesService.saveShutdownevent();
+        XxlJobHelper.log("故障事件调度程序执行完成!........");
+    }
+
 
 
 }