重构

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

@@ -19,6 +19,7 @@ public class GridQuery extends BaseEntity {
 	private String lockhead;
 	private Integer height;
 	private Integer pageSize;
+	private Integer curPage;
 	private String isnotfy;
 	
 	public String getId() {
@@ -93,6 +94,18 @@ public class GridQuery extends BaseEntity {
 	public void setIsnotfy(String isnotfy) {
 		this.isnotfy = isnotfy;
 	}
+
+	public Integer getCurPage() {
+		if(curPage == null){
+			return 0;
+		}
+		return curPage;
+	}
+
+	public void setCurPage(Integer curPage) {
+		this.curPage = curPage;
+	}
+
 	@Override
 	public void validate() {
 		this.name = RSBIUtils.htmlEscape(this.name);

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

@@ -142,6 +142,7 @@ public class GridService extends BaseCompService {
 		}
 		PageInfo page = new PageInfo();
 		page.setPagesize(pageSize);
+		page.setCurtpage(gridJson.getCurPage());
 		//是否禁用分页
 		String isnotfy = gridJson.getIsnotfy();
 		if("true".equals(isnotfy)){

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

@@ -52,7 +52,7 @@ public class BoxViewController extends BaseController {
 				return super.buildSucces(obj);
 			}
 		}catch (Exception ex){
-			logger.error("表格展现出错", ex);
+			logger.error("数据块展现出错", ex);
 			return super.buildError(ex.getMessage());
 		}
 	}

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

@@ -1,11 +1,14 @@
 package com.ruisitech.bi.web.portal;
 
+import com.alibaba.fastjson.JSON;
+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.portal.GridQuery;
 import com.ruisitech.bi.service.portal.GridService;
 import com.ruisitech.bi.util.BaseController;
 import com.ruisitech.bi.util.CompPreviewService;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -21,7 +24,9 @@ import javax.servlet.http.HttpServletResponse;
 @Scope("prototype")
 @RequestMapping(value = "/portal")
 public class GridViewController extends BaseController {
-	
+
+	private static Logger logger = Logger.getLogger(GridViewController.class);
+
 	@Autowired
 	private GridService serivce;
 
@@ -29,12 +34,26 @@ public class GridViewController extends BaseController {
 	public @ResponseBody
     Object tableView(@RequestBody GridQuery grid, HttpServletRequest req, HttpServletResponse res) throws Exception {
 		ExtContext.getInstance().removeMV(GridService.deftMvId);
-		MVContext mv = serivce.json2MV(grid);
-		CompPreviewService ser = new CompPreviewService(req, res, req.getServletContext());
-		ser.setParams(serivce.getMvParams());
-		ser.initPreview();
-		String ret = ser.buildMV(mv , req.getServletContext());
-		return ret;
+		try {
+			MVContext mv = serivce.json2MV(grid);
+			CompPreviewService ser = new CompPreviewService(req, res, req.getServletContext());
+			ser.setParams(serivce.getMvParams());
+			ser.initPreview();
+			String ret = ser.buildMV(mv , req.getServletContext());
+			Object obj = JSON.parse(ret);
+			if(obj instanceof JSONObject){
+				JSONObject json = (JSONObject)obj;
+				if (json.get("result") != null && json.getInteger("result") == 500) {
+					return super.buildError(json.getString("msg"));
+				}
+				return super.buildSucces(json);
+			}else {
+				return super.buildSucces(obj);
+			}
+		}catch (Exception ex){
+			logger.error("表格展现出错", ex);
+			return super.buildError(ex.getMessage());
+		}
 	}
 	
 }