From cb4df5a1c9cda76e828fa202990df33be0735105 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 29 六月 2023 09:32:34 +0800
Subject: [PATCH] poi、easyexcel、poi-tl升级 ，合并空调中的报表、数据源模块
---
src/main/java/com/product/server/report/controller/DataListReportController.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/product/server/report/controller/DataListReportController.java b/src/main/java/com/product/server/report/controller/DataListReportController.java
index 50fab3c..9b0cbaf 100644
--- a/src/main/java/com/product/server/report/controller/DataListReportController.java
+++ b/src/main/java/com/product/server/report/controller/DataListReportController.java
@@ -1,7 +1,5 @@
package com.product.server.report.controller;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
@@ -9,13 +7,10 @@
import com.product.core.exception.BaseException;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.module.data.config.CmnCode;
-import com.product.module.data.config.CmnConst;
-import com.product.module.data.service.SystemDataExportService;
import com.product.module.sys.version.ApiVersion;
+import com.product.server.report.config.CmnConst;
import com.product.server.report.config.ReportCode;
import com.product.server.report.config.SystemCode;
-import com.product.server.report.entity.ReportColumn;
-import com.product.server.report.entity.ReportEntity;
import com.product.server.report.service.DataListReportService;
import com.product.util.BaseUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,12 +19,8 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
/**
* Copyright 漏 6c
@@ -89,7 +80,7 @@
*/
@RequestMapping(value = "/get-report/{version}", method = RequestMethod.POST)
@ApiVersion(1)
- public String getReport(HttpServletRequest request) {
+ public String getTableInfo(HttpServletRequest request) {
try {
FieldSetEntity fse = null;
Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
@@ -101,7 +92,7 @@
SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
}
- return BaseUtil.success(dataListReportService.getReportEntity(fse));
+ return BaseUtil.success(dataListReportService.getReport(fse));
} catch (BaseException e) {
SpringMVCContextHolder.getSystemLogger().error(e);
return this.error(e.getCode(), e.getMessageInfo());
@@ -128,8 +119,8 @@
fse.setValue(CmnConst.CPAGE, 1);
fse.setValue(CmnConst.PAGESIZE, Integer.MAX_VALUE);
}
- dataListReportService.outReportExcel(response,fse);
- return OK();
+ dataListReportService.outReportExcel(response, fse);
+ return OK();
} catch (BaseException e) {
e.printStackTrace();
SpringMVCContextHolder.getSystemLogger().error(e);
@@ -140,5 +131,4 @@
return error(CmnCode.EXPORT_GENERAL_LIST_DATA_IMPORT_FIAL.getValue(), CmnCode.EXPORT_GENERAL_LIST_DATA_IMPORT_FIAL.getText() + e.getMessage());
}
}
-
}
--
Gitblit v1.9.2