设备、栋舍子节点排序

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceController.java

@@ -90,7 +90,7 @@ public class EnvDeviceController {
                 envDeviceEquipment.setEquipmentPort(i+1);
                 envDeviceEquipment.setUnitId(unitId);
                 envDeviceEquipment.setDeviceCode(deviceCode);
-                switch (device.charAt(i)){
+                switch (Character.getNumericValue(device.charAt(i))){
                     case 1:
                         envDeviceEquipment.setEquipmentName("风机"+fan);
                         envDeviceEquipment.setDeviceAlias(unitName+"风机");

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -317,6 +317,10 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
                 nodeMap.get(parentCode).getChildNode().add(item);
             }
         });
+        roots.forEach(parent -> {
+            List<TreeBaseBuilding> childNodes = parent.getChildNode();
+            childNodes.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getId())));
+        });
         return roots;
     }
 }