xushining 2 роки тому
батько
коміт
eb93d46925

+ 9 - 0
web/gdsx-ghost/pom.xml

@@ -45,6 +45,15 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

+ 7 - 7
web/gdsx-ghost/src/main/java/com/gyee/ghost/init/CacheContext.java

@@ -117,12 +117,12 @@ public class CacheContext implements CommandLineRunner {
 //        });
 
 
-//        String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
-//        try {
-////            realtimeService.saveWindturbineStatus2();
-//            realtimeService.saveWindstationStatus(yesterday,yesterday);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
+        try {
+//            realtimeService.saveWindturbineStatus2();
+            realtimeService.saveWindstationStatus(yesterday,yesterday);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

+ 2 - 2
web/gdsx-ghost/src/main/java/com/gyee/ghost/service/RealtimeService.java

@@ -156,7 +156,7 @@ public class RealtimeService {
 //        Date befroeDate = DateUtils.addMinutes(currentDate,-5);
         days.forEach(day->{
             Date date = DateUtils.parseDate(day);
-            Date addday = DateUtils.addMinutes(date, 1);
+            Date addday = DateUtils.addDays(date, 1);
             wtls.stream().forEach(wt->{
                 Map<String, Windturbinetestingpointai> stringWindturbinetestingpointaiMap = wtpAimap.get(wt.getId());
                 Windturbinetestingpointai windturbinetestingpointai = stringWindturbinetestingpointaiMap.get(Contant.ZTMX);
@@ -171,7 +171,7 @@ public class RealtimeService {
                         proEconStationStatusmx.setWindpowerstationId(wt.getWindpowerstationid());
                         proEconStationStatusmx.setWindturbineId(wt.getId());
                         proEconStationStatusmx.setRecorddate(date);
-                        proEconStationStatusmx.setStopHours(DoubleUtils.keepPrecision(new Double(minutes).intValue()/60,2));
+                        proEconStationStatusmx.setStopHours(DoubleUtils.keepPrecision(new Double(minutes)/60,2));
                         proEconStationStatusmx.setLossPower(0.0);
                         proEconStationStatusmx.setSatusCode(sta);
                         proEconStationStatusmx.setStatusDesc(statusmxMap.get(sta));

+ 2 - 2
web/gdsx-ghost/src/main/java/com/gyee/ghost/task/SaticScheduleTask.java

@@ -54,7 +54,7 @@ public class SaticScheduleTask {
 
 
     //或直接指定时间间隔,例如:5秒
-    @Scheduled(fixedRate=300000)
+//    @Scheduled(fixedRate=300000)
     private void status() {
         try {
             realtimeService.saveWindturbineStatus2();
@@ -63,7 +63,7 @@ public class SaticScheduleTask {
         }
     }
 
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "1 0 0 * * ?")
     //或直接指定时间间隔,例如:5秒
     //@Scheduled(fixedRate=5000)
     private void statustj() {

+ 11 - 2
web/gdsx-ghost/src/test/java/com/gyee/ghost/GhostTest.java

@@ -3,6 +3,8 @@ package com.gyee.ghost;/*
 @date   2022/8/3-17:10
 */
 
+import com.gyee.common.util.DateUtils;
+import com.gyee.ghost.service.RealtimeService;
 import com.gyee.ghost.service.auto.GhostService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,10 +21,17 @@ import javax.annotation.Resource;
 public class GhostTest {
     @Resource
     private GhostService ghostService;
+    @Resource
+    private RealtimeService realtimeService;
 
     @Test
     public void test1(){
-        double a = 1/2;
-        System.out.println();
+                String yesterday = DateUtils.getYesterdayStr("yyyy-MM-dd");
+        try {
+//            realtimeService.saveWindturbineStatus2();
+            realtimeService.saveWindstationStatus(yesterday,yesterday);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }