From b5ccb1636fc0efb0ea9d87c38995fee14cfd45d3 Mon Sep 17 00:00:00 2001 From: AlphaWu <wp@zafu.edu.cn> Date: 星期日, 20 八月 2023 15:50:24 +0800 Subject: [PATCH] 修正Database拼写错误。 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 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 old mode 100644 new mode 100755 index d84fb79..6f2a585 --- 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 @@ -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, -- Gitblit v1.8.0