首页开发完成待测试

Api/src/main/java/com/java110/api/listener/fee/QueryArrearsFeeListener.java

@@ -4,9 +4,7 @@ package com.java110.api.listener.fee;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
 import com.java110.common.constant.FeeTypeConstant;
-import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.ServiceCodeConstant;
-import com.java110.common.exception.ListenerExecuteException;
 import com.java110.common.util.Assert;
 import com.java110.common.util.BeanConvertUtil;
 import com.java110.common.util.DateUtil;
@@ -20,12 +18,9 @@ import com.java110.core.smo.room.IRoomInnerServiceSMO;
 import com.java110.core.smo.unit.IUnitInnerServiceSMO;
 import com.java110.dto.FeeDto;
 import com.java110.dto.OwnerDto;
-import com.java110.dto.OwnerRoomRelDto;
-import com.java110.dto.RoomDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.vo.api.ApiArrearsFeeDataVo;
 import com.java110.vo.api.ApiArrearsFeeVo;
-import com.java110.vo.api.ApiFeeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -88,10 +83,10 @@ public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener
         feeDtoParamIn.setArrearsEndTime(DateUtil.getCurrentDate());
 
         //车位时处理为 查询多个
-        if(FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(feeDtoParamIn.getFeeTypeCd())){
+        if (FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(feeDtoParamIn.getFeeTypeCd())) {
             feeDtoParamIn.setFeeTypeCd("");
             feeDtoParamIn.setFeeTypeCds(new String[]{FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE,
-                                                     FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE});
+                    FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE});
         }
 
         int feeCount = feeInnerServiceSMOImpl.queryFeesCount(feeDtoParamIn);
@@ -115,7 +110,10 @@ public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener
             List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
             freshRoomAndOwnerData(apiFeeVo, ownerDtos);
         } else {
-
+            OwnerDto ownerDto = new OwnerDto();
+            ownerDto.setRoomIds(objIds);
+            List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByParkingSpace(ownerDto);
+            freshParkingSpaceAndOwnerData(apiFeeVo, ownerDtos);
         }
 
 
@@ -129,13 +127,13 @@ public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener
      * 刷新 房间号
      *
      * @param apiFeeVos 费用出参对象
