From 76dedb11f8848fd138d494b74c9d5bd1d1de6fc8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 27 七月 2022 11:11:18 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
index 650dbe0..a9b23ef 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -1,9 +1,9 @@
package com.genersoft.iot.vmp.vmanager.log;
-import com.genersoft.iot.vmp.conf.UserSetup;
-import com.genersoft.iot.vmp.media.zlm.ZLMRunner;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.service.ILogService;
import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
+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;
@@ -19,7 +19,6 @@
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
@Api(tags = "鏃ュ織绠＄悊")
@CrossOrigin
@@ -33,9 +32,7 @@
private ILogService logService;
@Autowired
- private UserSetup userSetup;
-
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ private UserSetting userSetting;
/**
* 鍒嗛〉鏌ヨ鏃ュ織
@@ -66,17 +63,20 @@
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime
) {
- if (StringUtils.isEmpty(query)) query = null;
- if (StringUtils.isEmpty(startTime)) startTime = null;
- if (StringUtils.isEmpty(endTime)) endTime = null;
- if (!userSetup.getLogInDatebase()) {
+ if (StringUtils.isEmpty(query)) {
+ query = null;
+ }
+ if (StringUtils.isEmpty(startTime)) {
+ startTime = null;
+ }
+ if (StringUtils.isEmpty(endTime)) {
+ endTime = null;
+ }
+ if (!userSetting.getLogInDatebase()) {
logger.warn("鑷姩璁板綍鏃ュ織鍔熻兘宸插叧闂紝鏌ヨ缁撴灉鍙兘涓嶅畬鏁淬��");
}
- 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);
}
--
Gitblit v1.8.0