预测电量修改

src/main/java/com/gyee/frame/service/export/LoadrateHourlyService.java

@@ -30,6 +30,7 @@ public class LoadrateHourlyService {
             ptMap.put(2, "XH_GDC");
             ptMap.put(3, "MCH_GDC");
             ptMap.put(4, "HZJ_GDC");
+            ptMap.put(5, "AK_GDC");
         }
         return ptMap;
     }
@@ -42,6 +43,7 @@ public class LoadrateHourlyService {
             tpMap.put("XH_GDC",2);
             tpMap.put("MCH_GDC",3);
             tpMap.put("HZJ_GDC",4);
+            tpMap.put("AK_GDC",4);
         }
         return tpMap;
     }

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -481,7 +481,9 @@ public class GenreSetPushService {
 //            {
 //                rycfdl = rfdl * YCFDLXS;
 //            }
-            double rycfdl = StringUtils.round(rfdl * YCFDLXS, 2);
+            int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1;
+            double rycfdl = StringUtils.round((rfdl / hour) * 24, 2);
+//            double rycfdl = StringUtils.round(rfdl * YCFDLXS, 2);
             //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
             c = Calendar.getInstance();
             double yycfdl = (yfdl + rycfdl*(daynum-c.get(Calendar.DAY_OF_MONTH)))*YCFDLXS;

src/main/resources/logback.xml

@@ -111,7 +111,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 
 	<!-- dev环境 -->
 	<springProfile name="dev">
-	    <root level="INFO">
+	    <root level="ERROR">
 			<!-- 控制台 -->
 			<appender-ref ref="console" />
 	    </root>
@@ -119,7 +119,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 	
 	 <!-- 生产环境 -->
     <springProfile name="prod">
-	    <root level="INFO">
+	    <root level="ERROR">
 	        <appender-ref ref="appLogAppender"/>
 	    </root>
 	</springProfile>