From 038d360dd4f2dd3c06f5d97dc66ed13fd78de212 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 27 六月 2022 09:38:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rtc' into commercial
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
index e785856..56864db 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
@@ -9,6 +9,7 @@
import com.genersoft.iot.vmp.service.IDeviceAlarmService;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
@@ -23,9 +24,7 @@
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
@Api(tags = "鎶ヨ淇℃伅绠＄悊")
@@ -45,9 +44,6 @@
@Autowired
private IVideoManagerStorage storage;
-
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private SimpleDateFormat formatForGB = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
/**
* 鍒嗛〉鏌ヨ鎶ヨ
@@ -85,16 +81,30 @@
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime
) {
- if (StringUtils.isEmpty(alarmPriority)) alarmPriority = null;
- if (StringUtils.isEmpty(alarmMethod)) alarmMethod = null;
- if (StringUtils.isEmpty(alarmType)) alarmType = null;
- if (StringUtils.isEmpty(startTime)) startTime = null;
- if (StringUtils.isEmpty(endTime)) endTime = null;
+ if (StringUtils.isEmpty(alarmPriority)) {
+ alarmPriority = null;
+ }
+ if (StringUtils.isEmpty(alarmMethod)) {
+ alarmMethod = null;
+ }
+ if (StringUtils.isEmpty(alarmType)) {
+ alarmType = null;
+ }
+ if (StringUtils.isEmpty(startTime)) {
+ startTime = null;
+ }
+ if (StringUtils.isEmpty(endTime)) {
+ endTime = null;
+ }
try {
- if (startTime != null) format.parse(startTime);
- if (endTime != null) format.parse(endTime);
+ if (startTime != null) {
+ DateUtil.format.parse(startTime);
+ }
+ if (endTime != null) {
+ DateUtil.format.parse(endTime);
+ }
} catch (ParseException e) {
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
@@ -125,12 +135,18 @@
@RequestParam(required = false) String deviceIds,
@RequestParam(required = false) String time
) {
- if (StringUtils.isEmpty(id)) id = null;
- if (StringUtils.isEmpty(deviceIds)) deviceIds = null;
- if (StringUtils.isEmpty(time)) time = null;
+ if (StringUtils.isEmpty(id)) {
+ id = null;
+ }
+ if (StringUtils.isEmpty(deviceIds)) {
+ deviceIds = null;
+ }
+ if (StringUtils.isEmpty(time)) {
+ time = null;
+ }
try {
if (time != null) {
- format.parse(time);
+ DateUtil.format.parse(time);
}
} catch (ParseException e) {
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
@@ -173,7 +189,7 @@
deviceAlarm.setAlarmDescription("test");
deviceAlarm.setAlarmMethod("1");
deviceAlarm.setAlarmPriority("1");
- deviceAlarm.setAlarmTime(formatForGB.format(System.currentTimeMillis()));
+ deviceAlarm.setAlarmTime(DateUtil.formatISO8601.format(System.currentTimeMillis()));
deviceAlarm.setAlarmType("1");
deviceAlarm.setLongitude(115.33333);
deviceAlarm.setLatitude(39.33333);
--
Gitblit v1.8.0