-     * @param ownerDtos  房屋信息
+     * @param ownerDtos 房屋信息
      */
     private void freshRoomAndOwnerData(List<ApiArrearsFeeDataVo> apiFeeVos, List<OwnerDto> ownerDtos) {
 
         for (ApiArrearsFeeDataVo apiFeeVo : apiFeeVos) {
             for (OwnerDto ownerDto : ownerDtos) {
-                if(apiFeeVo.getPayerObjId().equals(ownerDto.getRoomId())){
+                if (apiFeeVo.getPayerObjId().equals(ownerDto.getRoomId())) {
                     apiFeeVo.setNum(ownerDto.getRoomNum());
                     apiFeeVo.setOwnerName(ownerDto.getName());
                     apiFeeVo.setTel(ownerDto.getLink());
@@ -144,6 +142,25 @@ public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener
         }
     }
 
+    /**
+     * 刷新 车位编号
+     *
+     * @param apiFeeVos 费用出参对象
+     * @param ownerDtos 房屋信息
+     */
+    private void freshParkingSpaceAndOwnerData(List<ApiArrearsFeeDataVo> apiFeeVos, List<OwnerDto> ownerDtos) {
+
+        for (ApiArrearsFeeDataVo apiFeeVo : apiFeeVos) {
+            for (OwnerDto ownerDto : ownerDtos) {
+                if (apiFeeVo.getPayerObjId().equals(ownerDto.getPsId())) {
+                    apiFeeVo.setNum(ownerDto.getNum());
+                    apiFeeVo.setOwnerName(ownerDto.getName());
+                    apiFeeVo.setTel(ownerDto.getLink());
+                }
+            }
+        }
+    }
+
     /**
      * 校验查询条件是否满足条件
      *
@@ -155,6 +172,11 @@ public class QueryArrearsFeeListener extends AbstractServiceApiDataFlowListener
 
     }
 
+    /**
+     * 查询 objIds
+     * @param feeDtos 费用信息
+     * @return objIds信息
+     */
     private String[] getObjIds(List<FeeDto> feeDtos) {
         List<String> objIds = new ArrayList<String>();
         for (FeeDto feeDto : feeDtos) {

UserService/src/main/java/com/java110/user/dao/IOwnerServiceDao.java

@@ -106,4 +106,12 @@ public interface IOwnerServiceDao {
      */
      List<Map> queryOwnersByRoom(Map info) throws DAOException;
 
+    /**
+     * 根据停车位查询业主信息
+     * @param info 查询条件
+     * @return 业主信息
+     * @throws DAOException 异常信息
+     */
+    List<Map> queryOwnersByParkingSpace(Map info) throws DAOException;
+
 }

UserService/src/main/java/com/java110/user/dao/impl/OwnerServiceDaoImpl.java

@@ -185,5 +185,13 @@ public class OwnerServiceDaoImpl extends BaseServiceDao implements IOwnerService
         return businessOwnerInfos;
     }
 
+    @Override
+    public List<Map> queryOwnersByParkingSpace(Map info) throws DAOException {
+        logger.debug("queryOwnersByParkingSpace 入参 info : {}", info);
+
+        List<Map> businessOwnerInfos = sqlSessionTemplate.selectList("ownerServiceDaoImpl.queryOwnersByParkingSpace", info);
+
+        return businessOwnerInfos;    }
+
 
 }

UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

@@ -51,7 +51,7 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
         //调用 小区服务查询 小区成员业主信息
         CommunityMemberDto communityMemberDto = BeanConvertUtil.covertBean(ownerDto, CommunityMemberDto.class);
         communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
-        if(StringUtils.isEmpty(communityMemberDto.getMemberId())&& !StringUtils.isEmpty(ownerDto.getOwnerId())){
+        if (StringUtils.isEmpty(communityMemberDto.getMemberId()) && !StringUtils.isEmpty(ownerDto.getOwnerId())) {
             communityMemberDto.setMemberId(ownerDto.getOwnerId());
         }
         List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto);
@@ -196,13 +196,18 @@ public class OwnerInnerServiceSMOImpl extends BaseServiceSMO implements IOwnerIn
 
 
     @Override
-    public int queryNoEnterRoomOwnerCount(OwnerDto ownerDto) {
+    public int queryNoEnterRoomOwnerCount(@RequestBody OwnerDto ownerDto) {
         return ownerServiceDaoImpl.queryNoEnterRoomOwnerCount(BeanConvertUtil.beanCovertMap(ownerDto));
     }
 
     @Override
-    public List<OwnerDto> queryOwnersByRoom(OwnerDto ownerDto) {
-        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByRoom(BeanConvertUtil.beanCovertMap(ownerDto)),OwnerDto.class);
+    public List<OwnerDto> queryOwnersByRoom(@RequestBody OwnerDto ownerDto) {
+        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
+    }
+
+    @Override
+    public List<OwnerDto> queryOwnersByParkingSpace(@RequestBody OwnerDto ownerDto) {
+        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnersByParkingSpace(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
     }
 
     public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {

WebService/src/main/resources/components/index-arrears/indexArrears.js

@@ -14,10 +14,15 @@
             vc.component._listArrearsData();
         },
         _initEvent:function(){
-
+            vc.on("indexArrears","_listArrearsData",function(){
+                vc.component._listArrearsData();
+            });
         },
         methods:{
             _listArrearsData:function(_page,_row){
+                if(!vc.getCurrentCommunity().hasOwnProperty('communityId')){
+                    return ;
+                }
                 var param = {
                     params:{
                         page:_page,

WebService/src/main/resources/components/index-context/indexContext.js

@@ -17,7 +17,9 @@
             vc.component._queryIndexContextData();
         },
         _initEvent:function(){
-
+            vc.on("indexContext","_queryIndexContextData",function(){
+                vc.component._queryIndexContextData();
+            });
         },
         methods:{
             _queryIndexContextData:function(){

WebService/src/main/resources/components/nav/nav.js

@@ -119,6 +119,11 @@
                                     vm.navCommunityInfo._currentCommunity = vm.navCommunityInfo.communityInfos[0];
                                     vc.setCurrentCommunity(vm.navCommunityInfo._currentCommunity);
                                     vc.setCommunitys(vm.navCommunityInfo.communityInfos);
+
+                                    //对首页做特殊处理，因为首页在加载数据时还没有小区信息 会报错
+
+                                    vc.emit("indexContext","_queryIndexContextData",{});
+                                    vc.emit("indexArrears","_listArrearsData",{});
                                }
                              },function(){
                                 console.log('请求失败处理');

java110-bean/src/main/java/com/java110/dto/OwnerDto.java

@@ -28,6 +28,8 @@ public class OwnerDto extends PageDto implements Serializable {
     private String memberId;
     private String ownerTypeCd;
     private String roomNum;
+    private String psId;
+    private String num;
 
     private String userName;
 
@@ -151,4 +153,20 @@ public void setMemberId(String memberId) {
     public void setRoomNum(String roomNum) {
         this.roomNum = roomNum;
     }
+
+    public String getPsId() {
+        return psId;
+    }
+
+    public void setPsId(String psId) {
+        this.psId = psId;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/owner/IOwnerInnerServiceSMO.java

@@ -88,4 +88,14 @@ public interface IOwnerInnerServiceSMO {
     @RequestMapping(value = "/queryOwnersByRoom", method = RequestMethod.POST)
     List<OwnerDto> queryOwnersByRoom(@RequestBody OwnerDto ownerDto);
 
+
+    /**
+     * 根据停车位查询业主信息
+     *
+     * @param ownerDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryOwnersByParkingSpace", method = RequestMethod.POST)
+    List<OwnerDto> queryOwnersByParkingSpace(@RequestBody OwnerDto ownerDto);
+
 }

java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml

@@ -364,7 +364,7 @@ and t.member_id= #{memberId}
             AND r.`room_id` = #{roomId}
         </if>
         <if test="roomIds != null ">
-            and t.room_id in
+            and r.room_id in
             <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
@@ -374,5 +374,27 @@ and t.member_id= #{memberId}
         AND t.`status_cd` = '0'
     </select>
 
+    <!-- 根据停车位查询 -->
+    <select id="queryOwnersByParkingSpace" parameterType="Map" resultType="Map">
+
+        select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
+        t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd
+        from p_parking_space ps , owner_car oc,building_owner t
+        where ps.ps_id = oc.ps_id
+        and oc.owner_id = t.owner_id
+        AND oc.`status_cd` = '0'
+        AND ps.`status_cd` = '0'
+        AND t.`status_cd` = '0'
+        <if test="psIds != null ">
+            and ps.ps_id in
+            <foreach collection="psIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="psId !=null and psId != ''">
+            AND ps.`ps_id` = #{psId}
+        </if>
+    </select>
+
 
 </mapper>