|
@@ -270,12 +270,14 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
|
|
|
for (Map.Entry<String, Double> entry : timeDataMap.entrySet()) {
|
|
|
Date dataTime = DateUtils.str2Date(entry.getKey(), DateUtils.SDF_SECOND);
|
|
|
+ if(dataTime.getTime()==lastComputeTime.getTime()){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (dataTime.getTime() > System.currentTimeMillis()) {
|
|
|
break;
|
|
|
}
|
|
|
computeCalculateDTO.setDataTime(dataTime);
|
|
|
Double targetData;
|
|
|
-
|
|
|
targetData = computeObjTargetDataByCalculate(computeCalculateDTO, formula);
|
|
|
if (targetData == null) {
|
|
|
break;
|
|
@@ -295,8 +297,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
private Date getDefultStartTime() throws Exception {
|
|
|
Date lastComputeTime;
|
|
|
if (StringUtils.isBlank(computePropertiesConfig.getDStartTime())) {
|
|
|
-
|
|
|
- lastComputeTime = DateUtils.get15MinLite(new Date());
|
|
|
+ lastComputeTime = DateUtils.get15MinLite(DateUtils.addHours(new Date(),-1));
|
|
|
} else {
|
|
|
lastComputeTime = DateUtils.str2Date(computePropertiesConfig.getDStartTime(), DateUtils.SDF_SECOND);
|
|
|
}
|