Skip to content

T
tagManager
Commit 401ce8bf by zhangkb
Options

修改接口

parent 91c55a4a
Showing with 81 additions and 81 deletions
src/main/java/com/keymobile/tagmanager/service/TagService.java
...@@ -706,88 +706,88 @@ public class TagService { ...@@ -706,88 +706,88 @@ public class TagService {
//获取用户关联的数据权限 //获取用户关联的数据权限
Map<Long, Set<String>> systemTagMap = GrantedAuthHelper.getDataPrivileges(); Map<Long, Set<String>> systemTagMap = GrantedAuthHelper.getDataPrivileges();
//调用repo接口获取标签关联的元数据 //调用repo接口获取标签关联的元数据
Map<String,Object> tagData = repoService.getPageByTag(systemTagMap, modelPath, idPath, tagType, Map<String,Object> tagData = repoService.getTagMetadata(dimensionType, idPath, keyword,
dimensionType, keyword, pageNum, pageSize); modelPath, pageNum, pageSize, tagType);
tagData.put("systemTagMap", systemTagMap); tagData.put("systemTagMap", systemTagMap);
// List<Map<String,Object>> content = (List<Map<String,Object>>)tagData.get("content"); List<Map<String,Object>> content = (List<Map<String,Object>>)tagData.get("content");
// //判断不是个人标签 //判断不是个人标签
// if(!dimensionType.equals("0")) { if(!dimensionType.equals("0")) {
// for(Map<String,Object> mData : content) { for(Map<String,Object> mData : content) {
// mData.put("operable", "1"); mData.put("operable", "1");
// } }
// return tagData; return tagData;
// } }
// if(content.isEmpty()) { if(content.isEmpty()) {
// return tagData; return tagData;
// }else { }else {
// logger.info("tag metadata user privilege:"+systemTagMap); logger.info("tag metadata user privilege:"+systemTagMap);
// if(systemTagMap.isEmpty()) { if(systemTagMap.isEmpty()) {
// tagData.put("content", new String[0]); tagData.put("content", new String[0]);
// tagData.put("totalElements",0); tagData.put("totalElements",0);
// tagData.put("totalPages",0); tagData.put("totalPages",0);
// tagData.put("numberOfElements",0); tagData.put("numberOfElements",0);
// return tagData; return tagData;
// }else { }else {
// //如果是元数据 //如果是元数据
// if(StringUtils.isBlank(modelPath)) { if(StringUtils.isBlank(modelPath)) {
// //比较标签关联的元数据所属系统跟用户被授予的系统是否一致 //比较标签关联的元数据所属系统跟用户被授予的系统是否一致
// for(Map<String,Object> mData : content) { for(Map<String,Object> mData : content) {
// mData.put("operable", "0"); mData.put("operable", "0");
// if(mData.get("sysList")!=null) { if(mData.get("sysList")!=null) {
// List<String> sysList = (List<String>)mData.get("sysList"); List<String> sysList = (List<String>)mData.get("sysList");
// //比较系统，有同个系统的则为可见的共享标签 //比较系统，有同个系统的则为可见的共享标签
// for(String sys : sysList) { for(String sys : sysList) {
// if(systemTagMap.get(Long.valueOf(sys))!=null) { if(systemTagMap.get(Long.valueOf(sys))!=null) {
// if(systemTagMap.get(Long.valueOf(sys)).contains("*")) { if(systemTagMap.get(Long.valueOf(sys)).contains("*")) {
// mData.put("operable", "1"); mData.put("operable", "1");
// }else { }else {
// //根据当前用户被授予的标签获取关联的元数据 //根据当前用户被授予的标签获取关联的元数据
// Set<String> tags = systemTagMap.get(Long.valueOf(sys)); Set<String> tags = systemTagMap.get(Long.valueOf(sys));
// for(String usrTag : tags) { for(String usrTag : tags) {
// Map<String,Object> userTagData = repoService.getTagMetadata("1", Map<String,Object> userTagData = repoService.getTagMetadata("1",
// usrTag, "", null, 1, 100000,"1"); usrTag, "", null, 1, 100000,"1");
// List<Map<String,Object>> tagContent = (List<Map<String,Object>>)userTagData.get("content"); List<Map<String,Object>> tagContent = (List<Map<String,Object>>)userTagData.get("content");
// if(tagContent.contains(mData)) { if(tagContent.contains(mData)) {
// mData.put("operable", "1"); mData.put("operable", "1");
// } }
// } }
// } }
// } }
// } }
// } }
// } }
// }else { }else {
// //定义存储标签list //定义存储标签list
// List<String> tagList = new ArrayList<>(); List<String> tagList = new ArrayList<>();
// //循环用户数据权限map //循环用户数据权限map
// for (Map.Entry<Long, Set<String>> entry : systemTagMap.entrySet()) { for (Map.Entry<Long, Set<String>> entry : systemTagMap.entrySet()) {
// Set<String> set = entry.getValue(); Set<String> set = entry.getValue();
// for(String tag : set) { for(String tag : set) {
// if("*".equals(tag)) { if("*".equals(tag)) {
// continue; continue;
// } }
// tagList.add(tag); tagList.add(tag);
// } }
// } }
// for(Map<String,Object> mData : content) { for(Map<String,Object> mData : content) {
// mData.put("operable", "0"); mData.put("operable", "0");
// if(tagList.isEmpty()) { if(tagList.isEmpty()) {
// mData.put("operable", "1"); mData.put("operable", "1");
// }else { }else {
// for(String usrTag : tagList) { for(String usrTag : tagList) {
// Map<String,Object> userTagData = repoService.getTagMetadata("1", Map<String,Object> userTagData = repoService.getTagMetadata("1",
// usrTag, "", modelPath, 1, 100000,"1"); usrTag, "", modelPath, 1, 100000,"1");
// List<Map<String,Object>> tagContent = (List<Map<String,Object>>)userTagData.get("content"); List<Map<String,Object>> tagContent = (List<Map<String,Object>>)userTagData.get("content");
// if(tagContent.contains(mData)) { if(tagContent.contains(mData)) {
// mData.put("operable", "1"); mData.put("operable", "1");
// } }
// } }
// } }
// } }
// } }
// } }
// } }
// tagData.put("content", content); tagData.put("content", content);
return tagData; return tagData;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment