配置

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomReservationService.java

@@ -121,9 +121,11 @@ public class ParkRoomReservationService implements BaseService<ParkRoomReservati
                         .filter(x -> x.getString("roomName").contains(dto.getRoomName()))
                         .collect(Collectors.toList());
             }
-            // 分页
+            // 排序、分页
             listSum = resultList.size();
             resultList = resultList.stream()
+                    .sorted(Comparator.comparingInt((JSONObject x) -> extractNumber(x.getString("buildingName")))
+                            .thenComparingInt((JSONObject x) -> extractNumber(x.getString("roomName"))))
                     .skip((long) (tablepar.getPageNum() - 1) * tablepar.getPageSize()) // 跳过前面的数据项
                     .limit(tablepar.getPageSize()) // 取出指定数量的数据
                     .collect(Collectors.toList());
@@ -322,4 +324,13 @@ public class ParkRoomReservationService implements BaseService<ParkRoomReservati
         }
     }
 
+    private static int extractNumber(String s) {
+        try {
+            String numStr = s.replaceAll("[^0-9]", "");
+            return numStr.isEmpty() ? 0 : Integer.parseInt(numStr);
+        } catch (NumberFormatException e) {
+            return 0; // 或者根据需求处理异常
+        }
+    }
+
 }

pro-base/src/main/java/com/idea/util/ApartmentUtil.java

@@ -18,14 +18,14 @@ import java.util.Date;
 public class ApartmentUtil {
 
     // 测试
-    private static final String postUrl = "http://t.server.hxjiot.com";
-    private static final String accountName = "cfmenma";
-    private static final String password = "7a035f450fc3fd742a1e736176cb5537";
+//    private static final String postUrl = "http://t.server.hxjiot.com";
+//    private static final String accountName = "cfmenma";
+//    private static final String password = "7a035f450fc3fd742a1e736176cb5537";
 
     // 正式
-//    private static final String postUrl = "https://server.hxjiot.com";
-//    private static final String accountName = "15190268398";
-//    private static final String password = "0f4c890d820d18c30028146abd38192a";
+    private static final String postUrl = "https://server.hxjiot.com";
+    private static final String accountName = "15190268398";
+    private static final String password = "0f4c890d820d18c30028146abd38192a";
 
     /**
      * 鉴权获取token