2024年11月11日 1.0.9 将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库

ETCLaneMonitoringEvaluation/.idea/mybatis-sql-config.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="mock-data-id-list">
+    <option name="list">
+      <list />
+    </option>
+  </component>
+</project>

ETCLaneMonitoringEvaluation/pom.xml

@@ -190,6 +190,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.10.13</version>
         </dependency>
+        <!--   goldendb驱动     -->
+        <dependency>
+            <groupId>com.zte.goldendb</groupId> <!-- 假设的groupId -->
+            <artifactId>gdb_mysql-connector-java</artifactId> <!-- 假设的artifactId -->
+            <version>5.1.46.67</version> <!-- 版本号 -->
+        </dependency>
 
     </dependencies>
 

ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/common/config/MyEnvironmentPostProcessor.java

@@ -1,6 +1,7 @@
 package com.nmggs.query.common.config;
 
 
+import com.nmggs.query.common.emnu.Constant;
 import com.nmggs.query.common.utils.PathUtil;
 import com.nmggs.query.common.utils.PropertiesUtil;
 import com.trkf.PasswordEncryption.PassWordUtils;
@@ -44,31 +45,39 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
             properties.load(new FileInputStream(path));
             String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType");
             Newproperties.load(new FileInputStream(NewPath));
-            properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs");
-            properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl"));
-            properties.setProperty("spring.datasource.username",properties.getProperty("DBUserName"));
-            properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
-            switch (DBType) {
-                case "1":
-                    properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("sqlClassName"));
-                    properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
-                    properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
-                    break;
-                case "2":
-                    properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("OracleClassName"));
-                    properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
-                    properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
-                    break;
-                case "3":
-                    properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("DMClassName"));
-                    properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
-                    properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
-                    break;
-                case "4":
-                    properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("MySQLClassName"));
-                    properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
-                    properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
-                    break;
+            //获取是否是goldenDB数据库
+            String IsGolDen = properties.getProperty("IsGolDen") == null ? "0" : properties.getProperty("IsGolDen");
+            properties.setProperty("spring.logback.logPath", PathUtil.TomcatPath + "/logs");
+            properties.setProperty("spring.datasource.url", properties.getProperty("DBUrl"));
+            properties.setProperty("spring.datasource.username", properties.getProperty("DBUserName"));
+            properties.setProperty("spring.datasource.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
+            if(Constant.STR_ONE.equals(IsGolDen)){
+                properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("GoldenDBClassName"));
+                properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("GoldenvalidationQuery"));
+                properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("GoldenvalidationQuery"));
+            }else {
+                switch (DBType) {
+                    case "1":
+                        properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("sqlClassName"));
+                        properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
+                        properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
+                        break;
+                    case "2":
+                        properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("OracleClassName"));
+                        properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
+                        properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
+                        break;
+                    case "3":
+                        properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("DMClassName"));
+                        properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
+                        properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
+                        break;
+                    case "4":
+                        properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("MySQLClassName"));
+                        properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
+                        properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
+                        break;
+                }
             }
             System.out.println("--------------------------ETCLaneMonitoringEvaluation-本次载入数据库----------------------");
             System.out.println("    server.port  :  " + properties.getProperty("server.port"));

ETCLaneMonitoringEvaluation/src/main/java/com/nmggs/query/service/impl/QueryTableServiceImpl.java

