Merge remote-tracking branch 'origin/zhczh_c' into zhczh_c

src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

@@ -1521,11 +1521,13 @@ public class DataProcessServiceImpl implements IDataProcessService {
                     updateData.setAggregatedRunningTime(historyData.getAggregatedRunningTime());
                     updateData.setContinuousRunningTime(0L);
                 }else if (historyData.getIsRunning()==1){
-                    log.info("bs_status: process [start],last status [start]");
+                    log.warn("Break due to last bs_status is start, the new bs_status is:"+value);
-                    Long tsPeriod = (System.currentTimeMillis()-Long.parseLong(historyData.getLatest_ts()));
+                    return;
-                    log.info("tsPeriod: "+tsPeriod);
+//                    log.info("bs_status: process [start],last status [start]");
-                    updateData.setAggregatedRunningTime(historyData.getAggregatedRunningTime()+tsPeriod);
+//                    Long tsPeriod = (System.currentTimeMillis()-Long.parseLong(historyData.getLatest_ts()));
-                    updateData.setContinuousRunningTime(0L);
+//                    log.info("tsPeriod: "+tsPeriod);
+//                    updateData.setAggregatedRunningTime(historyData.getAggregatedRunningTime()+tsPeriod);
+//                    updateData.setContinuousRunningTime(0L);
                 }
             }else if (value==0){
                 //Process [stop]