FIx 修复统计分析错误

VB_DSM_V2.1/Scripts/Dockers/docker-compose.yml

@@ -180,7 +180,7 @@ services:
 
   vber-server-analysis:
     build: ../../vbdsm-statistics/vbdsm-analysis
-    image: vbdsm-analysis:2.1.0
+    image: vbdsm-analysis:2.1.1
     container_name: vbdsm-analysis
     restart: always
     ports:
@@ -216,7 +216,7 @@ services:
 
   vber-server-statistics:
     build: ../../vbdsm-statistics/vbdsm-statistic
-    image: vbdsm-statistics:2.1.0
+    image: vbdsm-statistics:2.1.1
     container_name: vbdsm-statistics
     restart: always
     ports:

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/local/schedule.xml

@@ -26,11 +26,11 @@
     <timer>powerOnlineTimer.powerTimer</timer>
     <timer>powerOnlineTimer.powerDayTimer</timer>
 
-    <timer>shiftsEnergyTimer.today</timer>
-    <timer>shiftsEnergyTimer.yesterAndBefore</timer>
+    <!--    <timer>shiftsEnergyTimer.today</timer>-->
+    <!--    <timer>shiftsEnergyTimer.yesterAndBefore</timer>-->
 
-    <timer>stationEnergyTimer.today</timer>
-    <timer>stationEnergyTimer.yesterAndBefore</timer>
+    <!--    <timer>stationEnergyTimer.today</timer>-->
+    <!--    <timer>stationEnergyTimer.yesterAndBefore</timer>-->
 
     <timer>enterpriseStateTimer.EnterpriseStateTimingTask</timer>
 

VB_DSM_V2.1/vbdsm-statistics/vbdsm-analysis/src/main/resources/test/schedule.xml

@@ -26,11 +26,11 @@
     <timer>powerOnlineTimer.powerTimer</timer>
     <timer>powerOnlineTimer.powerDayTimer</timer>
 
-    <timer>shiftsEnergyTimer.today</timer>
-    <timer>shiftsEnergyTimer.yesterAndBefore</timer>
+    <!--    <timer>shiftsEnergyTimer.today</timer>-->
+    <!--    <timer>shiftsEnergyTimer.yesterAndBefore</timer>-->
 
-    <timer>stationEnergyTimer.today</timer>
-    <timer>stationEnergyTimer.yesterAndBefore</timer>
+    <!--    <timer>stationEnergyTimer.today</timer>-->
+    <!--    <timer>stationEnergyTimer.yesterAndBefore</timer>-->
 
     <timer>enterpriseStateTimer.EnterpriseStateTimingTask</timer>
 

VB_DSM_V2.1/vbdsm-statistics/vbdsm-statistic/src/main/java/cn/vbdsm/statistic/biz/impl/OnlineWarnAnalBizImpl.java

@@ -115,7 +115,7 @@ public class OnlineWarnAnalBizImpl implements IOnlineWarnAnalBiz {
         for (OnlineWarn onlineWarn : onlineWarns) {
             onlineWarn.setWarn_state(ONLINE_WARN_STATE_OVERTIME);
             //处理状态修改成已处理,判断是否人为处理
-            if (onlineWarn.getIs_resolved() != SOLVED_STATUS_SOLVED && onlineWarn.getHandle_result() == null && onlineWarn.getHandle_result() == 0) {
+            if (onlineWarn.getIs_resolved() != SOLVED_STATUS_SOLVED && (onlineWarn.getHandle_result() == null || onlineWarn.getHandle_result() == 0)) {
                 onlineWarn.setIs_resolved(SOLVED_STATUS_SOLVED);
                 onlineWarn.setHandle_result(HANDLE_RESULT_CODE_OVERTIME);
                 onlineWarn.setHandle_date(Long.valueOf(sdfHMDHMS.format(new Date())));