|
@@ -211,7 +211,7 @@ public class LeanModelStatistics {
|
|
|
Date deviceStopTimeEnd = DateUtils.addHours(fpgGatherData.getCreateTime(), 8);
|
|
|
if (fpgGatherData.getRunCurrent().compareTo(new BigDecimal(systemVariable.getDefaultValue())) < 0) { // 设备停止运行 直接更新停止时间结束不用统计任何东西
|
|
|
UpdateDefinition updateStartStop = new Update()
|
|
|
- .set("updateTime", curentDate).set("deviceStopTime", deviceStopTimeEnd).set("deviceStopTimeBank", deviceStopTimeEnd);
|
|
|
+ .set("updateTime", curentDate).set("deviceStopTime", DateUtils.date2Str(deviceStopTimeEnd, DateUtils.datetimeFormat.get())).set("deviceStopTimeBank", DateUtils.date2Str(deviceStopTimeEnd, DateUtils.datetimeFormat.get()));
|
|
|
mongoTemplate.updateFirst(queryStartStop, updateStartStop, DeviceStatiscsModelMongodb.class, startStopMonKey);
|
|
|
} else if(fpgGatherData.getRunCurrent().compareTo(new BigDecimal(systemVariable.getDefaultValue())) > 0 && timeRes != 0){ // 设备重新启动
|
|
|
startStopStatiscsData.setPower(runPower);
|
|
@@ -230,7 +230,7 @@ public class LeanModelStatistics {
|
|
|
.set("power", oldPower.add(runPower))
|
|
|
.set("selectricCurrent", oldSelectricCurrent.add(selectricCurrent))
|
|
|
.set("ingTime", oldRunTime.add(runTime))
|
|
|
- .set("deviceStopTime", deviceStopTime)
|
|
|
+ .set("deviceStopTime", DateUtils.date2Str(deviceStopTime, DateUtils.datetimeFormat.get()))
|
|
|
.set("updateTime", curentDate);
|
|
|
mongoTemplate.updateFirst(queryStartStop, updateStartStop, FpgStatiscsModelMongodb.class, startStopMonKey);
|
|
|
}
|