From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LogBasicController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LogBasicController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LogBasicController.java
index f16e2fc..0fee834 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LogBasicController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LogBasicController.java
@@ -4,13 +4,20 @@
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.LogBasicServiceI;
+import com.vci.starter.web.util.Lcm.Func;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Date;
/**
* 骞冲彴鏃ュ織鎺у埗鍣�
@@ -88,6 +95,7 @@
throw new VciBaseException(errorMsg);
}
}
+
/**
* 鏌ヨ鏃ュ織
* @param dto 鏌ヨ鏉′欢浼犺緭瀵硅薄
@@ -95,7 +103,7 @@
* @throws PLException
*/
@VciBusinessLog(operateName="鏃ュ織鏌ヨ")
- @GetMapping(value = "/getLogListByContion")
+ @PostMapping(value = "/getLogListByContion")
@ResponseBody
public BaseResult getLogListByContion(@RequestBody LogQueryCriteriaDTO dto){
try {
@@ -124,4 +132,28 @@
throw new VciBaseException(errorMsg);
}
}
+
+ /**
+ * 瀵煎嚭鏃ュ織
+ * @param dto 瀵煎嚭鏌ヨ浼犲弬鏁板璞�
+ * @param response
+ */
+ @PostMapping( "/exportLogs")
+ @VciBusinessLog(operateName = "瀵煎嚭鏃ュ織")
+ public void exportLogs(@RequestBody LogQueryCriteriaDTO dto, HttpServletResponse response){
+ try {
+ String excelPath = logBasicServiceI.exportLogs(dto);
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ } catch (Exception e) {
+ String msg = "瀵煎嚭鏃ュ織鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ try {
+ //鍑洪敊鏃�
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3