forked from p81075629/datagear
移除DataSet.getExports()设计，它应该在ChartDataSet中定义，后续再考虑完善
This commit is contained in:
interestinglife
parent
d9ee08adfc
commit
5780a21127
|
|
@ -73,11 +73,6 @@ public class ChartDataSet
|
|||
this.propertySigns = propertySigns;
|
||||
}
|
||||
|
||||
public boolean hasAlias()
|
||||
{
|
||||
return (this.alias != null && !this.alias.isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取数据集别名。
|
||||
* <p>
|
||||
|
|
|
|||
|
|
@ -55,24 +55,6 @@ public interface DataSet extends Identifiable
|
|||
*/
|
||||
DataSetParam getParam(String name);
|
||||
|
||||
/**
|
||||
* 获取输出列表。
|
||||
* <p>
|
||||
* 返回{@code null}或空列表，表示没有。
|
||||
* </p>
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<DataSetExport> getExports();
|
||||
|
||||
/**
|
||||
* 获取指定名称的输出，没有则返回{@code null}。
|
||||
*
|
||||
* @param name
|
||||
* @return
|
||||
*/
|
||||
DataSetExport getExport(String name);
|
||||
|
||||
/**
|
||||
* 给定的参数映射表是否可用于{@linkplain #getResult(Map)}。
|
||||
*
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
package org.datagear.analysis;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 数据集结果。
|
||||
|
|
@ -22,13 +21,6 @@ public interface DataSetResult
|
|||
*/
|
||||
List<?> getDatas();
|
||||
|
||||
/**
|
||||
* 获取输出项值集合，返回{@code null}或空表示没有输出项值。
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
Map<String, ?> getExportValues();
|
||||
|
||||
/**
|
||||
* 获取{@linkplain #getDatas()}中单条数据指定名称的属性值。
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,18 +7,15 @@
|
|||
*/
|
||||
package org.datagear.analysis.support;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.datagear.analysis.AbstractIdentifiable;
|
||||
import org.datagear.analysis.DataNameType;
|
||||
import org.datagear.analysis.DataSet;
|
||||
import org.datagear.analysis.DataSetException;
|
||||
import org.datagear.analysis.DataSetExport;
|
||||
import org.datagear.analysis.DataSetParam;
|
||||
import org.datagear.analysis.DataSetProperty;
|
||||
import org.datagear.analysis.DataSetResult;
|
||||
|
||||
/**
|
||||
* 抽象{@linkplain DataSet}。
|
||||
|
|
@ -32,9 +29,8 @@ public abstract class AbstractDataSet extends AbstractIdentifiable implements Da
|
|||
|
||||
private List<DataSetProperty> properties;
|
||||
|
||||
private List<DataSetParam> params;
|
||||
|
||||
private List<DataSetExport> exports;
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<DataSetParam> params = Collections.EMPTY_LIST;
|
||||
|
||||
public AbstractDataSet()
|
||||
{
|
||||
|
|
@ -98,28 +94,6 @@ public abstract class AbstractDataSet extends AbstractIdentifiable implements Da
|
|||
return getDataNameTypeByName(this.params, name);
|
||||
}
|
||||
|
||||
public boolean hasExport()
|
||||
{
|
||||
return (this.exports != null && !this.exports.isEmpty());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DataSetExport> getExports()
|
||||
{
|
||||
return exports;
|
||||
}
|
||||
|
||||
public void setExports(List<DataSetExport> exports)
|
||||
{
|
||||
this.exports = exports;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DataSetExport getExport(String name)
|
||||
{
|
||||
return getDataNameTypeByName(this.exports, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isReady(Map<String, ?> paramValues)
|
||||
{
|
||||
|
|
@ -137,30 +111,6 @@ public abstract class AbstractDataSet extends AbstractIdentifiable implements Da
|
|||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取输出值集。
|
||||
*
|
||||
* @param meta
|
||||
* @param datas
|
||||
* @return
|
||||
* @throws DataSetException
|
||||
*/
|
||||
protected Map<String, ?> getExportValues(DataSetResult dataSetResult) throws DataSetException
|
||||
{
|
||||
if (!hasExport())
|
||||
return null;
|
||||
|
||||
Map<String, Object> exportValues = new HashMap<>();
|
||||
|
||||
for (DataSetExport expt : this.exports)
|
||||
{
|
||||
Object value = expt.getExportValue(this, dataSetResult);
|
||||
exportValues.put(expt.getName(), value);
|
||||
}
|
||||
|
||||
return exportValues;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定名称的{@linkplain DataNameType}对象，没找到则返回{@code null}。
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
*/
|
||||
package org.datagear.analysis.support;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -27,9 +26,6 @@ public class MapDataSetResult implements DataSetResult
|
|||
{
|
||||
private List<Map<String, ?>> datas;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private Map<String, ?> exportValues = Collections.EMPTY_MAP;
|
||||
|
||||
public MapDataSetResult()
|
||||
{
|
||||
super();
|
||||
|
|
@ -61,15 +57,4 @@ public class MapDataSetResult implements DataSetResult
|
|||
|
||||
return ((Map<String, Object>) data).get(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, ?> getExportValues()
|
||||
{
|
||||
return exportValues;
|
||||
}
|
||||
|
||||
public void setExportValues(Map<String, ?> exportValues)
|
||||
{
|
||||
this.exportValues = exportValues;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,10 +157,6 @@ public class SqlDataSet extends AbstractDataSet
|
|||
List<Map<String, ?>> datas = getSqlDataSetSupport().resolveDatas(cn, rs, getProperties());
|
||||
MapDataSetResult result = new MapDataSetResult(datas);
|
||||
|
||||
Map<String, ?> exportValues = getExportValues(result);
|
||||
|
||||
result.setExportValues(exportValues);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,8 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter
|
|||
{
|
||||
super(new JsonDataSet(chartDataSet.getDataSet()));
|
||||
setPropertySigns(chartDataSet.getPropertySigns());
|
||||
setAlias(chartDataSet.getAlias());
|
||||
setParamValues(chartDataSet.getParamValues());
|
||||
}
|
||||
|
||||
public static JsonChartDataSet[] valuesOf(ChartDataSet[] chartDataSets)
|
||||
|
|
@ -113,7 +115,6 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter
|
|||
{
|
||||
super(dataSet.getId(), dataSet.getName(), dataSet.getProperties());
|
||||
setParams(dataSet.getParams());
|
||||
setExports(dataSet.getExports());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import java.util.Map;
|
|||
|
||||
import org.apache.ibatis.session.SqlSessionFactory;
|
||||
import org.datagear.analysis.DataSet;
|
||||
import org.datagear.analysis.DataSetExport;
|
||||
import org.datagear.analysis.DataSetParam;
|
||||
import org.datagear.analysis.DataSetProperty;
|
||||
import org.datagear.analysis.support.SqlDataSet;
|
||||
|
|
@ -180,10 +179,6 @@ public class SqlDataSetEntityServiceImpl extends AbstractMybatisDataPermissionEn
|
|||
List<DataSetParamPO> paramPOs = selectListMybatis("getParamPOs", sqlParams);
|
||||
List<DataSetParam> dataSetParams = DataSetParamPO.to(paramPOs);
|
||||
obj.setParams(dataSetParams);
|
||||
|
||||
List<DataSetExportPO> exportPOs = selectListMybatis("getExportPOs", sqlParams);
|
||||
List<DataSetExport> dataSetExports = DataSetExportPO.to(exportPOs);
|
||||
obj.setExports(dataSetExports);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -202,7 +197,6 @@ public class SqlDataSetEntityServiceImpl extends AbstractMybatisDataPermissionEn
|
|||
{
|
||||
saveDataSetPropertyPOs(entity);
|
||||
saveDataSetParamPOs(entity);
|
||||
saveDataSetExportPOs(entity);
|
||||
}
|
||||
|
||||
protected void saveDataSetPropertyPOs(SqlDataSet entity)
|
||||
|
|
@ -231,19 +225,6 @@ public class SqlDataSetEntityServiceImpl extends AbstractMybatisDataPermissionEn
|
|||
}
|
||||
}
|
||||
|
||||
protected void saveDataSetExportPOs(SqlDataSet entity)
|
||||
{
|
||||
deleteMybatis("deleteExportPOs", entity.getId());
|
||||
|
||||
List<DataSetExportPO> pos = DataSetExportPO.from(entity);
|
||||
|
||||
if (!pos.isEmpty())
|
||||
{
|
||||
for (DataSetExportPO relation : pos)
|
||||
insertMybatis("insertExportPO", relation);
|
||||
}
|
||||
}
|
||||
|
||||
public static abstract class DataSetChildPO<T>
|
||||
{
|
||||
private String dataSetId;
|
||||
|
|
@ -392,47 +373,4 @@ public class SqlDataSetEntityServiceImpl extends AbstractMybatisDataPermissionEn
|
|||
return pos;
|
||||
}
|
||||
}
|
||||
|
||||
public static class DataSetExportPO extends DataSetChildPO<DataSetExport>
|
||||
{
|
||||
public DataSetExportPO()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
public DataSetExportPO(String dataSetId, DataSetExport child, int order)
|
||||
{
|
||||
super(dataSetId, child, order);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DataSetExport getChild()
|
||||
{
|
||||
return super.getChild();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setChild(DataSetExport child)
|
||||
{
|
||||
super.setChild(child);
|
||||
}
|
||||
|
||||
public static List<DataSetExportPO> from(DataSet dataSet)
|
||||
{
|
||||
List<DataSetExportPO> pos = new ArrayList<DataSetExportPO>();
|
||||
|
||||
List<DataSetExport> exports = dataSet.getExports();
|
||||
|
||||
if (exports != null)
|
||||
{
|
||||
for (int i = 0; i < exports.size(); i++)
|
||||
{
|
||||
DataSetExportPO po = new DataSetExportPO(dataSet.getId(), exports.get(i), i);
|
||||
pos.add(po);
|
||||
}
|
||||
}
|
||||
|
||||
return pos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -292,3 +292,5 @@ ALTER TABLE DATAGEAR_SQL_DATA_SET ALTER COLUMN DS_SQL SET DATA TYPE VARCHAR(1000
|
|||
-----------------------------------------
|
||||
|
||||
RENAME COLUMN DATAGEAR_DATA_SET_PAR.PAR_DEFAULT_VALUE TO PAR_DESC;
|
||||
|
||||
DROP TABLE DATAGEAR_DATA_SET_EXPT;
|
||||
|
|
|
|||
|
|
@ -38,17 +38,6 @@
|
|||
)
|
||||
</insert>
|
||||
|
||||
<insert id="insertExportPO">
|
||||
INSERT INTO DATAGEAR_DATA_SET_EXPT
|
||||
(
|
||||
EXPT_DS_ID, EXPT_NAME, EXPT_TYPE, PROP_ORDER
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
#{dataSetId}, #{child.name}, #{child.type}, #{order}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<update id="update">
|
||||
UPDATE DATAGEAR_SQL_DATA_SET SET
|
||||
DS_NAME = #{entity.name},
|
||||
|
|
@ -76,12 +65,6 @@
|
|||
PAR_DS_ID = #{dataSetId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteExportPOs">
|
||||
DELETE FROM DATAGEAR_DATA_SET_EXPT
|
||||
WHERE
|
||||
EXPT_DS_ID = #{dataSetId}
|
||||
</delete>
|
||||
|
||||
<select id="getById" resultType="org.datagear.management.domain.SqlDataSetEntity">
|
||||
SELECT
|
||||
T.*
|
||||
|
|
@ -122,20 +105,6 @@
|
|||
PAR_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="getExportPOs" resultType="org.datagear.management.service.impl.SqlDataSetEntityServiceImpl$DataSetExportPO">
|
||||
SELECT
|
||||
EXPT_DS_ID AS ${_iq_}dataSetId${_iq_},
|
||||
EXPT_NAME AS ${_iq_}child.name${_iq_},
|
||||
EXPT_TYPE AS ${_iq_}child.type${_iq_},
|
||||
EXPT_ORDER AS ${_iq_}order${_iq_}
|
||||
FROM
|
||||
DATAGEAR_DATA_SET_EXPT
|
||||
WHERE
|
||||
EXPT_DS_ID = #{dataSetId}
|
||||
ORDER BY
|
||||
EXPT_ORDER ASC
|
||||
</select>
|
||||
|
||||
<select id="getDataIdPermissions" resultType="org.datagear.management.domain.DataIdPermission">
|
||||
SELECT
|
||||
T.DATA_ID as ${_iq_}dataId${_iq_},
|
||||
Loading…
Reference in New Issue