监视模块产品化计算服务修改

web/monitor-web-hbnew/src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -307,15 +307,15 @@ public class MatrixQfPushService {
         map.put("fcjrnum", fcdjnum+fcyxnum+fcgznum+fclxnum+fcwhnum+fcxdnum+fcslnum);
         List<String> qfzbls = new ArrayList<>();
         //日0欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R0QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R0QFZT).getCode());
         //日1欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R1QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R1QFZT).getCode());
         //日2欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R2QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R2QFZT).getCode());
         //日3欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R3QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R3QFZT).getCode());
         //日4欠发电量
-        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(FD, Constant.R4QFZT).getCode());
+        qfzbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(QS, Constant.R4QFZT).getCode());
         List<PointData> qfzblist = realApiUtil.getRealData(qfzbls);
 
         if (!qfzblist.isEmpty() && qfzblist.size() == qfzbls.size()) {

web/monitor-web-hbnew/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -155,7 +155,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                     else{
                                         PointData data = new PointData();
                                         data.setEdnaId(point.getCode());
-                                        data.setPointTime(snapItem.getPointTime());
+                                        data.setPointTime(0L);
                                         data.setPointValue("0");
                                         data.setPointName("1");
                                         data.setPointValueInDouble(0.0);
@@ -230,7 +230,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                 else{
                     PointData data = new PointData();
                     data.setEdnaId(pointid);
-                    data.setPointTime(sectionlist.get(0).getPointTime());
+                    data.setPointTime(0L);
                     data.setPointValue("0");
                     data.setPointName("1");
                     data.setPointValueInDouble(0.0);
@@ -239,7 +239,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
             } else {
                 PointData data = new PointData();
                 data.setEdnaId(pointid);
-                data.setPointTime(sectionlist.get(0).getPointTime());
+                data.setPointTime(0L);
                 data.setPointValue("0");
                 data.setPointName("1");
                 data.setPointValueInDouble(0.0);
@@ -442,7 +442,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                     else{
                                         PointData data = new PointData();
                                         data.setEdnaId(point.getCode());
-                                        data.setPointTime(snapItem.getPointTime());
+                                        data.setPointTime(0L);
                                         data.setPointValue("0");
                                         data.setPointName("1");
                                         data.setPointValueInDouble(0.0);
@@ -1036,7 +1036,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                     else{
                                         PointData data = new PointData();
                                         data.setEdnaId(pointid);
-                                        data.setPointTime(snapItem.getPointTime());
+                                        data.setPointTime(0L);
                                         data.setPointValue("0");
                                         data.setPointName("1");
                                         data.setPointValueInDouble(0.0);

web/monitor-web-hbnew/src/main/resources/logback.xml

@@ -8,7 +8,7 @@
     <contextName>logback</contextName>
 
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/usr/local/gyee/monitor/logs/" />
+    <property name="log.path" value="d:/gyee/monitor/logs/" />
 
     <!--0. 日志格式和颜色渲染 -->
     <!-- 彩色日志依赖的渲染类 -->