iidi
/
bocloud.ams
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除日志

develop
guyuliang 2024-08-24 20:36:23 +08:00
parent d242237936
commit 70803db54c
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bocloud.ams.service/src/main/java/com/bocloud/ams/service/instance/impl/InstanceServiceImpl.java
View File

@ -207,11 +207,6 @@ public class InstanceServiceImpl implements InstanceService {
String table = CmdbUtils.CMDB_INSTANCE + moduleCode.toLowerCase(); String table = CmdbUtils.CMDB_INSTANCE + moduleCode.toLowerCase();
String valueTable = CmdbUtils.CMDB_INSTANCE_VALUE + moduleCode.toLowerCase(); String valueTable = CmdbUtils.CMDB_INSTANCE_VALUE + moduleCode.toLowerCase();
boolean hasAdminRole = checkAdminRole(userId); boolean hasAdminRole = checkAdminRole(userId);
log.info("pager:{}",JSON.toJSONString(pager));
log.info("table:{}",JSON.toJSONString(table));
log.info("valueTable:{}",JSON.toJSONString(valueTable));
log.info("userId:{}",JSON.toJSONString(userId));
log.info("hasAdminRole:{}",JSON.toJSONString(hasAdminRole));
int total = instanceRepository.count(pager.getParams(), table, valueTable, userId, hasAdminRole); int total = instanceRepository.count(pager.getParams(), table, valueTable, userId, hasAdminRole);
list = this.instanceRepository.list(pager, table, valueTable, userId, hasAdminRole); list = this.instanceRepository.list(pager, table, valueTable, userId, hasAdminRole);
convertInstanceValue(list, moduleId, userId, hasAdminRole); convertInstanceValue(list, moduleId, userId, hasAdminRole);

4
bocloud.ams.service/src/main/java/com/bocloud/ams/service/module/impl/ModuleServiceImpl.java
View File

@ -432,8 +432,6 @@ public class ModuleServiceImpl implements ModuleService {
List<String> nameList = Arrays.asList("网络设备", "物理服务器", "安全设备"); List<String> nameList = Arrays.asList("网络设备", "物理服务器", "安全设备");
//查询根节点 //查询根节点
List<ModuleGroup> rootGroups = moduleGroupRepository.queryRootInName(nameList); List<ModuleGroup> rootGroups = moduleGroupRepository.queryRootInName(nameList);
log.info("rootGroups:{}", JSON.toJSONString(rootGroups));
log.info("context:{}", JSON.toJSONString(context));
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
@ -468,7 +466,6 @@ public class ModuleServiceImpl implements ModuleService {
} }
private void getInstaceCount(ModuleGroup rootGroup, Map<String, Object> resultMap, Long userId) throws Exception { private void getInstaceCount(ModuleGroup rootGroup, Map<String, Object> resultMap, Long userId) throws Exception {
log.info("rootGroup:{}", JSON.toJSONString(rootGroup));
//获取当前ModuleGroup下所有的modle //获取当前ModuleGroup下所有的modle
Pager pager = new Pager(); Pager pager = new Pager();
List<Param> modelParamList = new ArrayList<>(); List<Param> modelParamList = new ArrayList<>();
@ -498,7 +495,6 @@ public class ModuleServiceImpl implements ModuleService {
paramList.add(param); paramList.add(param);
boolean adminRole = instanceService.checkAdminRole(userId); boolean adminRole = instanceService.checkAdminRole(userId);
int count = instanceRepository.count(paramList, table, valueTable, userId, adminRole); int count = instanceRepository.count(paramList, table, valueTable, userId, adminRole);
log.info("count:{}", count);
total += count; total += count;
} }
resultMap.put(rootGroup.getCode(), total); resultMap.put(rootGroup.getCode(), total);