优化代码

wuxw

2025-03-20 3b6f49f1123f68bb6d1424070600158f85b66a30

优化代码

 java110-bean/src/main/java/com/java110/dto/account/AccountDto.java

@@ -37,6 +37,8 @@
    private String acctName;
    private String objType;
    private String partId;

    private String[] communityIds;
    private String hasMoney; // 1 标识有
    private String link;
    private String idCard;
@@ -214,4 +216,12 @@
    public void setRoomName(String roomName) {
        this.roomName = roomName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/complaint/ComplaintDto.java

@@ -36,6 +36,7 @@
    private String state;
    private String stateName;
    private String communityId;
    private String[] communityIds;

    private String taskId;

@@ -303,4 +304,12 @@
    public void setStaffs(List<ComplaintTypeUserDto> staffs) {
        this.staffs = staffs;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -61,6 +61,7 @@
    private String endTime;
    private String curTime;
    private String communityId;
    private String[] communityIds;
    private String feeTypeCdName;
    private String feeFlagName;

@@ -447,4 +448,12 @@
    public void setState(String state) {
        this.state = state;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/floor/FloorDto.java

@@ -26,6 +26,7 @@
    private String[] floorIds;

    private String communityId;
    private String[] communityIds;

    private String communityName;

@@ -166,4 +167,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/inspection/InspectionPlanDto.java

@@ -40,6 +40,7 @@
    private String inspectionPlanId;
    private String state;
    private String communityId;
    private String[] communityIds;

    private String communityName;
    private String staffId;
@@ -327,4 +328,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/inspection/InspectionTaskDto.java

@@ -31,6 +31,7 @@
    private String inspectionPlanName;
    private String planUserName;
    private String communityId;
    private String[] communityIds;
    private String actUserId;
    private String taskId;
    private String state;
@@ -307,4 +308,12 @@
    public void setInspectionRouteId(String inspectionRouteId) {
        this.inspectionRouteId = inspectionRouteId;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/machine/EquipmentAccountDto.java

@@ -29,6 +29,7 @@
    private String model;
    private String state;
    private String communityId;
    private String[] communityIds;
    private String brand;
    private String machineTypeCd;
    private String machineCode;
@@ -369,4 +370,12 @@
    public void setMachineNameLike(String machineNameLike) {
        this.machineNameLike = machineNameLike;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/machine/MachineTypeDto.java

@@ -20,6 +20,7 @@
    private String parentTypeId;
    private String machineTypeCd;
    private String communityId;
    private String[] communityIds;
    private String communityName;
    private String isEnable;
    private String machineTypeCode;
@@ -154,4 +155,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/owner/OwnerAppUserDto.java

@@ -33,6 +33,7 @@
    private String stateName;
    private String appUserId;
    private String communityId;
    private String[] communityIds;
    private String appTypeCd;
    private String memberId;
    private String ownerId;
@@ -352,4 +353,12 @@
    public void setOwnerTypeCdName(String ownerTypeCdName) {
        this.ownerTypeCdName = ownerTypeCdName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -63,6 +63,7 @@
    private List<String> states;
    private String stateName;
    private String communityId;
    private String[] communityIds;
    private String communityName;
    private String roomId;
    private String[] roomIds;
@@ -589,4 +590,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/repair/RepairSettingDto.java

@@ -21,6 +21,7 @@
    private String repairType;
    private String remark;
    private String communityId;
    private String[] communityIds;
    private String communityName;
    private String repairWay;
    private String repairWayName;
@@ -189,4 +190,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/reportFee/ReportFeeMonthStatisticsDto.java

@@ -35,6 +35,7 @@
    private String oweAmount;
    private String curOweAmount;
    private String communityId;
    private String[] communityIds;
    private String feeCreateTime;
    private String feeStartTime;
    private String feeEndTime;
@@ -1230,4 +1231,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-bean/src/main/java/com/java110/dto/work/WorkTaskDto.java

@@ -27,6 +27,7 @@

    private String finishTime;
    private String communityId;
    private String[] communityIds;
    private String communityName;
    private String storeId;
    private String taskId;
@@ -242,4 +243,12 @@
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }

    public String[] getCommunityIds() {
        return communityIds;
    }

    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }
}

 java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml

@@ -150,6 +150,12 @@
        <if test="partId !=null and partId != ''">
            and t.part_id= #{partId}
        </if>
        <if test="communityIds !=null ">
            and t.part_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="link !=null and link != ''">
            and t.link= #{link}
        </if>
@@ -253,6 +259,12 @@
        <if test="partId !=null and partId != ''">
            and t.part_id= #{partId}
        </if>
        <if test="communityIds !=null ">
            and t.part_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="link !=null and link != ''">
            and t.link= #{link}
        </if>

 java110-db/src/main/resources/mapper/common/EquipmentAccountV1ServiceDaoImplMapper.xml

@@ -280,6 +280,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="brand !=null and brand != ''">
            and t.brand= #{brand}
        </if>
@@ -501,6 +507,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="brand !=null and brand != ''">
            and t.brand= #{brand}
        </if>

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

@@ -228,6 +228,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="beforeTime !=null and beforeTime != ''">
            and t.before_time = #{beforeTime}
        </if>
@@ -288,6 +294,12 @@
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="beforeTime !=null and beforeTime != ''">
            and t.before_time = #{beforeTime}
@@ -371,6 +383,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
@@ -432,6 +450,12 @@
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="beforeTime !=null and beforeTime != ''">
            and t.before_time = #{beforeTime}
@@ -513,6 +537,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}

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

@@ -184,6 +184,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
@@ -331,6 +337,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>

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

@@ -212,6 +212,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.create_time &gt;= #{startTime}
        </if>
@@ -375,6 +381,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.create_time &gt;= #{startTime}
        </if>

 java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -199,6 +199,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
@@ -344,6 +350,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>

 java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml

@@ -59,6 +59,13 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
@@ -179,6 +186,13 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>

 java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1449,6 +1449,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.cur_month_time &gt;= #{startTime}
        </if>
@@ -1500,6 +1506,12 @@
        and t.detail_id = '-1'
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.cur_month_time &gt;= #{startTime}
@@ -1619,6 +1631,13 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="primeRate != null and primeRate != ''">
            and t.prime_rate = #{primeRate}
        </if>
@@ -1697,6 +1716,13 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="primeRate != null and primeRate != ''">
            and t.prime_rate = #{primeRate}
        </if>

 java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml

@@ -63,6 +63,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.create_time &gt;= #{startTime}
        </if>
@@ -175,6 +181,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="startTime !=null and startTime != ''">
            and t.create_time &gt;= #{startTime}
        </if>

 java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -176,6 +176,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" open="(" close=")"
                     separator="," item="item">#{item}
            </foreach>
        </if>
        <if test="appTypeCd !=null and appTypeCd != ''">
            and t.app_type_cd= #{appTypeCd}
        </if>
@@ -303,6 +309,12 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="communityIds !=null">
            and t.community_id in
            <foreach collection="communityIds" open="(" close=")"
                     separator="," item="item">#{item}
            </foreach>
        </if>
        <if test="appTypeCd !=null and appTypeCd != ''">
            and t.app_type_cd= #{appTypeCd}
        </if>

 service-acct/src/main/java/com/java110/acct/cmd/account/QueryAdminOwnerAccountCmd.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.acct.bmo.account.IGetAccountBMO;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -17,6 +18,7 @@
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -52,6 +54,9 @@
    @Autowired
    private IGetAccountBMO getAccountBMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -63,6 +68,14 @@

        AccountDto accountDto = BeanConvertUtil.covertBean(reqJson, AccountDto.class);

        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            accountDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        hasFeeId(reqJson, accountDto);
        String ownerId = reqJson.getString("ownerId");
        if (!StringUtil.isEmpty(ownerId)) {

 service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ListAdminEquipmentAccountCmd.java

@@ -17,6 +17,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -24,10 +25,12 @@
import com.java110.dto.machine.MachineTypeDto;
import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +62,9 @@
    @Autowired
    private IMachineTypeV1InnerServiceSMO machineTypeV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
@@ -69,6 +75,13 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        EquipmentAccountDto equipmentAccountDto = BeanConvertUtil.covertBean(reqJson, EquipmentAccountDto.class);
        String staffId = CmdContextUtils.getUserId(cmdDataFlowContext);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            equipmentAccountDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        int count = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccountsCount(equipmentAccountDto);


 service-common/src/main/java/com/java110/common/dao/impl/EquipmentAccountV1ServiceDaoImpl.java

@@ -69,9 +69,9 @@
    public List<Map> getEquipmentAccountInfo(Map info) throws DAOException {
        logger.debug("查询 getEquipmentAccountInfo 入参 info : {}",info);

        List<Map> businessEquipmentAccountInfos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.getEquipmentAccountInfo",info);
        List<Map> infos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.getEquipmentAccountInfo",info);

        return businessEquipmentAccountInfos;
        return infos;
    }


@@ -98,12 +98,12 @@
    public int queryEquipmentAccountsCount(Map info) {
        logger.debug("查询 queryEquipmentAccountsCount 入参 info : {}",info);

        List<Map> businessEquipmentAccountInfos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.queryEquipmentAccountsCount", info);
        if (businessEquipmentAccountInfos.size() < 1) {
        List<Map> infos = sqlSessionTemplate.selectList("equipmentAccountV1ServiceDaoImpl.queryEquipmentAccountsCount", info);
        if (infos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessEquipmentAccountInfos.get(0).get("count").toString());
        return Integer.parseInt(infos.get(0).get("count").toString());
    }



 service-community/src/main/java/com/java110/community/cmd/inspectionPlan/ListAdminInspectionPlansCmd.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -14,6 +15,7 @@
import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO;
import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -44,6 +46,10 @@
    @Autowired
    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;


    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        super.validatePageInfo(reqJson);
@@ -53,7 +59,13 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        InspectionPlanDto inspectionPlanDto = BeanConvertUtil.covertBean(reqJson, InspectionPlanDto.class);
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            inspectionPlanDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }
        int count = inspectionPlanV1InnerServiceSMOImpl.queryInspectionPlansCount(inspectionPlanDto);

        List<InspectionPlanDto> inspectionPlans = null;

 service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListAdminInspectionTasksCmd.java

@@ -17,6 +17,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -25,6 +26,7 @@
import com.java110.dto.repair.RepairDto;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -62,6 +64,9 @@
    @Autowired
    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
@@ -72,7 +77,13 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);
        String staffId = CmdContextUtils.getUserId(cmdDataFlowContext);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            inspectionTaskDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }
        if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
            inspectionTaskDto.setStates(reqJson.getString("moreState").split(","));
        }

 service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListAdminOwnerRepairsCmd.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -15,6 +16,7 @@
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.exception.CmdException;
@@ -51,6 +53,9 @@
    @Autowired
    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        super.validatePageInfo(reqJson);
