|
@@ -54,48 +54,6 @@ public class FloorLevelCheckUtil {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 根据楼层名称转换楼层信息
|
|
|
- * @param floorName
|
|
|
- * @return
|
|
|
- */
|
|
|
- private FloorLevel convertToFloorLevel(String floorName) {
|
|
|
- FloorLevel floor = new FloorLevel();
|
|
|
- if(StringUtils.isBlank(floorName)) {
|
|
|
- return floor;
|
|
|
- }
|
|
|
- // 顶层夹层
|
|
|
- if(floorName.startsWith("RFM")) {
|
|
|
- floor.type = 2;
|
|
|
- if(floorName.length() > 3) {
|
|
|
- floor.middle = Integer.valueOf(floorName.substring(3));
|
|
|
- }
|
|
|
- return floor;
|
|
|
- }
|
|
|
- // 顶层
|
|
|
- if(floorName.startsWith("RF")) {
|
|
|
- floor.type = 2;
|
|
|
- return floor;
|
|
|
- }
|
|
|
- // 正常楼层/地下
|
|
|
- if(floorName.startsWith("F") || floorName.startsWith("B")) {
|
|
|
- floor.type = floorName.startsWith("F")?1:0;
|
|
|
- // 是否有夹层
|
|
|
- int mIndex = floorName.indexOf("M");
|
|
|
- if(mIndex < 0) {
|
|
|
- floor.level = Integer.valueOf(floorName.substring(1));
|
|
|
- } else if (floorName.endsWith("M")) {
|
|
|
- // 没夹层数也算没夹层
|
|
|
- floor.level = Integer.valueOf(floorName.substring(1, mIndex));
|
|
|
- } else {
|
|
|
- floor.level = Integer.valueOf(floorName.substring(1, mIndex));
|
|
|
- floor.middle = Integer.valueOf(floorName.substring(mIndex+1));
|
|
|
- }
|
|
|
- return floor;
|
|
|
- }
|
|
|
- return floor;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
* 楼层比较器
|
|
|
*/
|
|
|
protected static class FloorModelCompare implements Comparator<FloorModelView> {
|
|
@@ -123,6 +81,49 @@ public class FloorLevelCheckUtil {
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据楼层名称转换楼层信息
|
|
|
+ * @param floorName
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ protected FloorLevel convertToFloorLevel(String floorName) {
|
|
|
+ FloorLevel floor = new FloorLevel();
|
|
|
+ if(StringUtils.isBlank(floorName)) {
|
|
|
+ return floor;
|
|
|
+ }
|
|
|
+ // 顶层夹层
|
|
|
+ if(floorName.startsWith("RFM")) {
|
|
|
+ floor.type = 2;
|
|
|
+ if(floorName.length() > 3) {
|
|
|
+ floor.middle = Integer.valueOf(floorName.substring(3));
|
|
|
+ }
|
|
|
+ return floor;
|
|
|
+ }
|
|
|
+ // 顶层
|
|
|
+ if(floorName.startsWith("RF")) {
|
|
|
+ floor.type = 2;
|
|
|
+ return floor;
|
|
|
+ }
|
|
|
+ // 正常楼层/地下
|
|
|
+ if(floorName.startsWith("F") || floorName.startsWith("B")) {
|
|
|
+ floor.type = floorName.startsWith("F")?1:0;
|
|
|
+ // 是否有夹层
|
|
|
+ int mIndex = floorName.indexOf("M");
|
|
|
+ if(mIndex < 0) {
|
|
|
+ floor.level = Integer.valueOf(floorName.substring(1));
|
|
|
+ } else if (floorName.endsWith("M")) {
|
|
|
+ // 没夹层数也算没夹层
|
|
|
+ floor.level = Integer.valueOf(floorName.substring(1, mIndex));
|
|
|
+ } else {
|
|
|
+ floor.level = Integer.valueOf(floorName.substring(1, mIndex));
|
|
|
+ floor.middle = Integer.valueOf(floorName.substring(mIndex+1));
|
|
|
+ }
|
|
|
+ return floor;
|
|
|
+ }
|
|
|
+ return floor;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|