重构

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

@@ -20,8 +20,6 @@ public class ChartJSONDto {
 	
 	private String maparea;
 	private String mapAreaName;
-	private String height;
-	private String width;
 	private String showLegend;
 	private String legendLayout;
 	private String legendpos;
@@ -116,21 +114,6 @@ public class ChartJSONDto {
 	public void setTypeIndex(Integer typeIndex) {
 		this.typeIndex = typeIndex;
 	}
-	public String getHeight() {
-		return height;
-	}
-
-	public void setHeight(String height) {
-		this.height = height;
-	}
-
-	public String getWidth() {
-		return width;
-	}
-
-	public void setWidth(String width) {
-		this.width = width;
-	}
 
 	public String getShowLegend() {
 		return showLegend;

src/main/java/com/ruisitech/bi/entity/portal/PortalChartQuery.java

@@ -25,6 +25,7 @@ public class PortalChartQuery {
 	private Integer cubeId;
 	private String name;
 	private String type;
+	private Integer height; //高度
 	
 	private Map<String, Object> style = new HashMap<String, Object>();
 	private Map<String, Integer> colors;  //系列颜色
@@ -115,5 +116,12 @@ public class PortalChartQuery {
 	public void setColors(Map<String, Integer> colors) {
 		this.colors = colors;
 	}
-	
+
+	public Integer getHeight() {
+		return height;
+	}
+
+	public void setHeight(Integer height) {
+		this.height = height;
+	}
 }

src/main/java/com/ruisitech/bi/entity/portal/PortalTableQuery.java

@@ -27,7 +27,7 @@ public class PortalTableQuery extends BaseEntity {
 	private List<PortalParamDto> portalParams;
 	private List<CompParamDto> params;
 	private String lockhead;
-	private String height;
+	private Integer height;
 	private String showtitle;
 	private Map<String, Object> style;
 	
@@ -125,12 +125,15 @@ public class PortalTableQuery extends BaseEntity {
 	public void setLockhead(String lockhead) {
 		this.lockhead = lockhead;
 	}
-	public String getHeight() {
+
+	public Integer getHeight() {
 		return height;
 	}
-	public void setHeight(String height) {
+
+	public void setHeight(Integer height) {
 		this.height = height;
 	}
+
 	public List<DimDto> getDims(){
 		List<DimDto> ret = new ArrayList<DimDto>();
 		ret.addAll(this.cols);

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

@@ -167,13 +167,6 @@ public class PortalChartService extends BaseCompService {
 		}
 		
 		ctx.setShape(chartJson.getType());
-		if("pie".equals(ctx.getShape()) || "gauge".equals(ctx.getShape())){
-			ctx.setWidth("100%");
-			ctx.setHeight(chartJson.getHeight() == null ? "250" : String.valueOf(chartJson.getHeight()));
-		}else{
-			ctx.setWidth("100%");
-			ctx.setHeight(chartJson.getHeight() == null ? "250" : String.valueOf(chartJson.getHeight()));
-		}
 		//默认图形为居中
 		ctx.setAlign("center");
 		

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

@@ -684,10 +684,6 @@ public class PortalPageService extends BaseCompService {
 		String id = ExtConstants.reportIdPrefix + IdCreater.create();
 		cr.setId(id);
 		cr.setOut("lockUI");
-		String height = table.getHeight();
-		if(height != null && height.length() > 0){
-			cr.setHeight(height);
-		}
 		cr.setShowData(true);
 		if(mybaseKpi != null){
 			cr.setBaseKpi(mybaseKpi);

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

@@ -368,10 +368,6 @@ public class PortalTableService  extends BaseCompService {
 		String id = ExtConstants.reportIdPrefix + IdCreater.create();
 		cr.setId(id);
 		cr.setOut("lockUI");
-		String height =  table.getHeight();
-		if(height != null && height.length() > 0){
-			cr.setHeight(height);
-		}
 		cr.setShowData(true);
 		
 		//创建datacenter