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/service/ChartPropertyConfigService.java | 24 +-
src/main/java/com/product/server/report/config/CmnConst.java | 3
src/main/java/com/product/server/report/controller/ReportConfigController.java | 208 ++-----------------------
src/main/java/com/product/server/report/service/GenerateEChartService.java | 29 ++-
src/main/java/com/product/server/report/service/DataListReportService.java | 5
src/main/java/com/product/server/report/service/ReportTypeService.java | 64 ++++----
src/main/java/com/product/server/report/service/ReportConfigService.java | 97 ++++++-----
7 files changed, 141 insertions(+), 289 deletions(-)
diff --git a/src/main/java/com/product/server/report/config/CmnConst.java b/src/main/java/com/product/server/report/config/CmnConst.java
index aa1d57c..7713fe0 100644
--- a/src/main/java/com/product/server/report/config/CmnConst.java
+++ b/src/main/java/com/product/server/report/config/CmnConst.java
@@ -144,6 +144,9 @@
public static final String TYPE_NAME = "type_name";
public static final String SYSTEM_SENIOR_QUERY_STRING = "systemSeniorQueryString";
public static final String REPORT_DATASOURCE_NAME = "report_datasource_name";
+ public static final String PARENT_ATTRIBUTE_NAME = "parent_attribute_name";
+ public static final String PARENT_ATTRIBUTE_UUID = "parent_attribute_uuid";
+ public static final String SUBORDINATE_ELEMENT_TYPE = "subordinate_element_type";
// 灞炴��-label
public static final String ATTR_COLSPAN = "colspan";
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();
diff --git a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
index dd02dbd..b9da905 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -230,7 +230,7 @@
JSONObject object = children.getJSONObject(i);
String grouping = object.getString("grouping");
JSONArray subChildren = object.getJSONArray("children");
- if ("1".equals(grouping) && "1".equals(jsonObject.getString("subordinateElementType"))) {
+ if ("1".equals(grouping) && "1".equals(jsonObject.getString(CmnConst.SUBORDINATE_ELEMENT_TYPE))) {
JSONObject group = new JSONObject();
group.put("children", JSONArray.parseArray(children.toJSONString()));
group.put("label", "缁勫悕");
@@ -294,18 +294,18 @@
*/
public DataTableEntity getEChartsElementList(String uuid)throws BaseException{
StringBuffer sql = new StringBuffer();
- sql.append(" SELECT a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinateElementType asubordinateElementType,a.prompt_name,a.default_value, ")
- .append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinateElementType bsubordinateElementType, ")
- .append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinateElementType csubordinateElementType, ")
- .append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinateElementType dsubordinateElementType, ")
- .append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinateElementType esubordinateElementType, ")
- .append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinateElementType fsubordinateElementType FROM ")
+ sql.append(" SELECT a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinate_element_type asubordinateElementType,a.prompt_name,a.default_value, ")
+ .append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinate_element_type bsubordinateElementType, ")
+ .append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinate_element_type csubordinateElementType, ")
+ .append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinate_element_type dsubordinateElementType, ")
+ .append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinate_element_type esubordinateElementType, ")
+ .append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinate_element_type fsubordinateElementType FROM ")
.append("product_sys_report_type_attribute a LEFT JOIN ")
- .append("product_sys_report_type_attribute b on a.parentAttributeUuid = b.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute c on b.parentAttributeUuid = c.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute d on c.parentAttributeUuid = d.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute e on d.parentAttributeUuid = e.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute f on e.parentAttributeUuid = f.uuid ")
+ .append("product_sys_report_type_attribute b on a.parent_attribute_uuid = b.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute c on b.parent_attribute_uuid = c.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute d on c.parent_attribute_uuid = d.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute e on d.parent_attribute_uuid = e.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute f on e.parent_attribute_uuid = f.uuid ")
.append(" WHERE a.config_properties = 1 ")
.append(" AND a.type_uuid = ? ");
diff --git a/src/main/java/com/product/server/report/service/DataListReportService.java b/src/main/java/com/product/server/report/service/DataListReportService.java
index adc1c2b..4ec83ca 100644
--- a/src/main/java/com/product/server/report/service/DataListReportService.java
+++ b/src/main/java/com/product/server/report/service/DataListReportService.java
@@ -11,6 +11,7 @@
import com.product.common.lang.StringUtils;
import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.cache.util.RedisUtil;
+import com.product.core.connection.ConnectionManager;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -27,6 +28,8 @@
import com.product.server.report.util.QuerySqlParseUtil;
import com.product.util.BaseUtil;
import com.product.util.SystemParamReplace;
+import com.product.util.UnifySQLFunction;
+
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -629,7 +632,7 @@
}
} else {
sql = replaceSqlContent(sqlText, fse, sort, reportConfigFse, curPage);
-
+ sql = UnifySQLFunction.timeFunctionReplace("single", sql);
if ("1".equalsIgnoreCase(reportConfigFse.getString(CmnConst.IS_PAGE))) {
Integer pageSize = reportConfigFse.getInteger(CmnConst.PAGE_SIZE);
recordDte = baseDao.listTable(sql, new Object[]{}, pageSize == null ? Integer.MAX_VALUE : pageSize, curPage);
diff --git a/src/main/java/com/product/server/report/service/GenerateEChartService.java b/src/main/java/com/product/server/report/service/GenerateEChartService.java
index 9a675e6..adf07be 100644
--- a/src/main/java/com/product/server/report/service/GenerateEChartService.java
+++ b/src/main/java/com/product/server/report/service/GenerateEChartService.java
@@ -117,18 +117,18 @@
DataTableEntity valueData = baseDao.listTable(sql_text,new Object[]{});
//鑾峰彇鎶ヨ〃閰嶇疆灞炴�ц〃 鍔爀charts閰嶇疆灞炴��
//鍙兘鏌ヨ鍒板叧鑱斿睘鎬у�肩殑灞炴�ц〃锛屽鏋滅埗绾у睘鎬т笅鏈夊涓浉鍚屽瓙灞炴�с�傞�氳繃grouping鍒嗙粍銆�
- DataTableEntity attributeData = baseDao.listTable("SELECT a.field_name,a.report_type_attr_value,a.uuid,a.grouping ,b.* FROM product_sys_report_config_attribute a LEFT JOIN product_sys_report_type_attribute b on a.report_type_attr = b.uuid WHERE a.report_config_uuid = ? ORDER BY a.grouping,b.parentAttributeUuid " ,new Object[]{fse.getString(CmnConst.UUID)});
+ DataTableEntity attributeData = baseDao.listTable("SELECT a.field_name,a.report_type_attr_value,a.uuid,a.grouping ,b.* FROM product_sys_report_config_attribute a LEFT JOIN product_sys_report_type_attribute b on a.report_type_attr = b.uuid WHERE a.report_config_uuid = ? ORDER BY a.grouping,b.parent_attribute_uuid " ,new Object[]{fse.getString(CmnConst.UUID)});
JSONObject allProperties = new JSONObject();
if(attributeData.getRows() > 0){
JSONObject propertyObject = new JSONObject();
- String parenUuid1 = attributeData.getString(0,"parentAttributeUuid");
+ String parenUuid1 = attributeData.getString(0,"parent_attribute_uuid");
String grouping1 = attributeData.getString(0,"grouping");
for (int i = 0,length = attributeData.getRows(); i < length; i++) {
FieldSetEntity fieldSet = attributeData.getFieldSetEntity(i);
//涓婄骇uuid
- String parenUuid2 = fieldSet.getString("parentAttributeUuid");
+ String parenUuid2 = fieldSet.getString("parent_attribute_uuid");
//涓婄骇name
- String parenName = fieldSet.getString("parentAttributeName");
+ String parenName = fieldSet.getString("parent_attribute_name");
//鍥捐〃灞炴�у��
String attr_value = fieldSet.getString("report_type_attr_value");
//涓虹┖浼犻粯璁ゅ��
@@ -166,9 +166,9 @@
grouping1 = grouping2;
//楗肩姸鍥炬彃鍏ユ暟鎹悓灞炰竴涓埗鍏冪礌 澶氫釜鍏冪礌鍜屽搴旂殑鏁版嵁闇�鍏ㄩ儴鎵惧嚭鏉ヤ竴璧峰皝瑁卝son
if(!BaseUtil.strIsNull(fieldName)){
- String parentAttributeName = fieldSet.getString("parentAttributeName");
+ String parentAttributeName = fieldSet.getString(CmnConst.PARENT_ATTRIBUTE_NAME);
//涓嬬骇涓哄璞¤繕鏄暟缁�
- String type = fieldSet.getString("subordinateElementType");
+ String type = fieldSet.getString("subordinate_element_ype");
List<String> keys = ListUtils.newArrayList();
List<String> keys2 = ListUtils.newArrayList();
keys.add(fieldName);
@@ -176,7 +176,7 @@
//涓烘渶鍚庝竴浣�
while (i < length-1) {
FieldSetEntity fieldSet2 = attributeData.getFieldSetEntity(i+1);
- String parenUuid3 = fieldSet2.getString("parentAttributeUuid");
+ String parenUuid3 = fieldSet2.getString("parent_attribute_uuid");
String fieldName3 = fieldSet2.getString(CmnConst.FIELD_NAME);
if(parenUuid2.equals(parenUuid3) && !BaseUtil.strIsNull(fieldName3)){
keys.add(fieldName3);
@@ -229,7 +229,7 @@
JSONArray objSubArray = obj.getJSONArray(attribute_name);
//纭畾浠栫殑瀛愬睘鎬ф椂(1)array 杩樻槸(0)object
// if(objSubArray == null){
- if ("1".equals(fieldSet.getString("subordinateElementType"))) {
+ if ("1".equals(fieldSet.getString(CmnConst.SUBORDINATE_ELEMENT_TYPE))) {
JSONArray array = new JSONArray();
array.add(obj);
superiorObj.put(attribute_name, array);
@@ -240,9 +240,9 @@
// superiorObj = obj;
// }
//涓婄骇灞炴�ame
- superiorUuid = fieldSet.getString("parentAttributeUuid");
+ superiorUuid = fieldSet.getString(CmnConst.PARENT_ATTRIBUTE_UUID);
//涓婄骇鍚嶇О
- String parentAttributeName = fieldSet.getString("parentAttributeName");
+ String parentAttributeName = fieldSet.getString(CmnConst.PARENT_ATTRIBUTE_NAME);
//濡傛灉鐖跺厓绱爑uid涓虹┖
if(BaseUtil.strIsNull(superiorUuid)){
JSONArray allSubProperties = allProperties.getJSONArray(attribute_name);
@@ -689,12 +689,15 @@
Integer pageSize = fieldSetEntity.getInteger(CmnConst.PAGE_SIZE);
StringBuffer sql = new StringBuffer();
// sql.append(" select * from ( ")
- sql.append(" select rc.uuid,rc.report_name,'鍥捐〃' type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name,rc.function_uuid ")
+ sql.append(" select rc.uuid,rc.report_name,'鍥捐〃' type_name,mp.menu_name tricode_parent,m.menu_icon,m.menu_name,rc.function_uuid ")
+// sql.append(" select rc.uuid,rc.report_name,'鍥捐〃' type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name,rc.function_uuid ")
.append(" FROM product_sys_report_config rc ")
.append(" inner join ( ")
- .append(" select function_uuid,group_concat(role_info separator ',') role_info ")
+ .append(" select function_uuid ")
+// .append(" select function_uuid,group_concat(role_info separator ',') role_info ") //Duird瑙ｆ瀽涓嶄簡杩欎釜鍑芥暟鐢ㄦ硶
.append(" from ( ")
- .append(" select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ")
+// .append(" select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ")
+ .append(" select function_uuid ")
.append(" FROM product_sys_clients c ")
.append(" inner join product_sys_org_levels o on o.client_uuid=c.uuid ")
.append(" inner join ( ")
diff --git a/src/main/java/com/product/server/report/service/ReportConfigService.java b/src/main/java/com/product/server/report/service/ReportConfigService.java
index 45c1bda..0f07290 100644
--- a/src/main/java/com/product/server/report/service/ReportConfigService.java
+++ b/src/main/java/com/product/server/report/service/ReportConfigService.java
@@ -51,10 +51,10 @@
List<Object> paramList = Lists.newArrayList();
StringBuilder sql = new StringBuilder(512);
- sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group")
- .append("\nFROM product_sys_report_config a")
- .append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid")
- .append("\nwhere (function_uuid is null or function_uuid='') ");
+ sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group");
+ sql.append("\nFROM product_sys_report_config a");
+ sql.append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid");
+ sql.append("\nWHERE (function_uuid is null or function_uuid='') ");
if (!StringUtils.isEmpty(fse.getString(CmnConst.TYPE_UUID))) {
sql.append("\nand b.type_group=?");
paramList.add(fse.getString(CmnConst.TYPE_UUID));
@@ -474,19 +474,25 @@
*
* @return
*/
- public JSONArray getReportReleaseInfo() {
StringBuilder sql = new StringBuilder(256);
+ public JSONArray getReportReleaseInfo() {
DataTableEntity aimDte = new DataTableEntity();
DataTableEntity dte;
Object[] arr;
String filter;
- sql.append("select distinct null pid,uuid sid,client_name name FROM product_sys_clients c")
- .append("\ninner join (")
- .append("\n select client_uuid pid,uuid sid,org_level_name FROM product_sys_org_levels where org_level_status=0 order by org_level_code")
- .append("\n) o on o.pid=c.uuid")
- .append("\ninner join (")
- .append("\n select org_level_uuid pid,uuid sid,role_name FROM product_sys_role where is_used=1")
- .append("\n) r on r.pid=o.sid");
+ sql.append("\nSELECT distinct null pid,uuid sid,client_name name ");
+ sql.append("\nFROM product_sys_clients c");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT client_uuid pid,uuid sid,org_level_name ");
+ sql.append("\n FROM product_sys_org_levels ");
+ sql.append("\n WHERE org_level_status=0 ");
+ sql.append("\n ORDER BY org_level_code");
+ sql.append("\n) o ON o.pid=c.uuid");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT org_level_uuid pid,uuid sid,role_name ");
+ sql.append("\n FROM product_sys_role ");
+ sql.append("\n WHERE is_used=1");
+ sql.append("\n) r ON r.pid=o.sid");
// 鍘绘帀admin鎵�灞炲鎴�
// .append("\nwhere c.uuid!='4d4679ed-c4c3-41b8-abfe-451a66fd4043'");
dte = baseDao.listTable(sql.toString(), new Object[]{});
@@ -496,14 +502,19 @@
arr = dte.getFieldAllValues("sid");
filter = BaseUtil.buildQuestionMarkFilter("client_uuid", arr.length, true);
sql.setLength(0);
- sql.append("\nselect distinct o.* from (")
- .append("\n select client_uuid pid,uuid sid,org_level_name name FROM product_sys_org_levels where org_level_status=0")
- .append("\n and ").append(filter)
- .append("\n order by org_level_code")
- .append("\n) o")
- .append("\ninner join (")
- .append("\n select org_level_uuid pid,uuid sid,role_name FROM product_sys_role where is_used=1")
- .append("\n) r on r.pid=o.sid");
+ sql.append("\nSELECT distinct o.* ");
+ sql.append("\nFROM (");
+ sql.append("\n SELECT client_uuid pid,uuid sid,org_level_name name ");
+ sql.append("\n FROM product_sys_org_levels ");
+ sql.append("\n WHERE org_level_status=0");
+ sql.append("\n AND ").append(filter);
+ sql.append("\n ORDER BY org_level_code");
+ sql.append("\n) o");
+ sql.append("\nINNER JOIN (");
+ sql.append("\n SELECT org_level_uuid pid,uuid sid,role_name ");
+ sql.append("\n FROM product_sys_role ");
+ sql.append("\n WHERE is_used=1");
+ sql.append("\n) r ON r.pid=o.sid");
dte = baseDao.listTable(sql.toString(), arr);
aimDte.addFieldSetEntity(dte);
@@ -565,28 +576,30 @@
public DataTableEntity releasedListReportConfig(FieldSetEntity fse) {
String filter = queryFilterService.getQueryFilter(fse);
StringBuilder sql = new StringBuilder(256);
-// sql.append("select * from ( ");
- sql.append("\n select rc.uuid,rc.report_name,rtc.type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
- sql.append("\n FROM product_sys_report_config rc ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,group_concat(role_info separator ',') role_info ");
- sql.append("\n from ( ");
- sql.append("\n select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ");
- sql.append("\n FROM product_sys_clients c ");
- sql.append("\n inner join product_sys_org_levels o on o.client_uuid=c.uuid ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,org_level_uuid,uuid role_uuid,role_name ");
- sql.append("\n FROM product_sys_role r ");
- sql.append("\n inner join ( ");
- sql.append("\n select function_uuid,role_uuid FROM product_sys_function_permission ");
- sql.append("\n ) p on r.uuid=p.role_uuid ");
- sql.append("\n ) r1 on o.uuid=r1.org_level_uuid ");
- sql.append("\n ) t ");
- sql.append("\n group by function_uuid ");
- sql.append("\n ) t1 on rc.function_uuid=t1.function_uuid ");
- sql.append("\n inner join product_sys_menus m on rc.function_uuid=m.function_uuid ");
- sql.append("\n inner join product_sys_report_type_config rtc on rc.type_uuid=rtc.uuid ");
- sql.append("\n inner join product_sys_menus mp on m.tricode_parent=mp.tricode ");
+ sql.append("\nSELECT rc.uuid,rc.report_name,rtc.type_name,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
+// sql.append("\nselect rc.uuid,rc.report_name,rtc.type_name,t1.role_info,mp.menu_name tricode_parent,m.menu_icon,m.menu_name ");
+ sql.append("\nFROM product_sys_report_config rc ");
+ sql.append("\nINNER JOIN ( ");
+// sql.append("\n select function_uuid,group_concat(role_info separator ',') role_info "); //璇硶瑙ｆ瀽澶辫触
+ sql.append("\n SELECT function_uuid ");
+ sql.append("\n FROM ( ");
+// sql.append("\n select function_uuid,concat(c.client_name,'/',o.org_level_name,'/',role_name) role_info ");
+ sql.append("\n SELECT function_uuid ");
+ sql.append("\n FROM product_sys_clients c ");
+ sql.append("\n INNER JOIN product_sys_org_levels o ON o.client_uuid=c.uuid ");
+ sql.append("\n INNER JOIN ( ");
+ sql.append("\n SELECT function_uuid,org_level_uuid,uuid role_uuid,role_name ");
+ sql.append("\n FROM product_sys_role r ");
+ sql.append("\n INNER JOIN ( ");
+ sql.append("\n SELECT function_uuid,role_uuid FROM product_sys_function_permission ");
+ sql.append("\n ) p ON r.uuid=p.role_uuid ");
+ sql.append("\n ) r1 ON o.uuid=r1.org_level_uuid ");
+ sql.append("\n ) t ");
+ sql.append("\n GROUP BY function_uuid ");
+ sql.append("\n) t1 ON rc.function_uuid = t1.function_uuid ");
+ sql.append("\nINNER INNER product_sys_menus m on rc.function_uuid=m.function_uuid ");
+ sql.append("\nINNER INNER product_sys_report_type_config rtc on rc.type_uuid=rtc.uuid ");
+ sql.append("\nINNER INNER product_sys_menus mp on m.tricode_parent=mp.tricode ");
// sql.append("\n) t2 ");
if (!StringUtils.isEmpty(filter)) {
sql.append(" WHERE " + filter);
diff --git a/src/main/java/com/product/server/report/service/ReportTypeService.java b/src/main/java/com/product/server/report/service/ReportTypeService.java
index 26024ef..f569ced 100644
--- a/src/main/java/com/product/server/report/service/ReportTypeService.java
+++ b/src/main/java/com/product/server/report/service/ReportTypeService.java
@@ -220,18 +220,18 @@
public DataTableEntity getEChartsElementList(String uuid)throws BaseException{
StringBuffer sql = new StringBuffer();
sql.append("SELECT ");
- sql.append(" a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinateElementType asubordinateElementType,a.is_commonly ais_commonly,a.prompt_name,a.default_value, ");
- sql.append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinateElementType bsubordinateElementType,b.is_commonly bis_commonly, ");
- sql.append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinateElementType csubordinateElementType,c.is_commonly cis_commonly, ");
- sql.append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinateElementType dsubordinateElementType,d.is_commonly dis_commonly, ");
- sql.append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinateElementType esubordinateElementType,e.is_commonly eis_commonly, ");
- sql.append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinateElementType fsubordinateElementType,f.is_commonly fis_commonly ");
+ sql.append(" a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinate_element_type asubordinateElementType,a.is_commonly ais_commonly,a.prompt_name,a.default_value, ");
+ sql.append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinate_element_type bsubordinateElementType,b.is_commonly bis_commonly, ");
+ sql.append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinate_element_type csubordinateElementType,c.is_commonly cis_commonly, ");
+ sql.append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinate_element_type dsubordinateElementType,d.is_commonly dis_commonly, ");
+ sql.append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinate_element_type esubordinateElementType,e.is_commonly eis_commonly, ");
+ sql.append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinate_element_type fsubordinateElementType,f.is_commonly fis_commonly ");
sql.append("FROM product_sys_report_type_attribute a ");
- sql.append("LEFT JOIN product_sys_report_type_attribute b on a.parentAttributeUuid = b.uuid ");
- sql.append("LEFT JOIN product_sys_report_type_attribute c on b.parentAttributeUuid = c.uuid ");
- sql.append("LEFT JOIN product_sys_report_type_attribute d on c.parentAttributeUuid = d.uuid ");
- sql.append("LEFT JOIN product_sys_report_type_attribute e on d.parentAttributeUuid = e.uuid ");
- sql.append("LEFT JOIN product_sys_report_type_attribute f on e.parentAttributeUuid = f.uuid ");
+ sql.append("LEFT JOIN product_sys_report_type_attribute b on a.parent_attribute_uuid = b.uuid ");
+ sql.append("LEFT JOIN product_sys_report_type_attribute c on b.parent_attribute_uuid = c.uuid ");
+ sql.append("LEFT JOIN product_sys_report_type_attribute d on c.parent_attribute_uuid = d.uuid ");
+ sql.append("LEFT JOIN product_sys_report_type_attribute e on d.parent_attribute_uuid = e.uuid ");
+ sql.append("LEFT JOIN product_sys_report_type_attribute f on e.parent_attribute_uuid = f.uuid ");
sql.append("WHERE a.config_properties = 1 ");
sql.append("AND a.type_uuid = ? ");
sql.append("ORDER BY a.is_commonly DESC");
@@ -283,18 +283,18 @@
//鍏冪礌uuid
String uuid = fieldSetEntity.getString(parameter[paramIndex]+"uuid");
//鍏冪礌瀛愬厓绱犵被鍨�
- String subType = fieldSetEntity.getString(parameter[paramIndex]+"subordinateElementType");
+ String subType = fieldSetEntity.getString(parameter[paramIndex] + CmnConst.SUBORDINATE_ELEMENT_TYPE);
//鍏冪礌鏄惁甯哥敤
String isCommonly = fieldSetEntity.getString(parameter[paramIndex] + "is_commonly");
JSONObject jsonObject = new JSONObject();
jsonObject.put("value",name);
jsonObject.put("label",detail);
jsonObject.put("uuid",uuid);
- jsonObject.put("subordinateElementType",subType);
+ jsonObject.put(CmnConst.SUBORDINATE_ELEMENT_TYPE,subType);
jsonObject.put("config_properties",fieldSetEntity.getString("config_properties"));
jsonObject.put("is_commonly", isCommonly);
jsonObject.put("is_commonly_label", "1".equals(isCommonly) ? "鏄�":"鍚�");
- jsonObject.put("subordinateElementType_label", "1".equals(subType) ? "鏁扮粍":"Object瀵硅薄");
+ jsonObject.put("subordinate_element_type_label", "1".equals(subType) ? "鏁扮粍":"Object瀵硅薄");
paramIndex++;
if(paramIndex < parameter.length) {
JSONArray childrenArray = new JSONArray();
@@ -356,10 +356,10 @@
fieldSetEntity.setValue(CmnConst.CREATED_BY,userId);
fieldSetEntity.setValue(CmnConst.CREATED_UTC_DATETIME,date);
fieldSetEntity.setValue(CmnConst.TYPE_UUID, type_uuid);
- fieldSetEntity.setValue("subordinateElementType", subFse.getString("subordinateElementType"));
+ fieldSetEntity.setValue(CmnConst.SUBORDINATE_ELEMENT_TYPE, subFse.getString(CmnConst.SUBORDINATE_ELEMENT_TYPE));
if(!BaseUtil.strIsNull(parentAttributeName) && !BaseUtil.strIsNull(parentAttributeUuid)){
- fieldSetEntity.setValue("parentAttributeName", parentAttributeName);
- fieldSetEntity.setValue("parentAttributeUuid", parentAttributeUuid);
+ fieldSetEntity.setValue(CmnConst.PARENT_ATTRIBUTE_NAME, parentAttributeName);
+ fieldSetEntity.setValue(CmnConst.PARENT_ATTRIBUTE_UUID, parentAttributeUuid);
}
fieldSetEntity.setValue(CmnConst.TYPE_GROUP, type);
@@ -388,35 +388,35 @@
String attributeName = fse.getString(CmnConst.ATTRIBUTE_NAME);
//鏂板
if(BaseUtil.strIsNull(uuid)){
- String parentAttributeUuid = fse.getString("parentAttributeUuid");
+ String parentAttributeUuid = fse.getString(CmnConst.PARENT_ATTRIBUTE_UUID);
//濡傛灉涓婄骇灞炴�т笉涓虹┖
if(!BaseUtil.strIsNull(parentAttributeUuid)){
- DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, " type_uuid = ? and parentAttributeUuid = ? and attribute_name = ?", new String[]{uuid, parentAttributeUuid, attributeName});
+ DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, " type_uuid = ? and parent_attribute_uuid = ? and attribute_name = ?", new String[]{uuid, parentAttributeUuid, attributeName});
if(dataTableEntity.getRows() > 0){
throw new BaseException(ReportCode.SAVE_CHART_ATTRIBUTE_REPETITION_FAIL.getValue(),
ReportCode.SAVE_CHART_ATTRIBUTE_REPETITION_FAIL.getText(), this.getClass(), "public String saveEChartsElement(FieldSetEntity fse) throws BaseException");
}
FieldSetEntity parentElement = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, parentAttributeUuid,false);
- if(BaseUtil.strIsNull(parentElement.getString("subordinateElementType"))){
- parentElement.setValue("subordinateElementType", 0);
+ if(BaseUtil.strIsNull(parentElement.getString(CmnConst.SUBORDINATE_ELEMENT_TYPE))){
+ parentElement.setValue(CmnConst.SUBORDINATE_ELEMENT_TYPE, 0);
}
- String parentUuid = parentElement.getString("parentAttributeUuid");
- String parentName = parentElement.getString("parentAttributeName");
+ String parentUuid = parentElement.getString(CmnConst.PARENT_ATTRIBUTE_UUID);
+ String parentName = parentElement.getString(CmnConst.PARENT_ATTRIBUTE_NAME);
if(BaseUtil.strIsNull(parentUuid) && !BaseUtil.strIsNull(parentName)){
- parentElement.setValue("parentAttributeName", null);
+ parentElement.setValue(CmnConst.PARENT_ATTRIBUTE_NAME, null);
}
parentElement.setValue("config_properties", 0);
baseDao.update(parentElement);
- fse.setValue("parentAttributeName", parentElement.getString("attribute_name"));
+ fse.setValue("parent_attribute_name", parentElement.getString("attribute_name"));
}else {
DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, "type_uuid = ? and attribute_name = ?", new String[]{typeUuid,attributeName});
if(dataTableEntity.getRows() > 0){
throw new BaseException(ReportCode.SAVE_CHART_ATTRIBUTE_REPETITION_FAIL.getValue(),
ReportCode.SAVE_CHART_ATTRIBUTE_REPETITION_FAIL.getText(), this.getClass(), "public String saveEChartsElement(FieldSetEntity fse) throws BaseException");
}
- fse.setValue("parentAttributeName", "option");
+ fse.setValue(CmnConst.PARENT_ATTRIBUTE_NAME, "option");
}
fse.setValue("config_properties", 1);
return baseDao.add(fse);
@@ -426,11 +426,11 @@
String attName = fieldSetEntity.getString("attribute_name");
String newAttName = fse.getString("attribute_name");
if(!attName.equals(newAttName)){
- DataTableEntity subElementData = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, " parentAttributeUuid = ? ",
+ DataTableEntity subElementData = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, " parent_attribute_uuid = ? ",
new String[]{uuid});
for (int i = 0; i < subElementData.getRows(); i++) {
FieldSetEntity subElementFse = subElementData.getFieldSetEntity(i);
- subElementFse.setValue("parentAttributeName", newAttName);
+ subElementFse.setValue(CmnConst.PARENT_ATTRIBUTE_NAME, newAttName);
baseDao.update(subElementFse);
}
}
@@ -450,14 +450,14 @@
public boolean delEChartsElement(FieldSetEntity fse) throws BaseException {
String uuid = fse.getString("uuid");
StringBuffer sql = new StringBuffer();
- sql.append(" SELECT * FROM product_sys_report_type_attribute WHERE parentAttributeUuid = ")
- .append(" (SELECT parentAttributeUuid FROM product_sys_report_type_attribute WHERE uuid = ?) ");
+ sql.append(" SELECT * FROM product_sys_report_type_attribute WHERE parent_attribute_uuid = ")
+ .append(" (SELECT parent_attribute_uuid FROM product_sys_report_type_attribute WHERE uuid = ?) ");
DataTableEntity dataTableEntity = baseDao.listTable(sql.toString(),new String[]{uuid});
//褰撳墠灞炴�х殑涓婄骇灞炴�� 鍙湁杩欎竴涓瓙灞炴��
if(dataTableEntity.getRows() == 1){
- String parentAttributeUuid = dataTableEntity.getString(0,"parentAttributeUuid");
+ String parentAttributeUuid = dataTableEntity.getString(0, CmnConst.PARENT_ATTRIBUTE_UUID);
FieldSetEntity parentField = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_REPORT_TYPE_ATTRIBUTE, parentAttributeUuid,false);
- parentField.setValue("subordinateElementType", null);
+ parentField.setValue(CmnConst.SUBORDINATE_ELEMENT_TYPE, null);
parentField.setValue("config_properties", 1);
baseDao.update(parentField);
}
--
Gitblit v1.9.2