|
@@ -1832,21 +1832,21 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
}
|
|
|
- list.sort(new Comparator<BaseCameraManagement>() {
|
|
|
- @Override
|
|
|
- public int compare(BaseCameraManagement o1, BaseCameraManagement o2) {
|
|
|
- String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
|
|
|
- String substring1 = name1.substring(0, 1);
|
|
|
- String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
|
|
|
- String substring2 = name2.substring(0, 1);
|
|
|
- int i = substring1.compareTo(substring2);
|
|
|
- if (i == 0) {
|
|
|
- return -o1.getInstallMile() - o2.getInstallMile();
|
|
|
- } else {
|
|
|
- return i;
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+// list.sort(new Comparator<BaseCameraManagement>() {
|
|
|
+// @Override
|
|
|
+// public int compare(BaseCameraManagement o1, BaseCameraManagement o2) {
|
|
|
+// String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
|
|
|
+// String substring1 = name1.substring(0, 1);
|
|
|
+// String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
|
|
|
+// String substring2 = name2.substring(0, 1);
|
|
|
+// int i = substring1.compareTo(substring2);
|
|
|
+// if (i == 0) {
|
|
|
+// return -o1.getInstallMile() - o2.getInstallMile();
|
|
|
+// } else {
|
|
|
+// return i;
|
|
|
+// }
|
|
|
+// }
|
|
|
+// });
|
|
|
List<RespCameraVo> cameraVos = new ArrayList<>();
|
|
|
for (BaseCameraManagement baseCameraManagement : list) {
|
|
|
RespCameraVo respCameraVo = new RespCameraVo();
|