src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
@@ -8,6 +8,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -43,6 +44,17 @@ return WVPResult.fail(ErrorCode.ERROR400); } /** * 默认异常处理 * @param e 异常 * @return 统一返回结果 */ @ExceptionHandler(HttpRequestMethodNotSupportedException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) public WVPResult<String> exceptionHandler(HttpRequestMethodNotSupportedException e) { return WVPResult.fail(ErrorCode.ERROR400); } /** * 自定义异常处理， 处理controller中返回的错误 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
@@ -71,11 +71,11 @@ if (ObjectUtils.isEmpty(deviceIds)) { deviceIds = null; } if (ObjectUtils.isEmpty(time)) { time = null; } if (!DateUtil.verification(time, DateUtil.formatter) ){ return null; }else if (!DateUtil.verification(time, DateUtil.formatter) ){ throw new ControllerException(ErrorCode.ERROR400.getCode(), "time格式为" + DateUtil.PATTERN); } List<String> deviceIdList = null; if (deviceIds != null) { @@ -170,16 +170,17 @@ if (ObjectUtils.isEmpty(alarmType)) { alarmType = null; } if (ObjectUtils.isEmpty(startTime)) { startTime = null; }else if (!DateUtil.verification(startTime, DateUtil.formatter) ){ throw new ControllerException(ErrorCode.ERROR400.getCode(), "startTime格式为" + DateUtil.PATTERN); } if (ObjectUtils.isEmpty(endTime)) { endTime = null; } if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){ throw new ControllerException(ErrorCode.ERROR100.getCode(), "开始时间或结束时间格式有误"); }else if (!DateUtil.verification(endTime, DateUtil.formatter) ){ throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime格式为" + DateUtil.PATTERN); } return deviceAlarmService.getAllAlarm(page, count, deviceId, alarmPriority, alarmMethod, src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -3,32 +3,29 @@ import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.RecordInfo; import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.service.IDeviceService; import com.genersoft.iot.vmp.service.IPlayService; 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.StreamContent; import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.async.DeferredResult; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.RecordInfo; import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.storager.IVideoManagerStorage; import javax.sip.InvalidArgumentException; import javax.sip.SipException; @@ -74,10 +71,10 @@ } DeferredResult<WVPResult<RecordInfo>> result = new DeferredResult<>(); if (!DateUtil.verification(startTime, DateUtil.formatter)){ throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime error, format is " + DateUtil.PATTERN); throw new ControllerException(ErrorCode.ERROR100.getCode(), "startTime格式为" + DateUtil.PATTERN); } if (!DateUtil.verification(endTime, DateUtil.formatter)){ throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime error, format is " + DateUtil.PATTERN); throw new ControllerException(ErrorCode.ERROR100.getCode(), "endTime格式为" + DateUtil.PATTERN); } Device device = storager.queryVideoDevice(deviceId); src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -60,18 +60,21 @@ if (ObjectUtils.isEmpty(query)) { query = null; } if (ObjectUtils.isEmpty(startTime)) { startTime = null; } if (ObjectUtils.isEmpty(endTime)) { endTime = null; } if (!userSetting.getLogInDatebase()) { logger.warn("自动记录日志功能已关闭，查询结果可能不完整。"); } if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){ throw new ControllerException(ErrorCode.ERROR400); if (ObjectUtils.isEmpty(startTime)) { startTime = null; }else if (!DateUtil.verification(startTime, DateUtil.formatter) ){ throw new ControllerException(ErrorCode.ERROR400.getCode(), "startTime格式为" + DateUtil.PATTERN); } if (ObjectUtils.isEmpty(endTime)) { endTime = null; }else if (!DateUtil.verification(endTime, DateUtil.formatter) ){ throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime格式为" + DateUtil.PATTERN); } return logService.getAll(page, count, query, type, startTime, endTime);
