重构

src/main/java/com/ruisitech/bi/entity/bireport/ChartQueryDto.java

@@ -8,6 +8,7 @@ public class ChartQueryDto extends BaseEntity {
 
 	private String dsid;
 	private String dsetId;
+	private String id;
 
 	private List<KpiDto> kpiJson;
 	
@@ -46,6 +47,15 @@ public class ChartQueryDto extends BaseEntity {
 	public void setDsetId(String dsetId) {
 		this.dsetId = dsetId;
 	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	@Override
 	public void validate() {
 		 

src/main/java/com/ruisitech/bi/service/bireport/ChartService.java

@@ -66,7 +66,7 @@ public class ChartService extends BaseCompService {
 		mv.setMvid(deftMvId);
 		
 		//创建chart
-		ChartContext cr = this.json2Chart(chart.getChartJson(), chart.getKpiJson(), false);
+		ChartContext cr = this.json2Chart(chart, false);
 		cr.setXlsData(xlsdata);
 		
 		String sql = this.createSql(chart, 0);
@@ -90,7 +90,9 @@ public class ChartService extends BaseCompService {
 		return mv;
 	}
 	
-	public ChartContext json2Chart(ChartJSONDto chartJson, List<KpiDto> kpiJson, boolean is3g){
+	public ChartContext json2Chart(ChartQueryDto chart, boolean is3g){
+		ChartJSONDto chartJson = chart.getChartJson();
+		List<KpiDto> kpiJson = chart.getKpiJson();
 		ChartContext ctx = new ChartContextImpl();
 		ctx.setLabel(chartJson.getLabel());
 		//设置x
@@ -147,8 +149,7 @@ public class ChartService extends BaseCompService {
 		ctx.setHeight("240");
 		
 		//设置ID
-		String chartId = ExtConstants.chartIdPrefix + IdCreater.create();
-		ctx.setId(chartId);
+		ctx.setId(chart.getId());
 		
 		//设置配置信息
 		List<ChartKeyContext> properties = new ArrayList<ChartKeyContext>();

src/main/java/com/ruisitech/bi/service/bireport/ReportService.java

@@ -254,7 +254,7 @@ public class ReportService extends BaseCompService {
 			mv.getChildren().add(txt);
 			txt.setParent(mv);
 		}
-		ChartContext cr = chartService.json2Chart(chart.getChartJson(), chart.getKpiJson(), false);
+		ChartContext cr = chartService.json2Chart(chart, false);
 		
 		String sql = chartService.createSql(chart, release);
 		GridDataCenterContext dc = chartService.createDataCenter(chart.getChartJson(), sql);

src/main/java/com/ruisitech/bi/service/portal/PortalChartService.java

@@ -118,6 +118,7 @@ public class PortalChartService extends BaseCompService {
 	
 	public ChartContext json2Chart(PortalChartQuery chart, String compId, boolean is3g){
 		ChartContext ctx = new ChartContextImpl();
+		ctx.setId(chart.getId());
 		ChartJSONDto chartJson = chart.getChartJson();
 		//设置x
 		DimDto obj = chartJson.getXcol();