|
@@ -52,6 +52,7 @@ import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ONE;
|
|
|
import static org.apache.commons.lang3.math.NumberUtils.INTEGER_ZERO;
|
|
|
|
|
|
/**
|
|
|
+ * 分组管理service
|
|
|
* @author 易涛
|
|
|
* @version 1.0
|
|
|
* @date 2021/9/8 14:18
|
|
@@ -63,10 +64,6 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
@Autowired
|
|
|
private RestHighLevelClient client;
|
|
|
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private GroupManagementServiceImpl groupManagementService;
|
|
|
-
|
|
|
@Override
|
|
|
public PageList<GroupManagementVo> equipsQuery(GroupManagementDTO managementDTO) {
|
|
|
List<GroupManagementVo> groupManagementVoList = new ArrayList<>();
|
|
@@ -119,7 +116,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
|
|
|
/**
|
|
|
* 根据id查询设备-常用方法
|
|
|
- * @param id
|
|
|
+ * @param id 设备id
|
|
|
* @author 易涛
|
|
|
* @date 2021/9/10 10:05
|
|
|
* @return java.lang.String
|
|
@@ -167,25 +164,29 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
}
|
|
|
return managementList;
|
|
|
}
|
|
|
+
|
|
|
@Override
|
|
|
public List<GroupTreeInfoVO> equipsGroupQuery(List<String> ids) {
|
|
|
List<GroupTreeInfoVO> groupTreeInfoVOList = Lists.newArrayList();
|
|
|
List<GroupManagement> groupManagementList = findEquipsByIds(ids);
|
|
|
for(GroupManagement management:groupManagementList) {
|
|
|
if(StringUtils.isEmpty(management.getInfos())){
|
|
|
- return null;
|
|
|
+ return groupTreeInfoVOList;
|
|
|
}
|
|
|
String infos = management.getInfos().replace(DELIM_START,"")
|
|
|
.replace(DELIM_END,"").replace("\"","")
|
|
|
.replace(BACKSLASH,"").replace(" ","")
|
|
|
.trim();
|
|
|
if (StringUtils.isEmpty(infos)) {
|
|
|
- return null;
|
|
|
+ return groupTreeInfoVOList;
|
|
|
}
|
|
|
Map<String, String> infoMap = Arrays.stream(infos.split(COMMA))
|
|
|
.collect(Collectors.toMap(key-> key, value->value, (e1, e2) -> e1));
|
|
|
List<GroupTreeVO> groupTreeVOList = getGroupTree();
|
|
|
GroupTreeInfoVO infoVO = new GroupTreeInfoVO();
|
|
|
+ if(CollectionUtils.isEmpty(groupTreeVOList)){
|
|
|
+ return groupTreeInfoVOList;
|
|
|
+ }
|
|
|
groupTreeInfoVOList.add(queryGroupName(groupTreeVOList,infoVO,infoMap,management.getId()));
|
|
|
}
|
|
|
return groupTreeInfoVOList;
|
|
@@ -257,9 +258,9 @@ public class GroupManagementServiceImpl implements GroupManagementService {
|
|
|
|
|
|
/**
|
|
|
* 查询分组下的设备
|
|
|
- * @param condition
|
|
|
- * @param classCode
|
|
|
- * @return
|
|
|
+ * @param condition 分组条件
|
|
|
+ * @param classCode 分组编码
|
|
|
+ * @return 分组下的设备
|
|
|
*/
|
|
|
public List<GroupManagementVo> getEquipList(String condition,String classCode){
|
|
|
GroupManagementDTO managementDTO = new GroupManagementDTO();
|