From e86f1ca83fd5ff8dac184b8bdd86b05b307c3868 Mon Sep 17 00:00:00 2001 From: hong Date: Mon, 17 Oct 2022 13:21:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?getBusStopLineTOpredictTime.jsp=EB=8A=94=20?= =?UTF-8?q?=EB=8F=84=EC=B0=A9=EC=98=88=EC=A0=95=EC=8B=9C=EA=B0=84=EC=9D=B4?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=EB=90=9C=20=ED=94=84=EB=A1=A0=ED=8A=B8?= =?UTF-8?q?=EB=8B=A8.//=20=EA=B0=B1=EC=8B=A0=EC=8B=9C=EA=B0=84=EB=B9=A0?= =?UTF-8?q?=EC=A7=84=EA=B1=B0=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/user/getBusStopLine.jsp | 22 +- .../user/getBusStopLineTOpredictTime.jsp | 433 ++++++++++++++++++ 2 files changed, 437 insertions(+), 18 deletions(-) create mode 100644 ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLineTOpredictTime.jsp diff --git a/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLine.jsp b/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLine.jsp index 4bb597a6..c71f8a92 100644 --- a/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLine.jsp +++ b/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLine.jsp @@ -1,7 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> @@ -220,8 +219,8 @@ function moveMap(){ ${cbldto.businfoName}
- ${cbldto.locationTime} +
@@ -277,8 +276,8 @@ function moveMap(){ ${cbldto.businfoName}
- ${cbldto.locationTime} +
@@ -365,8 +364,8 @@ function moveMap(){ ${cbldto.businfoName}
- ${cbldto.locationTime} +
@@ -386,25 +385,12 @@ function moveMap(){
- - - - - - ${fn:split(ptlDTO.avgTime- cbl.timeGAP,'.')[0]}분 - - - - - - -
- +
diff --git a/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLineTOpredictTime.jsp b/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLineTOpredictTime.jsp new file mode 100644 index 00000000..4bb597a6 --- /dev/null +++ b/ybusadmin/src/main/webapp/WEB-INF/views/user/getBusStopLineTOpredictTime.jsp @@ -0,0 +1,433 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> + + + + + + + + + + + + Ybus + + + + + + + + +
+ +
+
+ + + + +
+
+
+
+ +
+
+ +
+
+
+ 기점 +
+
+
+ + + + +
+
+
+
+ ${cbldto.businfoName} +
+
+ + ${cbldto.locationTime} +
+
+
+
+ + + + +
+
+
+
+ ${dto.busStop} +
+
+
+ +
+
+ +
+
+
+
+
+
+ + + +
+
+
+
+ +
+
+ +
+
+
+ 종점 +
+
+
+ + + + +
+
+
+
+ ${cbldto.businfoName} +
+
+ + ${cbldto.locationTime} +
+
+
+
+ + + +
+
+
+
+ ${dto.busStop} +
+
+
+ +
+
+ +
+
+
+
+
+
+ + + +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+
+ 회차 +
+
+
+ + +
+
+ +
+
+ +
+
+ + + + +
+
+
+
+ ${cbldto.businfoName} +
+
+ + ${cbldto.locationTime} +
+
+
+
+ + + + +
+
+
+
+ ${dto.busStop} +
+
+
+ +
+
+ + + + + + ${fn:split(ptlDTO.avgTime- cbl.timeGAP,'.')[0]}분 + + + + + + + + +
+
+
+
+
+
+ + + + + +
+ + +
+ + + + +
+ +
+ + \ No newline at end of file From b42ae8ae8119c46755af9933c6662c9534e7ba59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Oct 2022 20:16:00 +0000 Subject: [PATCH 2/2] Bump jackson-databind Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.4.4 to 2.13.4.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../web-resources/META-INF/maven/com.test/spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ybusadmin/Users/adam/Downloads/eclipse/workspace/ybusadmin/target/m2e-wtp/web-resources/META-INF/maven/com.test/spring/pom.xml b/ybusadmin/Users/adam/Downloads/eclipse/workspace/ybusadmin/target/m2e-wtp/web-resources/META-INF/maven/com.test/spring/pom.xml index b99c2bed..6e016d67 100644 --- a/ybusadmin/Users/adam/Downloads/eclipse/workspace/ybusadmin/target/m2e-wtp/web-resources/META-INF/maven/com.test/spring/pom.xml +++ b/ybusadmin/Users/adam/Downloads/eclipse/workspace/ybusadmin/target/m2e-wtp/web-resources/META-INF/maven/com.test/spring/pom.xml @@ -57,7 +57,7 @@ com.fasterxml.jackson.core jackson-databind - 2.4.4 + 2.13.4.1