From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/common/web/RouterController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 4112db7..5760c9d 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,25 +13,53 @@
@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/index.html":"/"+applicationName+"/views/index.html";
- response.sendRedirect(redirect);
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/index.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/login")
public void login(HttpServletResponse response) {
- try{
- String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/views/login.html";
- response.sendRedirect(redirect);
- } 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) {
+ 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