优化单元查询功能

java110

2022-03-04 0d92e6ae6c44d79632ea7d79e193dd169f0fe1b3

优化单元查询功能

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

@@ -34,6 +34,7 @@
     * 名称
     */
    private String floorId;
    private String floorNum;

    private String remark;
    private String layerCount;
@@ -151,4 +152,12 @@
    public void setUnitArea(String unitArea) {
        this.unitArea = unitArea;
    }

    public String getFloorNum() {
        return floorNum;
    }

    public void setFloorNum(String floorNum) {
        this.floorNum = floorNum;
    }
}

 java110-bean/src/main/java/com/java110/vo/api/ApiUnitVo.java

@@ -18,6 +18,9 @@
    //小区楼ID
    private String floorId;


    private String floorNum;

    //单元编号
    private String unitNum;

@@ -110,4 +113,12 @@
    public void setUnitArea(String unitArea) {
        this.unitArea = unitArea;
    }

    public String getFloorNum() {
        return floorNum;
    }

    public void setFloorNum(String floorNum) {
        this.floorNum = floorNum;
    }
}

 java110-db/src/main/resources/mapper/community/UnitServiceDaoImplMapper.xml

@@ -93,16 +93,12 @@
    <select id="getUnitInfo" parameterType="Map" resultType="Map">
        select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
        bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea
        bId,t.user_id,t.user_id userId,t.unit_area,t.unit_area unitArea,ff.floor_num floorNum
        from building_unit t
        <if test="communityId!=null and communityId != ''">
            ,f_floor ff
        </if>
        left join f_floor ff on t.`floor_id` = ff.`floor_id` and ff.status_cd = '0'
        where 1 =1
        <if test="communityId!=null and communityId != ''">
            and t.`floor_id` = ff.`floor_id`
            AND ff.community_id = #{communityId}
            and ff.status_cd = '0'
        </if>
        <if test="floorId !=null and floorId != ''">
            and t.floor_id= #{floorId}

 service-api/src/main/java/com/java110/api/listener/unit/QueryUnitsListener.java

File was deleted

 service-community/src/main/java/com/java110/community/cmd/unit/QueryUnitsCmd.java

New file
@@ -0,0 +1,53 @@
package com.java110.community.cmd.unit;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.FloorDto;
import com.java110.dto.UnitDto;
import com.java110.intf.community.IFloorInnerServiceSMO;
import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.ApiUnitVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.util.List;

@Java110Cmd(serviceCode = "unit.queryUnits")
public class QueryUnitsCmd extends AbstractServiceCmdListener {
    @Autowired
    private IUnitInnerServiceSMO unitInnerServiceSMOImpl;

    @Autowired
    private IFloorInnerServiceSMO floorInnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
        //Assert.jsonObjectHaveKey(reqJson, "floorId", "请求中未包含floorId信息");
        //校验小区楼ID和小区是否有对应关系
        int total = floorInnerServiceSMOImpl.queryFloorsCount(BeanConvertUtil.covertBean(reqJson, FloorDto.class));

        if (total < 1) {
            throw new IllegalArgumentException("传入小区楼ID不是该小区的楼");
        }
    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        UnitDto unitDto = BeanConvertUtil.covertBean(reqJson, UnitDto.class);

        List<UnitDto> unitDtoList = unitInnerServiceSMOImpl.queryUnits(unitDto);

        List<ApiUnitVo> apiUnitVos = BeanConvertUtil.covertBeanList(unitDtoList, ApiUnitVo.class);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiUnitVos), HttpStatus.OK);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }
}