组件测试完成

吴学文

2019-03-19 732f76a904e6f202b6d953257500e3a8aaf3dfdb

 WebService/src/main/java/com/java110/web/controller/ConsoleController.java

File was renamed from ConsoleService/src/main/java/com/java110/console/controller/ConsoleController.java
@@ -1,11 +1,11 @@
package com.java110.console.controller;
package com.java110.web.controller;

import com.alibaba.fastjson.JSONObject;
import com.java110.common.exception.NoAuthorityException;
import com.java110.common.exception.SMOException;
import com.java110.common.util.Assert;
import com.java110.common.util.StringUtil;
import com.java110.console.smo.IConsoleServiceSMO;
import com.java110.web.smo.IConsoleServiceSMO;
import com.java110.core.base.controller.BaseController;
import com.java110.entity.service.PageData;
import org.slf4j.Logger;
@@ -16,10 +16,6 @@
import org.springframework.web.bind.annotation.RequestMapping;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 控制中心处理类
@@ -37,28 +33,8 @@
    @RequestMapping(path = "/")
    public String index(Model model, HttpServletRequest request) {
        String template = "index";
        try {
            //1.0 获取对象
            PageData pd = this.getPageData(request);
            // 判断用户是否登录
            checkLogin(pd);
            model.addAttribute("templateName","控制中心首页");
            //2.0 查询菜单信息
            getMenus(model,pd,consoleServiceSMOImpl.getMenuItemsByManageId(pd.getUserId()));
            //3.0 查询各个系统调用量
        }catch (NoAuthorityException e){
            //跳转到登录页面
            template = "redirect:/login";
        }catch (IllegalArgumentException e){
            template = "redirect:/system/error";
        }catch (SMOException e){
            template = "redirect:/system/error";
        }catch (Exception e){
            logger.error("系统异常：",e);
            template = "redirect:/system/error";
        }finally {

            return template;
        }
    }

    /**