From fc89b7b517e191fb6c9b66fa86dd05ebab0f54c5 Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期三, 13 七月 2022 11:29:46 +0800
Subject: [PATCH] 测试提交权限
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 22 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 434bbd4..509c988 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
@@ -1,8 +1,15 @@
package com.genersoft.iot.vmp.vmanager.gb28181.alarm;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.SubscribeInfo;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
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;
@@ -17,9 +24,8 @@
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
@Api(tags = "鎶ヨ淇℃伅绠＄悊")
@@ -31,7 +37,14 @@
@Autowired
private IDeviceAlarmService deviceAlarmService;
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @Autowired
+ private ISIPCommander commander;
+
+ @Autowired
+ private ISIPCommanderForPlatform commanderForPlatform;
+
+ @Autowired
+ private IVideoManagerStorage storage;
/**
* 鍒嗛〉鏌ヨ鎶ヨ
@@ -56,8 +69,8 @@
@ApiImplicitParam(name="alarmMethod", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
@ApiImplicitParam(name="alarmMethod", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
@ApiImplicitParam(name="alarmType", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
- @ApiImplicitParam(name="startTime", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
- @ApiImplicitParam(name="endTime", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
+ @ApiImplicitParam(name="startTime", value = "寮�濮嬫椂闂�" ,dataTypeClass = String.class),
+ @ApiImplicitParam(name="endTime", value = "缁撴潫鏃堕棿" ,dataTypeClass = String.class),
})
public ResponseEntity<PageInfo<DeviceAlarm>> getAll(
@RequestParam int page,
@@ -69,17 +82,24 @@
@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);
- } catch (ParseException e) {
+ if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
@@ -109,14 +129,16 @@
@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;
- try {
- if (time != null) {
- format.parse(time);
- }
- } catch (ParseException e) {
+ if (StringUtils.isEmpty(id)) {
+ id = null;
+ }
+ if (StringUtils.isEmpty(deviceIds)) {
+ deviceIds = null;
+ }
+ if (StringUtils.isEmpty(time)) {
+ time = null;
+ }
+ if (!DateUtil.verification(time, DateUtil.formatter) ){
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
List<String> deviceIdList = null;
@@ -133,5 +155,51 @@
return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
}
+ /**
+ * 娴嬭瘯鍚戜笂绾�/璁惧鍙戦�佹ā鎷熸姤璀﹂�氱煡
+ *
+ * @param deviceId 鎶ヨid
+ * @return
+ */
+ @ApiOperation("娴嬭瘯鍚戜笂绾�/璁惧鍙戦�佹ā鎷熸姤璀﹂�氱煡")
+ @GetMapping("/test/notify/alarm")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="deviceId", value = "deviceId", required = true ,dataTypeClass = Integer.class)
+ })
+ public ResponseEntity<WVPResult<String>> delete(
+ @RequestParam(required = false) String deviceId
+ ) {
+ if (StringUtils.isEmpty(deviceId)) {
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
+ Device device = storage.queryVideoDevice(deviceId);
+ ParentPlatform platform = storage.queryParentPlatByServerGBId(deviceId);
+ DeviceAlarm deviceAlarm = new DeviceAlarm();
+ deviceAlarm.setChannelId(deviceId);
+ deviceAlarm.setAlarmDescription("test");
+ deviceAlarm.setAlarmMethod("1");
+ deviceAlarm.setAlarmPriority("1");
+ deviceAlarm.setAlarmTime(DateUtil.formatterISO8601.format(LocalDateTime.now()));
+ deviceAlarm.setAlarmType("1");
+ deviceAlarm.setLongitude(115.33333);
+ deviceAlarm.setLatitude(39.33333);
+
+ if (device != null && platform == null) {
+ commander.sendAlarmMessage(device, deviceAlarm);
+ }else if (device == null && platform != null){
+ commanderForPlatform.sendAlarmMessage(platform, deviceAlarm);
+ }else {
+ WVPResult wvpResult = new WVPResult();
+ wvpResult.setCode(0);
+ wvpResult.setMsg("鏃犳硶纭畾" + deviceId + "鏄钩鍙拌繕鏄澶�");
+ return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
+ }
+
+ WVPResult wvpResult = new WVPResult();
+ wvpResult.setCode(0);
+ wvpResult.setMsg("success");
+ return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
+ }
+
}
--
Gitblit v1.8.0