Browse Source

部署平头镇一期计算

xieshengjie 2 years ago
parent
commit
c075ec012f

+ 1 - 1
realtime/generation-service/src/main/java/com/gyee/generation/service/StatusService.java

@@ -100,7 +100,7 @@ public class StatusService {
                     }
                     else {
                         List<PointData> interruptionRealData = edosUtil.getRealData(interruptionList);
-                        List<PointData> collect = interruptionRealData.stream().filter(i -> Math.abs(currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
+                        List<PointData> collect = interruptionRealData.stream().filter(i -> (currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
                         if (collect.size()!=interruptionRealData.size()){
                             Double ztmx = edosUtil.getRealData(ztmxPoint).getPointValueInDouble();
                             if (ztmx == 7 || ztmx == 9 || ztmx == 10 || ztmx == 11 || ztmx == 4 || ztmx == 5 ){     //手打状态

+ 3 - 3
realtime/generation-service/src/main/resources/application-jn.yml

@@ -85,11 +85,11 @@ logging:
 db:
   url: http://10.81.3.152:8011/ts
 #参与计算的场站
-runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC
+runWindpowerstation: GJY_FDC,DJY_FDC,YF_FDC,HSM_FDC,PTZ_FDC
 #计算状态用ai或者di
 clauStatus:
   ai: GJY03_GC   #配置期次
-  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC
+  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC
 #判断数据终端
 second: 1800
 #判断降出力
@@ -100,7 +100,7 @@ AI178: 17.4    #转矩给定
 #计算电量直接取,如果不是1就是相减算
 typeOfElectric:
   #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC
+  direct: GJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC