From 5461b8ebf2f8bf66a9d34351eb8783484304958a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 16:17:28 +0800
Subject: [PATCH] 支持全局异常和统一返回结果，未完待续
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 insertions(+), 36 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 79b7d58..c8bd3f4 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,5 +1,6 @@
package com.genersoft.iot.vmp.vmanager.gb28181.alarm;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
@@ -8,14 +9,17 @@
import com.genersoft.iot.vmp.service.IDeviceAlarmService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -55,22 +59,22 @@
@Parameter(name = "id", description = "ID")
@Parameter(name = "deviceIds", description = "澶氫釜璁惧id,閫楀彿鍒嗛殧")
@Parameter(name = "time", description = "缁撴潫鏃堕棿")
- public ResponseEntity<WVPResult<String>> delete(
+ public Integer delete(
@RequestParam(required = false) Integer id,
@RequestParam(required = false) String deviceIds,
@RequestParam(required = false) String time
) {
- if (StringUtils.isEmpty(id)) {
+ if (ObjectUtils.isEmpty(id)) {
id = null;
}
- if (StringUtils.isEmpty(deviceIds)) {
+ if (ObjectUtils.isEmpty(deviceIds)) {
deviceIds = null;
}
- if (StringUtils.isEmpty(time)) {
+ if (ObjectUtils.isEmpty(time)) {
time = null;
}
if (!DateUtil.verification(time, DateUtil.formatter) ){
- return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+ return null;
}
List<String> deviceIdList = null;
if (deviceIds != null) {
@@ -78,12 +82,7 @@
deviceIdList = Arrays.asList(deviceIdArray);
}
- int count = deviceAlarmService.clearAlarmBeforeTime(id, deviceIdList, time);
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- wvpResult.setData(count);
- return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
+ return deviceAlarmService.clearAlarmBeforeTime(id, deviceIdList, time);
}
/**
@@ -95,12 +94,7 @@
@GetMapping("/test/notify/alarm")
@Operation(summary = "娴嬭瘯鍚戜笂绾�/璁惧鍙戦�佹ā鎷熸姤璀﹂�氱煡")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿")
- public ResponseEntity<WVPResult<String>> delete(
- @RequestParam(required = false) String deviceId
- ) {
- if (StringUtils.isEmpty(deviceId)) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
+ public void delete(@RequestParam String deviceId) {
Device device = storage.queryVideoDevice(deviceId);
ParentPlatform platform = storage.queryParentPlatByServerGBId(deviceId);
DeviceAlarm deviceAlarm = new DeviceAlarm();
@@ -118,16 +112,9 @@
}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);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(),"鏃犳硶纭畾" + deviceId + "鏄钩鍙拌繕鏄澶�");
}
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
}
/**
@@ -153,7 +140,7 @@
@Parameter(name = "startTime",description = "寮�濮嬫椂闂�")
@Parameter(name = "endTime",description = "缁撴潫鏃堕棿")
@GetMapping("/all")
- public ResponseEntity<PageInfo<DeviceAlarm>> getAll(
+ public PageInfo<DeviceAlarm> getAll(
@RequestParam int page,
@RequestParam int count,
@RequestParam(required = false) String deviceId,
@@ -163,31 +150,28 @@
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime
) {
- if (StringUtils.isEmpty(alarmPriority)) {
+ if (ObjectUtils.isEmpty(alarmPriority)) {
alarmPriority = null;
}
- if (StringUtils.isEmpty(alarmMethod)) {
+ if (ObjectUtils.isEmpty(alarmMethod)) {
alarmMethod = null;
}
- if (StringUtils.isEmpty(alarmType)) {
+ if (ObjectUtils.isEmpty(alarmType)) {
alarmType = null;
}
- if (StringUtils.isEmpty(startTime)) {
+ if (ObjectUtils.isEmpty(startTime)) {
startTime = null;
}
- if (StringUtils.isEmpty(endTime)) {
+ if (ObjectUtils.isEmpty(endTime)) {
endTime = null;
}
if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){
- return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "寮�濮嬫椂闂存垨缁撴潫鏃堕棿鏍煎紡鏈夎");
}
- PageInfo<DeviceAlarm> allAlarm = deviceAlarmService.getAllAlarm(page, count, deviceId, alarmPriority, alarmMethod,
+ return deviceAlarmService.getAllAlarm(page, count, deviceId, alarmPriority, alarmMethod,
alarmType, startTime, endTime);
- return new ResponseEntity<>(allAlarm, HttpStatus.OK);
}
-
-
}
--
Gitblit v1.8.0