处理山西大同影响容量数据集

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Faultrecord.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
+
 /**
  * <p>
  * 
@@ -34,9 +37,9 @@ public class Faultrecord extends Model {
 
     private String wtname;
 
-    private Long begindate;
+    private Date begindate;
 
-    private Long enddate;
+    private Date enddate;
 
     private String faulttype;
 

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Mainrecord.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -34,9 +36,9 @@ public class Mainrecord extends Model {
 
     private String wtname;
 
-    private Long begindate;
+    private Date begindate;
 
-    private Long enddate;
+    private Date enddate;
 
     private String defecteliminating;
 

web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -431,8 +431,9 @@ public class GhostService {
         if (StringUtils.isNotEmpty(faulttype)){
             qw.eq("faulttype",faulttype);
         }
-        qw.ge("begindate",begin).le("enddate",end);
+        qw.ge("begindate",DateUtils.parseLongToDate(begin)).le("enddate",DateUtils.parseLongToDate(end));
         List<Faultrecord> faultrecordList = faultrecordService.list(qw);
+
         return faultrecordList;
     }
 
@@ -458,7 +459,7 @@ public class GhostService {
         faultrecord.setProjectname(promap.get(projectid).getName());
         faultrecord.setWpid(windpowerstationid);
         faultrecord.setWpname(wpmap.get(windpowerstationid).getName());
-        double hours = DateUtils.hoursDiff2(DateUtils.parseLongToDate(faultrecord.getBegindate()), DateUtils.parseLongToDate(faultrecord.getEnddate()));
+        double hours = DateUtils.hoursDiff2(faultrecord.getBegindate(), faultrecord.getEnddate());
         faultrecord.setFaultduration(hours);
         faultrecord.setImpactcapacity(hours * wtcap.get(faultrecord.getWtid()) / 10000);
         boolean b = faultrecordService.saveOrUpdate(faultrecord);
@@ -486,7 +487,7 @@ public class GhostService {
             qw.eq("wtid",wtid);
         }
 
-        qw.ge("begindate",begin).le("enddate",end);
+        qw.ge("begindate",DateUtils.parseLongToDate(begin)).le("enddate",DateUtils.parseLongToDate(end));
         List<Mainrecord> mainrecordList = mainrecordService.list(qw);
         return mainrecordList;
     }
@@ -513,7 +514,7 @@ public class GhostService {
         mainrecord.setProjectname(promap.get(projectid).getName());
         mainrecord.setWpid(windpowerstationid);
         mainrecord.setWpname(wpmap.get(windpowerstationid).getName());
-        double hours = DateUtils.hoursDiff2(DateUtils.parseLongToDate(mainrecord.getBegindate()), DateUtils.parseLongToDate(mainrecord.getEnddate()));
+        double hours = DateUtils.hoursDiff2(mainrecord.getBegindate(), mainrecord.getEnddate());
         mainrecord.setFaultduration(hours);
         mainrecord.setImpactcapacity(hours * wtcap.get(mainrecord.getWtid()) / 10000);
         boolean b = mainrecordService.saveOrUpdate(mainrecord);