|
@@ -436,10 +436,15 @@ public class GeoHazardMonitorTokenController {
|
|
if (releaseAlarmVo.getReleaseTime().toString().length() == 10) {
|
|
if (releaseAlarmVo.getReleaseTime().toString().length() == 10) {
|
|
releaseAlarmVo.setReleaseTime(releaseAlarmVo.getReleaseTime() * 1000);
|
|
releaseAlarmVo.setReleaseTime(releaseAlarmVo.getReleaseTime() * 1000);
|
|
}
|
|
}
|
|
- msgAlarm.setReleasedTime(new Date(releaseAlarmVo.getReleaseTime()));
|
|
|
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
|
+ cal.setTime(new Date(releaseAlarmVo.getReleaseTime()));
|
|
|
|
+ cal.set(Calendar.MILLISECOND, 0);
|
|
|
|
+ cal.set(Calendar.MILLISECOND, 0);
|
|
|
|
+ msgAlarm.setReleasedTime(cal.getTime());
|
|
msgAlarm.setReleaseContent(releaseAlarmVo.getReleaseContent());
|
|
msgAlarm.setReleaseContent(releaseAlarmVo.getReleaseContent());
|
|
msgAlarm.setReleasedBy(releaseAlarmVo.getOperator());
|
|
msgAlarm.setReleasedBy(releaseAlarmVo.getOperator());
|
|
msgAlarm.setUpdateBy(releaseAlarmVo.getOperator());
|
|
msgAlarm.setUpdateBy(releaseAlarmVo.getOperator());
|
|
|
|
+ msgAlarm.setUpdateTime(new Date());
|
|
msgAlarm.setIsRelease(1);
|
|
msgAlarm.setIsRelease(1);
|
|
boolean count = msgAlarmService.updateById(msgAlarm);
|
|
boolean count = msgAlarmService.updateById(msgAlarm);
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|