优化 房屋短线 最多 三个问题

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java

@@ -174,7 +174,7 @@ public class ImportOwnerCarSMOImpl extends DefaultAbstractComponentSMO implement
 
             //获取房屋名称
             String roomName = ownerCarDto.getRoomName().trim();
-            String[] split = roomName.split("-");
+            String[] split = roomName.split("-",3);
             String floorNum = split[0];
             String unitNum = split[1];
             String roomNum = split[2];

service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java

@@ -25,7 +25,6 @@ import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.ApiRoomDataVo;
 import com.java110.vo.api.ApiRoomVo;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -97,7 +96,7 @@ public class QueryRoomsCmd extends Cmd {
 //        }
         String roomId = "";
         String unitId = "";
-        if (reqJson.containsKey("flag") && !StringUtil.isEmpty(reqJson.getString("flag")) && reqJson.getString("flag").equals("0")
+        if (reqJson.containsKey("flag") && "0".equals(reqJson.getString("flag"))
                 && reqJson.containsKey("floorNum") && !StringUtil.isEmpty(reqJson.getString("floorNum"))
                 && reqJson.containsKey("unitNum") && !StringUtil.isEmpty(reqJson.getString("unitNum"))
                 && reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
@@ -131,15 +130,15 @@ public class QueryRoomsCmd extends Cmd {
             roomDto.setRoomId(roomId);
             roomDto.setUnitId(unitId);
         }
-        if (reqJson.containsKey("flag") && !StringUtil.isEmpty(reqJson.getString("flag")) && reqJson.getString("flag").equals("1")) {
+        if (reqJson.containsKey("flag") && "1".equals(reqJson.getString("flag"))) {
             if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
-                String[] roomNums = reqJson.getString("roomNum").split("-");
+                String[] roomNums = reqJson.getString("roomNum").split("-", 3);
                 if (roomNums != null && roomNums.length == 3) {
                     roomDto.setFloorNum(roomNums[0]);
                     roomDto.setUnitNum(roomNums[1]);
                     roomDto.setRoomNum(roomNums[2]);
                 } else {
-                    throw new IllegalArgumentException("房屋编号错误！");
+                    roomDto.setRoomNum(reqJson.getString("roomNum"));
                 }
             } else {
                 roomDto.setUnitNum("");

service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java

@@ -283,7 +283,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             return false;
         }
         if (MeterWaterDto.METER_TYPE_ROOM.equals(meterWaterDto.getObjType())) {
-            String[] nums = roomNum.split("-");
+            String[] nums = roomNum.split("-",3);
             if (nums.length != 3) {
                 return false;
             }
@@ -300,7 +300,7 @@ public class QueryPreMeterWaterImpl implements IQueryPreMeterWater {
             meterWaterDto.setObjId(roomDtos.get(0).getRoomId());
 
         } else {
-            String[] nums = roomNum.split("-");
+            String[] nums = roomNum.split("-",2);
             if (nums.length != 2) {
                 return false;
             }

service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java

@@ -95,7 +95,7 @@ public class ListFeeCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
-            String[] roomNums = reqJson.getString("roomNum").split("-");
+            String[] roomNums = reqJson.getString("roomNum").split("-",3);
             if (roomNums == null || roomNums.length != 3) {
                 throw new IllegalArgumentException("房屋编号格式错误！");
             }

service-fee/src/main/java/com/java110/fee/cmd/meterWater/ListMeterWaterCmd.java

@@ -126,7 +126,7 @@ public class ListMeterWaterCmd extends Cmd {
         }
 
         if (MeterWaterDto.PAYER_OBJ_TYPE_ROOM.equals(meterWaterDto.getObjType())) {
-            String[] nums = roomNum.split("-");
+            String[] nums = roomNum.split("-",3);
             if (nums.length != 3) {
                 return false;
             }
@@ -143,7 +143,7 @@ public class ListMeterWaterCmd extends Cmd {
             meterWaterDto.setObjId(roomDtos.get(0).getRoomId());
 
         } else {
-            String[] nums = roomNum.split("-");
+            String[] nums = roomNum.split("-",2);
             if (nums.length != 2) {
                 return false;
             }

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationCompleted.java

@@ -135,7 +135,7 @@ public class MachineRoomRenovationCompleted extends DatabusAdaptImpl {
         basePrivilegeDto.setResource("/wechatDecorationNotice");
         List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
         String url = sendMsgUrl + accessToken;
-        String[] roomName = paramIn.getString("roomName").split("-");
+        String[] roomName = paramIn.getString("roomName").split("-",3);
         if (userDtos != null && userDtos.size() > 0) {
             for (UserDto userDto : userDtos) {
                 //根据 userId 查询到openId

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java

@@ -194,7 +194,7 @@ public class MachineRoomRenovationDetail extends DatabusAdaptImpl {
         if (communityDtos != null && communityDtos.size() > 0) {
             tel = communityDtos.get(0).getTel();
         }
-        String[] roomNames = paramIn.getString("roomName").split("-");
+        String[] roomNames = paramIn.getString("roomName").split("-",3);
         if (ownerAppUserDtos.size() > 0) {
             //获取openId
             String openId = ownerAppUserDtos.get(0).getOpenId();

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomToExamine.java

@@ -185,7 +185,7 @@ public class MachineRoomToExamine extends DatabusAdaptImpl {
         if (communityDtos != null && communityDtos.size() > 0) {
             tel = communityDtos.get(0).getTel();
         }
-        String[] roomNames = paramIn.getString("roomName").split("-");
+        String[] roomNames = paramIn.getString("roomName").split("-",3);
         //获取状态
         String state = paramIn.getString("state");
         if (ownerAppUserDtos.size() > 0) {

service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java

@@ -174,7 +174,7 @@ public class MachineSaveRoomRenovation extends DatabusAdaptImpl {
         basePrivilegeDto.setResource("/wechatDecorationNotice");
         List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
         String url = sendMsgUrl + accessToken;
-        String[] roomName = paramIn.getString("roomName").split("-");
+        String[] roomName = paramIn.getString("roomName").split("-",3);
         if (userDtos != null && userDtos.size() > 0) {
             for (UserDto userDto : userDtos) {
                 //根据 userId 查询到openId
@@ -278,7 +278,7 @@ public class MachineSaveRoomRenovation extends DatabusAdaptImpl {
         if (communityDtos != null && communityDtos.size() > 0) {
             tel = communityDtos.get(0).getTel();
         }
-        String[] roomName = paramIn.getString("roomName").split("-");
+        String[] roomName = paramIn.getString("roomName").split("-",3);
         if (ownerAppUserDtos.size() > 0) {
             //获取openId
             String openId = ownerAppUserDtos.get(0).getOpenId();

service-job/src/main/java/com/java110/job/task/wechat/FeeCollectionPushMessageTemplate.java

@@ -296,7 +296,7 @@ public class FeeCollectionPushMessageTemplate extends TaskSystemQuartz {
             oweUrl = FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportOweFeeDo.getPayerObjType()) ? oweRoomUrl : oweCarUrl;
             String[] roomName = new String[]{};
             if ("3333".equals(reportOweFeeDo.getPayerObjType())) {
-                roomName = itemDto.getPayerObjName().split("-");
+                roomName = itemDto.getPayerObjName().split("-",3);
             }
             for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
                 try {

service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java

@@ -360,7 +360,7 @@ public class ReportFeeMonthStatisticsApi {
         reportFeeMonthStatisticsDto.setEndTime(endTime);
         reportFeeMonthStatisticsDto.setObjId(objId);
         if(!StringUtil.isEmpty(roomName)){
-            String[] roomNameArray = roomName.split("-");
+            String[] roomNameArray = roomName.split("-",3);
             reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);
             reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);
             reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);

service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java

@@ -112,7 +112,7 @@ public class ReportOwnerPayFeeApi {
         reportOwnerPayFeeDto.setOwnerName(ownerName);
         reportOwnerPayFeeDto.setFeeTypeCd(feeTypeCd);
         if (!StringUtil.isEmpty(roomName) && roomName.contains("-")) {
-            String[] datas = roomName.split("-");
+            String[] datas = roomName.split("-",3);
             if (datas.length != 3) {
                 throw new IllegalArgumentException("房屋格式错误，请填写 楼栋-单元-房屋格式");
             }

service-store/src/main/java/com/java110/store/cmd/complaint/ListComplaintsCmd.java

@@ -52,7 +52,7 @@ public class ListComplaintsCmd extends Cmd{
 
         String roomId = reqJson.getString("roomId");
         if (!StringUtil.isEmpty(roomId) && roomId.contains("-")) {
-            String[] values = roomId.split("-");
+            String[] values = roomId.split("-",3);
             if (values.length == 3) {
                 RoomDto roomDto = new RoomDto();
                 roomDto.setFloorNum(values[0]);

service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java

@@ -450,7 +450,7 @@ public class ComprehensiveQueryImpl implements IComprehensiveQuery {
             throw new IllegalArgumentException("查询内容格式错误，请输入 楼栋-商铺 如 1-1");
         }
 
-        String[] values = searchValue.split("-");
+        String[] values = searchValue.split("-",3);
 
         if (values.length != 2) {
             throw new IllegalArgumentException("查询内容格式错误，请输入 楼栋-商铺 如 1-1");

service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java

@@ -97,7 +97,7 @@ public class QueryOwnersCmd extends Cmd {
         if (!roomName.contains("-")) {
             throw new IllegalArgumentException("房屋格式错误,请写入如 楼栋-单元-房屋 格式");
         }
-        String[] params = roomName.split("-");
+        String[] params = roomName.split("-",3);
         if (params.length != 3) {
             throw new IllegalArgumentException("房屋格式错误,请写入如 楼栋-单元-房屋 格式");
         }

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java

@@ -213,7 +213,7 @@ public class ImportCustomCreateFeeSMOImpl extends DefaultAbstractComponentSMO im
             if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importCustomCreateFeeDto.getObjType())) {
                 continue;
             }
-            objNames = importCustomCreateFeeDto.getObjName().split("-");
+            objNames = importCustomCreateFeeDto.getObjName().split("-",3);
             if (objNames.length != 3) {
                 continue;
             }

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportOwnerCarSMOImpl.java

@@ -138,7 +138,7 @@ public class ImportOwnerCarSMOImpl extends DefaultAbstractComponentSMO implement
             importOwnerCar.setOwnerName(os[5].toString());
             //获取车位
             String parkingLot = os[6].toString();
-            String[] split = parkingLot.split("-");
+            String[] split = parkingLot.split("-",2);
             importOwnerCar.setAreaNum(split[0]);
             importOwnerCar.setNum(split[1]);
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -176,7 +176,7 @@ public class ImportOwnerCarSMOImpl extends DefaultAbstractComponentSMO implement
 
             //获取房屋名称
             String roomName = ownerCarDto.getRoomName().trim();
-            String[] split = roomName.split("-");
+            String[] split = roomName.split("-",3);
             String floorNum = split[0];
             String unitNum = split[1];
             String roomNum = split[2];