From d1ef13d1f116e69a7f44e78d64fd0fe4ce2cad80 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 10 二月 2025 13:17:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/RouterController.java | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java index 92ad6a6..ad57dfa 100644 --- a/src/main/java/com/zy/common/web/RouterController.java +++ b/src/main/java/com/zy/common/web/RouterController.java @@ -1,8 +1,8 @@ package com.zy.common.web; -import com.core.common.Cools; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import javax.servlet.http.HttpServletResponse; @@ -13,14 +13,13 @@ @Controller public class RouterController { - @Value("${spring.application.name}") - private String applicationName; + @Value("${server.servlet.context-path}") + private String contextPath; @RequestMapping("/") public void index(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"views/login.html":"/"+applicationName+"/views/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/index.html"); } catch (Exception ex){ ex.printStackTrace(); } @@ -29,8 +28,28 @@ @RequestMapping("/login") public void login(HttpServletResponse response) { try{ - String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/views/login.html"; - response.sendRedirect(redirect); + response.sendRedirect(contextPath+"/views/login.html"); + } catch (Exception ex){ + ex.printStackTrace(); + } + } + + @RequestMapping("/monitor/{cnrId}/{ledId}") + public void monitor(@PathVariable("cnrId") Integer cnrId, + @PathVariable("ledId") Integer ledId, + HttpServletResponse response) { + 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(); } -- Gitblit v1.9.1