重构

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

@@ -1,10 +1,13 @@
 package com.ruisitech.bi.web.portal;
 
+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.PortalChartQuery;
 import com.ruisitech.bi.service.portal.PortalChartService;
+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;
@@ -19,33 +22,38 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 @Scope("prototype")
 @RequestMapping(value = "/portal")
-public class ChartViewController {
-	
+public class ChartViewController extends BaseController {
+
+	private static Logger logger = Logger.getLogger(ChartViewController.class);
+
 	@Autowired
 	private PortalChartService chartService;
 
 	@RequestMapping(value="/ChartView.action", method = RequestMethod.POST)
 	public @ResponseBody
     Object tableView(@RequestBody PortalChartQuery chartJson, HttpServletRequest req, HttpServletResponse res) throws Exception {
-		req.setAttribute("compId", chartJson.getId());
-		ExtContext.getInstance().removeMV(PortalChartService.deftMvId);
-		MVContext mv = chartService.json2MV(chartJson);
-		
-		CompPreviewService ser = new CompPreviewService(req, res, req.getServletContext());
-		ser.setParams(chartService.getMvParams());
-		ser.initPreview();
-		String ret = ser.buildMV(mv, req.getServletContext());
-		return ret;
-	}
-	
-	@RequestMapping(value="/ChartType.action")
-	public String chartType() {
-		return "portal/ChartView-chartType";
+		try {
+			ExtContext.getInstance().removeMV(PortalChartService.deftMvId);
+			MVContext mv = chartService.json2MV(chartJson);
+
+			CompPreviewService ser = new CompPreviewService(req, res, req.getServletContext());
+			ser.setParams(chartService.getMvParams());
+			ser.initPreview();
+			String ret = ser.buildMV(mv, req.getServletContext());
+			JSONObject obj = JSONObject.parseObject(ret);
+			if(obj.get("result") != null && obj.getInteger("result") == 500){
+				return super.buildError(obj.getString("msg"));
+			}
+			return super.buildSucces(obj);
+		}catch (Exception ex){
+			logger.error("图形展现出错", ex);
+			return super.buildError(ex.getMessage());
+		}
 	}
-	
+
 	@RequestMapping(value="/chartColors.action")
 	public @ResponseBody
     Object chartColors() {
-		return chartService.queryChartColors();
+		return super.buildSucces(chartService.queryChartColors());
 	}
 }