@@ -60,6 +65,15 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);

        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            ownerRepairDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        //todo 处理时间
        ifHasTime(ownerRepairDto);
        if (!StringUtil.isEmpty(ownerRepairDto.getRoomId()) && ownerRepairDto.getRoomId().contains(",")) {

 service-community/src/main/java/com/java110/community/cmd/room/QueryAdminRoomCmd.java

@@ -51,6 +51,7 @@

        RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);


        // 计算根据业主查询
        computeOwnerRoomIds(reqJson, roomDto);


 service-community/src/main/java/com/java110/community/dao/impl/InspectionPlanV1ServiceDaoImpl.java

@@ -21,6 +21,7 @@
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.community.dao.IInspectionPlanV1ServiceDao;
import com.java110.utils.util.ListUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -100,12 +101,12 @@
    public int queryInspectionPlansCount(Map info) {
        logger.debug("查询 queryInspectionPlansCount 入参 info : {}",info);

        List<Map> businessInspectionPlanInfos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.queryInspectionPlansCount", info);
        if (businessInspectionPlanInfos.size() < 1) {
        List<Map> infos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.queryInspectionPlansCount", info);
        if (ListUtil.isNull(infos)) {
            return 0;
        }

        return Integer.parseInt(businessInspectionPlanInfos.get(0).get("count").toString());
        return Integer.parseInt(infos.get(0).get("count").toString());
    }

    /**

 service-community/src/main/java/com/java110/community/dao/impl/InspectionTaskServiceDaoImpl.java

@@ -54,9 +54,9 @@

        logger.debug("查询活动信息 入参 info : {}", info);

        List<Map> businessInspectionTaskInfos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.getBusinessInspectionTaskInfo", info);
        List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.getBusinessInspectionTaskInfo", info);

        return businessInspectionTaskInfos;
        return infos;
    }


@@ -89,9 +89,9 @@
    public List<Map> getInspectionTaskInfo(Map info) throws DAOException {
        logger.debug("查询活动信息 入参 info : {}", info);

        List<Map> businessInspectionTaskInfos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.getInspectionTaskInfo", info);
        List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.getInspectionTaskInfo", info);

        return businessInspectionTaskInfos;
        return infos;
    }


@@ -122,12 +122,12 @@
    public int queryInspectionTasksCount(Map info) {
        logger.debug("查询活动数据 入参 info : {}", info);

        List<Map> businessInspectionTaskInfos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.queryInspectionTasksCount", info);
        if (businessInspectionTaskInfos.size() < 1) {
        List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskServiceDaoImpl.queryInspectionTasksCount", info);
        if (infos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessInspectionTaskInfos.get(0).get("count").toString());
        return Integer.parseInt(infos.get(0).get("count").toString());
    }

    /**

 service-fee/src/main/java/com/java110/fee/cmd/feeConfig/QueryAdminFeeConfigsCmd.java

@@ -2,15 +2,18 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.PageDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
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 com.java110.vo.api.feeConfig.ApiFeeConfigDataVo;
import com.java110.vo.api.feeConfig.ApiFeeConfigVo;
@@ -27,6 +30,9 @@
    @Autowired
    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        super.validatePageInfo(reqJson);
@@ -36,6 +42,15 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        FeeConfigDto feeConfigDto = BeanConvertUtil.covertBean(reqJson, FeeConfigDto.class);

        String staffId = CmdContextUtils.getUserId(cmdDataFlowContext);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            feeConfigDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        if (!StringUtil.isEmpty(reqJson.getString("isFlag")) && reqJson.getString("isFlag").equals("0")) {
            feeConfigDto.setPage(PageDto.DEFAULT_PAGE);
        }

 service-fee/src/main/java/com/java110/fee/dao/impl/FeeConfigServiceDaoImpl.java

@@ -51,8 +51,8 @@
    @Override
    public List<Map> getBusinessFeeConfigInfo(Map info) throws DAOException {
        logger.debug("查询费用配置信息 入参 info : {}", info);
        List<Map> businessFeeConfigInfos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.getBusinessFeeConfigInfo", info);
        return businessFeeConfigInfos;
        List<Map> infos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.getBusinessFeeConfigInfo", info);
        return infos;
    }


@@ -111,11 +111,11 @@
    @Override
    public int queryFeeConfigsCount(Map info) {
        logger.debug("查询费用配置数据 入参 info : {}", info);
        List<Map> businessFeeConfigInfos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.queryFeeConfigsCount", info);
        if (businessFeeConfigInfos.size() < 1) {
        List<Map> infos = sqlSessionTemplate.selectList("feeConfigServiceDaoImpl.queryFeeConfigsCount", info);
        if (infos.size() < 1) {
            return 0;
        }
        return Integer.parseInt(businessFeeConfigInfos.get(0).get("count").toString());
        return Integer.parseInt(infos.get(0).get("count").toString());
    }

    @Override

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminAccessControlCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -52,6 +57,16 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {

        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }

        ResultVo resultVo = sendIotImpl.postAdmin("listAdminAccessControlBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminAccessControlInoutCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,10 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -51,6 +57,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminAccessControlInoutBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminBarrierCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -52,6 +57,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminBarrierBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminCarInoutDetailCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -51,6 +56,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminCarInoutDetailBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminChargeMachineCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,10 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -51,6 +57,15 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }

        ResultVo resultVo = sendIotImpl.postAdmin("listAdminChargeMachineBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminChargeMachineOrderCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -52,6 +57,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminChargeMachineOrderBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminMeterChargeCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,9 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -51,6 +56,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminMeterChargeBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-job/src/main/java/com/java110/job/cmd/iot/ListAdminMeterMachineCmd.java

@@ -7,11 +7,13 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.job.adapt.hcIot.http.ISendIot;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

@@ -26,6 +28,10 @@

    @Autowired
    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -51,6 +57,14 @@

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            String communityIdStr = String.join(", ", communityIds);
            reqJson.put("communityIdStr",communityIdStr);
        }
        ResultVo resultVo = sendIotImpl.postAdmin("listAdminMeterMachineBmoImpl", reqJson);

        if (resultVo.getCode() != ResultVo.CODE_OK) {

 service-oa/src/main/java/com/java110/oa/cmd/work/ListAdminWorkTaskCmd.java

@@ -26,6 +26,7 @@
import com.java110.dto.work.WorkTaskDto;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
@@ -60,6 +61,10 @@
    @Autowired
    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;


    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
@@ -72,6 +77,14 @@
        WorkTaskDto workTaskDto = BeanConvertUtil.covertBean(reqJson, WorkTaskDto.class);
        workTaskDto.setStoreId("");

        String staffId = CmdContextUtils.getUserId(cmdDataFlowContext);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            workTaskDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        int count = workTaskV1InnerServiceSMOImpl.queryWorkTasksCount(workTaskDto);

        List<WorkTaskDto> workTaskDtos = null;

 service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityFeeTypeTreeCmd.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -13,6 +14,7 @@
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
@@ -34,6 +36,9 @@
    @Autowired
    private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        // must be administrator
@@ -46,7 +51,13 @@
        List<CommunityDto> communityDtos = null;

        CommunityDto communityDto = new CommunityDto();
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            communityDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        communityDtos = communityV1InnerServiceSMOImpl.queryCommunitys(communityDto);
        JSONArray communitys = new JSONArray();

 service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityFloorTreeCmd.java

@@ -3,11 +3,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.floor.FloorDto;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
@@ -26,6 +28,8 @@
    @Autowired
    private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        // must be administrator
@@ -38,7 +42,13 @@
        List<FloorDto> floorDtos = null;

        FloorDto floorDto = new FloorDto();
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            floorDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        floorDtos = reportCommunityInnerServiceSMOImpl.queryCommunityFloorTree(floorDto);
        JSONArray communitys = new JSONArray();

 service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityInspectionTreeCmd.java

@@ -3,12 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.inspection.InspectionPlanDto;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
@@ -30,6 +32,9 @@
    @Autowired
    private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        // must be administrator
@@ -43,6 +48,13 @@

        InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();

        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            inspectionPlanDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        inspectionPlanDtos = reportCommunityInnerServiceSMOImpl.queryCommunityInspectionTree(inspectionPlanDto);
        JSONArray communitys = new JSONArray();

 service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityMachineTypeTreeCmd.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -11,6 +12,7 @@
import com.java110.dto.org.OrgDto;
import com.java110.dto.unit.UnitDto;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
@@ -29,6 +31,9 @@
    @Autowired
    private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validateAdmin(context);
@@ -42,6 +47,15 @@

        MachineTypeDto machineTypeDto = new MachineTypeDto();

        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            machineTypeDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }


        machineTypeDtos = reportCommunityInnerServiceSMOImpl.queryCommunityMachineTypeTree(machineTypeDto);
        JSONArray communitys = new JSONArray();
        if (ListUtil.isNull(machineTypeDtos)) {

 service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityRepairTreeCmd.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -11,6 +12,7 @@
import com.java110.dto.repair.RepairSettingDto;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
@@ -32,6 +34,10 @@
    @Autowired
    private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;


    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        // must be administrator
@@ -44,7 +50,13 @@
        List<RepairSettingDto> repairSettingDtos = null;

        RepairSettingDto repairSettingDto = new RepairSettingDto();
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            repairSettingDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        repairSettingDtos = reportCommunityInnerServiceSMOImpl.queryCommunityRepairTree(repairSettingDto);
        JSONArray communitys = new JSONArray();

 service-report/src/main/java/com/java110/report/cmd/fee/QueryAdminOweFeeDetailCmd.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -10,6 +11,7 @@
import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.report.bmo.reportFeeMonthStatistics.impl.GetReportFeeMonthStatisticsBMOImpl;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
@@ -36,6 +38,9 @@
    @Autowired
    private ICommunityV1InnerServiceSMO communityV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validateAdmin(context);
@@ -45,6 +50,13 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthStatisticsDto.class);
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            reportFeeMonthStatisticsDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }
        int count = reportFeeMonthStatisticsInnerServiceSMOImpl.queryOweFeeDetailCount(reportFeeMonthStatisticsDto);
        List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = null;
        if (count > 0) {

 service-report/src/main/java/com/java110/report/cmd/fee/QueryAdminPayFeeDetailCmd.java

@@ -2,14 +2,17 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,11 +20,16 @@
import org.springframework.http.ResponseEntity;

import java.text.ParseException;
import java.util.List;

@Java110Cmd(serviceCode = "fee.queryAdminPayFeeDetail")
public class QueryAdminPayFeeDetailCmd extends Cmd {
    @Autowired
    private IQueryPayFeeDetailInnerServiceSMO queryPayFeeDetailInnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        super.validatePageInfo(reqJson);
@@ -39,6 +47,13 @@

        reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
        reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + "");
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            reportFeeMonthStatisticsDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }


        ResultVo resultVo = queryPayFeeDetailInnerServiceSMOImpl.query(reportFeeMonthStatisticsDto);

 service-store/src/main/java/com/java110/store/cmd/complaint/ListAdminComplaintsCmd.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -14,6 +15,7 @@
import com.java110.intf.store.IComplaintTypeUserV1InnerServiceSMO;
import com.java110.intf.store.IComplaintV1InnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -48,6 +50,8 @@
    @Autowired
    private IComplaintTypeUserV1InnerServiceSMO complaintTypeUserV1InnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -59,6 +63,14 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {

        ComplaintDto complaintDto = BeanConvertUtil.covertBean(reqJson, ComplaintDto.class);
        String staffId = CmdContextUtils.getUserId(context);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            complaintDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        complaintDto.setStoreId("");
        int count = complaintV1InnerServiceSMOImpl.queryComplaintsCount(complaintDto);
        List<ComplaintDto> complaintDtos = null;

 service-user/src/main/java/com/java110/user/cmd/owner/ListAdminAppUserOwnersCmd.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -9,9 +10,11 @@
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.intf.user.IStaffCommunityV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
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 com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,10 @@
    @Autowired
    private IMenuInnerServiceSMO menuInnerServiceSMOImpl;

    @Autowired
    private IStaffCommunityV1InnerServiceSMO staffCommunityV1InnerServiceSMOImpl;


    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

@@ -40,8 +47,16 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        //获取当前用户id
        String userId = reqJson.getString("userId");
        OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);

        String staffId = CmdContextUtils.getUserId(cmdDataFlowContext);

        List<String> communityIds = staffCommunityV1InnerServiceSMOImpl.queryStaffCommunityIds(staffId);

        if (!ListUtil.isNull(communityIds)) {
            ownerAppUserDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        }

        ownerAppUserDto.setUserId(reqJson.getString("systemUserId"));
        int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
        int row = reqJson.getIntValue("row");