diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index fe70b82..fb74560 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -17,9 +17,7 @@ import javax.annotation.Resource; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -128,7 +126,10 @@ alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), DateUtil.parseTime(alarmRecordDTO.getOperateTime()))); } else if ("1".equals(alarmRecordDTO.getStatus())) {//未消警,计算时长 - alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), new Date())); + //同步相差8小时时间 + Calendar now = Calendar.getInstance(); + now.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); + alarmRecordDTO.setAlarmDuration(getTimeDifference(alarmRecordDTO.getAlarmTimeDate(), now.getTime())); } if (ToolUtil.isNotEmpty(alarmRecordDTO.getAlarmContentName())) { alarmRecordDTO.setAlarmContent(EhcacheConstant.retBean().getAlarmContentByName(alarmRecordDTO.getAlarmContentName()));