From ec90519c90925accf157434130bcf4ac7958c17d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 08 三月 2023 16:57:07 +0800
Subject: [PATCH] 添加设备离线原因
---
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 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 6ad1d9d..3cabb99 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,27 +1,23 @@
package com.genersoft.iot.vmp.vmanager.log;
import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
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.genersoft.iot.vmp.vmanager.bean.ErrorCode;
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.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import java.text.ParseException;
-
@Tag(name = "鏃ュ織绠＄悊")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/log")
public class LogController {
@@ -53,7 +49,7 @@
@Parameter(name = "type", description = "绫诲瀷", required = true)
@Parameter(name = "startTime", description = "寮�濮嬫椂闂�", required = true)
@Parameter(name = "endTime", description = "缁撴潫鏃堕棿", required = true)
- public ResponseEntity<PageInfo<LogDto>> getAll(
+ public PageInfo<LogDto> getAll(
@RequestParam int page,
@RequestParam int count,
@RequestParam(required = false) String query,
@@ -61,13 +57,13 @@
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime
) {
- if (StringUtils.isEmpty(query)) {
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- if (StringUtils.isEmpty(startTime)) {
+ if (ObjectUtils.isEmpty(startTime)) {
startTime = null;
}
- if (StringUtils.isEmpty(endTime)) {
+ if (ObjectUtils.isEmpty(endTime)) {
endTime = null;
}
if (!userSetting.getLogInDatebase()) {
@@ -75,11 +71,10 @@
}
if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){
- return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400);
}
- PageInfo<LogDto> allLog = logService.getAll(page, count, query, type, startTime, endTime);
- return new ResponseEntity<>(allLog, HttpStatus.OK);
+ return logService.getAll(page, count, query, type, startTime, endTime);
}
/**
@@ -88,14 +83,8 @@
*/
@Operation(summary = "鍋滄瑙嗛鍥炴斁")
@DeleteMapping("/clear")
- public ResponseEntity<WVPResult<String>> clear() {
-
- int count = logService.clear();
- WVPResult wvpResult = new WVPResult();
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
- wvpResult.setData(count);
- return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
+ public void clear() {
+ logService.clear();
}
}
--
Gitblit v1.8.0