优化代码

java110

2020-09-23 888aa95ca12e9ef66f4d4a3b9d44903a9887dd59

优化代码

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

@@ -14,8 +14,10 @@
 **/
public class RoomDto extends PageDto implements Serializable {

    public static final String STATE_SELL = "2001";
    public static final String STATE_FREE = "2002";
    public static final String STATE_SELL = "2001"; // 已入住
    public static final String STATE_FREE = "2002"; //未入住
    public static final String STATE_DELIVERY = "2003";//已交房
    public static final String STATE_RENOVATION = "2005";//已装修


    private String feeCoefficient;
@@ -43,6 +45,7 @@


    private String state;
    private String[] states;
    private String stateName;
    private String unitNum;

@@ -280,4 +283,12 @@
    public void setStateName(String stateName) {
        this.stateName = stateName;
    }

    public String[] getStates() {
        return states;
    }

    public void setStates(String[] states) {
        this.states = states;
    }
}

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

@@ -337,6 +337,12 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="states != null">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
@@ -665,6 +671,12 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="states != null">
            and t.state in
            <foreach collection="states" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>

 service-api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java

@@ -82,8 +82,12 @@
        reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
        //判断收费范围
        RoomDto roomDto = new RoomDto();
        if (reqJson.containsKey("roomState") && "2001".equals(reqJson.getString("roomState"))) {
            roomDto.setState("2001");
        if (reqJson.containsKey("roomState") && RoomDto.STATE_SELL.equals(reqJson.getString("roomState"))) {
            roomDto.setState(RoomDto.STATE_SELL);
        }
        if (reqJson.containsKey("roomState") && reqJson.getString("roomState").contains(",")) {
            String states = reqJson.getString("roomState");
            roomDto.setStates(states.split(","));
        }
        if ("1000".equals(reqJson.getString("locationTypeCd"))) {//小区

@@ -161,7 +165,6 @@

        context.setResponseEntity(responseEntity);
    }



    @Override

 service-api/src/main/java/com/java110/api/listener/room/UpdateRoomListener.java

@@ -72,7 +72,9 @@
        if (!"2001".equals(reqJson.getString("state"))
                && !"2002".equals(reqJson.getString("state"))
                && !"2003".equals(reqJson.getString("state"))
                && !"2004".equals(reqJson.getString("state"))) {
                && !"2004".equals(reqJson.getString("state"))
                && !"2005".equals(reqJson.getString("state"))
        ) {
            throw new IllegalArgumentException("不是有效房屋状态 传入数据错误");
        }


 service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java

@@ -445,7 +445,9 @@
        if (!"2001".equals(reqJson.getString("state"))
                && !"2002".equals(reqJson.getString("state"))
                && !"2003".equals(reqJson.getString("state"))
                && !"2004".equals(reqJson.getString("state"))) {
                && !"2004".equals(reqJson.getString("state"))
                && !"2005".equals(reqJson.getString("state"))
        ) {
            throw new IllegalArgumentException("不是有效房屋状态 传入数据错误");
        }