From 60b4a5324daf69abe84c81c5e13266e658be1144 Mon Sep 17 00:00:00 2001
From: datagear <datagear@163.com>
Date: Tue, 11 Aug 2020 11:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94JSON?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E5=9B=BE=E8=A1=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../management/domain/ChartDataSetVO.java         | 15 +++++++--------
 .../management/domain/SummaryDataSetEntity.java   |  6 +++++-
 .../management/service/DataSetEntityService.java  |  3 +--
 .../datagear/web/controller/ChartController.java  |  7 +++++--
 .../view/freemarker/analysis/chart/chart_form.ftl |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java b/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java
index 54ef676c..ef861c7a 100644
--- a/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java
+++ b/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java
@@ -10,7 +10,6 @@ package org.datagear.management.domain;
 import org.datagear.analysis.ChartDataSet;
 import org.datagear.analysis.DataSet;
 import org.datagear.analysis.DataSetResult;
-import org.datagear.analysis.support.SqlDataSet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -32,14 +31,14 @@ public class ChartDataSetVO extends ChartDataSet
 		super(dataSet);
 	}
 
-	public SqlDataSet getSqlDataSet()
+	/**
+	 * 设置{@linkplain SummaryDataSetEntity}，仅用于保存操作。
+	 * 
+	 * @param dataSetEntity
+	 */
+	public void setSummaryDataSetEntity(SummaryDataSetEntity dataSetEntity)
 	{
-		return (SqlDataSet) super.getDataSet();
-	}
-
-	public void setSqlDataSet(SqlDataSet sqlDataSet)
-	{
-		super.setDataSet(sqlDataSet);
+		super.setDataSet(dataSetEntity);
 	}
 
 	@JsonIgnore
diff --git a/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java
index ad8c982f..7910dbfa 100644
--- a/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java
+++ b/datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java
@@ -11,12 +11,16 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
 
+import org.datagear.analysis.DataSet;
 import org.datagear.analysis.DataSetException;
 import org.datagear.analysis.DataSetResult;
 import org.datagear.analysis.support.AbstractDataSet;
 
 /**
- * 概要数据集实体。
+ * 概要{@linkplain DataSetEntity}。
+ * <p>
+ * 此类不表示任何具体的{@linkplain DataSet}实现，仅用于表示{@linkplain DataSetEntity}结构。
+ * </p>
  * 
  * @author datagear@163.com
  *
diff --git a/datagear-management/src/main/java/org/datagear/management/service/DataSetEntityService.java b/datagear-management/src/main/java/org/datagear/management/service/DataSetEntityService.java
index 7c75a513..aadfc5dd 100644
--- a/datagear-management/src/main/java/org/datagear/management/service/DataSetEntityService.java
+++ b/datagear-management/src/main/java/org/datagear/management/service/DataSetEntityService.java
@@ -8,7 +8,6 @@
 package org.datagear.management.service;
 
 import org.datagear.analysis.DataSet;
-import org.datagear.analysis.support.SqlDataSet;
 import org.datagear.management.domain.DataSetEntity;
 
 /**
@@ -20,7 +19,7 @@ import org.datagear.management.domain.DataSetEntity;
 public interface DataSetEntityService extends DataPermissionEntityService<String, DataSetEntity>
 {
 	/**
-	 * 获取可用于执行分析的{@linkplain SqlDataSet}。
+	 * 获取可用于执行分析的{@linkplain DataSet}。
 	 * 
 	 * @param id
 	 * @return
diff --git a/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java b/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java
index 818430de..9f24cdd4 100644
--- a/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java
+++ b/datagear-web/src/main/java/org/datagear/web/controller/ChartController.java
@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.datagear.analysis.ChartPluginManager;
+import org.datagear.analysis.DataSetParam;
 import org.datagear.analysis.DataSetResult;
 import org.datagear.analysis.RenderContext;
 import org.datagear.analysis.TemplateDashboardWidgetResManager;
@@ -427,10 +428,12 @@ public class ChartController extends AbstractChartPluginAwareController implemen
 		{
 			for (ChartDataSetVO vo : chartDataSetVOs)
 			{
-				if (vo.getSqlDataSet().hasParam())
+				List<DataSetParam> params = vo.getDataSet().getParams();
+
+				if (params != null && !params.isEmpty())
 				{
 					Map<String, Object> paramValues = getDataSetParamValueConverter().convert(vo.getParamValues(),
-							vo.getSqlDataSet().getParams());
+							params);
 					vo.setParamValues(paramValues);
 				}
 			}
diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl
index 835ee5b4..35e8be15 100644
--- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl
@@ -297,7 +297,7 @@ readonly 是否只读操作，允许为null
 				propertySigns[signName] = signValues;
 			});
 			
-			re.push({ "sqlDataSet": { "id": dataSetId, "params": dataSetParams }, "propertySigns": propertySigns, "alias": alias, "paramValues": paramValues });
+			re.push({ "summaryDataSetEntity": { "id": dataSetId, "params": dataSetParams }, "propertySigns": propertySigns, "alias": alias, "paramValues": paramValues });
 		});
 		
 		return re;