Skip to content

A
amos-boot-biz
Commit 40f4868a authored by tangwei's avatar tangwei
Browse files
Options

修改拓扑图bug

parent 068d964f
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 19 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java
View file @ 40f4868a
...@@ -655,27 +655,32 @@ public class TopographyController extends AbstractBaseController { ...@@ -655,27 +655,32 @@ public class TopographyController extends AbstractBaseController {
ConcurrentHashMap map1 = new ConcurrentHashMap(); ConcurrentHashMap map1 = new ConcurrentHashMap();
List<String> list = equipmentIndexService.getGruopName(equipmentId); List<String> list = equipmentIndexService.getGruopName(equipmentId);
list.forEach(x -> { list.forEach(x -> {
QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_id", equipmentId); if(!"".equals(x)) {
wrapper.eq("group_name", x); QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
wrapper.orderByAsc("sort_num"); wrapper.eq("equipment_id", equipmentId);
List<EquProperty> properList = new ArrayList<>(); wrapper.eq("group_name", x);
equipmentIndexService.list(wrapper).forEach(y -> { wrapper.orderByAsc("sort_num");
EquProperty equProperty = new EquProperty(); List<EquProperty> properList = new ArrayList<>();
equProperty.setEquipmentIndexId(y.getId()); equipmentIndexService.list(wrapper).forEach(y -> {
equProperty.setIsIot(y.getIsIot()); EquProperty equProperty = new EquProperty();
equProperty.setPerfQuotaName(y.getPerfQuotaName()); equProperty.setEquipmentIndexId(y.getId());
equProperty.setEquipmentIndexName(y.getPerfQuotaName()); equProperty.setIsIot(y.getIsIot());
equProperty.setGroupName(y.getGroupName()); equProperty.setPerfQuotaName(y.getPerfQuotaName());
equProperty.setValue(y.getPerfValue()); equProperty.setEquipmentIndexName(y.getPerfQuotaName());
equProperty.setUnitName(y.getUnitName()); equProperty.setGroupName(y.getGroupName());
equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId()); equProperty.setValue(y.getPerfValue());
properList.add(equProperty); equProperty.setUnitName(y.getUnitName());
}); equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
map.put(x, properList); properList.add(equProperty);
});
map.put(x, properList);
}
}); });
QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>(); QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>();
wrappernull.isNull("group_name").or().eq("group_name", " "); wrappernull.isNull("group_name").or().eq("group_name", "");
wrappernull.eq("equipment_id", equipmentId); wrappernull.eq("equipment_id", equipmentId);
wrappernull.orderByAsc("sort_num"); wrappernull.orderByAsc("sort_num");
List<EquProperty> properList = new ArrayList<>(); List<EquProperty> properList = new ArrayList<>();
......
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