From b874509c73cbdea8eab37bb232ed3fd515b9a1a2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 27 十一月 2023 09:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 8fea8d4..e62e28e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -1,28 +1,23 @@
package com.vci.ubcs.log.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.common.utils.StringUtils;
-import com.vci.ubcs.log.dto.LocalLogVO;
+import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.rmi.ServerException;
import java.util.List;
-import java.util.Map;
/**
* 鏈湴绯荤粺鏃ュ織
@@ -44,7 +39,7 @@
* @return
*/
@PostMapping("/lazy-list")
- public R<List<LocalLog>> getSystemLogList(@RequestBody LocalLog localLog){
+ public R<List<LocalLogVO>> getSystemLogList(@RequestBody LocalLog localLog){
return R.data(logLocalService.getSystemLogList(localLog.getLogPath()));
}
--
Gitblit v1.9.3