1.

王通
1 parent 07243d32
Showing 5 changed files with 153 additions and 143 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/filter/AuthorityFilter.java
src/main/resources/static/pages/home.html
src/test/java/com/bsth/entity/sys/Module.java
-package com.bsth;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-@EnableTransactionManagement
-@SpringBootApplication
-public class Application extends SpringBootServletInitializer {
-	
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(Application.class);
-	}
-
-	@Bean
-	@Primary
-	public ObjectMapper objectMapper() {
-		ObjectMapper objectMapper = new ObjectMapper();
-		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-
-		return objectMapper;
-	}
-
-	public static void main(String[] args) throws Exception {
-		SpringApplication.run(Application.class, args);
-	}
+package com.bsth;
+
+import com.bsth.data.SystemParamCache;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+@EnableTransactionManagement
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+	
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
+
+	@Autowired
+	private SystemParamCache systemParamCache;
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(Application.class);
+	}
+
+	@Bean
+	@Primary
+	public ObjectMapper objectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+
+		return objectMapper;
+	}
+
+	public static void main(String[] args) throws Exception {
+		SpringApplication.run(Application.class, args);
+	}
 }
 \ No newline at end of file
@@ -131,6 +131,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             SecurityUtils.login(user, request);
             //session里写入用户名，webSocket连接时标识身份用
             session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+            session.setAttribute(Constants.RESOURCE_AUTHORITYS, user.getLinks());
             //获取公司权限数据
             List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
@@ -173,6 +174,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             SecurityUtils.login(user, request);
             //session里写入用户名，webSocket连接时标识身份用
             session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+            session.setAttribute(Constants.RESOURCE_AUTHORITYS, user.getLinks());
             //获取公司权限数据
             List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