@@ -9,11 +9,9 @@ import com.nmggs.query.common.utils.UuidUtil;
 import com.nmggs.query.mapper.SysMapper;
 import com.nmggs.query.service.QueryTableService;
 import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -26,8 +24,6 @@ import java.util.Map;
  */
 @Service
 public class QueryTableServiceImpl implements QueryTableService {
-    @Value("${DBType}")
-    private String DBType;
     @Resource
     private SysMapper sysMapper;
 
@@ -44,16 +40,10 @@ public class QueryTableServiceImpl implements QueryTableService {
     @Override
     public List<Map<String, Object>> selectETCSuccessRateByStaNo(Map<String, Object> map) {
         String uuid = UuidUtil.getUuid();
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list;
         try {
             Map<String, Object> params = getParams(map);
-            if(Constant.STR_TWO.equals(DBType)){
                 list = sysMapper.selectByStanoDt(params);
-            }else  if(Constant.STR_ONE.equals(DBType)){
-                list = sysMapper.selectByStanoDtSqlServer(params);
-            }else  if(Constant.STR_FOUR.equals(DBType)){
-                list = sysMapper.selectByStanoDtMySql(params);
-            }
 
         } catch (Exception e) {
             LogUtil.WriteLog_Error
@@ -78,16 +68,10 @@ public class QueryTableServiceImpl implements QueryTableService {
     @Override
     public List<Map<String, Object>> selectETCSuccessRateByStaNoAndPort(Map<String, Object> map) {
         String uuid = UuidUtil.getUuid();
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list;
         try {
             Map<String, Object> params = getParams(map);
-            if(Constant.STR_TWO.equals(DBType)){
                 list = sysMapper.selectByStanoAndPortDt(params);
-            }else  if(Constant.STR_ONE.equals(DBType)){
-                list = sysMapper.selectByStanoAndPortDtSqlServer(params);
-            }else  if(Constant.STR_FOUR.equals(DBType)){
-                list = sysMapper.selectByStanoAndPortDtMySql(params);
-            }
 
         } catch (Exception e) {
             LogUtil.WriteLog_Error
@@ -114,7 +98,7 @@ public class QueryTableServiceImpl implements QueryTableService {
         String uuid = UuidUtil.getUuid();
         Map<String, Object> params = new HashMap<>();
 
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list;
         try {
             List<String> stringList = com.nmggs.query.common.utils.ObjectUtils.objToList(map.get("dt"));
             String startDate = null;
@@ -133,13 +117,7 @@ public class QueryTableServiceImpl implements QueryTableService {
             if (ObjectUtils.isNotEmpty(map.get("gbtype"))){
                 params.put("gbtype", map.get("gbtype"));
             }
-            if(Constant.STR_TWO.equals(DBType)){
                 list = sysMapper.selectChartByStanoDt(params);
-            }else  if(Constant.STR_ONE.equals(DBType)){
-                list = sysMapper.selectChartByStanoDtSqlServer(params);
-            }else  if(Constant.STR_FOUR.equals(DBType)){
-                list = sysMapper.selectChartByStanoDtMySql(params);
-            }
         } catch (Exception e) {
             LogUtil.WriteLog_Error
                     ("[uuid:" + uuid + "]-查询操作失败" + e.getMessage() + e,

ETCLaneMonitoringEvaluation/src/main/resources/static/application.properties

@@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
 DMvalidationQuery=SELECT 1
 MySQLClassName=com.mysql.cj.jdbc.Driver
 MySQLvalidationQuery=SELECT 1
+GoldenDBClassName=com.goldendb.jdbc.Driver
+GoldenvalidationQuery=SELECT 1 FROM DUAL
 mybatis-plus.configuration.map-underscore-to-camel-case=false
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

ETCLaneMonitoringEvaluation/src/main/resources/static/resource/img/vue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

ETCLaneMonitoringEvaluation/src/main/resources/version/1.0.9.txt

@@ -8,3 +8,4 @@
 7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推
 8     2024年10月18日     1.0.7       增加物理成功率页面，优化相关查询及页面，新建分中心归属分公司表SUB_CENTER_OWNER_JAVA
 9     2024年10月23日     1.0.8       大屏增加报表页面跳转并携带成功率小于98%的站编码
+10    2024年11月11日     1.0.9       将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库

ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/static/application.properties

@@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
 DMvalidationQuery=SELECT 1
 MySQLClassName=com.mysql.cj.jdbc.Driver
 MySQLvalidationQuery=SELECT 1
+GoldenDBClassName=com.goldendb.jdbc.Driver
+GoldenvalidationQuery=SELECT 1 FROM DUAL
 mybatis-plus.configuration.map-underscore-to-camel-case=false
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

ETCLaneMonitoringEvaluation/target/ETCLaneMonitoringEvaluation/WEB-INF/classes/version/1.0.9.txt

@@ -8,3 +8,4 @@
 7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推
 8     2024年10月18日     1.0.7       增加物理成功率页面，优化相关查询及页面，新建分中心归属分公司表SUB_CENTER_OWNER_JAVA
 9     2024年10月23日     1.0.8       大屏增加报表页面跳转并携带成功率小于98%的站编码
+10    2024年11月11日     1.0.9       将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库

ETCLaneMonitoringEvaluation/target/classes/static/application.properties

@@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
 DMvalidationQuery=SELECT 1
 MySQLClassName=com.mysql.cj.jdbc.Driver
 MySQLvalidationQuery=SELECT 1
+GoldenDBClassName=com.goldendb.jdbc.Driver
+GoldenvalidationQuery=SELECT 1 FROM DUAL
 mybatis-plus.configuration.map-underscore-to-camel-case=false
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

ETCLaneMonitoringEvaluation/target/classes/version/1.0.9.txt

@@ -8,3 +8,4 @@
 7     2024年09月18日     1.0.6       重点关注门架车流量统计页面将专项作业车车流量，分别加载货车的对应车型中，如21型，加在11型中，以此类推
 8     2024年10月18日     1.0.7       增加物理成功率页面，优化相关查询及页面，新建分中心归属分公司表SUB_CENTER_OWNER_JAVA
 9     2024年10月23日     1.0.8       大屏增加报表页面跳转并携带成功率小于98%的站编码
+10    2024年11月11日     1.0.9       将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库

ETCLaneMonitoringEvaluationView/ETCLaneMonitoringEvaluation/index.html

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>大屏展示</title>
+  <script type="module" crossorigin src="./assets/index-ff633256.js"></script>
+  <link rel="stylesheet" href="./assets/index-9beced89.css">
+</head>
+
+<body>
+  <canvas style="position:absolute;z-index:-2;" id="starBg"></canvas>
+  <div style=" position:relative;" id="app"></div>
+  <div class="bj"></div>
+</body>
+
+</html>
+
+
+<style>
+  html,
+  body {
+    margin: 0;
+
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    /* 添加垂直和水平滚动条 */
+    overflow-x: hidden;
+    /* 仅添加水平滚动条 */
+    overflow-y: hidden;
+    /* 仅添加垂直滚动条 */
+    /* filter: brightness(0.8); */
+  }
+
+  .bj {
+    background-image: url(./assets/bj2x-f2598e06.png);
+    background-size: cover;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    backdrop-filter: blur(5px);
+    /* 模糊效果 */
+    filter: brightness(0.7);
+    z-index: -1;
+  }
+
+  #app {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+  }
+</style>