重构

pom.xml

@@ -60,12 +60,12 @@
         </dependency>
         <!-- 本地jar -->
         <dependency>
-            <groupId>com.ruisi.ext</groupId>
+            <groupId>com.rsbi.ext</groupId>
             <artifactId>ext3</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
             <type>jar</type>
             <scope>system</scope>
-            <systemPath>${project.basedir}/libs/ext3-1.4.jar</systemPath>
+            <systemPath>${project.basedir}/libs/ext3-1.5.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/ruisitech/bi/RsbiOsApplication.java

@@ -1,6 +1,6 @@
 package com.ruisitech.bi;
 
-import com.ruisi.ext.engine.control.ExtContextLoaderListener;
+import com.rsbi.ext.engine.control.ExtContextLoaderListener;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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

@@ -8,20 +8,13 @@ public class ChartQueryDto extends BaseEntity {
 
 	private String dsid;
 	private String dsetId;
-	private Integer compId;
-	
+
 	private List<KpiDto> kpiJson;
 	
 	private ChartJSONDto chartJson;
 	
 	private List<ParamDto> params;
-	
-	public Integer getCompId() {
-		return compId;
-	}
-	public void setCompId(Integer compId) {
-		this.compId = compId;
-	}
+
 	public List<KpiDto> getKpiJson() {
 		return kpiJson;
 	}

src/main/java/com/ruisitech/bi/entity/model/DataSource.java

@@ -1,8 +1,8 @@
 package com.ruisitech.bi.entity.model;
 
-import com.ruisi.ext.engine.dao.DatabaseHelper;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.exception.ExtConfigException;
+import com.rsbi.ext.engine.dao.DatabaseHelper;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.exception.ExtConfigException;
 import com.ruisitech.bi.entity.common.BaseEntity;
 import com.ruisitech.bi.util.RSBIUtils;
 

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

@@ -2,15 +2,15 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.util.P;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.dsource.DataSourceContext;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ext.engine.view.context.form.TextFieldContext;
-import com.ruisi.ext.engine.view.context.form.TextFieldContextImpl;
-import com.ruisi.ext.engine.view.exception.ExtConfigException;
-import com.ruisi.ispire.dc.grid.GridShift;
+import com.rsbi.ext.engine.util.P;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.dsource.DataSourceContext;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.view.context.form.TextFieldContext;
+import com.rsbi.ext.engine.view.context.form.TextFieldContextImpl;
+import com.rsbi.ext.engine.view.exception.ExtConfigException;
+import com.rsbi.ispire.dc.grid.GridShift;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.model.DataSource;
 import com.ruisitech.bi.entity.portal.CompParamDto;

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

@@ -2,22 +2,22 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.chart.ChartContext;
-import com.ruisi.ext.engine.view.context.chart.ChartContextImpl;
-import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContextImpl;
-import com.ruisi.ext.engine.view.context.dc.grid.GridFilterContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridSetConfContext;
-import com.ruisi.ext.engine.view.context.html.TextContext;
-import com.ruisi.ext.engine.view.context.html.TextContextImpl;
-import com.ruisi.ispire.dc.grid.GridFilter;
+import com.rsbi.ext.engine.view.context.chart.ChartContext;
+import com.rsbi.ext.engine.view.context.chart.ChartContextImpl;
+import com.rsbi.ext.engine.view.context.chart.ChartKeyContext;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContextImpl;
+import com.rsbi.ext.engine.view.context.dc.grid.GridFilterContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridSetConfContext;
+import com.rsbi.ext.engine.view.context.html.TextContext;
+import com.rsbi.ext.engine.view.context.html.TextContextImpl;
+import com.rsbi.ispire.dc.grid.GridFilter;
 import com.ruisitech.bi.entity.bireport.*;
 import com.ruisitech.bi.mapper.bireport.AreaMapper;
 import com.ruisitech.bi.util.RSBIUtils;
@@ -65,12 +65,6 @@ public class ChartService extends BaseCompService {
 		mv.setFormId(formId);
 		mv.setMvid(deftMvId);
 		
-	
-		if(!xlsdata){
-			//创建图形钻取项
-			this.createChartDrill(mv, chart);
-		}
-		
 		//创建chart
 		ChartContext cr = this.json2Chart(chart.getChartJson(), chart.getKpiJson(), false);
 		cr.setXlsData(xlsdata);
@@ -506,35 +500,6 @@ public class ChartService extends BaseCompService {
 		ret = ret.replaceAll("##", "\\$extUtils.printJH()").replaceAll("@", "'");
 		return ret;
 	}
-	
-	/**
-	 * 创建图形钻取菜单
-	 * @param mv
-	 */
-	public void createChartDrill(MVContext mv, ChartQueryDto chart){
-		StringBuffer txt = new StringBuffer();
-		txt.append("<div class=\"chartdrillmenu\">");
-		
-		int cnt = 0;
-		for(DimDto dim : chart.getChartJson().getParams()){
-			//if(dim.getDimpos().equals("param")){
-				if(cnt == 0){
-					txt.append("钻取维：");
-				}
-				txt.append("<span class=\"chartdrillDim\"><a href=\"javascript:;\" title=\"上卷\" onclick=\"chartGoupDim("+chart.getCompId()+", "+dim.getId()+",'"+dim.getPos()+"',true)\" style=\"opacity:0.5\"></a>"+dim.getDimdesc()+"("+dim.getValDesc()+")</span>");
-				cnt++;
-			//}
-		}
-		if(cnt == 0){
-			txt.append("<span class=\"charttip\">(点击图形节点进行钻取分析)</span>");
-		}
-		txt.append("</div>");
-		
-		TextContext text = new TextContextImpl();
-		text.setText(txt.toString());
-		text.setParent(mv);
-		mv.getChildren().add(text);
-	}
 
 	/**
 	 * 创建图形的dataCenter
@@ -547,6 +512,7 @@ public class ChartService extends BaseCompService {
 		List<DimDto> dims = chartJson.getDims();
 		GridDataCenterContext ctx = new GridDataCenterContextImpl();
 		GridSetConfContext conf = new GridSetConfContext();
+		conf.setUseCache(false);
 		ctx.setConf(conf);
 		ctx.setId("DC-" + IdCreater.create());
 		String name = TemplateManager.getInstance().createTemplate(sql);

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

@@ -2,20 +2,20 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.chart.ChartContext;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.cross.CrossReportContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
-import com.ruisi.ext.engine.view.context.form.*;
-import com.ruisi.ext.engine.view.context.html.DivContext;
-import com.ruisi.ext.engine.view.context.html.DivContextImpl;
-import com.ruisi.ext.engine.view.context.html.TextContext;
-import com.ruisi.ext.engine.view.context.html.TextContextImpl;
+import com.rsbi.ext.engine.view.context.chart.ChartContext;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.cross.CrossReportContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContext;
+import com.rsbi.ext.engine.view.context.form.*;
+import com.rsbi.ext.engine.view.context.html.DivContext;
+import com.rsbi.ext.engine.view.context.html.DivContextImpl;
+import com.rsbi.ext.engine.view.context.html.TextContext;
+import com.rsbi.ext.engine.view.context.html.TextContextImpl;
 import com.ruisitech.bi.entity.bireport.ChartQueryDto;
 import com.ruisitech.bi.entity.bireport.DimDto;
 import com.ruisitech.bi.entity.bireport.ParamDto;

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

@@ -2,11 +2,11 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.builder.dsource.DataSourceBuilder;
-import com.ruisi.ext.engine.view.context.dsource.DataSourceContext;
-import com.ruisi.ext.engine.view.context.grid.PageInfo;
-import com.ruisi.ext.engine.wrapper.ExtRequest;
-import com.ruisi.ext.engine.wrapper.TestRequestImpl;
+import com.rsbi.ext.engine.view.builder.dsource.DataSourceBuilder;
+import com.rsbi.ext.engine.view.context.dsource.DataSourceContext;
+import com.rsbi.ext.engine.view.context.grid.PageInfo;
+import com.rsbi.ext.engine.wrapper.ExtRequest;
+import com.rsbi.ext.engine.wrapper.TestRequestImpl;
 import com.ruisitech.bi.entity.bireport.TableDetailDto;
 import com.ruisitech.bi.entity.model.DataSource;
 import jxl.Workbook;

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

@@ -2,17 +2,17 @@ package com.ruisitech.bi.service.bireport;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.cross.*;
-import com.ruisi.ext.engine.view.context.dc.grid.*;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ispire.dc.grid.GridFilter;
-import com.ruisi.ispire.dc.grid.GridProcContext;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.cross.*;
+import com.rsbi.ext.engine.view.context.dc.grid.*;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ispire.dc.grid.GridFilter;
+import com.rsbi.ispire.dc.grid.GridProcContext;
 import com.ruisitech.bi.entity.bireport.DimDto;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.bireport.ParamDto;

src/main/java/com/ruisitech/bi/service/frame/DaoHelperConfig.java

@@ -5,8 +5,8 @@
  */
 package com.ruisitech.bi.service.frame;
 
-import com.ruisi.ext.engine.dao.DaoHelper;
-import com.ruisi.ext.engine.dao.DaoHelperImpl;
+import com.rsbi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.dao.DaoHelperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/ruisitech/bi/service/frame/MenuService.java

@@ -5,7 +5,7 @@
  */
 package com.ruisitech.bi.service.frame;
 
-import com.ruisi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.dao.DaoHelper;
 import com.ruisitech.bi.entity.common.BaseEntity;
 import com.ruisitech.bi.entity.common.Result;
 import com.ruisitech.bi.entity.frame.Menu;

src/main/java/com/ruisitech/bi/service/frame/RoleService.java

@@ -5,7 +5,7 @@
  */
 package com.ruisitech.bi.service.frame;
 
-import com.ruisi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.dao.DaoHelper;
 import com.ruisitech.bi.entity.frame.Role;
 import com.ruisitech.bi.mapper.frame.RoleMapper;
 import com.ruisitech.bi.util.RSBIUtils;

src/main/java/com/ruisitech/bi/service/frame/UserService.java

@@ -1,6 +1,6 @@
 package com.ruisitech.bi.service.frame;
 
-import com.ruisi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.dao.DaoHelper;
 import com.ruisitech.bi.entity.frame.User;
 import com.ruisitech.bi.mapper.frame.UserMapper;
 import com.ruisitech.bi.util.RSBIUtils;

src/main/java/com/ruisitech/bi/service/model/DataSourceService.java

@@ -1,6 +1,6 @@
 package com.ruisitech.bi.service.model;
 
-import com.ruisi.ext.engine.view.exception.ExtConfigException;
+import com.rsbi.ext.engine.view.exception.ExtConfigException;
 import com.ruisitech.bi.entity.common.RequestStatus;
 import com.ruisitech.bi.entity.common.Result;
 import com.ruisitech.bi.entity.model.DataSource;

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

@@ -2,15 +2,15 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ext.engine.view.context.html.*;
-import com.ruisi.ext.engine.view.emitter.chart.ChartUtils;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.view.context.html.*;
+import com.rsbi.ext.engine.view.emitter.chart.ChartUtils;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.portal.BoxQuery;
 import com.ruisitech.bi.service.bireport.BaseCompService;

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

@@ -2,17 +2,17 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ext.engine.view.context.grid.PageInfo;
-import com.ruisi.ext.engine.view.context.gridreport.GridCell;
-import com.ruisi.ext.engine.view.context.gridreport.GridReportContext;
-import com.ruisi.ext.engine.view.context.gridreport.GridReportContextImpl;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.view.context.grid.PageInfo;
+import com.rsbi.ext.engine.view.context.gridreport.GridCell;
+import com.rsbi.ext.engine.view.context.gridreport.GridReportContext;
+import com.rsbi.ext.engine.view.context.gridreport.GridReportContextImpl;
 import com.ruisitech.bi.entity.portal.CompParamDto;
 import com.ruisitech.bi.entity.portal.GridColDto;
 import com.ruisitech.bi.entity.portal.GridQuery;

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

@@ -2,18 +2,18 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.chart.ChartContext;
-import com.ruisi.ext.engine.view.context.chart.ChartContextImpl;
-import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
-import com.ruisi.ext.engine.view.context.chart.ChartLinkContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ext.engine.view.emitter.chart.AbstractChartEmitter;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.chart.ChartContext;
+import com.rsbi.ext.engine.view.context.chart.ChartContextImpl;
+import com.rsbi.ext.engine.view.context.chart.ChartKeyContext;
+import com.rsbi.ext.engine.view.context.chart.ChartLinkContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContext;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.view.emitter.chart.AbstractChartEmitter;
 import com.ruisitech.bi.entity.bireport.ChartJSONDto;
 import com.ruisitech.bi.entity.bireport.DimDto;
 import com.ruisitech.bi.entity.bireport.KpiDto;

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

@@ -2,26 +2,26 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.chart.ChartContext;
-import com.ruisi.ext.engine.view.context.chart.ChartKeyContext;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.cross.BaseKpiField;
-import com.ruisi.ext.engine.view.context.cross.CrossKpi;
-import com.ruisi.ext.engine.view.context.cross.CrossReportContext;
-import com.ruisi.ext.engine.view.context.cross.RowDimContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
-import com.ruisi.ext.engine.view.context.face.OptionsLoader;
-import com.ruisi.ext.engine.view.context.form.*;
-import com.ruisi.ext.engine.view.context.gridreport.GridReportContext;
-import com.ruisi.ext.engine.view.context.html.*;
-import com.ruisi.ext.engine.view.context.html.table.*;
-import com.ruisi.ext.engine.view.exception.ExtConfigException;
+import com.rsbi.ext.engine.view.context.chart.ChartContext;
+import com.rsbi.ext.engine.view.context.chart.ChartKeyContext;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.cross.BaseKpiField;
+import com.rsbi.ext.engine.view.context.cross.CrossKpi;
+import com.rsbi.ext.engine.view.context.cross.CrossReportContext;
+import com.rsbi.ext.engine.view.context.cross.RowDimContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContext;
+import com.rsbi.ext.engine.view.context.face.OptionsLoader;
+import com.rsbi.ext.engine.view.context.form.*;
+import com.rsbi.ext.engine.view.context.gridreport.GridReportContext;
+import com.rsbi.ext.engine.view.context.html.*;
+import com.rsbi.ext.engine.view.context.html.table.*;
+import com.rsbi.ext.engine.view.exception.ExtConfigException;
 import com.ruisitech.bi.entity.bireport.DimDto;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.bireport.TableQueryDto;

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

@@ -2,20 +2,20 @@ package com.ruisitech.bi.service.portal;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.init.TemplateManager;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.MVContextImpl;
-import com.ruisi.ext.engine.view.context.cross.BaseKpiField;
-import com.ruisi.ext.engine.view.context.cross.CrossKpi;
-import com.ruisi.ext.engine.view.context.cross.CrossReportContext;
-import com.ruisi.ext.engine.view.context.cross.RowDimContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContext;
-import com.ruisi.ext.engine.view.context.dc.grid.GridDataCenterContextImpl;
-import com.ruisi.ext.engine.view.context.dc.grid.GridSetConfContext;
-import com.ruisi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.init.TemplateManager;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContextImpl;
+import com.rsbi.ext.engine.view.context.cross.BaseKpiField;
+import com.rsbi.ext.engine.view.context.cross.CrossKpi;
+import com.rsbi.ext.engine.view.context.cross.CrossReportContext;
+import com.rsbi.ext.engine.view.context.cross.RowDimContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContext;
+import com.rsbi.ext.engine.view.context.dc.grid.GridDataCenterContextImpl;
+import com.rsbi.ext.engine.view.context.dc.grid.GridSetConfContext;
+import com.rsbi.ext.engine.view.context.form.InputField;
 import com.ruisitech.bi.entity.bireport.DimDto;
 import com.ruisitech.bi.entity.bireport.KpiDto;
 import com.ruisitech.bi.entity.bireport.TableQueryDto;

src/main/java/com/ruisitech/bi/util/CompPreviewService.java

@@ -1,30 +1,30 @@
 package com.ruisitech.bi.util;
 
-import com.ruisi.ext.engine.ConstantsEngine;
-import com.ruisi.ext.engine.ExtConfigConstants;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.control.InputOption;
-import com.ruisi.ext.engine.control.InputOptionFactory;
-import com.ruisi.ext.engine.cross.CrossFieldLoader;
-import com.ruisi.ext.engine.dao.DaoHelper;
-import com.ruisi.ext.engine.init.ExtEnvirContext;
-import com.ruisi.ext.engine.init.ExtEnvirContextImpl;
-import com.ruisi.ext.engine.service.loginuser.LoginUserFactory;
-import com.ruisi.ext.engine.service.loginuser.LoginUserInfoLoader;
-import com.ruisi.ext.engine.util.DaoUtils;
-import com.ruisi.ext.engine.util.IdCreater;
-import com.ruisi.ext.engine.view.builder.BuilderManager;
-import com.ruisi.ext.engine.view.context.Element;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.context.form.InputField;
-import com.ruisi.ext.engine.view.emitter.ContextEmitter;
-import com.ruisi.ext.engine.view.emitter.json.JSON2Emitter;
-import com.ruisi.ext.engine.view.exception.ExtRuntimeException;
-import com.ruisi.ext.engine.wrapper.ExtRequest;
-import com.ruisi.ext.engine.wrapper.ExtRequestImpl;
-import com.ruisi.ext.engine.wrapper.ExtResponse;
-import com.ruisi.ext.engine.wrapper.ExtResponseImpl;
+import com.rsbi.ext.engine.ConstantsEngine;
+import com.rsbi.ext.engine.ExtConfigConstants;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.control.InputOption;
+import com.rsbi.ext.engine.control.InputOptionFactory;
+import com.rsbi.ext.engine.cross.CrossFieldLoader;
+import com.rsbi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.init.ExtEnvirContext;
+import com.rsbi.ext.engine.init.ExtEnvirContextImpl;
+import com.rsbi.ext.engine.service.loginuser.LoginUserFactory;
+import com.rsbi.ext.engine.service.loginuser.LoginUserInfoLoader;
+import com.rsbi.ext.engine.util.DaoUtils;
+import com.rsbi.ext.engine.util.IdCreater;
+import com.rsbi.ext.engine.view.builder.BuilderManager;
+import com.rsbi.ext.engine.view.context.Element;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.form.InputField;
+import com.rsbi.ext.engine.view.emitter.ContextEmitter;
+import com.rsbi.ext.engine.view.emitter.json.JSON2Emitter;
+import com.rsbi.ext.engine.view.exception.ExtRuntimeException;
+import com.rsbi.ext.engine.wrapper.ExtRequest;
+import com.rsbi.ext.engine.wrapper.ExtRequestImpl;
+import com.rsbi.ext.engine.wrapper.ExtResponse;
+import com.rsbi.ext.engine.wrapper.ExtResponseImpl;
 import com.ruisitech.bi.service.bireport.TableService;
 import com.ruisitech.ext.service.ExtLoginInfoLoader;
 import org.apache.commons.fileupload.FileUploadException;

src/main/java/com/ruisitech/bi/util/MVCleanListener.java

@@ -1,8 +1,8 @@
 package com.ruisitech.bi.util;
 
-import com.ruisi.ext.engine.control.ContextListener;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.control.ContextListener;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 
 import javax.servlet.ServletContextEvent;
 import java.util.ArrayList;

src/main/java/com/ruisitech/bi/util/RSBIUtils.java

@@ -1,8 +1,8 @@
 package com.ruisitech.bi.util;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.runtime.tag.CalendarTag;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.runtime.tag.CalendarTag;
 import com.ruisitech.bi.entity.frame.User;
 import com.ruisitech.bi.service.frame.ShiroDbRealm;
 import org.apache.ibatis.session.SqlSession;

src/main/java/com/ruisitech/bi/util/SqliteHelperImpl.java

@@ -5,8 +5,8 @@
  */
 package com.ruisitech.bi.util;
 
-import com.ruisi.ext.engine.dao.DatabaseHelper;
-import com.ruisi.ext.engine.view.context.grid.PageInfo;
+import com.rsbi.ext.engine.dao.DatabaseHelper;
+import com.rsbi.ext.engine.view.context.grid.PageInfo;
 
 /**
  * bi系统的 sqlite 实现

src/main/java/com/ruisitech/bi/web/app/AppReportViewController.java

@@ -2,7 +2,7 @@ package com.ruisitech.bi.web.app;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.service.portal.PortalPageService;
 import com.ruisitech.bi.service.portal.PortalService;
 import com.ruisitech.bi.util.CompPreviewService;

src/main/java/com/ruisitech/bi/web/bireport/ChartController.java

@@ -1,9 +1,11 @@
 package com.ruisitech.bi.web.bireport;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.alibaba.fastjson.JSONObject;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.bireport.ChartQueryDto;
 import com.ruisitech.bi.service.bireport.ChartService;
+import com.ruisitech.bi.util.BaseController;
 import com.ruisitech.bi.util.CompPreviewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
@@ -19,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 @Scope("prototype")
 @RequestMapping(value = "/bireport")
-public class ChartController {
+public class ChartController extends BaseController  {
 	
 	@Autowired
 	private ChartService chartService;
@@ -27,7 +29,6 @@ public class ChartController {
 	@RequestMapping(value="/ChartView.action", method = RequestMethod.POST)
 	public @ResponseBody
     Object chartView(@RequestBody ChartQueryDto chartJson, HttpServletRequest req, HttpServletResponse res) throws Exception {
-		req.setAttribute("compId", String.valueOf(chartJson.getCompId()));
 		ExtContext.getInstance().removeMV(ChartService.deftMvId);
 		MVContext mv = chartService.json2MV(chartJson, false);
 		
@@ -35,6 +36,7 @@ public class ChartController {
 		//ser.setParams(tableService.getMvParams());
 		ser.initPreview();
 		String ret = ser.buildMV(mv, req.getServletContext());
-		return ret;
+		JSONObject obj = JSONObject.parseObject(ret);
+		return super.buildSucces(obj.toJSONString());
 	}
 }

src/main/java/com/ruisitech/bi/web/bireport/ReportDesignController.java

@@ -2,13 +2,13 @@ package com.ruisitech.bi.web.bireport;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.emitter.ContextEmitter;
-import com.ruisi.ext.engine.view.emitter.excel.ExcelEmitter;
-import com.ruisi.ext.engine.view.emitter.pdf.PdfEmitter;
-import com.ruisi.ext.engine.view.emitter.text.TextEmitter;
-import com.ruisi.ext.engine.view.emitter.word.WordEmitter;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.emitter.ContextEmitter;
+import com.rsbi.ext.engine.view.emitter.excel.ExcelEmitter;
+import com.rsbi.ext.engine.view.emitter.pdf.PdfEmitter;
+import com.rsbi.ext.engine.view.emitter.text.TextEmitter;
+import com.rsbi.ext.engine.view.emitter.word.WordEmitter;
 import com.ruisitech.bi.entity.bireport.OlapInfo;
 import com.ruisitech.bi.service.bireport.OlapService;
 import com.ruisitech.bi.service.bireport.ReportService;

src/main/java/com/ruisitech/bi/web/bireport/TableController.java

@@ -1,7 +1,7 @@
 package com.ruisitech.bi.web.bireport;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.bireport.TableQueryDto;
 import com.ruisitech.bi.service.bireport.TableService;
 import com.ruisitech.bi.util.BaseController;

src/main/java/com/ruisitech/bi/web/model/DataSourceController.java

@@ -1,6 +1,6 @@
 package com.ruisitech.bi.web.model;
 
-import com.ruisi.ext.engine.view.exception.ExtConfigException;
+import com.rsbi.ext.engine.view.exception.ExtConfigException;
 import com.ruisitech.bi.entity.model.DataSource;
 import com.ruisitech.bi.service.model.DataSourceService;
 import com.ruisitech.bi.util.BaseController;

src/main/java/com/ruisitech/bi/web/portal/BoxViewController.java

@@ -1,7 +1,7 @@
 package com.ruisitech.bi.web.portal;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.portal.BoxQuery;
 import com.ruisitech.bi.service.portal.BoxService;
 import com.ruisitech.bi.util.BaseController;

src/main/java/com/ruisitech/bi/web/portal/ChartViewController.java

@@ -1,7 +1,7 @@
 package com.ruisitech.bi.web.portal;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.portal.PortalChartQuery;
 import com.ruisitech.bi.service.portal.PortalChartService;
 import com.ruisitech.bi.util.CompPreviewService;

src/main/java/com/ruisitech/bi/web/portal/GridViewController.java

@@ -1,7 +1,7 @@
 package com.ruisitech.bi.web.portal;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.portal.GridQuery;
 import com.ruisitech.bi.service.portal.GridService;
 import com.ruisitech.bi.util.BaseController;

src/main/java/com/ruisitech/bi/web/portal/PortalViewController.java

@@ -2,14 +2,14 @@ package com.ruisitech.bi.web.portal;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ruisi.ext.engine.ExtConstants;
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
-import com.ruisi.ext.engine.view.emitter.ContextEmitter;
-import com.ruisi.ext.engine.view.emitter.excel.ExcelEmitter;
-import com.ruisi.ext.engine.view.emitter.pdf.PdfEmitter;
-import com.ruisi.ext.engine.view.emitter.text.TextEmitter;
-import com.ruisi.ext.engine.view.emitter.word.WordEmitter;
+import com.rsbi.ext.engine.ExtConstants;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.emitter.ContextEmitter;
+import com.rsbi.ext.engine.view.emitter.excel.ExcelEmitter;
+import com.rsbi.ext.engine.view.emitter.pdf.PdfEmitter;
+import com.rsbi.ext.engine.view.emitter.text.TextEmitter;
+import com.rsbi.ext.engine.view.emitter.word.WordEmitter;
 import com.ruisitech.bi.service.portal.PortalPageService;
 import com.ruisitech.bi.service.portal.PortalService;
 import com.ruisitech.bi.util.CompPreviewService;

src/main/java/com/ruisitech/bi/web/portal/TableViewController.java

@@ -1,7 +1,7 @@
 package com.ruisitech.bi.web.portal;
 
-import com.ruisi.ext.engine.view.context.ExtContext;
-import com.ruisi.ext.engine.view.context.MVContext;
+import com.rsbi.ext.engine.view.context.ExtContext;
+import com.rsbi.ext.engine.view.context.MVContext;
 import com.ruisitech.bi.entity.portal.PortalTableQuery;
 import com.ruisitech.bi.service.portal.PortalTableService;
 import com.ruisitech.bi.util.CompPreviewService;

src/main/java/com/ruisitech/ext/service/ExtLoginChecker.java

@@ -1,9 +1,9 @@
 package com.ruisitech.ext.service;
 
-import com.ruisi.ext.engine.control.sys.LoginSecurityAdapter;
-import com.ruisi.ext.engine.dao.DaoHelper;
-import com.ruisi.ext.engine.wrapper.ExtRequest;
-import com.ruisi.ext.engine.wrapper.ExtResponse;
+import com.rsbi.ext.engine.control.sys.LoginSecurityAdapter;
+import com.rsbi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.wrapper.ExtRequest;
+import com.rsbi.ext.engine.wrapper.ExtResponse;
 
 import javax.servlet.ServletContext;
 

src/main/java/com/ruisitech/ext/service/ExtLoginInfoLoader.java

@@ -1,8 +1,8 @@
 package com.ruisitech.ext.service;
 
-import com.ruisi.ext.engine.dao.DaoHelper;
-import com.ruisi.ext.engine.service.loginuser.LoginUserInfoLoader;
-import com.ruisi.ext.engine.wrapper.ExtRequest;
+import com.rsbi.ext.engine.dao.DaoHelper;
+import com.rsbi.ext.engine.service.loginuser.LoginUserInfoLoader;
+import com.rsbi.ext.engine.wrapper.ExtRequest;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/ruisitech/ext/service/LoadXmlFromDB.java

@@ -1,6 +1,6 @@
 package com.ruisitech.ext.service;
 
-import com.ruisi.ext.engine.init.ExtXMLLoader;
+import com.rsbi.ext.engine.init.ExtXMLLoader;
 
 import javax.servlet.ServletContext;
 import java.io.InputStream;

src/main/java/com/ruisitech/ext/service/MyCrossFieldLoader.java

@@ -1,8 +1,8 @@
 package com.ruisitech.ext.service;
 
-import com.ruisi.ext.engine.cross.CrossFieldLoader;
-import com.ruisi.ext.engine.view.context.cross.CrossField;
-import com.ruisi.ext.engine.wrapper.ExtRequest;
+import com.rsbi.ext.engine.cross.CrossFieldLoader;
+import com.rsbi.ext.engine.view.context.cross.CrossField;
+import com.rsbi.ext.engine.wrapper.ExtRequest;
 
 import java.util.List;
 import java.util.Map;

src/main/webapp/WEB-INF/ext2/ext-config/ext-config.xml

@@ -13,41 +13,41 @@
 	<constant name="xmlLoader" value="com.ruisitech.ext.service.LoadXmlFromDB"/>
 	<constant name="contextListener" value="com.ruisitech.bi.util.MVCleanListener"/>
 
-	<chart shape="line" class="com.ruisi.ext.engine.view.emitter.chart.echarts.LineChart"/>
-	<chart shape="area" class="com.ruisi.ext.engine.view.emitter.chart.echarts.AreaChart"/>
-	<chart shape="bar" class="com.ruisi.ext.engine.view.emitter.chart.echarts.BarChart"/>
-	<chart shape="bubble" class="com.ruisi.ext.engine.view.emitter.chart.echarts.BubbleChart"/>
-	<chart shape="column" class="com.ruisi.ext.engine.view.emitter.chart.echarts.ColumnChart"/>
-	<chart shape="gauge" class="com.ruisi.ext.engine.view.emitter.chart.echarts.GaugeChart"/>
-	<chart shape="gauge2" class="com.ruisi.ext.engine.view.emitter.chart.echarts.GaugeChart2"/>
-	<chart shape="mgauge" class="com.ruisi.ext.engine.view.emitter.chart.echarts.GaugeChart3"/>
-	<chart shape="map" class="com.ruisi.ext.engine.view.emitter.chart.echarts.MapChart"/>
-	<chart shape="nestingPie" class="com.ruisi.ext.engine.view.emitter.chart.echarts.NestingPieChart"/>
-	<chart shape="pie" class="com.ruisi.ext.engine.view.emitter.chart.echarts.PieChart"/>
-	<chart shape="pie2" class="com.ruisi.ext.engine.view.emitter.chart.echarts.PieChart2"/>
-	<chart shape="radar" class="com.ruisi.ext.engine.view.emitter.chart.echarts.RadarChart"/>
-	<chart shape="scatter" class="com.ruisi.ext.engine.view.emitter.chart.echarts.ScatterChart"/>
-	<chart shape="scatterMap" class="com.ruisi.ext.engine.view.emitter.chart.echarts.ScatterMapChart"/>
+	<chart shape="line" class="com.rsbi.ext.engine.view.emitter.chart.echarts.LineChart"/>
+	<chart shape="area" class="com.rsbi.ext.engine.view.emitter.chart.echarts.AreaChart"/>
+	<chart shape="bar" class="com.rsbi.ext.engine.view.emitter.chart.echarts.BarChart"/>
+	<chart shape="bubble" class="com.rsbi.ext.engine.view.emitter.chart.echarts.BubbleChart"/>
+	<chart shape="column" class="com.rsbi.ext.engine.view.emitter.chart.echarts.ColumnChart"/>
+	<chart shape="gauge" class="com.rsbi.ext.engine.view.emitter.chart.echarts.GaugeChart"/>
+	<chart shape="gauge2" class="com.rsbi.ext.engine.view.emitter.chart.echarts.GaugeChart2"/>
+	<chart shape="mgauge" class="com.rsbi.ext.engine.view.emitter.chart.echarts.GaugeChart3"/>
+	<chart shape="map" class="com.rsbi.ext.engine.view.emitter.chart.echarts.MapChart"/>
+	<chart shape="nestingPie" class="com.rsbi.ext.engine.view.emitter.chart.echarts.NestingPieChart"/>
+	<chart shape="pie" class="com.rsbi.ext.engine.view.emitter.chart.echarts.PieChart"/>
+	<chart shape="pie2" class="com.rsbi.ext.engine.view.emitter.chart.echarts.PieChart2"/>
+	<chart shape="radar" class="com.rsbi.ext.engine.view.emitter.chart.echarts.RadarChart"/>
+	<chart shape="scatter" class="com.rsbi.ext.engine.view.emitter.chart.echarts.ScatterChart"/>
+	<chart shape="scatterMap" class="com.rsbi.ext.engine.view.emitter.chart.echarts.ScatterMapChart"/>
 	
-	<db type="oracle" class="com.ruisi.ext.engine.dao.OracleHelperImpl"/>
-	<db type="mysql" class="com.ruisi.ext.engine.dao.MysqlHelperImpl"/>
-	<db type="sqlser" class="com.ruisi.ext.engine.dao.SqlServerHelperImpl"/>
-	<db type="db2" class="com.ruisi.ext.engine.dao.Db2HelperImpl"/>
-	<db type="hive" class="com.ruisi.ext.engine.dao.HiveHelperImpl"/>
-	<db type="kylin" class="com.ruisi.ext.engine.dao.KylinHelperImpl"/>
-	<db type="postgresql" class="com.ruisi.ext.engine.dao.PostgresqlHelperImpl"/>
+	<db type="oracle" class="com.rsbi.ext.engine.dao.OracleHelperImpl"/>
+	<db type="mysql" class="com.rsbi.ext.engine.dao.MysqlHelperImpl"/>
+	<db type="sqlser" class="com.rsbi.ext.engine.dao.SqlServerHelperImpl"/>
+	<db type="db2" class="com.rsbi.ext.engine.dao.Db2HelperImpl"/>
+	<db type="hive" class="com.rsbi.ext.engine.dao.HiveHelperImpl"/>
+	<db type="kylin" class="com.rsbi.ext.engine.dao.KylinHelperImpl"/>
+	<db type="postgresql" class="com.rsbi.ext.engine.dao.PostgresqlHelperImpl"/>
 	<db type="sqlite" class="com.ruisitech.bi.util.SqliteHelperImpl"/>
 
-	<service id="ext.sys.param.cascade" class="com.ruisi.ext.engine.service.impl.ParameterCascadeServiceImpl" result="global"/>
-	<service id="ext.sys.fenye.ajax" class="com.ruisi.ext.engine.service.impl.AjaxFenyeServiceImpl" result="global"/>
-	<service id="ext.sys.tab.ajax" class="com.ruisi.ext.engine.service.impl.TabAjaxService" result="global"/>
-	<service id="ext.sys.export" class="com.ruisi.ext.engine.service.impl.ExportServiceImpl" result="global"/>
-	<service id="ext.sys.chart.rebuild" class="com.ruisi.ext.engine.service.impl.ChartRebuildServiceImpl" result="global"/>
-	<service id="ext.sys.cross.loadData" class="com.ruisi.ext.engine.service.impl.CrossDataLoadServiceImpl" result="global"/>
-	<service id="ext.sys.cross.rebuild" class="com.ruisi.ext.engine.service.impl.CrossRebuildServiceImpl" result="global"/>
-	<service id="ext.sys.emitter.text" class="com.ruisi.ext.engine.service.impl.TextEmitterServiceImpl" result="global"/>
-	<service id="ext.sys.cross.export" class="com.ruisi.ext.engine.service.impl.CrossExportServiceImpl" result="global"/>
-	<service id="ext.sys.mv.export" class="com.ruisi.ext.engine.service.impl.MVExportServiceImpl" result="global"/>
-	<service id="ext.sys.gridreport.rebuild" class="com.ruisi.ext.engine.service.impl.GridReportRebuildImpl" result="global"/>
+	<service id="ext.sys.param.cascade" class="com.rsbi.ext.engine.service.impl.ParameterCascadeServiceImpl" result="global"/>
+	<service id="ext.sys.fenye.ajax" class="com.rsbi.ext.engine.service.impl.AjaxFenyeServiceImpl" result="global"/>
+	<service id="ext.sys.tab.ajax" class="com.rsbi.ext.engine.service.impl.TabAjaxService" result="global"/>
+	<service id="ext.sys.export" class="com.rsbi.ext.engine.service.impl.ExportServiceImpl" result="global"/>
+	<service id="ext.sys.chart.rebuild" class="com.rsbi.ext.engine.service.impl.ChartRebuildServiceImpl" result="global"/>
+	<service id="ext.sys.cross.loadData" class="com.rsbi.ext.engine.service.impl.CrossDataLoadServiceImpl" result="global"/>
+	<service id="ext.sys.cross.rebuild" class="com.rsbi.ext.engine.service.impl.CrossRebuildServiceImpl" result="global"/>
+	<service id="ext.sys.emitter.text" class="com.rsbi.ext.engine.service.impl.TextEmitterServiceImpl" result="global"/>
+	<service id="ext.sys.cross.export" class="com.rsbi.ext.engine.service.impl.CrossExportServiceImpl" result="global"/>
+	<service id="ext.sys.mv.export" class="com.rsbi.ext.engine.service.impl.MVExportServiceImpl" result="global"/>
+	<service id="ext.sys.gridreport.rebuild" class="com.rsbi.ext.engine.service.impl.GridReportRebuildImpl" result="global"/>
 
 </ext-config>