joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test-training2' into test-training2

Browse Source
This commit is contained in:
joylink_zhangsai 2022-11-03 17:38:46 +08:00
commit 6eecb0e6bc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/services/permission/OldPermissionDataSyncService.java
View File

@ -74,7 +74,7 @@ public class OldPermissionDataSyncService {
static{
MAPID_TYPE_MAP.put(154L,Simulation.Type.RAILWAY); //大铁标准站
// MAPID_TYPE_MAP.put(81L,Simulation.Type.RAILWAY); //北交大客流
MAPID_TYPE_MAP.put(161L,Simulation.Type.EMERGENCY); //北交大客流
MAPID_TYPE_MAP.put(161L,Simulation.Type.EMERGENCY); //武汉8号线应急调度
}
private void truncateAllTable(){
syncDAO.clearRtsPermission();

3
src/main/java/club/joylink/rtss/services/permission/PermissionSubjectService.java
View File

@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.*;
@ -145,7 +146,7 @@ public class PermissionSubjectService {
//从当前用户所有权限获取所有权限类型为：PROJECT && 数据== 用户项目code && 项目code对应的所有mapId == mapId（入参）
List<PermissionSubjectVO> projectVOList = subjectVOList.stream()
.filter(d->(Objects.equals(d.getPermissionType(), PermissionTypeEnum.PROJECT.getValue()))
&& Objects.equals(d.getProjectCode(),projectCode) && projectMapIdList.contains(mapId)).collect(Collectors.toList());
&& StringUtils.endsWithIgnoreCase(d.getProjectCode(),projectCode) && projectMapIdList.contains(mapId)).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(projectVOList)){
this.createSystemAbilityVOForProejctOrMap(projectVOList,voList);
return projectVOList;