From f7090a3271fafbf5c3b0435697a985055aaa94a7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 30 八月 2024 12:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
index b86ab56..3d37d4c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
@@ -9,19 +9,27 @@
import com.vci.pagemodel.PortalVIVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
+import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.ControllerUtil;
+import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.enumpck.ItemDblEnum;
import com.vci.web.enumpck.ItemTypeEnum;
import com.vci.web.service.OsPortalVIServiceI;
+import com.vci.web.service.WebBtmIOServiceI;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
/**
@@ -56,17 +64,18 @@
/**
*鏍规嵁琛ㄥ崟id鑾峰彇鍏蜂綋鏁版嵁
* @param id
+ * @param viType
* @return
*/
@GetMapping( "/getPortalVIById")
@VciBusinessLog(operateName = "鑾峰彇琛ㄥ崟/琛ㄦ牸鏁版嵁")
- public BaseResult getPortalVIById(@RequestBody String id,@RequestBody String viType){
+ public BaseResult getPortalVIById(@RequestParam("id") String id,@RequestParam("viType") String viType){
try{
PortalVIVO portalVIVO= portalVIServiceI.getPortalVIById(id,viType);
return BaseResult.success(portalVIVO);
}catch (Throwable e){
e.printStackTrace();
- String exceptionMessage = "鍒涘缓涓氬姟绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ String exceptionMessage = "鑾峰彇琛ㄥ崟/琛ㄦ牸鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
logger.error(exceptionMessage);
return BaseResult.fail(exceptionMessage);
}
@@ -110,12 +119,12 @@
*/
@DeleteMapping("/deleteByIds")
@VciBusinessLog(operateName = "鍒犻櫎琛ㄥ崟/琛ㄦ牸")
- public BaseResult deleteByIds(@RequestBody String ids){
+ public BaseResult deleteByIds(@RequestParam("ids") String ids){
try {
return portalVIServiceI.delete(ids) ? BaseResult.success("鍒犻櫎鎴愬姛锛�"):BaseResult.fail("鍒犻櫎澶辫触锛�");
} catch (PLException e) {
e.printStackTrace();
- String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
logger.error(exceptionMessage);
return BaseResult.fail(exceptionMessage);
}
@@ -124,10 +133,10 @@
*
*/
@PostMapping("/clone")
- @VciBusinessLog(operateName = "鍒犻櫎琛ㄥ崟/琛ㄦ牸")
+ @VciBusinessLog(operateName = "鍏嬮殕琛ㄥ崟/琛ㄦ牸")
public BaseResult clone(@RequestBody ClonePortalVIDTOList portalVIDTOList){
try {
- return portalVIServiceI.clone(portalVIDTOList) ? BaseResult.success("鍒犻櫎鎴愬姛锛�"):BaseResult.fail("鍒犻櫎澶辫触锛�");
+ return portalVIServiceI.clone(portalVIDTOList) ? BaseResult.success("鍏嬮殕鎴愬姛锛�"):BaseResult.fail("鍏嬮殕澶辫触锛�");
} catch (Throwable e) {
e.printStackTrace();
String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -135,6 +144,26 @@
return BaseResult.fail(exceptionMessage);
}
+ }
+
+ /**
+ * 瀵煎嚭鏁版嵁搴撶殑琛ㄤ俊鎭埌excel
+ * @param response 鍝嶅簲瀵硅薄
+ * @param ids 涓氬姟绫诲瀷鐨勭紪鍙凤紝鐢ㄩ�楀彿鍒嗗壊
+ */
+ @PostMapping("/exportExcel")
+ @VciBusinessLog(operateName = "瀵煎嚭琛ㄥ崟/琛ㄦ牸鍒癳xcel涓�")
+ public void exportExcel(String ids,HttpServletResponse response){
+ String excelFileName = portalVIServiceI.exportToExcel(VciBaseUtil.str2List(ids));
+ try {
+ ControllerUtil.writeFileToResponse(response,excelFileName);
+ } catch (IOException e) {
+ try {
+ ControllerUtil.writeDataToResponse(response, LangBaseUtil.getErrorMsg(e).getBytes(StandardCharsets.UTF_8),null);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
}
/**
* 鑾峰彇灞炴�у瓧娈电被鍨�
@@ -148,7 +177,7 @@
* 鑾峰彇瓒呴摼鎺ュ脊鍑烘柟娉�
*/
@GetMapping("/getItemDblList")
- @VciBusinessLog(operateName = "灞炴�у瓧娈电被鍨�")
+ @VciBusinessLog(operateName = "瓒呴摼鎺ョ被鍨�")
public BaseResult<List<KeyValue>> getItemDblList(){
return BaseResult.dataList(ItemDblEnum.getEnumAll());
}
--
Gitblit v1.9.3