xieshengjie 2 år sedan
förälder
incheckning
509b493f1b

+ 4 - 4
realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java

@@ -32,7 +32,7 @@ public class CycleCalculationService {
 
         Date currentDate = DateUtils.getCurrentDate();
 
-        Date date = DateUtils.addSeconds(currentDate, -1);
+        Date date = DateUtils.addMinutes(currentDate, -5);
         Date date15age = DateUtils.addMinutes(currentDate, -15);
 
         Date samedayZero = DateUtils.getSamedayZero();
@@ -297,7 +297,7 @@ public class CycleCalculationService {
                 double nzsdl = 0;
 
 
-                if (currentDate.getTime()>samedayZero.getTime() && currentDate.getTime()<=samedayZeroAdd15.getTime()){
+                if (date.getTime()>samedayZero.getTime() && date.getTime()<=samedayZeroAdd15.getTime()){
                     rpjfs = dataMap.get("pjfs");
                     rpjgl = dataMap.get("pjgl");
                     rkydl = dataMap.get("kydl");
@@ -365,7 +365,7 @@ public class CycleCalculationService {
                         rzfdl = Math.abs(temp);
                     }
                 }
-                if (currentDate.getTime()>monthFirstZero.getTime() && currentDate.getTime()<=monthFirstZeroAdd15.getTime()){
+                if (date.getTime()>monthFirstZero.getTime() && date.getTime()<=monthFirstZeroAdd15.getTime()){
                     ypjfs = dataMap.get("pjfs");
                     ypjgl = dataMap.get("pjgl");
                     ykydl = dataMap.get("kydl");
@@ -435,7 +435,7 @@ public class CycleCalculationService {
                         yzfdl = Math.abs(temp);
                     }
                 }
-                if (currentDate.getTime()>yearFirstZero.getTime() && currentDate.getTime()<=yearFirstZeroAdd15.getTime()){
+                if (date.getTime()>yearFirstZero.getTime() && date.getTime()<=yearFirstZeroAdd15.getTime()){
                     npjfs = dataMap.get("pjfs");
                     npjgl = dataMap.get("pjgl");
                     nkydl = dataMap.get("kydl");