From a8097c35da2d9bc027cf65515915e2514873807f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 五月 2022 14:44:00 +0800
Subject: [PATCH] 更新readme
---
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..44b1688 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,7 +1,6 @@
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.vmanager.bean.WVPResult;
@@ -33,7 +32,7 @@
private ILogService logService;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -66,16 +65,26 @@
@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);
+ if (startTime != null) {
+ format.parse(startTime);
+ }
+ if (endTime != null) {
+ format.parse(endTime);
+ }
} catch (ParseException e) {
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
--
Gitblit v1.8.0