From d231b4211b17951f403d17aa57b2f0d5f9e43f89 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 22 二月 2023 17:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs' into bfwcs
---
src/main/java/com/zy/common/web/RouterController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index ea841de..0b83bb3 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -43,12 +43,22 @@
}
}
- @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);
+ 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