service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java
@@ -9,6 +9,7 @@ import com.java110.intf.user.IOwnerCarV1InnerServiceSMO; import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO; import com.java110.intf.user.IOwnerV1InnerServiceSMO; import com.java110.utils.util.ListUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -98,7 +99,7 @@ @Override public List<RoomDto> queryRoomOweFee(List<RoomDto> roomDtos) { if (roomDtos == null || roomDtos.size() < 1) { if (ListUtil.isNull(roomDtos)) { return roomDtos; } List<String> roomIds = new ArrayList<>(); @@ -139,7 +140,7 @@ } private void queryRoomOweFee(List<String> roomIds, List<RoomDto> roomDtos) { if (roomIds == null || roomIds.size() < 1) { if (ListUtil.isNull(roomIds)) { return; } Map info = new HashMap(); @@ -149,12 +150,14 @@ for (RoomDto roomDto : roomDtos) { for (Map count : repairCounts) { if (!StringUtil.isEmpty(roomDto.getRoomId()) && !StringUtil.isEmpty(count.get("roomId").toString())) { if (roomDto.getRoomId().equals(count.get("roomId").toString())) { roomDto.setRoomOweFee(count.get("oweFee").toString()); } } else { if (StringUtil.isEmpty(roomDto.getRoomId())) { continue; } if (StringUtil.isEmpty(count.get("roomId").toString())) { continue; } if (roomDto.getRoomId().equals(count.get("roomId").toString())) { roomDto.setRoomOweFee(count.get("oweFee").toString()); } } } @@ -176,7 +179,7 @@ List<Map> repairCounts = reportOweFeeInnerServiceSMOImpl.queryOweFeesByOwnerIds(info); for (RoomDto roomDto : roomDtos) { if(StringUtil.isEmpty(roomDto.getOwnerId())){ if (StringUtil.isEmpty(roomDto.getOwnerId())) { continue; } for (Map count : repairCounts) { @@ -264,7 +267,7 @@ List<Map> memberCounts = ownerCarV1InnerServiceSMOImpl.queryOwnerCarCountByOwnerIds(ownerIds); for (RoomDto roomDto : roomDtos) { if(StringUtil.isEmpty(roomDto.getOwnerId())){ if (StringUtil.isEmpty(roomDto.getOwnerId())) { continue; } for (Map count : memberCounts) { @@ -293,7 +296,7 @@ List<Map> memberCounts = ownerV1InnerServiceSMOImpl.queryOwnerMembersCount(ownerIds); for (RoomDto roomDto : roomDtos) { if(StringUtil.isEmpty(roomDto.getOwnerId())){ if (StringUtil.isEmpty(roomDto.getOwnerId())) { continue; } for (Map count : memberCounts) { service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsByOwnerCmd.java
@@ -82,15 +82,8 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException { RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class); hasRoomNum(reqJson, roomDto); if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) { String[] roomNums = reqJson.getString("roomNum").split("-"); if (roomNums != null && roomNums.length == 3) { roomDto.setFloorNum(roomNums[0]); roomDto.setUnitNum(roomNums[1]); roomDto.setRoomNum(roomNums[2]); } } ApiRoomVo apiRoomVo = new ApiRoomVo(); List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto); roomDtoList = queryRoomStatisticsBMOImpl.queryRoomOweFee(roomDtoList); @@ -102,4 +95,27 @@ ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiRoomVo), HttpStatus.OK); context.setResponseEntity(responseEntity); } /** * 判断是否存在房屋编号 * @param reqJson * @param roomDto */ private void hasRoomNum(JSONObject reqJson, RoomDto roomDto) { if (!reqJson.containsKey("roomNum")) { return; } String roomNum = reqJson.getString("roomNum"); if (StringUtil.isEmpty(roomNum)) { return; } String[] roomNums = reqJson.getString("roomNum").split("-"); if (roomNums != null && roomNums.length == 3) { roomDto.setFloorNum(roomNums[0]); roomDto.setUnitNum(roomNums[1]); roomDto.setRoomNum(roomNums[2]); } } } service-community/src/main/java/com/java110/community/dao/impl/RoomServiceDaoImpl.java
@@ -54,9 +54,9 @@ logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getBusinessRoomInfo", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getBusinessRoomInfo", info); return businessRoomInfos; return infos; } @@ -89,9 +89,9 @@ public List<Map> getRoomInfo(Map info) throws DAOException { logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfo", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfo", info); return businessRoomInfos; return infos; } @@ -122,75 +122,75 @@ public int queryRoomsCount(Map info) { logger.debug("查询小区房屋数据 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsCount", info); if (businessRoomInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(businessRoomInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public int queryRoomsByCommunityIdCount(Map info) { logger.debug("查询小区房屋数据 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsByCommunityIdCount", info); if (businessRoomInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsByCommunityIdCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(businessRoomInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public int queryRoomsWithOutSellByCommunityIdCount(Map info) { logger.debug("查询小区房屋数据 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsWithOutSellByCommunityIdCount", info); if (businessRoomInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsWithOutSellByCommunityIdCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(businessRoomInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public int queryRoomsWithSellByCommunityIdCount(Map info) { logger.debug("查询小区房屋数据 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsWithSellByCommunityIdCount", info); if (businessRoomInfos.size() < 1) { List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsWithSellByCommunityIdCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(businessRoomInfos.get(0).get("count").toString()); return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public List<Map> getRoomInfoByCommunityId(Map info) { logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoByCommunityId", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoByCommunityId", info); return businessRoomInfos; return infos; } @Override public List<Map> getRoomInfoByOwner(Map info) { logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoByOwner", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoByOwner", info); return businessRoomInfos; return infos; } @Override public List<Map> getRoomInfoWithOutSellByCommunityId(Map info) { logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoWithOutSellByCommunityId", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoWithOutSellByCommunityId", info); return businessRoomInfos; return infos; } @@ -198,15 +198,15 @@ public List<Map> getRoomInfoWithSellByCommunityId(Map info) { logger.debug("查询小区房屋信息 入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoWithSellByCommunityId", info); List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfoWithSellByCommunityId", info); return businessRoomInfos; return infos; } public List<Map> getRoomInfos(Map info){ logger.debug("查询小区房屋信息 getRoomInfos入参 info : {}", info); List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfos", info); return businessRoomInfos; List<Map> infos = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfos", info); return infos; }
@@ -19,6 +19,7 @@ import com.java110.utils.constant.StatusConstant; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import com.java110.utils.util.StringUtil; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -68,7 +69,7 @@ List<RoomDto> rooms = BeanConvertUtil.covertBeanList(roomServiceDaoImpl.getRoomInfoByCommunityId(BeanConvertUtil.beanCovertMap(roomDto)), RoomDto.class); if (rooms == null || rooms.size() == 0) { if (ListUtil.isNull(rooms)) { return rooms; }
