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/OsQueryTemplateController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
index 8410035..47e59f1 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
@@ -1,12 +1,17 @@
package com.vci.web.controller;
+import cn.hutool.core.io.FileUtil;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.qtm.QTD;
import com.vci.dto.QTInfoDTO;
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.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.OsQuereyTemplateServiceI;
+import com.vci.starter.web.util.Lcm.Func;
+import org.apache.commons.lang3.StringUtils;
import org.dom4j.DocumentException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,9 +20,11 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.IOException;
import java.util.Arrays;
-import java.util.List;
+import java.util.Date;
+import java.util.Map;
/**
* 鏌ヨ妯℃澘鐨勬帶鍒跺櫒
@@ -257,14 +264,15 @@
return objectBaseResult;
}
}
+
/**
* 瀵煎嚭閾炬帴绫诲瀷鏌ヨ妯℃澘
* names 鏌ヨ妯℃澘鍚�
* @return
*/
@PostMapping("/expLinkTemplate")
- public void expLinkTemplate(@RequestBody List<String> names,HttpServletResponse response) throws PLException, IOException {
- quereyTemplateServiceI.expLinkTemplate(names, response);
+ public void expLinkTemplate(@RequestBody Map qtNames, HttpServletResponse response) throws PLException, IOException {
+ quereyTemplateServiceI.expLinkTemplate(String.valueOf(qtNames.get("qtNames")), response);
}
/**
@@ -353,8 +361,21 @@
* @return
*/
@PostMapping("/expBtmQTTemplate")
- public void expBtmQTTemplate(List<String> qtNames,HttpServletResponse response) throws PLException, IOException {
- quereyTemplateServiceI.expBtmQTTemplate(qtNames, response);
+ public void expBtmQTTemplate(@RequestBody Map qtNames, HttpServletResponse response) throws PLException, IOException {
+ try {
+ String excelPath = quereyTemplateServiceI.expBtmQTTemplate(String.valueOf(qtNames.get("qtNames")));
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ FileUtil.del(LocalFileUtil.getDefaultTempFolder() + File.separator);
+ } 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