Merge remote-tracking branch 'origin/glccwcs' into glccwcs

Administrator

3 天以前 aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2

 src/main/java/com/zy/common/web/RouterController.java

@@ -18,38 +18,48 @@

    @RequestMapping("/")
    public void index(HttpServletResponse response) {
        try{
            response.sendRedirect(contextPath+"/views/index.html");
        } catch (Exception ex){
        try {
            response.sendRedirect(contextPath + "/views/index.html");
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }

    @RequestMapping("/login")
    public void login(HttpServletResponse response) {
        try{
            response.sendRedirect(contextPath+"/views/login.html");
        } catch (Exception ex){
        try {
            response.sendRedirect(contextPath + "/views/login.html");
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }

    @RequestMapping("/control")
    public void control(HttpServletResponse response) {
        try{
            response.sendRedirect(contextPath+"/views/control.html");
        } catch (Exception ex){
        try {
            response.sendRedirect(contextPath + "/views/control.html");
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }

    @RequestMapping("/monitor/{cnrId}")
    @RequestMapping("/monitor/{cnrId}/{ledId}")
    public void monitor(@PathVariable("cnrId") Integer cnrId,
                        @PathVariable("ledId") Integer ledId,
                        HttpServletResponse response) {
        try{
            String append = cnrId==null?"":("?crnId="+cnrId);
            response.sendRedirect(contextPath+"/views/monitor/monitor.html"+append);
        } catch (Exception ex){
        try {
            response.sendRedirect(contextPath + "/views/monitor/monitor.html" + "?" + "crnId=" + cnrId + "&" + "ledId=" + ledId);
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }

    @RequestMapping("/monitor0/{ledId}")
    public void monitor(@PathVariable("ledId") Integer ledId,
                        HttpServletResponse response) {
        try {
            response.sendRedirect(contextPath + "/views/monitor/monitor0.html" + "?" + "crnId=" + 2 + "&" + "ledId=" + ledId);
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }