优化代码

java110

2021-01-11 c351e59bb187237aec9d86183f17214dd89054fd

优化代码

 docs/document/services/tempCarFeeConfigAttr/DeleteTempCarFeeConfigAttrInfo.md

File was deleted

 docs/document/services/tempCarFeeConfigAttr/SaveTempCarFeeConfigAttrInfo.md

File was deleted

 docs/document/services/tempCarFeeConfigAttr/UpdateTempCarFeeConfigAttrInfo.md

File was deleted

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

@@ -18,6 +18,8 @@
    public static final String STATE_FREE = "2002"; //未入住
    public static final String STATE_DELIVERY = "2003";//已交房
    public static final String STATE_RENOVATION = "2005";//已装修
    public static final String ROOM_TYPE_ROOM = "1010301";//普通房屋
    public static final String ROOM_TYPE_SHOPS = "2020602";//商铺


    private String feeCoefficient;
@@ -42,6 +44,7 @@
    private String ownerName;
    private String idCard;
    private String link;
    private String roomType;


    private String state;
@@ -291,4 +294,12 @@
    public void setStates(String[] states) {
        this.states = states;
    }

    public String getRoomType() {
        return roomType;
    }

    public void setRoomType(String roomType) {
        this.roomType = roomType;
    }
}

 java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -25,6 +25,7 @@
    private String remark;
    private String state;
    private String communityId;
    private String roomType;


    public String getRoomId() {
@@ -84,7 +85,6 @@
    }



    public String getUserId() {
        return userId;
    }
@@ -124,4 +124,12 @@
    public void setFeeCoefficient(String feeCoefficient) {
        this.feeCoefficient = feeCoefficient;
    }

    public String getRoomType() {
        return roomType;
    }

    public void setRoomType(String roomType) {
        this.roomType = roomType;
    }
}

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

@@ -7,20 +7,22 @@
    <!-- 保存小区房屋信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessRoomInfo" parameterType="Map">
        insert into business_building_room(
        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
        room_type
        ) values (
        #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
        #{communityId}
        #{communityId},#{roomType}
        )
    </insert>


    <!-- 查询小区房屋信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id
        userId,t.room_id,t.room_id
        roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.operate,t.room_num,t.room_num
        roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
        communityId
        communityId,t.room_type,t.room_type roomType
        from business_building_room t
        where 1 =1
        <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -62,6 +64,9 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
@@ -72,9 +77,11 @@
    <!-- 保存小区房屋信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveRoomInfoInstance" parameterType="Map">
        insert into building_room(
        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
        room_type
        ) select
        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id
        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
        t.room_type
        from business_building_room t where 1=1
        <if test="feeCoefficient !=null and feeCoefficient != ''">
            and t.fee_coefficient= #{feeCoefficient}
@@ -113,6 +120,9 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
@@ -125,7 +135,7 @@
        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
        builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
        bId,t.apartment,t.state,t.community_id,t.community_id communityId
        bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType
        from building_room t
        where 1 =1
        <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -173,6 +183,9 @@
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -282,6 +295,9 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>


    </select>
@@ -292,7 +308,8 @@
        select count(1) count
        FROM building_room t
        inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
        '0'
        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -338,6 +355,9 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="states != null">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -365,7 +385,8 @@
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
        '0'
        LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -410,6 +431,9 @@
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -426,7 +450,8 @@
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
        '0'
        LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -471,6 +496,9 @@
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -482,13 +510,15 @@

    <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
    <select id="getRoomInfoWithOutSellByCommunityId" parameterType="Map" resultType="Map">
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
        '0'
        LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -533,6 +563,9 @@
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -546,13 +579,15 @@

    <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
    <select id="getRoomInfoWithSellByCommunityId" parameterType="Map" resultType="Map">
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
        '0'
        LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -597,6 +632,9 @@
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -611,13 +649,16 @@

    <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
    <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name stateName
        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
        stateName
        FROM building_room t
        inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
        '0'
        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
        WHERE 1 =1
        AND t.`community_id` = #{communityId}
@@ -672,6 +713,9 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="states != null">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -691,10 +735,11 @@
    <!-- 根据业主查询房屋信息 -->
    <select id="getRoomInfoByOwner" parameterType="Map" resultType="Map">
        SELECT
        t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
        t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
        unitNum,f.`floor_num` floorNum
        unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type
        FROM
        building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
        WHERE
@@ -707,6 +752,9 @@
        AND t.`status_cd` = '0'
        AND bo.`status_cd` = '0'
        AND bo.`owner_type_cd` = '1001'
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and borr.`status_cd` = #{statusCd}
        </if>
@@ -748,13 +796,16 @@

    <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
    <select id="getRoomInfos" parameterType="Map" resultType="Map">
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
        statusCd,t.remark,t.user_id,
        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
        t.room_type roomType,t.room_type
        FROM
        building_room t
        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
        '0'
        WHERE t.status_cd= '0'
        <if test="floorId !=null and floorId != ''">
            and f.`floor_id`= #{floorId}
@@ -783,6 +834,9 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="roomType !=null and roomType != ''">
            and t.room_type= #{roomType}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>

 service-community/src/main/java/com/java110/community/listener/room/AbstractRoomBusinessServiceDataFlowListener.java

@@ -1,12 +1,12 @@
package com.java110.community.listener.room;

import com.alibaba.fastjson.JSONObject;
import com.java110.community.dao.IRoomServiceDao;
import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
import com.java110.entity.center.Business;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.community.dao.IRoomServiceDao;
import com.java110.entity.center.Business;
import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -19,7 +19,7 @@
 * Created by wuxw on 2018/7/4.
 */
public abstract class AbstractRoomBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
    private  static Logger logger = LoggerFactory.getLogger(AbstractRoomBusinessServiceDataFlowListener.class);
    private static Logger logger = LoggerFactory.getLogger(AbstractRoomBusinessServiceDataFlowListener.class);


    /**
@@ -50,6 +50,7 @@
        businessRoomInfo.put("unitId", businessRoomInfo.get("unit_id"));
        businessRoomInfo.put("apartment", businessRoomInfo.get("apartment"));
        businessRoomInfo.put("communityId", businessRoomInfo.get("community_id"));
        businessRoomInfo.put("roomType", businessRoomInfo.get("room_type"));
        businessRoomInfo.remove("bId");
        businessRoomInfo.put("statusCd", statusCd);
    }
@@ -60,7 +61,7 @@
     *
     * @param businessRoom 小区房屋信息
     */
    protected Map<String,String> autoSaveDelBusinessRoom(Business business, JSONObject businessRoom) {
    protected Map<String, String> autoSaveDelBusinessRoom(Business business, JSONObject businessRoom) {
//自动插入DEL
        Map info = new HashMap();
        info.put("roomId", businessRoom.getString("roomId"));
@@ -87,6 +88,7 @@
        currentRoomInfo.put("unitId", currentRoomInfo.get("unit_id"));
        currentRoomInfo.put("apartment", currentRoomInfo.get("apartment"));
        currentRoomInfo.put("communityId", currentRoomInfo.get("community_id"));
        currentRoomInfo.put("roomType", currentRoomInfo.get("room_type"));

        currentRoomInfo.put("operate", StatusConstant.OPERATE_DEL);
        getRoomServiceDaoImpl().saveBusinessRoomInfo(currentRoomInfo);