修改拓扑物联信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -247,28 +247,31 @@ public class FireFightingSystemController extends AbstractBaseController {
         List<EquProperty> properALlList =  new ArrayList<>();
         List<String> list = equipmentIndexService.getGruopName(equipmentId);
         list.forEach(x -> {
-            QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
-            wrapper.eq("equipment_id", equipmentId);
-            wrapper.eq("group_name", x);
-            wrapper.orderByAsc("sort_num");
-            List<EquProperty> properList = new ArrayList<>();
-            equipmentIndexService.list(wrapper).forEach(y -> {
-                EquProperty equProperty = new EquProperty();
-                equProperty.setEquipmentIndexId(y.getId());
-                equProperty.setIsIot(y.getIsIot());
-                equProperty.setPerfQuotaName(y.getPerfQuotaName());
-                equProperty.setEquipmentIndexName(y.getPerfQuotaName());
-                equProperty.setGroupName(y.getGroupName());
-                equProperty.setValue(y.getPerfValue());
-                equProperty.setUnitName(y.getUnitName());
-                equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
-                properList.add(equProperty);
-            });
-            properALlList.addAll(properList);
-            map.put(x, properList);
+            if(!"".equals(x)) {
+                QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
+                wrapper.eq("equipment_id", equipmentId);
+                wrapper.eq("group_name", x);
+                wrapper.orderByAsc("sort_num");
+                List<EquProperty> properList = new ArrayList<>();
+                equipmentIndexService.list(wrapper).forEach(y -> {
+                    EquProperty equProperty = new EquProperty();
+                    equProperty.setEquipmentIndexId(y.getId());
+                    equProperty.setIsIot(y.getIsIot());
+                    equProperty.setPerfQuotaName(y.getPerfQuotaName());
+                    equProperty.setEquipmentIndexName(y.getPerfQuotaName());
+                    equProperty.setGroupName(y.getGroupName());
+                    equProperty.setValue(y.getPerfValue());
+                    equProperty.setUnitName(y.getUnitName());
+                    equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
+                    properList.add(equProperty);
+                });
+                properALlList.addAll(properList);
+                map.put(x, properList);
+            }
+
         });
         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.orderByAsc("sort_num");
         List<EquProperty> properList = new ArrayList<>();