From 6c0c3557e791dc46948190dd3745335ed043d051 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 17 九月 2025 09:30:32 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/server/report/controller/ReportConfigController.java |  208 ++++-----------------------------------------------
 1 files changed, 19 insertions(+), 189 deletions(-)

diff --git a/src/main/java/com/product/server/report/controller/ReportConfigController.java b/src/main/java/com/product/server/report/controller/ReportConfigController.java
index 3a4d8e2..57f4573 100644
--- a/src/main/java/com/product/server/report/controller/ReportConfigController.java
+++ b/src/main/java/com/product/server/report/controller/ReportConfigController.java
@@ -15,11 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.product.common.lang.StringUtils;
-import com.product.core.config.CoreConst;
 import com.product.core.controller.support.AbstractBaseController;
 import com.product.core.entity.DataTableEntity;
 import com.product.core.entity.FieldSetEntity;
-import com.product.core.entity.RequestParameterEntity;
 import com.product.core.exception.BaseException;
 import com.product.server.report.config.ReportCode;
 import com.product.server.report.config.CmnConst;
@@ -27,6 +25,10 @@
 import com.product.server.report.service.ReportConfigService;
 import com.product.server.report.service.idel.IReportConfigService;
 
+/**
+ *	閰嶇疆鎶ヨ〃
+ *
+ */
 @RestController
 @RequestMapping("/api/report-config")
 public class ReportConfigController extends AbstractBaseController {
@@ -38,14 +40,9 @@
     @ApiVersion(1)
     public String getButton(HttpServletRequest request) {
         try {
-            FieldSetEntity fse = null;
-            Object bean = request.getAttribute("requestPara");
-            if (bean != null) {
-                RequestParameterEntity reqp = (RequestParameterEntity) bean;
-                fse = reqp.getFormData();
-            }
-            if (bean == null || fse == null || fse.getString("uuid") == null) {
-                return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
+            if (StringUtils.isEmpty(fse.getUUID())) {
+                return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
             }
             DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夋寜閽寜鍔熻兘鍒嗙粍", new String[]{fse.getUUID()});
             return OK_List(dt);
@@ -68,21 +65,7 @@
     @ApiVersion(1)
     public String listReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             DataTableEntity dt = reportConfigService.listReportConfig(fse.getInteger("cpage"), fse.getInteger("pageSize"), fse);
             return OK_List(dt);
         } catch (BaseException e) {
@@ -105,21 +88,7 @@
     @ApiVersion(1)
     public String findReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             //uuid鏄惁涓虹┖
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -146,21 +115,7 @@
     @ApiVersion(1)
     public String addReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             IReportConfigService service = (IReportConfigService) getProxyInstance(reportConfigService);
             String uuid = service.addReportConfig(fse);
             return OK_Add(uuid);
@@ -184,21 +139,7 @@
     @ApiVersion(1)
     public String updateReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             //uuid鏄惁涓虹┖
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -231,21 +172,7 @@
     @ApiVersion(1)
     public String deleteReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             //uuid鏄惁涓虹┖
             if (StringUtils.isEmpty(fse.getUUID())) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -277,21 +204,7 @@
     @ApiVersion(1)
     public String releaseConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             //鍒ゆ柇浼犲弬鏄惁姝ｅ父
             if (StringUtils.isEmpty(CmnConst.UUID) || StringUtils.isEmpty(CmnConst.TRICODE_PARENT) || StringUtils.isEmpty(CmnConst.ROLE_UUID)) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -323,21 +236,7 @@
     @ApiVersion(1)
     public String cancelReleaseConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             //鍒ゆ柇浼犲弬鏄惁姝ｅ父
             if (StringUtils.isEmpty(CmnConst.UUID) || StringUtils.isEmpty(CmnConst.TRICODE_PARENT) || StringUtils.isEmpty(CmnConst.ROLE_UUID)) {
                 return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -369,21 +268,7 @@
     @ApiVersion(1)
     public String copyConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             String uuid = reportConfigService.copyConfig(fse.getUUID());
             return OK_Add(uuid);
         } catch (BaseException e) {
@@ -406,21 +291,7 @@
     @ApiVersion(1)
     public String quoteReportConfig(HttpServletResponse response, HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             return OK_List(reportConfigService.quoteReportConfig(fse));
         } catch (BaseException e) {
             e.printStackTrace();
@@ -442,21 +313,7 @@
     @ApiVersion(1)
     public String getReportReleaseInfo(HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             JSONArray jsonArray = reportConfigService.getReportReleaseInfo();
             return BaseUtil.success(jsonArray, null);
         } catch (BaseException e) {
@@ -478,21 +335,7 @@
     @ApiVersion(1)
     public String viewReportReleaseInfo(HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+        	FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             JSONObject resultObj = reportConfigService.viewReportReleaseInfo(fse);
             return BaseUtil.success(resultObj, null);
         } catch (BaseException e) {
@@ -515,20 +358,7 @@
     public String releasedListReportConfig(HttpServletRequest request) {
         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(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-            }
-            //鍒ゆ柇琛ㄥ悕鏄惁姝ｅ父
-            if (!CmnConst.PRODUCT_SYS_REPORT_CONFIG.equals(fse.getTableName())) {
-                return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-            }
+            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_SYS_REPORT_CONFIG);
             return OK_List(reportConfigService.releasedListReportConfig(fse));
         } catch (BaseException e) {
             e.printStackTrace();

--
Gitblit v1.9.2