重构

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

@@ -210,9 +210,7 @@ public abstract class BaseCompService {
 				target.setValue(defvalue);
 				target.setType("hidden");
 				mvParams.put(target.getId(), target);
-				mv.getMvParams().put(target.getId(), target);
-				
-				
+				mv.setMvParam(target.getId(), target);
 				mv.getChildren().add(target);
 				target.setParent(mv);
 			}

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

@@ -47,10 +47,10 @@ public class ChartController extends BaseController  {
 			ser.initPreview();
 			String ret = ser.buildMV(mv, req.getServletContext());
 			JSONObject obj = JSONObject.parseObject(ret);
-			obj = obj.getJSONObject(chartJson.getId());
 			if(obj.get("result") != null && obj.getInteger("result") == 500){
 				return super.buildError(obj.getString("msg"));
 			}
+			obj = obj.getJSONObject(chartJson.getId());
 			return super.buildSucces(obj);
 		}catch (Exception ex){
 			logger.error("图形展现出错", ex);

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

@@ -42,10 +42,10 @@ public class TableController extends BaseController {
 			ser.initPreview();
 			String ret = ser.buildMV(mv, req.getServletContext());
 			JSONObject json = JSONObject.parseObject(ret);
-			json = json.getJSONObject(tableJson.getCompId());
 			if(json.get("result") != null && json.getInteger("result") == 500){
 				return super.buildError(json.getString("msg"));
 			}
+			json = json.getJSONObject(tableJson.getCompId());
 			return super.buildSucces(json);
 		}catch (Exception ex){
 			logger.error("表格展现出错", ex);

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

@@ -42,12 +42,11 @@ public class BoxViewController extends BaseController {
 			ser.initPreview();
 			String ret = ser.buildMV(mv, req.getServletContext());
 			JSONObject json = JSONObject.parseObject(ret);
-			json = json.getJSONObject(box.getId());
 			if (json.get("result") != null && json.getInteger("result") == 500) {
 				return super.buildError(json.getString("msg"));
 			}
+			json = json.getJSONObject(box.getId());
 			return super.buildSucces(json);
-
 		}catch (Exception ex){
 			logger.error("数据块展现出错", ex);
 			return super.buildError(ex.getMessage());

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

@@ -42,10 +42,10 @@ public class ChartViewController extends BaseController {
 			ser.initPreview();
 			String ret = ser.buildMV(mv, req.getServletContext());
 			JSONObject obj = JSONObject.parseObject(ret);
-			obj = obj.getJSONObject(chartJson.getId());
 			if(obj.get("result") != null && obj.getInteger("result") == 500){
 				return super.buildError(obj.getString("msg"));
 			}
+			obj = obj.getJSONObject(chartJson.getId());
 			return super.buildSucces(obj);
 		}catch (Exception ex){
 			logger.error("图形展现出错", ex);

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

@@ -42,12 +42,11 @@ public class GridViewController extends BaseController {
 			ser.initPreview();
 			String ret = ser.buildMV(mv , req.getServletContext());
 			JSONObject json = JSONObject.parseObject(ret);
-			json = json.getJSONObject(grid.getId());
 			if (json.get("result") != null && json.getInteger("result") == 500) {
 				return super.buildError(json.getString("msg"));
 			}
+			json = json.getJSONObject(grid.getId());
 			return super.buildSucces(json);
-
 		}catch (Exception ex){
 			logger.error("表格展现出错", ex);
 			return super.buildError(ex.getMessage());

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

@@ -57,16 +57,12 @@ public class PortalViewController extends BaseController {
 			ser.setParams(pageService.getMvParams());
 			ser.initPreview();
 			String ret = ser.buildMV(mv, req.getServletContext());
-			Object obj = JSON.parse(ret);
-			if(obj instanceof JSONObject){
-				JSONObject rjson = (JSONObject)obj;
-				if (rjson.get("result") != null && rjson.getInteger("result") == 500) {
-					return super.buildError(rjson.getString("msg"));
-				}
-				return super.buildSucces(rjson);
-			}else {
-				return super.buildSucces(obj);
+			JSONObject rjson = JSONObject.parseObject(ret);
+			if (rjson.get("result") != null && rjson.getInteger("result") == 500) {
+				return super.buildError(rjson.getString("msg"));
 			}
+			return super.buildSucces(rjson);
+
 		}catch (Exception ex){
 			logger.error("报表展现错误", ex);
 			return super.buildError(ex.getMessage());

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

@@ -43,10 +43,10 @@ public class TableViewController extends BaseController {
 			ser.initPreview();
 			String ret = ser.buildMV(mv , req.getServletContext());
 			JSONObject json = JSONObject.parseObject(ret);
-			json = json.getJSONObject(table.getId());
 			if (json.get("result") != null && json.getInteger("result") == 500) {
 				return super.buildError(json.getString("msg"));
 			}
+			json = json.getJSONObject(table.getId());
 			return super.buildSucces(json);
 
 		}catch (Exception ex){