youxiw2000 / bsthLineProfiles · Commits

Commit 91f1b9377587db055506fde44c693070f9e0f6d1

Authored by yiming
1 parent bddc449d
build: skipped

bf

Inline Side-by-side
Showing 3 changed files with 11 additions and 3 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @91f1b93
... ... @@ -317,6 +317,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
317 317 }
318 318  
319 319 @Override
  320 + @DataScope(deptAlias = "h1")
320 321 public List<LineHistoryReport>getLineHistoryReport(BsthTLine bsthTLine){
321 322 return bsthTLineMapper.getLineHistoryReport(bsthTLine);
322 323 }
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
  View file @91f1b93
... ... @@ -100,8 +100,8 @@ public class LoginController extends BaseController
100 100 User user = tokenService.getUser(token);
101 101 if (user == null && token != null) {
102 102  
103   - //String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
104   - String dataJsonStr = sendPost("http://112.64.45.51:32740/information/authenticate/loginAuthentication",token);
  103 + //String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);//测试
  104 + String dataJsonStr = sendPost("http://112.64.45.51:32740/information/authenticate/loginAuthentication",token);//正式
105 105  
106 106  
107 107 //String dataJsonStr="{\"code\":200,\"msg\":\"成功\",\"data\":{\"userId\":\"50aa4eea655d42c49bef086e68a789ad\",\"userName\":\"拓华\",\"userType\":null,\"photoPath\":\"http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/http://106.54.221.120:8013/\",\"sex\":\"女\",\"idCard\":\"\",\"telephoneNumber\":\"1\",\"mailbox\":\"1\",\"account\":\"100005\",\"status\":\"01\",\"remark\":\"\",\"sort\":\"\",\"orgId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"companyInfo\":{\"organizationId\":\"578ECB10-9859-47CC-A6D5-CEE09536243D\",\"parentId\":\"7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A\",\"number\":\"KD01.0115\",\"simpleNameCn\":\"PJ\",\"simpleName\":\"浦交本部\",\"name\":\"上海浦东新区公交本部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部\",\"status\":\"01\",\"remark\":null,\"type\":\"01\",\"attributes\":\"01\",\"sort\":\"KD01.0101\"},\"orgInfo\":{\"organizationId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"parentId\":\"EB26BC7B-D6BA-49BE-83A2-661E6D1E1825\",\"number\":\"KD01.0115.0013.0010\",\"simpleNameCn\":\"XXGLB\",\"simpleName\":\"信息管理部\",\"name\":\"信息管理部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部/浦交本部/信息管理部\",\"status\":\"01\",\"remark\":null,\"type\":\"02\",\"attributes\":\"\",\"sort\":\"KD01.0101.0001.0012\"},\"userAuthList\":[{\"pjtId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"pjtName\":\"线路档案系统\",\"pjtCode\":\"SYS0015\",\"sort\":\"15\",\"roleList\":[{\"roleId\":\"5e7bcde5554b470ab3a1324703cfed6e\",\"roleName\":\"拓华测试角色\",\"roleCode\":\"thcsjs\",\"sort\":\"1\",\"resourceList\":[{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\",\"groupBy\":null},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2cd312c1fd8f42c59dbfea33e2d6b0ba\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路基础信息报表\",\"resourceCode\":\"线路基础信息报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2035\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\",\"groupBy\":null},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\",\"groupBy\":null},{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\",\"groupBy\":null}]}],\"globalResourceList\":[{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\",\"groupBy\":null},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"2cd312c1fd8f42c59dbfea33e2d6b0ba\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路基础信息报表\",\"resourceCode\":\"线路基础信息报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2035\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\",\"groupBy\":null},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\",\"groupBy\":null},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\",\"groupBy\":null},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\",\"groupBy\":null},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\",\"groupBy\":null},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\",\"groupBy\":null},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\",\"groupBy\":null},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\",\"groupBy\":null}]}]}}";
... ... @@ -125,7 +125,13 @@ public class LoginController extends BaseController
125 125 u.setLoginName(account);
126 126 u.setUserName(account);
127 127 u.setPassword(pwd);
128   - u.setDeptId(dept.getDeptId());
  128 + //浦交本部特殊处理设置为最高权限
  129 + if(dept.getCode().contains("KD01.0115")){
  130 + u.setDeptId(100L);
  131 + }else {
  132 + u.setDeptId(dept.getDeptId());
  133 + }
  134 +
129 135 Long[] arr={2L};
130 136 u.setRoleIds(arr);
131 137 u.setLineinfoData("[{\"name\":\"company\",\"text\":\"公司\",\"checked\":true},{\"name\":\"fCompany\",\"text\":\"分公司\",\"checked\":true},{\"name\":\"lineName\",\"text\":\"线路名称\",\"checked\":true},{\"name\":\"lineType\",\"text\":\"线路类型\",\"checked\":true},{\"name\":\"lineLevel\",\"text\":\"线路属性\",\"checked\":true},{\"name\":\"serviceType\",\"text\":\"营运方式\",\"checked\":true},{\"name\":\"revenueType\",\"text\":\"营收类型\",\"checked\":true},{\"name\":\"district\",\"text\":\"区属\",\"checked\":true},{\"name\":\"inoutDistrict\",\"text\":\"是否区内\",\"checked\":true},{\"name\":\"roadType\",\"text\":\"道路类型\",\"checked\":true},{\"name\":\"serviceTime\",\"text\":\"运营时间\",\"checked\":true},{\"name\":\"airConditionerType\",\"text\":\"是否空调\",\"checked\":true},{\"name\":\"sellTicketType\",\"text\":\"售票类型\",\"checked\":true},{\"name\":\"ticketPrice\",\"text\":\"票价\",\"checked\":true},{\"name\":\"halfwayStation\",\"text\":\"站点名称\",\"checked\":true},{\"name\":\"directions\",\"text\":\"线路走向\",\"checked\":true},{\"name\":\"stationUp\",\"text\":\"站级数(上行)\",\"checked\":true},{\"name\":\"stationDown\",\"text\":\"站级数(下行)\",\"checked\":true},{\"name\":\"firstStation\",\"text\":\"首站\",\"checked\":true},{\"name\":\"lastStation\",\"text\":\"末站\",\"checked\":true},{\"name\":\"firstTime\",\"text\":\"起点站首末班\",\"checked\":true},{\"name\":\"lastTime\",\"text\":\"终点站首末班\",\"checked\":true},{\"name\":\"mileageUp\",\"text\":\"上行里程数\",\"checked\":true},{\"name\":\"mileageDown\",\"text\":\"下行里程数\",\"checked\":true},{\"name\":\"lineDistance\",\"text\":\"线路长度\",\"checked\":true},{\"name\":\"isWarrant\",\"text\":\"是否权证\",\"checked\":true},{\"name\":\"warrantStartTime\",\"text\":\"授权起始日期\",\"checked\":true},{\"name\":\"warrantEndTime\",\"text\":\"授权结束日期\",\"checked\":true},{\"name\":\"warrantYear\",\"text\":\"授权年限\",\"checked\":true},{\"name\":\"serviceState\",\"text\":\"营运状态\",\"checked\":true},{\"name\":\"busType\",\"text\":\"车辆类型\",\"checked\":true},{\"name\":\"planCancelTime\",\"text\":\"线路暂停日期\",\"checked\":true},{\"name\":\"cancelTime\",\"text\":\"实际撤销日期\",\"checked\":true},{\"name\":\"remark\",\"text\":\"备注\",\"checked\":true},{\"name\":\"updateBy\",\"text\":\"更新人\",\"checked\":true},{\"name\":\"updateTime\",\"text\":\"更新时间\",\"checked\":true},{\"name\":\"timeSchedule\",\"text\":\"行车作业计划报备时间\",\"checked\":true},{\"name\":\"travelTimeUp\",\"text\":\"行驶时间(上行)\",\"checked\":true},{\"name\":\"travelTimeDown\",\"text\":\"行驶时间(下行)\",\"checked\":true},{\"name\":\"travelIntervalUp\",\"text\":\"行驶间隔(高峰)\",\"checked\":true},{\"name\":\"travelIntervalDown\",\"text\":\"行驶间隔(低谷)\",\"checked\":true},{\"name\":\"warrantVehiclesLarge\",\"text\":\"经营权证(大)\",\"checked\":true},{\"name\":\"warrantVehiclesMiddle\",\"text\":\"经营权证(中)\",\"checked\":true},{\"name\":\"vehiclesNumber\",\"text\":\"实际配车数\",\"checked\":true},{\"name\":\"numberVehiclesLarge\",\"text\":\"实际车辆数(大)\",\"checked\":true},{\"name\":\"numberVehiclesMiddle\",\"text\":\"实际车辆数(中)\",\"checked\":true},{\"name\":\"carPlate\",\"text\":\"车辆自编号\",\"checked\":true},{\"name\":\"numberPerson\",\"text\":\"线路配档数\",\"checked\":true},{\"name\":\"numberPersonDriver\",\"text\":\"司机人数\",\"checked\":true},{\"name\":\"numberPersonSales\",\"text\":\"售票员数\",\"checked\":true},{\"name\":\"busEvNumber\",\"text\":\"新能源车数\",\"checked\":true},{\"name\":\"divideLevel\",\"text\":\"间隔等级\",\"checked\":true},{\"name\":\"hasTimelists\",\"text\":\"是否挂牌\",\"checked\":true},{\"name\":\"isMetro\",\"text\":\"是否轨交末班车衔接\",\"checked\":true},{\"name\":\"metroTime\",\"text\":\"轨交时间\",\"checked\":true},{\"name\":\"coldBonusType\",\"text\":\"冷僻线路补贴类型\",\"checked\":true},{\"name\":\"lineUpdateType\",\"text\":\"性质\",\"checked\":true}]");
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @91f1b93
... ... @@ -1388,6 +1388,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1388 1388 <if test="createTimeEnd != null and createTimeEnd != ''"> and h1.create_time &lt;= #{createTimeEnd}</if>
1389 1389 <if test="lineName != null and lineName != ''"> and h1.line_name =#{lineName}</if>
1390 1390 <if test="lineUpdateType != null and lineUpdateType != ''"> and h1.line_update_type =#{lineUpdateType}</if>
  1391 + ${params.dataScope}
1391 1392 </where>
1392 1393 </select>
1393 1394  
... ...