|
@@ -2841,8 +2841,10 @@ public class HandleDataController extends BaseController
|
|
|
|
|
|
|
|
|
|
private void closeWarning(TXinyiWarningRecord tXinyiWarningRecord) {
|
|
private void closeWarning(TXinyiWarningRecord tXinyiWarningRecord) {
|
|
- Date nowDate = DateUtils.getNowDate();
|
|
|
|
|
|
+// Date nowDate = DateUtils.getNowDate();
|
|
tXinyiWarningRecord.setStatus(2);
|
|
tXinyiWarningRecord.setStatus(2);
|
|
|
|
+ //2025年05月10日13:33:35 因为要处理历史数据,所以这里的时间不能用当前时间,应该用报警的下一个时段
|
|
|
|
+ Date nowDate = DateUtils.addHours(tXinyiWarningRecord.getUpdateTime(), 1);
|
|
tXinyiWarningRecord.setOffTime(nowDate);
|
|
tXinyiWarningRecord.setOffTime(nowDate);
|
|
tXinyiWarningRecord.setUpdateTime(nowDate);
|
|
tXinyiWarningRecord.setUpdateTime(nowDate);
|
|
tXinyiWarningRecord.setUpdateBy(WARNING_DEFAULT_CREATE);
|
|
tXinyiWarningRecord.setUpdateBy(WARNING_DEFAULT_CREATE);
|