From 69da583c3a1ebb923c5023c5e2b42f094ccb1b53 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:32:35 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块

---
 src/main/java/com/product/print/controller/PrintRealizeController.java |  102 +++++++++++++++++++++++++-------------------------
 1 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/product/print/controller/PrintRealizeController.java b/src/main/java/com/product/print/controller/PrintRealizeController.java
index 6a7e876..8dc8918 100644
--- a/src/main/java/com/product/print/controller/PrintRealizeController.java
+++ b/src/main/java/com/product/print/controller/PrintRealizeController.java
@@ -28,63 +28,63 @@
 @RequestMapping("/api/print/realize")
 public class PrintRealizeController extends AbstractBaseController {
 
-    @Autowired
-    IPrintRealizeService printRealizeService;
+	@Autowired
+	IPrintRealizeService printRealizeService;
 
-    @PostMapping("/print/{version}")
-    @ApiVersion(1)
-    public String print(HttpServletRequest request, HttpServletResponse response) {
-        try {
-            FieldSetEntity fse = null;
-            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-            if (bean != null) {
-                RequestParameterEntity reqp = (RequestParameterEntity) bean;
-                fse = reqp.getFormData();
-            }
-            if (bean == null || fse == null) {
-                return this.error(CmnCode.SYSTEM_FORM_NODATA);
-            }
+	@PostMapping("/print/{version}")
+	@ApiVersion(1)
+	public String print(HttpServletRequest request, HttpServletResponse response) {
+		try {
+			FieldSetEntity fse = null;
+			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+			if (bean != null) {
+				RequestParameterEntity reqp = (RequestParameterEntity) bean;
+				fse = reqp.getFormData();
+			}
+			if (bean == null || fse == null) {
+				return this.error(CmnCode.SYSTEM_FORM_NODATA);
+			}
 //            if (!CmnConst.TABLE_PRINT_CONFIG.equals(fse.getTableName())) {
 //                return error(CmnCode.SYSTEM_TABLE_NODATA);
 //            }
-            if (StringUtils.isEmpty(CmnConst.PRINT_TEMP)) {
-                return error(CmnCode.SYSTEM_FORM_COUNT);
-            }
-            printRealizeService.print(fse, response);
-            return OK();
-        } catch (BaseException e) {
-            return error(e);
-        } catch (Exception e) {
-            return error(CmnCode.GET_PRINT_CONFIG_LIST_FAIL, e);
-        }
-    }
-    
-    @PostMapping("/printWord/{version}")
-    @ApiVersion(1)
-    public String printWord(HttpServletRequest request, HttpServletResponse response) {
-        try {
-            FieldSetEntity fse = null;
-            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-            if (bean != null) {
-                RequestParameterEntity reqp = (RequestParameterEntity) bean;
-                fse = reqp.getFormData();
-            }
-            if (bean == null || fse == null) {
-                return this.error(CmnCode.SYSTEM_FORM_NODATA);
-            }
+			if (StringUtils.isEmpty(CmnConst.PRINT_TEMP)) {
+				return error(CmnCode.SYSTEM_FORM_COUNT);
+			}
+			printRealizeService.print(fse, response, true);
+			return OK();
+		} catch (BaseException e) {
+			return error(e);
+		} catch (Exception e) {
+			return error(CmnCode.GET_PRINT_CONFIG_LIST_FAIL, e);
+		}
+	}
+
+	@PostMapping("/printWord/{version}")
+	@ApiVersion(1)
+	public String printWord(HttpServletRequest request, HttpServletResponse response) {
+		try {
+			FieldSetEntity fse = null;
+			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
+			if (bean != null) {
+				RequestParameterEntity reqp = (RequestParameterEntity) bean;
+				fse = reqp.getFormData();
+			}
+			if (bean == null || fse == null) {
+				return this.error(CmnCode.SYSTEM_FORM_NODATA);
+			}
 //            if (!CmnConst.TABLE_PRINT_CONFIG.equals(fse.getTableName())) {
 //                return error(CmnCode.SYSTEM_TABLE_NODATA);
 //            }
-            if (StringUtils.isEmpty(CmnConst.PRINT_TEMP)) {
-                return error(CmnCode.SYSTEM_FORM_COUNT);
-            }
-            printRealizeService.printWord(fse, response);
-            return OK();
-        } catch (BaseException e) {
-            return error(e);
-        } catch (Exception e) {
-            return error(CmnCode.GET_PRINT_CONFIG_LIST_FAIL, e);
-        }
-    }
+			if (StringUtils.isEmpty(CmnConst.PRINT_TEMP)) {
+				return error(CmnCode.SYSTEM_FORM_COUNT);
+			}
+			printRealizeService.print(fse, response, false);
+			return OK();
+		} catch (BaseException e) {
+			return error(e);
+		} catch (Exception e) {
+			return error(CmnCode.GET_PRINT_CONFIG_LIST_FAIL, e);
+		}
+	}
 
 }

--
Gitblit v1.9.2