@@ -29,7 +29,7 @@ public class AuthorityFilter extends BaseFilter {
 	private final String scheduleReferer = "/real_control/v2";
-	private String[] pubUrls = new String[]{ "/sockjs/", "/pages/", "/error", "/dictionary/all", "/user/isWeakCipher", "/user/isRealName", "/user/currentUser", "/user/companyData", "/module/findByCurrentUser", "/eci/validate_get_destroy_info", "/business", "/personnel/all_py", "/companyAuthority/all", "/line/all", "/basic/refresh_person_data", "/downloadFile", "/report/lineList", "/adminUtils", "/metronic_v4.5.4", "/assets" };
+	private String[] pubUrls = new String[]{ "/sockjs/", "/pages/home.html", "/error", "/dictionary/all", "/user/isWeakCipher", "/user/isRealName", "/user/currentUser", "/user/companyData", "/module/findByCurrentUser", "/eci/validate_get_destroy_info", "/business", "/personnel/all_py", "/companyAuthority/all", "/line/all", "/basic/refresh_person_data", "/downloadFile", "/report/lineList", "/adminUtils", "/metronic_v4.5.4", "/assets" };
 	@Override
 	public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
-<style>
-    .system_change_log{
-        background: #fff;
-        color: #666;
-        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-        height: calc(100% + 10px);
-        margin-top: -10px;
-        font-size: 14px;
-        padding: 10px 0 0 15px;
-        overflow: auto;
-    }
-    .system_change_log>ul{
-        margin:0px;
-        list-style:none;
-    }
-
-    .system_change_log>ul>li.sub_title{
-        text-indent: 0;
-    }
-
-    .system_change_log>ul>li.sub_title>h6{
-        font-size: 12px;
-        font-family: 微软雅黑;
-        color: #000;
-        margin-top: 8px;
-        margin-bottom: 8px;
-    }
-
-    .system_change_log>ul>li{
-        margin: 5px 0;
-        text-indent: 25px;
-    }
-
-    .system_change_log .label{
-        width: 55px;
-        display: inline-block;
-        padding: 0 10px;
-        line-height: 1.5;
-        font-size: 12px;
-        color: #fff;
-        vertical-align: middle;
-        white-space: nowrap;
-        border-radius: 2px !important;
-        text-transform: uppercase;
-        text-align: center;
-        text-indent: 3px;
-        margin-right: 15px;
-    }
-    .system_change_log .label.s_c_add{
-        background-color: #32d296;
-    }
-
-    .system_change_log .label.s_c_change{
-        background-color: #1e87f0;
-    }
-
-    .system_change_log .label.s_c_remove{
-        background-color: #faa05a;
-    }
-</style>
-<div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2019-08-15 更新说明 Changelog</h2>
-    <br><br>
-    <ul >
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">修复</span>1、线路配置里的“场既是站”设置，可以设置多个停车场。</li>
-        <li><span class="label s_c_change">修复</span>2、修复出场班次和首班发车无指令的问题。</li>
-        <li><span class="label s_c_change">修复</span>3、修复现调中的模拟地图显示问题。</li>
-        <li><span class="label s_c_change">修复</span>4、在现调中的实到时间后面加上时间差。</li>
-        <li class="sub_title"><h6>计划调度</h6></li>
-        <li><span class="label s_c_change">修复</span>1、时刻表导出时的文件名按照时刻表名称来如（嘉定18路20180215时刻表.xls）及其他导出文件的文件名为（线路名+表名+内容时间）。</li>
-        <li class="sub_title"><h6>统计报表</h6></li>
-        <li><span class="label s_c_change">新增</span>1、到离站查询报表。</li>
-        <li><span class="label s_c_change">修复</span>2、临加班次备注显示在工作汇总中。</li>
-        <li><span class="label s_c_change">修复</span>3、更新调度日报的排序。</li>
-        <li><span class="label s_c_change">新增</span>4、在班次日报表中增加一个合计栏。</li>
-        <li><span class="label s_c_change">修复</span>5、班次日报重做。</li>
-        <li class="sub_title"><h6>基础信息</h6></li>
-        <li><span class="label s_c_change">修复</span>1、修复基础信息设备管理的显示问题。</li>
-        <li><span class="label s_c_change">修复</span>2、修复基础信息中新人员性别识别问题。</li>
-        <li><span class="label s_c_change">修复</span>3、修复基础中线路站点的序号问题。</li>
-    </ul>
-</div>
-
-<script type="text/javascript">
-    $.get("/user/validPWDExpired", function(msg) {
-       if ("ok" === msg) {
-           return;
-       }
-
-       var htmlText = [];
-       htmlText.push("<span style='font-weight: bold; font-style: italic; '>" + msg + "</span></br>");
-       swal({
-           title: "账户密码提示",
-           text: htmlText.join("</br>"),
-           html: true,
-           type: "warning",
-           showCancelButton: true,
-           cancelButtonText: "关闭",
-           confirmButtonColor: "#3598dc",
-           closeOnConfirm: false
-       });
-    });
-</script>
+<style>
+    .system_change_log{
+        background: #fff;
+        color: #666;
+        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+        height: calc(100% + 10px);
+        margin-top: -10px;
+        font-size: 14px;
+        padding: 10px 0 0 15px;
+        overflow: auto;
+    }
+    .system_change_log>ul{
+        margin:0px;
+        list-style:none;
+    }
+
+    .system_change_log>ul>li.sub_title{
+        text-indent: 0;
+    }
+
+    .system_change_log>ul>li.sub_title>h6{
+        font-size: 12px;
+        font-family: 微软雅黑;
+        color: #000;
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    .system_change_log>ul>li{
+        margin: 5px 0;
+        text-indent: 25px;
+    }
+
+    .system_change_log .label{
+        width: 55px;
+        display: inline-block;
+        padding: 0 10px;
+        line-height: 1.5;
+        font-size: 12px;
+        color: #fff;
+        vertical-align: middle;
+        white-space: nowrap;
+        border-radius: 2px !important;
+        text-transform: uppercase;
+        text-align: center;
+        text-indent: 3px;
+        margin-right: 15px;
+    }
+    .system_change_log .label.s_c_add{
+        background-color: #32d296;
+    }
+
+    .system_change_log .label.s_c_change{
+        background-color: #1e87f0;
+    }
+
+    .system_change_log .label.s_c_remove{
+        background-color: #faa05a;
+    }
+</style>
+<div class="system_change_log">
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2025-06-15 更新说明 Changelog</h2>
+    <br><br>
+    <ul >
+        <li class="sub_title"><h6>线调</h6></li>
+        <li><span class="label s_c_change">修复</span>1、线路配置里的“场既是站”设置，可以设置多个停车场。</li>
+        <li><span class="label s_c_change">修复</span>2、修复出场班次和首班发车无指令的问题。</li>
+        <li><span class="label s_c_change">修复</span>3、修复现调中的模拟地图显示问题。</li>
+        <li><span class="label s_c_change">修复</span>4、在现调中的实到时间后面加上时间差。</li>
+        <li class="sub_title"><h6>计划调度</h6></li>
+        <li><span class="label s_c_change">修复</span>1、时刻表导出时的文件名按照时刻表名称来如（嘉定18路20180215时刻表.xls）及其他导出文件的文件名为（线路名+表名+内容时间）。</li>
+        <li class="sub_title"><h6>统计报表</h6></li>
+        <li><span class="label s_c_change">新增</span>1、到离站查询报表。</li>
+        <li><span class="label s_c_change">修复</span>2、临加班次备注显示在工作汇总中。</li>
+        <li><span class="label s_c_change">修复</span>3、更新调度日报的排序。</li>
+        <li><span class="label s_c_change">新增</span>4、在班次日报表中增加一个合计栏。</li>
+        <li><span class="label s_c_change">修复</span>5、班次日报重做。</li>
+        <li class="sub_title"><h6>基础信息</h6></li>
+        <li><span class="label s_c_change">修复</span>1、修复基础信息设备管理的显示问题。</li>
+        <li><span class="label s_c_change">修复</span>2、修复基础信息中新人员性别识别问题。</li>
+        <li><span class="label s_c_change">修复</span>3、修复基础中线路站点的序号问题。</li>
+    </ul>
+</div>
+
+<script type="text/javascript">
+    $.get("/user/validPWDExpired", function(msg) {
+       if ("ok" === msg) {
+           return;
+       }
+
+       var htmlText = [];
+       htmlText.push("<span style='font-weight: bold; font-style: italic; '>" + msg + "</span></br>");
+       swal({
+           title: "账户密码提示",
+           text: htmlText.join("</br>"),
+           html: true,
+           type: "warning",
+           showCancelButton: true,
+           cancelButtonText: "关闭",
+           confirmButtonColor: "#3598dc",
+           closeOnConfirm: false
+       });
+    });
+</script>
 package com.bsth.entity.sys;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import javax.persistence.*;
 import java.util.Date;
 import java.util.LinkedHashSet;
@@ -26,6 +28,7 @@ public class Module {
     private String path;
+    @JsonIgnore
     private String mappSymbol;
     private boolean enable;