java110
2020-05-28 f7b32b8f0143ea03f81ff5a54a5fd1fd208b921b
优化完成巡检计划
61个文件已修改
6个文件已添加
2628 ■■■■■ 已修改文件
Api/src/main/java/com/java110/api/bmo/community/ICommunityBMO.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/complaint/IComplaintBMO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/complaint/impl/ComplaintBMOImpl.java 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/fee/IFeeBMO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/floor/IFloorBMO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/inspection/IInspectionBMO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/community/DeleteCommunityListener.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/community/ListAuditEnterCommunitysListener.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/community/UpdateCommunityListener.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/complaint/AuditComplaintListener.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/complaint/DeleteComplaintListener.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/complaint/SaveComplaintListener.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/complaint/UpdateComplaintListener.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/DeleteFeeConfigListener.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/DeleteFeeListener.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/SaveFeeConfigListener.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/fee/UpdateFeeConfigListener.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/floor/DeleteFloorListener.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/floor/EditFloorListener.java 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/floor/SaveFloorListener.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/floor/AbstractFloorBusinessServiceDataFlowListener.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/floor/DeleteFloorInfoListener.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/floor/SaveFloorInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/floor/UpdateFloorInfoListener.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/AbstractInspectionPlanBusinessServiceDataFlowListener.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/DeleteInspectionPlanInfoListener.java 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/SaveInspectionPlanInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/UpdateInspectionPlanInfoListener.java 97 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/config/DeleteFeeConfigInfoListener.java 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/config/SaveFeeConfigInfoListener.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/config/UpdateFeeConfigInfoListener.java 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/detail/AbstractFeeDetailBusinessServiceDataFlowListener.java 69 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/detail/DeleteFeeDetailInfoListener.java 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/detail/SaveFeeDetailInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/detail/UpdateFeeDetailInfoListener.java 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/fee/AbstractFeeBusinessServiceDataFlowListener.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/fee/DeleteFeeInfoListener.java 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/fee/SaveFeeInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/AddFeeConfigSMOImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/EditFeeConfigSMOImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/RoomCreateFeeSMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
StoreService/src/main/java/com/java110/store/listener/complaint/AbstractComplaintBusinessServiceDataFlowListener.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StoreService/src/main/java/com/java110/store/listener/complaint/DeleteComplaintInfoListener.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StoreService/src/main/java/com/java110/store/listener/complaint/SaveComplaintInfoListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
StoreService/src/main/java/com/java110/store/listener/complaint/UpdateComplaintInfoListener.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/complaint/ComplaintPo.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/fee/PayFeeConfigPo.java 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/fee/PayFeeDetailPo.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/fee/PayFeePo.java 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/floor/FloorPo.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/inspection/InspectionPlanPo.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Api/src/main/java/com/java110/api/bmo/community/ICommunityBMO.java
@@ -57,7 +57,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 退出小区成员
@@ -74,7 +74,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -83,7 +83,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -92,7 +92,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -101,7 +101,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -110,7 +110,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -119,7 +119,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区成员 开发者 代理商 运维 商户
@@ -127,7 +127,7 @@
     * @param paramInJson 组装 楼小区关系
     * @return 小区成员信息
     */
    public JSONArray addCommunityMembers(JSONObject paramInJson);
    public void addCommunityMembers(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -136,7 +136,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -145,6 +145,6 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext);
}
Api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -11,6 +11,7 @@
import com.java110.dto.community.CommunityDto;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.community.CommunityPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
@@ -214,18 +215,10 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMMUNITY_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunity = new JSONObject();
        businessCommunity.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
        return business;
        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        super.delete(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMMUNITY_INFO);
    }
@@ -236,14 +229,9 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigProperty(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
@@ -256,10 +244,10 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "002");//按月出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -269,12 +257,8 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigParkingSpaceUpSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE);
@@ -287,10 +271,11 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "003");//按天出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -300,12 +285,8 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigParkingSpaceDownSell(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 3);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
@@ -318,10 +299,11 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "003");//按天出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -331,12 +313,8 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigParkingSpaceUpHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 4);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE);
@@ -349,10 +327,11 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "003");//按天出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -362,12 +341,8 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigParkingSpaceDownHire(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 5);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
@@ -380,10 +355,11 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "003");//按天出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -393,12 +369,8 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfigParkingSpaceTemp(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 6);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_TEMP_DOWN_PARKING_SPACE);
@@ -411,10 +383,11 @@
        businessFeeConfig.put("additionalAmount", "0.00");
        businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
        businessFeeConfig.put("configId", paramInJson.getString("configId"));
        businessFeeConfig.put("billType", "004");//按天出账
        businessFeeConfig.put("isDefault", "T");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -423,53 +396,37 @@
     * @param paramInJson 组装 楼小区关系
     * @return 小区成员信息
     */
    public JSONArray addCommunityMembers(JSONObject paramInJson) {
    public void addCommunityMembers(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONArray businesses = new JSONArray();
        //添加代理商户
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 1);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunityMember = new JSONObject();
        businessCommunityMember.put("communityMemberId", "-1");
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", paramInJson.getString("storeId"));
        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.AGENT);
        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
        businesses.add(business);
        CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
        super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        //添加运维商户
        //添加开发商户
        business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 2);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        businessCommunityMember = new JSONObject();
        businessCommunityMember.put("communityMemberId", "-1");
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", "400000000000000001");
        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OPT);
        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
        businesses.add(business);
        communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
        super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_ORDER + 3);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        businessCommunityMember = new JSONObject();
        businessCommunityMember.put("communityMemberId", "-1");
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", "400000000000000002");
        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.DEV);
        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
        businesses.add(business);
        communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
        super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        return businesses;
    }
    /**
@@ -479,19 +436,13 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("communityId", GenerateCodeFactory.getCommunityId());
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunity = new JSONObject();
        businessCommunity.putAll(paramInJson);
        businessCommunity.put("state", "1000");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
        return business;
        paramInJson.put("state", "1000");
        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        super.insert(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMMUNITY_INFO);
    }
    /**
@@ -501,17 +452,12 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void updateCommunityOne(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunity = new JSONObject();
        businessCommunity.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
        return business;
        CommunityPo communityPo = BeanConvertUtil.covertBean(paramInJson, CommunityPo.class);
        super.update(dataFlowContext, communityPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
    }
}
Api/src/main/java/com/java110/api/bmo/complaint/IComplaintBMO.java
@@ -21,7 +21,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void updateComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -30,7 +30,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void deleteComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -39,7 +39,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加投诉建议信息
@@ -48,5 +48,5 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject upComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void upComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext);
}
Api/src/main/java/com/java110/api/bmo/complaint/impl/ComplaintBMOImpl.java
@@ -9,6 +9,7 @@
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.po.complaint.ComplaintPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -40,7 +41,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void updateComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        ComplaintDto complaintDto = new ComplaintDto();
        complaintDto.setStoreId(paramInJson.getString("storeId"));
@@ -50,17 +51,12 @@
        Assert.listOnlyOne(complaintDtos, "存在多条记录,或不存在数据" + complaintDto.getComplaintId());
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessComplaint = new JSONObject();
        businessComplaint.putAll(BeanConvertUtil.beanCovertMap(complaintDtos.get(0)));
        businessComplaint.put("state", "10002");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessComplaint", businessComplaint);
        return business;
        ComplaintPo complaintPo = BeanConvertUtil.covertBean(businessComplaint, ComplaintPo.class);
        super.update(dataFlowContext, complaintPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT);
    }
    /**
@@ -70,18 +66,9 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMPLAINT);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessComplaint = new JSONObject();
        businessComplaint.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessComplaint", businessComplaint);
        return business;
    public void deleteComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        ComplaintPo complaintPo = BeanConvertUtil.covertBean(paramInJson, ComplaintPo.class);
        super.delete(dataFlowContext, complaintPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMPLAINT);
    }
    /**
@@ -91,22 +78,12 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        paramInJson.put("complaintId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_complaintId));
        paramInJson.put("state", "10001");
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMPLAINT);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessComplaint = new JSONObject();
        businessComplaint.putAll(paramInJson);
        //businessComplaint.put("complaintId", "-1");
        //businessComplaint.put("state", "10001");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessComplaint", businessComplaint);
        return business;
        ComplaintPo complaintPo = BeanConvertUtil.covertBean(paramInJson, ComplaintPo.class);
        super.insert(dataFlowContext, complaintPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMPLAINT);
    }
    /**
@@ -116,7 +93,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject upComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void upComplaint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        ComplaintDto complaintDto = new ComplaintDto();
        complaintDto.setStoreId(paramInJson.getString("storeId"));
@@ -126,16 +103,12 @@
        Assert.listOnlyOne(complaintDtos, "存在多条记录,或不存在数据" + complaintDto.getComplaintId());
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessComplaint = new JSONObject();
        businessComplaint.putAll(paramInJson);
        businessComplaint.put("state", complaintDtos.get(0).getState());
        businessComplaint.put("roomId", complaintDtos.get(0).getRoomId());
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessComplaint", businessComplaint);
        return business;
        ComplaintPo complaintPo = BeanConvertUtil.covertBean(paramInJson, ComplaintPo.class);
        super.update(dataFlowContext, complaintPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT);
    }
}
Api/src/main/java/com/java110/api/bmo/fee/IFeeBMO.java
@@ -23,7 +23,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加物业费用
     *
@@ -31,7 +31,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public JSONObject updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext);
@@ -95,7 +95,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加物业费用
@@ -122,5 +122,5 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext);
}
Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -15,6 +15,8 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.hardwareAdapation.CarInoutDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -55,6 +57,7 @@
    @Autowired
    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
    /**
     * 添加小区信息
     *
@@ -62,19 +65,11 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
    public void deleteFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
        super.delete(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_CONFIG);
    }
    /**
     * 添加物业费用
     *
@@ -82,18 +77,12 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
    public void deleteFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject businessUnit = new JSONObject();
        businessUnit.put("feeId", paramInJson.getString("feeId"));
        businessUnit.put("communityId", paramInJson.getString("communityId"));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
        return business;
        PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
        super.delete(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
    }
    public JSONObject updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
@@ -189,7 +178,7 @@
        //BigDecimal receivableAmount = feePrice;
        if ("-101".equals(paramInJson.getString("cycles"))) {//自定义缴费
            BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
            cycles = receivedAmount.divide(feePrice,2,BigDecimal.ROUND_HALF_EVEN);
            cycles = receivedAmount.divide(feePrice, 2, BigDecimal.ROUND_HALF_EVEN);
            paramInJson.put("tmpCycles", cycles);
            businessFeeDetail.put("cycles", cycles.doubleValue());
            businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
@@ -199,7 +188,7 @@
            businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
        }
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
        return business;
    }
@@ -236,10 +225,10 @@
        feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
        feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
        feeMap.put("cycles", paramInJson.getString("cycles"));
        feeMap.put("configEndTime",feeInfo.getConfigEndTime());
        feeMap.put("configEndTime", feeInfo.getConfigEndTime());
        businessFee.putAll(feeMap);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO, businessFee);
        return business;
    }
@@ -330,7 +319,7 @@
        double tmpReceivableAmount = cycles.multiply(receivableAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
        businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
        paramInJson.put("receivableAmount", tmpReceivableAmount);
        return business;
    }
@@ -361,7 +350,7 @@
        feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
        feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
        businessFee.putAll(feeMap);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO, businessFee);
        return business;
    }
@@ -379,13 +368,13 @@
        CarInoutDto carInoutDto = carInoutDtos.get(0);
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ+2);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCarInout = new JSONObject();
        businessCarInout.putAll(BeanConvertUtil.beanCovertMap(carInoutDto));
        businessCarInout.put("state", "100400");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCarInout", businessCarInout);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_CAR_INOUT, businessCarInout);
        return business;
    }
@@ -455,7 +444,7 @@
        double receivableAmount = money;
        businessFeeDetail.put("receivableAmount", receivableAmount);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessFeeDetail);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFeeDetail);
        paramInJson.put("receivableAmount", receivableAmount);
        return business;
    }
@@ -483,7 +472,7 @@
        feeMap.put("amount", paramInJson.getString("receivableAmount"));
        feeMap.put("state", "2009001");
        businessFee.putAll(feeMap);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL, businessFee);
        return business;
    }
@@ -495,20 +484,13 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("configId", "-1");
        businessFeeConfig.put("isDefault", "F");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        paramInJson.put("configId", "-1");
        paramInJson.put("isDefault", "F");
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(paramInJson, PayFeeConfigPo.class);
        super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
    }
    /**
@@ -539,10 +521,11 @@
        businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
        businessUnit.put("state", "2008001");
        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO, businessUnit);
        return business;
    }
    /**
     * 添加物业费用
     *
@@ -571,10 +554,11 @@
        businessUnit.put("feeFlag", paramInJson.getString("feeFlag"));
        businessUnit.put("state", "2008001");
        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessUnit);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO, businessUnit);
        return business;
    }
    /**
     * 添加费用项信息
     *
@@ -582,24 +566,19 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void updateFeeConfig(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
        feeConfigDto.setConfigId(paramInJson.getString("configId"));
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
        Assert.listOnlyOne(feeConfigDtos, "未找到该费用项");
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_CONFIG);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFeeConfig = new JSONObject();
        businessFeeConfig.putAll(paramInJson);
        businessFeeConfig.put("isDefault", feeConfigDtos.get(0).getIsDefault());
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeConfig", businessFeeConfig);
        return business;
        PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
        super.update(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_CONFIG);
    }
}
Api/src/main/java/com/java110/api/bmo/floor/IFloorBMO.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.IApiBaseBMO;
import com.java110.core.context.DataFlowContext;
/**
 * @ClassName IFloorBMO
@@ -19,14 +20,15 @@
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFloor(JSONObject paramInJson);
    public void deleteFloor(JSONObject paramInJson, DataFlowContext context);
    /**
     * 退出小区成员
     *
     * @param paramInJson 接口传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject exitCommunityMember(JSONObject paramInJson);
    public void exitCommunityMember(JSONObject paramInJson, DataFlowContext context);
    /**
     * 添加小区楼信息
@@ -34,7 +36,7 @@
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject editFloor(JSONObject paramInJson);
    public void editFloor(JSONObject paramInJson, DataFlowContext context);
    /**
     * 添加小区楼信息
@@ -42,12 +44,13 @@
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFloor(JSONObject paramInJson);
    public void addFloor(JSONObject paramInJson, DataFlowContext context);
    /**
     * 添加小区成员
     *
     * @param paramInJson 组装 楼小区关系
     * @return 小区成员信息
     */
    public JSONObject addCommunityMember(JSONObject paramInJson);
    public void addCommunityMember(JSONObject paramInJson, DataFlowContext context);
}
Api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java
@@ -3,10 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.floor.IFloorBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.po.community.CommunityMemberPo;
import com.java110.po.floor.FloorPo;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,25 +30,17 @@
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
    private static final int DEFAULT_SEQ_COMMUNITY_MEMBER = 2;
    /**
     * 添加小区楼信息
     *
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteFloor(JSONObject paramInJson) {
    public void deleteFloor(JSONObject paramInJson, DataFlowContext context) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FLOOR_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFloor = new JSONObject();
        businessFloor.put("floorId", paramInJson.getString("floorId"));
        businessFloor.put("communityId", paramInJson.getString("communityId"));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
        return business;
        FloorPo floorPo = BeanConvertUtil.covertBean(paramInJson, FloorPo.class);
        super.delete(context, floorPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_FLOOR_INFO);
    }
    /**
@@ -53,12 +49,8 @@
     * @param paramInJson 接口传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject exitCommunityMember(JSONObject paramInJson) {
    public void exitCommunityMember(JSONObject paramInJson, DataFlowContext context) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_QUIT_COMMUNITY);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunityMember = new JSONObject();
        CommunityMemberDto communityMemberDto = new CommunityMemberDto();
        communityMemberDto.setMemberId(paramInJson.getString("floorId"));
@@ -70,36 +62,10 @@
        if (communityMemberDtoList == null || communityMemberDtoList.size() != 1) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "小区楼和小区存在关系存在异常,请检查");
        }
        businessCommunityMember.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
        CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
        super.delete(context, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_QUIT_COMMUNITY);
        return business;
    }
    /**
     * 添加小区楼信息
     *
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject editFloor(JSONObject paramInJson) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FLOOR_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFloor = new JSONObject();
        businessFloor.put("floorId", paramInJson.getString("floorId"));
        businessFloor.put("name", paramInJson.getString("name"));
        businessFloor.put("remark", paramInJson.getString("remark"));
        businessFloor.put("userId", paramInJson.getString("userId"));
        businessFloor.put("floorNum", paramInJson.getString("floorNum"));
        businessFloor.put("communityId", paramInJson.getString("communityId"));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
        return business;
    }
    /**
@@ -108,13 +74,8 @@
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public JSONObject addFloor(JSONObject paramInJson) {
    public void editFloor(JSONObject paramInJson, DataFlowContext context) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessFloor = new JSONObject();
        businessFloor.put("floorId", paramInJson.getString("floorId"));
        businessFloor.put("name", paramInJson.getString("name"));
@@ -122,9 +83,28 @@
        businessFloor.put("userId", paramInJson.getString("userId"));
        businessFloor.put("floorNum", paramInJson.getString("floorNum"));
        businessFloor.put("communityId", paramInJson.getString("communityId"));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFloor", businessFloor);
        return business;
        FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
        super.update(context, floorPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FLOOR_INFO);
    }
    /**
     * 添加小区楼信息
     *
     * @param paramInJson 接口调用放传入入参
     * @return 订单服务能够接受的报文
     */
    public void addFloor(JSONObject paramInJson, DataFlowContext context) {
        JSONObject businessFloor = new JSONObject();
        businessFloor.put("floorId", paramInJson.getString("floorId"));
        businessFloor.put("name", paramInJson.getString("name"));
        businessFloor.put("remark", paramInJson.getString("remark"));
        businessFloor.put("userId", paramInJson.getString("userId"));
        businessFloor.put("floorNum", paramInJson.getString("floorNum"));
        businessFloor.put("communityId", paramInJson.getString("communityId"));
        FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
        super.insert(context, floorPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
    }
@@ -134,21 +114,15 @@
     * @param paramInJson 组装 楼小区关系
     * @return 小区成员信息
     */
    public JSONObject addCommunityMember(JSONObject paramInJson) {
    public void addCommunityMember(JSONObject paramInJson, DataFlowContext context) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ_COMMUNITY_MEMBER);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessCommunityMember = new JSONObject();
        businessCommunityMember.put("communityMemberId", "-1");
        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
        businessCommunityMember.put("memberId", paramInJson.getString("floorId"));
        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
        return business;
        CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
        super.insert(context, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
    }
}
Api/src/main/java/com/java110/api/bmo/inspection/IInspectionBMO.java
@@ -21,7 +21,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void deleteInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
@@ -30,7 +30,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void addInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加巡检计划信息
@@ -39,7 +39,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void updateInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加设备信息
@@ -48,7 +48,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateInspectionPlanState(JSONObject paramInJson, DataFlowContext dataFlowContext);
    public void updateInspectionPlanState(JSONObject paramInJson, DataFlowContext dataFlowContext);
    /**
     * 添加小区信息
Api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java
@@ -8,6 +8,7 @@
import com.java110.core.smo.inspectionRoute.IInspectionRoutePointRelInnerServiceSMO;
import com.java110.dto.inspectionPlan.InspectionPlanDto;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.po.inspection.InspectionPlanPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -42,19 +43,14 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject deleteInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void deleteInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(paramInJson, InspectionPlanPo.class);
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_PLAN);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessInspectionPlan = new JSONObject();
        businessInspectionPlan.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionPlan", businessInspectionPlan);
        return business;
        super.delete(dataFlowContext, inspectionPlanPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_PLAN);
    }
    /**
     * 添加小区信息
     *
@@ -62,19 +58,14 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject addInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void addInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_PLAN);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessInspectionPlan = new JSONObject();
        businessInspectionPlan.putAll(paramInJson);
        businessInspectionPlan.put("inspectionPlanId", "-1");
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionPlan", businessInspectionPlan);
        return business;
        InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(businessInspectionPlan, InspectionPlanPo.class);
        super.insert(dataFlowContext, inspectionPlanPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_PLAN);
    }
    /**
@@ -84,18 +75,9 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessInspectionPlan = new JSONObject();
        businessInspectionPlan.putAll(paramInJson);
        //计算 应收金额
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionPlan", businessInspectionPlan);
        return business;
    public void updateInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(paramInJson, InspectionPlanPo.class);
        super.update(dataFlowContext, inspectionPlanPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN);
    }
    /**
@@ -105,7 +87,7 @@
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateInspectionPlanState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
    public void updateInspectionPlanState(JSONObject paramInJson, DataFlowContext dataFlowContext) {
        InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();
        inspectionPlanDto.setCommunityId(paramInJson.getString("communityId"));
@@ -113,16 +95,11 @@
        List<InspectionPlanDto> inspectionPlanDtos = inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto);
        Assert.listOnlyOne(inspectionPlanDtos, "根据计划ID查询到多条记录,请检查数据");
        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessInspectionPlan = new JSONObject();
        businessInspectionPlan.putAll(BeanConvertUtil.beanCovertMap(inspectionPlanDtos.get(0)));
        businessInspectionPlan.put("state", paramInJson.getString("state"));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionPlan", businessInspectionPlan);
        return business;
        InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(businessInspectionPlan, InspectionPlanPo.class);
        super.update(dataFlowContext, inspectionPlanPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN);
    }
    /**
@@ -187,6 +164,7 @@
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionPoint", businessInspectionPoint);
        return business;
    }
    /**
     * 添加小区信息
     *
Api/src/main/java/com/java110/api/bmo/machineTranslate/impl/MachineTranslateBMOImpl.java
@@ -271,7 +271,7 @@
            paramInJson.put("name", ownerDtos.get(0).getName());
            paramInJson.put("tel", ownerDtos.get(0).getLink());
            paramInJson.put("idCard", ownerDtos.get(0).getIdCard());
            paramInJson.put("relTypeCd", "10000");
            paramInJson.put("relTypeCd", "60000");
        } else { //钥匙申请ID
            ApplicationKeyDto applicationKeyDto = new ApplicationKeyDto();
            applicationKeyDto.setCommunityId(paramInJson.getString("communityId"));
@@ -283,7 +283,7 @@
            paramInJson.put("name", applicationKeyDtos.get(0).getName());
            paramInJson.put("tel", applicationKeyDtos.get(0).getTel());
            paramInJson.put("idCard", applicationKeyDtos.get(0).getIdCard());
            paramInJson.put("relTypeCd", "30000");
            paramInJson.put("relTypeCd", "60000");
        }
Api/src/main/java/com/java110/api/listener/community/DeleteCommunityListener.java
@@ -3,22 +3,20 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.community.ICommunityBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.dto.community.CommunityDto;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.community.CommunityDto;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import com.java110.core.annotation.Java110Listener;
import java.util.List;
@@ -27,11 +25,12 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("deleteCommunityListener")
public class DeleteCommunityListener extends AbstractServiceApiListener {
public class DeleteCommunityListener extends AbstractServiceApiPlusListener {
    @Autowired
    private ICommunityBMO communityBMOImpl;
    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -43,28 +42,19 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        CommunityDto communityDto = new CommunityDto();
        communityDto.setCommunityId((String)reqJson.get("communityId"));
        communityDto.setCommunityId((String) reqJson.get("communityId"));
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        if(communityDtos.size() == 0 || communityDtos == null){
            throw new IllegalArgumentException("没有查询到communityId为:"+communityDto.getCommunityId()+"小区信息");
        if (communityDtos.size() == 0 || communityDtos == null) {
            throw new IllegalArgumentException("没有查询到communityId为:" + communityDto.getCommunityId() + "小区信息");
        }
        if("1100".equals(communityDtos.get(0).getState())){
        if ("1100".equals(communityDtos.get(0).getState())) {
            throw new IllegalArgumentException("删除失败,该小区已审核通过");
        }
        //添加单元信息
        businesses.add(communityBMOImpl.deleteCommunity(reqJson, context));
        //businesses.addAll(communityBMOImpl.exitCommunityMember(reqJson));
        communityBMOImpl.deleteCommunity(reqJson, context);
        ResponseEntity<String> responseEntity = communityBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
Api/src/main/java/com/java110/api/listener/community/ListAuditEnterCommunitysListener.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.community.ICommunityBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.annotation.Java110Listener;
@@ -28,7 +29,7 @@
 * 查询需要入驻审核单子
 */
@Java110Listener("listAuditEnterCommunitysListener")
public class ListAuditEnterCommunitysListener extends AbstractServiceApiListener {
public class ListAuditEnterCommunitysListener extends AbstractServiceApiPlusListener {
    @Autowired
Api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java
@@ -1,30 +1,22 @@
package com.java110.api.listener.community;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.community.ICommunityBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.utils.constant.*;
import com.java110.utils.util.Assert;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
/**
 * 保存小区侦听
 * add by wuxw 2019-06-30
 */
@Java110Listener("saveCommunityListener")
public class SaveCommunityListener extends AbstractServiceApiListener {
public class SaveCommunityListener extends AbstractServiceApiPlusListener {
    @Autowired
    private ICommunityBMO communityBMOImpl;
@@ -42,26 +34,17 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(communityBMOImpl.addCommunity(reqJson, context));
        businesses.addAll(communityBMOImpl.addCommunityMembers(reqJson));
        communityBMOImpl.addCommunity(reqJson, context);
        communityBMOImpl.addCommunityMembers(reqJson, context);
        //产生物业费配置信息
        businesses.add(communityBMOImpl.addFeeConfigProperty(reqJson, context));
        businesses.add(communityBMOImpl.addFeeConfigParkingSpaceUpSell(reqJson, context)); // 地上出售
        businesses.add(communityBMOImpl.addFeeConfigParkingSpaceDownSell(reqJson, context)); // 地下出售
        businesses.add(communityBMOImpl.addFeeConfigParkingSpaceUpHire(reqJson, context));//地上出租
        businesses.add(communityBMOImpl.addFeeConfigParkingSpaceDownHire(reqJson, context));//地下出租
        businesses.add(communityBMOImpl.addFeeConfigParkingSpaceTemp(reqJson, context));//地下出租
        communityBMOImpl.addFeeConfigProperty(reqJson, context);
        communityBMOImpl.addFeeConfigParkingSpaceUpSell(reqJson, context); // 地上出售
        communityBMOImpl.addFeeConfigParkingSpaceDownSell(reqJson, context); // 地下出售
        communityBMOImpl.addFeeConfigParkingSpaceUpHire(reqJson, context);//地上出租
        communityBMOImpl.addFeeConfigParkingSpaceDownHire(reqJson, context);//地下出租
        communityBMOImpl.addFeeConfigParkingSpaceTemp(reqJson, context);//地下出租
        ResponseEntity<String> responseEntity = communityBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
Api/src/main/java/com/java110/api/listener/community/UpdateCommunityListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.community.ICommunityBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
@@ -22,10 +23,11 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("updateCommunityListener")
public class UpdateCommunityListener extends AbstractServiceApiListener {
public class UpdateCommunityListener extends AbstractServiceApiPlusListener {
    @Autowired
    private ICommunityBMO communityBMOImpl;
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
@@ -39,18 +41,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(communityBMOImpl.updateCommunityOne(reqJson, context));
        ResponseEntity<String> responseEntity = communityBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        communityBMOImpl.updateCommunityOne(reqJson, context);
    }
    @Override
Api/src/main/java/com/java110/api/listener/complaint/AuditComplaintListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.complaint.IComplaintBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
@@ -32,7 +33,7 @@
 * 查询小区侦听类
 */
@Java110Listener("auditComplaintListener")
public class AuditComplaintListener extends AbstractServiceApiListener {
public class AuditComplaintListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IComplaintBMO complaintBMOImpl;
@@ -95,14 +96,7 @@
        boolean isLastTask = complaintUserInnerServiceSMOImpl.completeTask(complaintDto);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功", HttpStatus.OK);
        if (isLastTask) {
            HttpHeaders header = new HttpHeaders();
            context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
            JSONArray businesses = new JSONArray();
            AppService service = event.getAppService();
            //添加单元信息
            businesses.add(complaintBMOImpl.updateComplaint(reqJson, context));
            responseEntity = complaintBMOImpl.callService(context, service.getServiceCode(), businesses);
            complaintBMOImpl.updateComplaint(reqJson, context);
        }
        context.setResponseEntity(responseEntity);
Api/src/main/java/com/java110/api/listener/complaint/DeleteComplaintListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.complaint.IComplaintBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.util.Assert;
import com.java110.core.context.DataFlowContext;
import com.java110.entity.center.AppService;
@@ -24,7 +25,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("deleteComplaintListener")
public class DeleteComplaintListener extends AbstractServiceApiListener {
public class DeleteComplaintListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IComplaintBMO complaintBMOImpl;
@@ -39,19 +40,9 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
       complaintBMOImpl.deleteComplaint(reqJson, context);
        //添加单元信息
        businesses.add(complaintBMOImpl.deleteComplaint(reqJson, context));
        ResponseEntity<String> responseEntity = complaintBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
    @Override
Api/src/main/java/com/java110/api/listener/complaint/SaveComplaintListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.complaint.IComplaintBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
import com.java110.dto.complaint.ComplaintDto;
@@ -29,7 +30,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("saveComplaintListener")
public class SaveComplaintListener extends AbstractServiceApiListener {
public class SaveComplaintListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IComplaintBMO complaintBMOImpl;
@@ -55,25 +56,15 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        complaintBMOImpl.addComplaint(reqJson, context);
        AppService service = event.getAppService();
        commit(context);
        //添加单元信息
        businesses.add(complaintBMOImpl.addComplaint(reqJson, context));
        ResponseEntity<String> responseEntity = complaintBMOImpl.callService(context, service.getServiceCode(), businesses);
        if(HttpStatus.OK == responseEntity.getStatusCode()){
        if (HttpStatus.OK == context.getResponseEntity().getStatusCode()) {
            ComplaintDto complaintDto = BeanConvertUtil.covertBean(reqJson, ComplaintDto.class);
            complaintDto.setCurrentUserId(reqJson.getString("userId"));
            complaintUserInnerServiceSMOImpl.startProcess(complaintDto);
        }
        context.setResponseEntity(responseEntity);
    }
    @Override
Api/src/main/java/com/java110/api/listener/complaint/UpdateComplaintListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.complaint.IComplaintBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.utils.constant.BusinessTypeConstant;
@@ -27,7 +28,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("updateComplaintListener")
public class UpdateComplaintListener extends AbstractServiceApiListener {
public class UpdateComplaintListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IComplaintBMO complaintBMOImpl;
@@ -52,18 +53,8 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        complaintBMOImpl.upComplaint(reqJson, context);
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(complaintBMOImpl.upComplaint(reqJson, context));
        ResponseEntity<String> responseEntity = complaintBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
    @Override
Api/src/main/java/com/java110/api/listener/fee/DeleteFeeConfigListener.java
@@ -1,30 +1,24 @@
package com.java110.api.listener.fee;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.fee.IFeeBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
/**
 * 保存小区侦听
 * add by wuxw 2019-06-30
 */
@Java110Listener("deleteFeeConfigListener")
public class DeleteFeeConfigListener extends AbstractServiceApiListener {
public class DeleteFeeConfigListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IFeeBMO feeBMOImpl;
@@ -52,19 +46,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(feeBMOImpl.deleteFeeConfig(reqJson, context));
        ResponseEntity<String> responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        feeBMOImpl.deleteFeeConfig(reqJson, context);
    }
    @Override
Api/src/main/java/com/java110/api/listener/fee/DeleteFeeListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.fee.IFeeBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeInnerServiceSMO;
@@ -33,7 +34,7 @@
 * add by wuxw 2020/1/31
 **/
@Java110Listener("deleteFeeListener")
public class DeleteFeeListener extends AbstractServiceApiListener {
public class DeleteFeeListener extends AbstractServiceApiPlusListener {
    private static Logger logger = LoggerFactory.getLogger(DeleteFeeListener.class);
    @Autowired
    private IFeeBMO feeBMOImpl;
@@ -79,22 +80,11 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(feeBMOImpl.deleteFee(reqJson, context));
        ResponseEntity<String> responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        feeBMOImpl.deleteFee(reqJson, context);
    }
    @Override
    public int getOrder() {
        return DEFAULT_ORDER;
Api/src/main/java/com/java110/api/listener/fee/SaveFeeConfigListener.java
@@ -26,6 +26,7 @@
    @Autowired
    private IFeeBMO feeBMOImpl;
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -39,6 +40,8 @@
        Assert.hasKeyAndValue(reqJson, "squarePrice", "必填,请填写计费单价");
        Assert.hasKeyAndValue(reqJson, "additionalAmount", "必填,请填写附加费用");
        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
    }
@@ -46,18 +49,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(feeBMOImpl.addFeeConfig(reqJson, context));
        ResponseEntity<String> responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        feeBMOImpl.addFeeConfig(reqJson, context);
    }
    @Override
@@ -70,9 +62,5 @@
        return HttpMethod.POST;
    }
    @Override
    public int getOrder() {
        return DEFAULT_ORDER;
    }
}
Api/src/main/java/com/java110/api/listener/fee/SaveRoomCreateFeeListener.java
@@ -69,7 +69,7 @@
        Assert.hasKeyAndValue(reqJson, "locationTypeCd", "未包含收费范围");
        Assert.hasKeyAndValue(reqJson, "locationObjId", "未包含收费对象");
        Assert.hasKeyAndValue(reqJson, "configId", "未包含收费项目");
        Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
//        Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
        Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户ID");
    }
Api/src/main/java/com/java110/api/listener/fee/UpdateFeeConfigListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.fee.IFeeBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -26,7 +27,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("updateFeeConfigListener")
public class UpdateFeeConfigListener extends AbstractServiceApiListener {
public class UpdateFeeConfigListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@@ -46,25 +47,15 @@
        Assert.hasKeyAndValue(reqJson, "squarePrice", "必填,请填写计费单价");
        Assert.hasKeyAndValue(reqJson, "additionalAmount", "必填,请填写附加费用");
        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(reqJson, "billType", "必填,请填写出账类型");
    }
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(feeBMOImpl.updateFeeConfig(reqJson, context));
        ResponseEntity<String> responseEntity = feeBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        feeBMOImpl.updateFeeConfig(reqJson, context);
    }
    @Override
Api/src/main/java/com/java110/api/listener/floor/DeleteFloorListener.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.floor.IFloorBMO;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -26,7 +28,7 @@
 * 删除小区楼信息
 */
@Java110Listener("deleteFloorListener")
public class DeleteFloorListener extends AbstractServiceApiDataFlowListener {
public class DeleteFloorListener extends AbstractServiceApiPlusListener {
    private static Logger logger = LoggerFactory.getLogger(DeleteFloorListener.class);
@@ -46,48 +48,20 @@
        return HttpMethod.POST;
    }
    @Override
    public void soService(ServiceDataFlowEvent event) {
        logger.debug("ServiceDataFlowEvent : {}", event);
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        Assert.jsonObjectHaveKey(reqJson, "floorId", "请求报文中未包含floorId");
        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
    }
        DataFlowContext dataFlowContext = event.getDataFlowContext();
        AppService service = event.getAppService();
        String paramIn = dataFlowContext.getReqData();
        //校验数据
        validate(paramIn);
        JSONObject paramObj = JSONObject.parseObject(paramIn);
        HttpHeaders header = new HttpHeaders();
        //dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        //添加小区楼
        businesses.add(floorBMOImpl.deleteFloor(paramObj));
        businesses.add(floorBMOImpl.exitCommunityMember(paramObj));
        ResponseEntity<String> responseEntity = floorBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
        dataFlowContext.setResponseEntity(responseEntity);
        floorBMOImpl.deleteFloor(reqJson, context);
        floorBMOImpl.exitCommunityMember(reqJson, context);
    }
    /**
     * 校验数据
     *
     * @param paramIn 接口请求数据
     */
    private void validate(String paramIn) {
        Assert.jsonObjectHaveKey(paramIn, "floorId", "请求报文中未包含floorId");
        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
    }
    @Override
    public int getOrder() {
        return DEFAULT_ORDER;
    }
    public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
        return communityInnerServiceSMOImpl;
Api/src/main/java/com/java110/api/listener/floor/EditFloorListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.floor.IFloorBMO;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
@@ -28,7 +29,7 @@
 * add by wuxw 2019/4/28
 **/
@Java110Listener("editFloorListener")
public class EditFloorListener extends AbstractServiceApiDataFlowListener {
public class EditFloorListener extends AbstractServiceApiPlusListener {
    private static Logger logger = LoggerFactory.getLogger(EditFloorListener.class);
@@ -46,52 +47,18 @@
    }
    @Override
    public void soService(ServiceDataFlowEvent event) {
        logger.debug("ServiceDataFlowEvent : {}", event);
        DataFlowContext dataFlowContext = event.getDataFlowContext();
        AppService service = event.getAppService();
        String paramIn = dataFlowContext.getReqData();
        //校验数据
        validate(paramIn);
        JSONObject paramObj = JSONObject.parseObject(paramIn);
        HttpHeaders header = new HttpHeaders();
        //dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        //添加小区楼
        businesses.add(floorBMOImpl.editFloor(paramObj));
        ResponseEntity<String> responseEntity = floorBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
        dataFlowContext.setResponseEntity(responseEntity);
    }
    /**
     * 数据校验
     *
     * @param paramIn "communityId": "7020181217000001",
     *                "memberId": "3456789",
     *                "memberTypeCd": "390001200001"
     */
    private void validate(String paramIn) {
        Assert.jsonObjectHaveKey(paramIn, "floorId", "请求报文中未包含floorId");
        Assert.jsonObjectHaveKey(paramIn, "name", "请求报文中未包含name");
        Assert.jsonObjectHaveKey(paramIn, "userId", "请求报文中未包含userId");
        Assert.jsonObjectHaveKey(paramIn, "floorNum", "请求报文中未包含floorNum");
        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        Assert.jsonObjectHaveKey(reqJson, "floorId", "请求报文中未包含floorId");
        Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");
        Assert.jsonObjectHaveKey(reqJson, "userId", "请求报文中未包含userId");
        Assert.jsonObjectHaveKey(reqJson, "floorNum", "请求报文中未包含floorNum");
        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
    }
    @Override
    public int getOrder() {
        return DEFAULT_ORDER;
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        floorBMOImpl.editFloor(reqJson,context);
    }
}
Api/src/main/java/com/java110/api/listener/floor/SaveFloorListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.floor.IFloorBMO;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -31,14 +32,13 @@
 **/
@Java110Listener("saveFloorListener")
public class SaveFloorListener extends AbstractServiceApiDataFlowListener {
public class SaveFloorListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IFloorBMO floorBMOImpl;
    @Autowired
    private IFloorInnerServiceSMO floorInnerServiceSMOImpl;
    private static Logger logger = LoggerFactory.getLogger(SaveFloorListener.class);
@@ -54,38 +54,35 @@
    }
    @Override
    public void soService(ServiceDataFlowEvent event) {
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        Assert.jsonObjectHaveKey(reqJson, "name", "请求报文中未包含name");
        Assert.jsonObjectHaveKey(reqJson, "userId", "请求报文中未包含userId");
        Assert.jsonObjectHaveKey(reqJson, "floorNum", "请求报文中未包含floorNum");
        Assert.jsonObjectHaveKey(reqJson, "communityId", "请求报文中未包含communityId");
        logger.debug("ServiceDataFlowEvent : {}", event);
        DataFlowContext dataFlowContext = event.getDataFlowContext();
        AppService service = event.getAppService();
        FloorDto floorDto = new FloorDto();
        floorDto.setFloorNum(reqJson.getString("floorNum"));
        floorDto.setCommunityId(reqJson.getString("communityId"));
        String paramIn = dataFlowContext.getReqData();
        //校验数据
        validate(paramIn);
        JSONObject paramObj = JSONObject.parseObject(paramIn);
        int floorCount = floorInnerServiceSMOImpl.queryFloorsCount(floorDto);
        HttpHeaders header = new HttpHeaders();
        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, "-1");
        dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        if (floorCount > 0) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "楼栋编号已经存在");
        }
    }
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        //生成floorId
        generateFloorId(paramObj);
        generateFloorId(reqJson);
        //添加小区楼
        businesses.add(floorBMOImpl.addFloor(paramObj));
        floorBMOImpl.addFloor(reqJson, context);
        //小区楼添加到小区中
        businesses.add(floorBMOImpl.addCommunityMember(paramObj));
        ResponseEntity<String> responseEntity = floorBMOImpl.callService(dataFlowContext, service.getServiceCode(), businesses);
        dataFlowContext.setResponseEntity(responseEntity);
        floorBMOImpl.addCommunityMember(reqJson, context);
    }
    /**
@@ -106,23 +103,7 @@
     *                "memberTypeCd": "390001200001"
     */
    private void validate(String paramIn) {
        Assert.jsonObjectHaveKey(paramIn, "name", "请求报文中未包含name");
        Assert.jsonObjectHaveKey(paramIn, "userId", "请求报文中未包含userId");
        Assert.jsonObjectHaveKey(paramIn, "floorNum", "请求报文中未包含floorNum");
        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含communityId");
        JSONObject paramObj = JSONObject.parseObject(paramIn);
        FloorDto floorDto = new FloorDto();
        floorDto.setFloorNum(paramObj.getString("floorNum"));
        floorDto.setCommunityId(paramObj.getString("communityId"));
        int floorCount = floorInnerServiceSMOImpl.queryFloorsCount(floorDto);
        if (floorCount > 0) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "楼栋编号已经存在");
        }
    }
Api/src/main/java/com/java110/api/listener/inspectionPlan/DeleteInspectionPlanListener.java
@@ -28,6 +28,7 @@
    @Autowired
    private IInspectionBMO inspectionBMOImpl;
    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -39,19 +40,8 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        inspectionBMOImpl.deleteInspectionPlan(reqJson, context);
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(inspectionBMOImpl.deleteInspectionPlan(reqJson, context));
        ResponseEntity<String> responseEntity = inspectionBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
    }
    @Override
Api/src/main/java/com/java110/api/listener/inspectionPlan/SaveInspectionPlanListener.java
@@ -44,19 +44,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(inspectionBMOImpl.addInspectionPlan(reqJson, context));
        ResponseEntity<String> responseEntity = inspectionBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        inspectionBMOImpl.addInspectionPlan(reqJson, context);
    }
    @Override
Api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.inspection.IInspectionBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
@@ -22,7 +23,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("updateInspectionPlanListener")
public class UpdateInspectionPlanListener extends AbstractServiceApiListener {
public class UpdateInspectionPlanListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IInspectionBMO inspectionBMOImpl;
    @Override
@@ -42,19 +43,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(inspectionBMOImpl.updateInspectionPlan(reqJson, context));
        ResponseEntity<String> responseEntity = inspectionBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
      inspectionBMOImpl.updateInspectionPlan(reqJson, context);
    }
    @Override
Api/src/main/java/com/java110/api/listener/inspectionPlan/UpdateInspectionPlanStateListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.inspection.IInspectionBMO;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
@@ -30,7 +31,7 @@
 * add by wuxw 2019-06-30
 */
@Java110Listener("updateInspectionPlanStateListener")
public class UpdateInspectionPlanStateListener extends AbstractServiceApiListener {
public class UpdateInspectionPlanStateListener extends AbstractServiceApiPlusListener {
    @Autowired
    private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
@@ -50,18 +51,7 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        HttpHeaders header = new HttpHeaders();
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONArray businesses = new JSONArray();
        AppService service = event.getAppService();
        //添加单元信息
        businesses.add(inspectionBMOImpl.updateInspectionPlanState(reqJson, context));
        ResponseEntity<String> responseEntity = inspectionBMOImpl.callService(context, service.getServiceCode(), businesses);
        context.setResponseEntity(responseEntity);
        inspectionBMOImpl.updateInspectionPlanState(reqJson, context);
    }
    @Override
CommunityService/src/main/java/com/java110/community/listener/floor/AbstractFloorBusinessServiceDataFlowListener.java
@@ -79,6 +79,12 @@
        currentFloorInfo.put("operate", StatusConstant.OPERATE_DEL);
        getFloorServiceDaoImpl().saveBusinessFloorInfo(currentFloorInfo);
        for(Object key : currentFloorInfo.keySet()) {
            if(businessFloor.get(key) == null) {
                businessFloor.put(key.toString(), currentFloorInfo.get(key));
            }
        }
    }
CommunityService/src/main/java/com/java110/community/listener/floor/DeleteFloorInfoListener.java
@@ -61,25 +61,23 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFloor 节点
        if (data.containsKey("businessFloor")) {
            //处理 businessFloor 节点
            if (data.containsKey("businessFloor")) {
                Object _obj = data.get("businessFloor");
                JSONArray businessFloors = null;
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FLOOR_INFO)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FLOOR_INFO);
            JSONArray businessFloors = null;
            if (_obj instanceof JSONObject) {
                businessFloors = new JSONArray();
                businessFloors.add(_obj);
            } else {
                businessFloors = (JSONArray) _obj;
            }
            //JSONObject businessFloor = data.getJSONObject("businessFloor");
            for (int _floorIndex = 0; _floorIndex < businessFloors.size(); _floorIndex++) {
                JSONObject businessFloor = businessFloors.getJSONObject(_floorIndex);
                doBusinessFloor(business, businessFloor);
                if (_obj instanceof JSONObject) {
                    businessFloors = new JSONArray();
                    businessFloors.add(_obj);
                } else {
                    businessFloors = (JSONArray) _obj;
                }
                //JSONObject businessFloor = data.getJSONObject("businessFloor");
                for (int _floorIndex = 0; _floorIndex < businessFloors.size(); _floorIndex++) {
                    JSONObject businessFloor = businessFloors.getJSONObject(_floorIndex);
                    doBusinessFloor(business, businessFloor);
                    if (_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("floorId", businessFloor.getString("floorId"));
                    }
                    dataFlowContext.addParamOut("floorId", businessFloor.getString("floorId"));
                }
            }
        }
CommunityService/src/main/java/com/java110/community/listener/floor/SaveFloorInfoListener.java
@@ -53,8 +53,8 @@
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        //处理 businessFloor 节点
        if(data.containsKey("businessFloor")){
            Object _obj = data.get("businessFloor");
        if(data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO)){
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FLOOR_INFO);
            JSONArray businessFloors = null;
            if(_obj instanceof JSONObject){
                businessFloors = new JSONArray();
CommunityService/src/main/java/com/java110/community/listener/floor/UpdateFloorInfoListener.java
@@ -63,26 +63,24 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFloor 节点
        if (data.containsKey("businessFloor")) {
            //处理 businessFloor 节点
            if (data.containsKey("businessFloor")) {
                Object _obj = data.get("businessFloor");
                JSONArray businessFloors = null;
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FLOOR_INFO)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FLOOR_INFO);
            JSONArray businessFloors = null;
            if (_obj instanceof JSONObject) {
                businessFloors = new JSONArray();
                businessFloors.add(_obj);
            } else {
                businessFloors = (JSONArray) _obj;
            }
            //JSONObject businessFloor = data.getJSONObject("businessFloor");
            for (int _floorIndex = 0; _floorIndex < businessFloors.size(); _floorIndex++) {
                JSONObject businessFloor = businessFloors.getJSONObject(_floorIndex);
                doBusinessFloor(business, businessFloor);
                if (_obj instanceof JSONObject) {
                    businessFloors = new JSONArray();
                    businessFloors.add(_obj);
                } else {
                    businessFloors = (JSONArray) _obj;
                }
                //JSONObject businessFloor = data.getJSONObject("businessFloor");
                for (int _floorIndex = 0; _floorIndex < businessFloors.size(); _floorIndex++) {
                    JSONObject businessFloor = businessFloors.getJSONObject(_floorIndex);
                    doBusinessFloor(business, businessFloor);
                    if (_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("floorId", businessFloor.getString("floorId"));
                    }
                    dataFlowContext.addParamOut("floorId", businessFloor.getString("floorId"));
                }
            }
        }
    }
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/AbstractInspectionPlanBusinessServiceDataFlowListener.java
@@ -91,6 +91,12 @@
        currentInspectionPlanInfo.put("communityId", businessInspectionPlan.get("communityId"));
        currentInspectionPlanInfo.put("operate", StatusConstant.OPERATE_DEL);
        getInspectionPlanServiceDaoImpl().saveBusinessInspectionPlanInfo(currentInspectionPlanInfo);
        for (Object key : currentInspectionPlanInfo.keySet()) {
            if (businessInspectionPlan.get(key) == null) {
                businessInspectionPlan.put(key.toString(), currentInspectionPlanInfo.get(key));
            }
        }
    }
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/DeleteInspectionPlanInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 删除巡检计划信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessInspectionPlan:{} 巡检计划基本信息节点
 * 2、businessInspectionPlanAttr:[{}] 巡检计划属性信息节点
@@ -51,36 +51,36 @@
    /**
     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessInspectionPlan 节点
        if(data.containsKey("businessInspectionPlan")){
            //处理 businessInspectionPlan 节点
            if(data.containsKey("businessInspectionPlan")){
                Object _obj = data.get("businessInspectionPlan");
                JSONArray businessInspectionPlans = null;
                if(_obj instanceof JSONObject){
                    businessInspectionPlans = new JSONArray();
                    businessInspectionPlans.add(_obj);
                }else {
                    businessInspectionPlans = (JSONArray)_obj;
                }
                //JSONObject businessInspectionPlan = data.getJSONObject("businessInspectionPlan");
                for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlans.size();_inspectionPlanIndex++) {
                    JSONObject businessInspectionPlan = businessInspectionPlans.getJSONObject(_inspectionPlanIndex);
                    doBusinessInspectionPlan(business, businessInspectionPlan);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlan.getString("inspectionPlanId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_PLAN)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_PLAN);
            JSONArray businessInspectionPlans = null;
            if (_obj instanceof JSONObject) {
                businessInspectionPlans = new JSONArray();
                businessInspectionPlans.add(_obj);
            } else {
                businessInspectionPlans = (JSONArray) _obj;
            }
            //JSONObject businessInspectionPlan = data.getJSONObject("businessInspectionPlan");
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlans.size(); _inspectionPlanIndex++) {
                JSONObject businessInspectionPlan = businessInspectionPlans.getJSONObject(_inspectionPlanIndex);
                doBusinessInspectionPlan(business, businessInspectionPlan);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlan.getString("inspectionPlanId"));
                }
            }
        }
@@ -88,8 +88,9 @@
    /**
     * 删除 instance数据
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -98,17 +99,17 @@
        //巡检计划信息
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_DEL);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_DEL);
        //巡检计划信息
        List<Map> businessInspectionPlanInfos = inspectionPlanServiceDaoImpl.getBusinessInspectionPlanInfo(info);
        if( businessInspectionPlanInfos != null && businessInspectionPlanInfos.size() >0) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size();_inspectionPlanIndex++) {
        if (businessInspectionPlanInfos != null && businessInspectionPlanInfos.size() > 0) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size(); _inspectionPlanIndex++) {
                Map businessInspectionPlanInfo = businessInspectionPlanInfos.get(_inspectionPlanIndex);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo,StatusConstant.STATUS_CD_INVALID);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo, StatusConstant.STATUS_CD_INVALID);
                inspectionPlanServiceDaoImpl.updateInspectionPlanInfoInstance(businessInspectionPlanInfo);
                dataFlowContext.addParamOut("inspectionPlanId",businessInspectionPlanInfo.get("inspection_plan_id"));
                dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlanInfo.get("inspection_plan_id"));
            }
        }
@@ -117,54 +118,55 @@
    /**
     * 撤单
     * 从business表中查询到DEL的数据 将instance中的数据更新回来
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //巡检计划信息
        List<Map> inspectionPlanInfo = inspectionPlanServiceDaoImpl.getInspectionPlanInfo(info);
        if(inspectionPlanInfo != null && inspectionPlanInfo.size() > 0){
        if (inspectionPlanInfo != null && inspectionPlanInfo.size() > 0) {
            //巡检计划信息
            List<Map> businessInspectionPlanInfos = inspectionPlanServiceDaoImpl.getBusinessInspectionPlanInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessInspectionPlanInfos == null ||  businessInspectionPlanInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(inspectionPlan),程序内部异常,请检查! "+delInfo);
            if (businessInspectionPlanInfos == null || businessInspectionPlanInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(inspectionPlan),程序内部异常,请检查! " + delInfo);
            }
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size();_inspectionPlanIndex++) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size(); _inspectionPlanIndex++) {
                Map businessInspectionPlanInfo = businessInspectionPlanInfos.get(_inspectionPlanIndex);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo, StatusConstant.STATUS_CD_VALID);
                inspectionPlanServiceDaoImpl.updateInspectionPlanInfoInstance(businessInspectionPlanInfo);
            }
        }
    }
    /**
     * 处理 businessInspectionPlan 节点
     * @param business 总的数据节点
     *
     * @param business               总的数据节点
     * @param businessInspectionPlan 巡检计划节点
     */
    private void doBusinessInspectionPlan(Business business,JSONObject businessInspectionPlan){
    private void doBusinessInspectionPlan(Business business, JSONObject businessInspectionPlan) {
        Assert.jsonObjectHaveKey(businessInspectionPlan,"inspectionPlanId","businessInspectionPlan 节点下没有包含 inspectionPlanId 节点");
        Assert.jsonObjectHaveKey(businessInspectionPlan, "inspectionPlanId", "businessInspectionPlan 节点下没有包含 inspectionPlanId 节点");
        if(businessInspectionPlan.getString("inspectionPlanId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"inspectionPlanId 错误,不能自动生成(必须已经存在的inspectionPlanId)"+businessInspectionPlan);
        if (businessInspectionPlan.getString("inspectionPlanId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "inspectionPlanId 错误,不能自动生成(必须已经存在的inspectionPlanId)" + businessInspectionPlan);
        }
        //自动插入DEL
        autoSaveDelBusinessInspectionPlan(business,businessInspectionPlan);
        autoSaveDelBusinessInspectionPlan(business, businessInspectionPlan);
    }
    public IInspectionPlanServiceDao getInspectionPlanServiceDaoImpl() {
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/SaveInspectionPlanInfoListener.java
@@ -53,8 +53,8 @@
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        //处理 businessInspectionPlan 节点
        if(data.containsKey("businessInspectionPlan")){
            Object bObj = data.get("businessInspectionPlan");
        if(data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_PLAN)){
            Object bObj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION_PLAN);
            JSONArray businessInspectionPlans = null;
            if(bObj instanceof JSONObject){
                businessInspectionPlans = new JSONArray();
CommunityService/src/main/java/com/java110/community/listener/inspectionPlan/UpdateInspectionPlanInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 修改巡检计划信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessInspectionPlan:{} 巡检计划基本信息节点
 * 2、businessInspectionPlanAttr:[{}] 巡检计划属性信息节点
@@ -51,45 +51,46 @@
    /**
     * business过程
     *
     * @param dataFlowContext 上下文对象
     * @param business 业务对象
     * @param business        业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessInspectionPlan 节点
        if(data.containsKey("businessInspectionPlan")){
            //处理 businessInspectionPlan 节点
            if(data.containsKey("businessInspectionPlan")){
                Object _obj = data.get("businessInspectionPlan");
                JSONArray businessInspectionPlans = null;
                if(_obj instanceof JSONObject){
                    businessInspectionPlans = new JSONArray();
                    businessInspectionPlans.add(_obj);
                }else {
                    businessInspectionPlans = (JSONArray)_obj;
                }
                //JSONObject businessInspectionPlan = data.getJSONObject("businessInspectionPlan");
                for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlans.size();_inspectionPlanIndex++) {
                    JSONObject businessInspectionPlan = businessInspectionPlans.getJSONObject(_inspectionPlanIndex);
                    doBusinessInspectionPlan(business, businessInspectionPlan);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlan.getString("inspectionPlanId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_PLAN);
            JSONArray businessInspectionPlans = null;
            if (_obj instanceof JSONObject) {
                businessInspectionPlans = new JSONArray();
                businessInspectionPlans.add(_obj);
            } else {
                businessInspectionPlans = (JSONArray) _obj;
            }
            //JSONObject businessInspectionPlan = data.getJSONObject("businessInspectionPlan");
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlans.size(); _inspectionPlanIndex++) {
                JSONObject businessInspectionPlan = businessInspectionPlans.getJSONObject(_inspectionPlanIndex);
                doBusinessInspectionPlan(business, businessInspectionPlan);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlan.getString("inspectionPlanId"));
                }
            }
        }
    }
    /**
     * business to instance 过程
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -97,17 +98,17 @@
        JSONObject data = business.getDatas();
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_ADD);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_ADD);
        //巡检计划信息
        List<Map> businessInspectionPlanInfos = inspectionPlanServiceDaoImpl.getBusinessInspectionPlanInfo(info);
        if( businessInspectionPlanInfos != null && businessInspectionPlanInfos.size() >0) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size();_inspectionPlanIndex++) {
        if (businessInspectionPlanInfos != null && businessInspectionPlanInfos.size() > 0) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size(); _inspectionPlanIndex++) {
                Map businessInspectionPlanInfo = businessInspectionPlanInfos.get(_inspectionPlanIndex);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo, StatusConstant.STATUS_CD_VALID);
                inspectionPlanServiceDaoImpl.updateInspectionPlanInfoInstance(businessInspectionPlanInfo);
                if(businessInspectionPlanInfo.size() == 1) {
                if (businessInspectionPlanInfo.size() == 1) {
                    dataFlowContext.addParamOut("inspectionPlanId", businessInspectionPlanInfo.get("inspection_plan_id"));
                }
            }
@@ -117,8 +118,9 @@
    /**
     * 撤单
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
@@ -126,24 +128,24 @@
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //巡检计划信息
        List<Map> inspectionPlanInfo = inspectionPlanServiceDaoImpl.getInspectionPlanInfo(info);
        if(inspectionPlanInfo != null && inspectionPlanInfo.size() > 0){
        if (inspectionPlanInfo != null && inspectionPlanInfo.size() > 0) {
            //巡检计划信息
            List<Map> businessInspectionPlanInfos = inspectionPlanServiceDaoImpl.getBusinessInspectionPlanInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessInspectionPlanInfos == null || businessInspectionPlanInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(inspectionPlan),程序内部异常,请检查! "+delInfo);
            if (businessInspectionPlanInfos == null || businessInspectionPlanInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(inspectionPlan),程序内部异常,请检查! " + delInfo);
            }
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size();_inspectionPlanIndex++) {
            for (int _inspectionPlanIndex = 0; _inspectionPlanIndex < businessInspectionPlanInfos.size(); _inspectionPlanIndex++) {
                Map businessInspectionPlanInfo = businessInspectionPlanInfos.get(_inspectionPlanIndex);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessInspectionPlanInfo(businessInspectionPlanInfo, StatusConstant.STATUS_CD_VALID);
                inspectionPlanServiceDaoImpl.updateInspectionPlanInfoInstance(businessInspectionPlanInfo);
            }
        }
@@ -151,30 +153,28 @@
    }
    /**
     * 处理 businessInspectionPlan 节点
     * @param business 总的数据节点
     *
     * @param business               总的数据节点
     * @param businessInspectionPlan 巡检计划节点
     */
    private void doBusinessInspectionPlan(Business business,JSONObject businessInspectionPlan){
    private void doBusinessInspectionPlan(Business business, JSONObject businessInspectionPlan) {
        Assert.jsonObjectHaveKey(businessInspectionPlan,"inspectionPlanId","businessInspectionPlan 节点下没有包含 inspectionPlanId 节点");
        Assert.jsonObjectHaveKey(businessInspectionPlan, "inspectionPlanId", "businessInspectionPlan 节点下没有包含 inspectionPlanId 节点");
        if(businessInspectionPlan.getString("inspectionPlanId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"inspectionPlanId 错误,不能自动生成(必须已经存在的inspectionPlanId)"+businessInspectionPlan);
        if (businessInspectionPlan.getString("inspectionPlanId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "inspectionPlanId 错误,不能自动生成(必须已经存在的inspectionPlanId)" + businessInspectionPlan);
        }
        //自动保存DEL
        autoSaveDelBusinessInspectionPlan(business,businessInspectionPlan);
        autoSaveDelBusinessInspectionPlan(business, businessInspectionPlan);
        businessInspectionPlan.put("bId",business.getbId());
        businessInspectionPlan.put("bId", business.getbId());
        businessInspectionPlan.put("operate", StatusConstant.OPERATE_ADD);
        //保存巡检计划信息
        inspectionPlanServiceDaoImpl.saveBusinessInspectionPlanInfo(businessInspectionPlan);
    }
    public IInspectionPlanServiceDao getInspectionPlanServiceDaoImpl() {
@@ -184,7 +184,6 @@
    public void setInspectionPlanServiceDaoImpl(IInspectionPlanServiceDao inspectionPlanServiceDaoImpl) {
        this.inspectionPlanServiceDaoImpl = inspectionPlanServiceDaoImpl;
    }
}
FeeService/src/main/java/com/java110/fee/listener/config/AbstractFeeConfigBusinessServiceDataFlowListener.java
@@ -89,6 +89,11 @@
        currentFeeConfigInfo.put("operate", StatusConstant.OPERATE_DEL);
        getFeeConfigServiceDaoImpl().saveBusinessFeeConfigInfo(currentFeeConfigInfo);
        for(Object key : currentFeeConfigInfo.keySet()) {
            if(businessFeeConfig.get(key) == null) {
                businessFeeConfig.put(key.toString(), currentFeeConfigInfo.get(key));
            }
        }
    }
FeeService/src/main/java/com/java110/fee/listener/config/DeleteFeeConfigInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 删除费用配置信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessFeeConfig:{} 费用配置基本信息节点
 * 2、businessFeeConfigAttr:[{}] 费用配置属性信息节点
@@ -51,36 +51,36 @@
    /**
     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeConfig 节点
        if(data.containsKey("businessFeeConfig")){
            //处理 businessFeeConfig 节点
            if(data.containsKey("businessFeeConfig")){
                Object _obj = data.get("businessFeeConfig");
                JSONArray businessFeeConfigs = null;
                if(_obj instanceof JSONObject){
                    businessFeeConfigs = new JSONArray();
                    businessFeeConfigs.add(_obj);
                }else {
                    businessFeeConfigs = (JSONArray)_obj;
                }
                //JSONObject businessFeeConfig = data.getJSONObject("businessFeeConfig");
                for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigs.size();_feeConfigIndex++) {
                    JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                    doBusinessFeeConfig(business, businessFeeConfig);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
            JSONArray businessFeeConfigs = null;
            if (_obj instanceof JSONObject) {
                businessFeeConfigs = new JSONArray();
                businessFeeConfigs.add(_obj);
            } else {
                businessFeeConfigs = (JSONArray) _obj;
            }
            //JSONObject businessFeeConfig = data.getJSONObject("businessFeeConfig");
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigs.size(); _feeConfigIndex++) {
                JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                doBusinessFeeConfig(business, businessFeeConfig);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                }
            }
        }
@@ -88,8 +88,9 @@
    /**
     * 删除 instance数据
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -98,17 +99,17 @@
        //费用配置信息
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_DEL);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_DEL);
        //费用配置信息
        List<Map> businessFeeConfigInfos = feeConfigServiceDaoImpl.getBusinessFeeConfigInfo(info);
        if( businessFeeConfigInfos != null && businessFeeConfigInfos.size() >0) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size();_feeConfigIndex++) {
        if (businessFeeConfigInfos != null && businessFeeConfigInfos.size() > 0) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size(); _feeConfigIndex++) {
                Map businessFeeConfigInfo = businessFeeConfigInfos.get(_feeConfigIndex);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_INVALID);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo, StatusConstant.STATUS_CD_INVALID);
                feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
                dataFlowContext.addParamOut("configId",businessFeeConfigInfo.get("config_id"));
                dataFlowContext.addParamOut("configId", businessFeeConfigInfo.get("config_id"));
            }
        }
@@ -117,54 +118,55 @@
    /**
     * 撤单
     * 从business表中查询到DEL的数据 将instance中的数据更新回来
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //费用配置信息
        List<Map> feeConfigInfo = feeConfigServiceDaoImpl.getFeeConfigInfo(info);
        if(feeConfigInfo != null && feeConfigInfo.size() > 0){
        if (feeConfigInfo != null && feeConfigInfo.size() > 0) {
            //费用配置信息
            List<Map> businessFeeConfigInfos = feeConfigServiceDaoImpl.getBusinessFeeConfigInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessFeeConfigInfos == null ||  businessFeeConfigInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(feeConfig),程序内部异常,请检查! "+delInfo);
            if (businessFeeConfigInfos == null || businessFeeConfigInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(feeConfig),程序内部异常,请检查! " + delInfo);
            }
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size();_feeConfigIndex++) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size(); _feeConfigIndex++) {
                Map businessFeeConfigInfo = businessFeeConfigInfos.get(_feeConfigIndex);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo, StatusConstant.STATUS_CD_VALID);
                feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
            }
        }
    }
    /**
     * 处理 businessFeeConfig 节点
     * @param business 总的数据节点
     *
     * @param business          总的数据节点
     * @param businessFeeConfig 费用配置节点
     */
    private void doBusinessFeeConfig(Business business,JSONObject businessFeeConfig){
    private void doBusinessFeeConfig(Business business, JSONObject businessFeeConfig) {
        Assert.jsonObjectHaveKey(businessFeeConfig,"configId","businessFeeConfig 节点下没有包含 configId 节点");
        Assert.jsonObjectHaveKey(businessFeeConfig, "configId", "businessFeeConfig 节点下没有包含 configId 节点");
        if(businessFeeConfig.getString("configId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"configId 错误,不能自动生成(必须已经存在的configId)"+businessFeeConfig);
        if (businessFeeConfig.getString("configId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "configId 错误,不能自动生成(必须已经存在的configId)" + businessFeeConfig);
        }
        //自动插入DEL
        autoSaveDelBusinessFeeConfig(business,businessFeeConfig);
        autoSaveDelBusinessFeeConfig(business, businessFeeConfig);
    }
    public IFeeConfigServiceDao getFeeConfigServiceDaoImpl() {
FeeService/src/main/java/com/java110/fee/listener/config/SaveFeeConfigInfoListener.java
@@ -24,7 +24,7 @@
 * Created by wuxw on 2018/5/18.
 */
@Java110Listener("saveFeeConfigInfoListener")
@Transactional
public class SaveFeeConfigInfoListener extends AbstractFeeConfigBusinessServiceDataFlowListener{
    private static Logger logger = LoggerFactory.getLogger(SaveFeeConfigInfoListener.class);
@@ -53,8 +53,8 @@
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeConfig 节点
        if(data.containsKey("businessFeeConfig")){
            Object bObj = data.get("businessFeeConfig");
        if(data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG)){
            Object bObj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
            JSONArray businessFeeConfigs = null;
            if(bObj instanceof JSONObject){
                businessFeeConfigs = new JSONArray();
FeeService/src/main/java/com/java110/fee/listener/config/UpdateFeeConfigInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 修改费用配置信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessFeeConfig:{} 费用配置基本信息节点
 * 2、businessFeeConfigAttr:[{}] 费用配置属性信息节点
@@ -51,45 +51,45 @@
    /**
     * business过程
     *
     * @param dataFlowContext 上下文对象
     * @param business 业务对象
     * @param business        业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeConfig 节点
        if(data.containsKey("businessFeeConfig")){
            //处理 businessFeeConfig 节点
            if(data.containsKey("businessFeeConfig")){
                Object _obj = data.get("businessFeeConfig");
                JSONArray businessFeeConfigs = null;
                if(_obj instanceof JSONObject){
                    businessFeeConfigs = new JSONArray();
                    businessFeeConfigs.add(_obj);
                }else {
                    businessFeeConfigs = (JSONArray)_obj;
                }
                //JSONObject businessFeeConfig = data.getJSONObject("businessFeeConfig");
                for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigs.size();_feeConfigIndex++) {
                    JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                    doBusinessFeeConfig(business, businessFeeConfig);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
            JSONArray businessFeeConfigs = null;
            if (_obj instanceof JSONObject) {
                businessFeeConfigs = new JSONArray();
                businessFeeConfigs.add(_obj);
            } else {
                businessFeeConfigs = (JSONArray) _obj;
            }
            //JSONObject businessFeeConfig = data.getJSONObject("businessFeeConfig");
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigs.size(); _feeConfigIndex++) {
                JSONObject businessFeeConfig = businessFeeConfigs.getJSONObject(_feeConfigIndex);
                doBusinessFeeConfig(business, businessFeeConfig);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("configId", businessFeeConfig.getString("configId"));
                }
            }
        }
    }
    /**
     * business to instance 过程
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -97,17 +97,17 @@
        JSONObject data = business.getDatas();
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_ADD);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_ADD);
        //费用配置信息
        List<Map> businessFeeConfigInfos = feeConfigServiceDaoImpl.getBusinessFeeConfigInfo(info);
        if( businessFeeConfigInfos != null && businessFeeConfigInfos.size() >0) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size();_feeConfigIndex++) {
        if (businessFeeConfigInfos != null && businessFeeConfigInfos.size() > 0) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size(); _feeConfigIndex++) {
                Map businessFeeConfigInfo = businessFeeConfigInfos.get(_feeConfigIndex);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo, StatusConstant.STATUS_CD_VALID);
                feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
                if(businessFeeConfigInfo.size() == 1) {
                if (businessFeeConfigInfo.size() == 1) {
                    dataFlowContext.addParamOut("configId", businessFeeConfigInfo.get("config_id"));
                }
            }
@@ -117,8 +117,9 @@
    /**
     * 撤单
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
@@ -126,24 +127,24 @@
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //费用配置信息
        List<Map> feeConfigInfo = feeConfigServiceDaoImpl.getFeeConfigInfo(info);
        if(feeConfigInfo != null && feeConfigInfo.size() > 0){
        if (feeConfigInfo != null && feeConfigInfo.size() > 0) {
            //费用配置信息
            List<Map> businessFeeConfigInfos = feeConfigServiceDaoImpl.getBusinessFeeConfigInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessFeeConfigInfos == null || businessFeeConfigInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(feeConfig),程序内部异常,请检查! "+delInfo);
            if (businessFeeConfigInfos == null || businessFeeConfigInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(feeConfig),程序内部异常,请检查! " + delInfo);
            }
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size();_feeConfigIndex++) {
            for (int _feeConfigIndex = 0; _feeConfigIndex < businessFeeConfigInfos.size(); _feeConfigIndex++) {
                Map businessFeeConfigInfo = businessFeeConfigInfos.get(_feeConfigIndex);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeConfigInfo(businessFeeConfigInfo, StatusConstant.STATUS_CD_VALID);
                feeConfigServiceDaoImpl.updateFeeConfigInfoInstance(businessFeeConfigInfo);
            }
        }
@@ -151,30 +152,28 @@
    }
    /**
     * 处理 businessFeeConfig 节点
     * @param business 总的数据节点
     *
     * @param business          总的数据节点
     * @param businessFeeConfig 费用配置节点
     */
    private void doBusinessFeeConfig(Business business,JSONObject businessFeeConfig){
    private void doBusinessFeeConfig(Business business, JSONObject businessFeeConfig) {
        Assert.jsonObjectHaveKey(businessFeeConfig,"configId","businessFeeConfig 节点下没有包含 configId 节点");
        Assert.jsonObjectHaveKey(businessFeeConfig, "configId", "businessFeeConfig 节点下没有包含 configId 节点");
        if(businessFeeConfig.getString("configId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"configId 错误,不能自动生成(必须已经存在的configId)"+businessFeeConfig);
        if (businessFeeConfig.getString("configId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "configId 错误,不能自动生成(必须已经存在的configId)" + businessFeeConfig);
        }
        //自动保存DEL
        autoSaveDelBusinessFeeConfig(business,businessFeeConfig);
        autoSaveDelBusinessFeeConfig(business, businessFeeConfig);
        businessFeeConfig.put("bId",business.getbId());
        businessFeeConfig.put("bId", business.getbId());
        businessFeeConfig.put("operate", StatusConstant.OPERATE_ADD);
        //保存费用配置信息
        feeConfigServiceDaoImpl.saveBusinessFeeConfigInfo(businessFeeConfig);
    }
    public IFeeConfigServiceDao getFeeConfigServiceDaoImpl() {
@@ -184,7 +183,6 @@
    public void setFeeConfigServiceDaoImpl(IFeeConfigServiceDao feeConfigServiceDaoImpl) {
        this.feeConfigServiceDaoImpl = feeConfigServiceDaoImpl;
    }
}
FeeService/src/main/java/com/java110/fee/listener/detail/AbstractFeeDetailBusinessServiceDataFlowListener.java
@@ -15,16 +15,16 @@
import java.util.Map;
/**
 *
 * 费用明细 服务侦听 父类
 * Created by wuxw on 2018/7/4.
 */
public abstract class AbstractFeeDetailBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener{
public abstract class AbstractFeeDetailBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
    private static Logger logger = LoggerFactory.getLogger(AbstractFeeDetailBusinessServiceDataFlowListener.class);
    /**
     * 获取 DAO工具类
     *
     * @return
     */
    public abstract IFeeDetailServiceDao getFeeDetailServiceDaoImpl();
@@ -32,59 +32,64 @@
    /**
     * 刷新 businessFeeDetailInfo 数据
     * 主要将 数据库 中字段和 接口传递字段建立关系
     *
     * @param businessFeeDetailInfo
     */
    protected void flushBusinessFeeDetailInfo(Map businessFeeDetailInfo,String statusCd){
    protected void flushBusinessFeeDetailInfo(Map businessFeeDetailInfo, String statusCd) {
        businessFeeDetailInfo.put("newBId", businessFeeDetailInfo.get("b_id"));
        businessFeeDetailInfo.put("operate",businessFeeDetailInfo.get("operate"));
businessFeeDetailInfo.put("primeRate",businessFeeDetailInfo.get("prime_rate"));
businessFeeDetailInfo.put("detailId",businessFeeDetailInfo.get("detail_id"));
businessFeeDetailInfo.put("receivableAmount",businessFeeDetailInfo.get("receivable_amount"));
businessFeeDetailInfo.put("cycles",businessFeeDetailInfo.get("cycles"));
businessFeeDetailInfo.put("remark",businessFeeDetailInfo.get("remark"));
businessFeeDetailInfo.put("receivedAmount",businessFeeDetailInfo.get("received_amount"));
businessFeeDetailInfo.put("communityId",businessFeeDetailInfo.get("community_id"));
businessFeeDetailInfo.put("feeId",businessFeeDetailInfo.get("fee_id"));
businessFeeDetailInfo.remove("bId");
        businessFeeDetailInfo.put("operate", businessFeeDetailInfo.get("operate"));
        businessFeeDetailInfo.put("primeRate", businessFeeDetailInfo.get("prime_rate"));
        businessFeeDetailInfo.put("detailId", businessFeeDetailInfo.get("detail_id"));
        businessFeeDetailInfo.put("receivableAmount", businessFeeDetailInfo.get("receivable_amount"));
        businessFeeDetailInfo.put("cycles", businessFeeDetailInfo.get("cycles"));
        businessFeeDetailInfo.put("remark", businessFeeDetailInfo.get("remark"));
        businessFeeDetailInfo.put("receivedAmount", businessFeeDetailInfo.get("received_amount"));
        businessFeeDetailInfo.put("communityId", businessFeeDetailInfo.get("community_id"));
        businessFeeDetailInfo.put("feeId", businessFeeDetailInfo.get("fee_id"));
        businessFeeDetailInfo.remove("bId");
        businessFeeDetailInfo.put("statusCd", statusCd);
    }
    /**
     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
     *
     * @param businessFeeDetail 费用明细信息
     */
    protected void autoSaveDelBusinessFeeDetail(Business business, JSONObject businessFeeDetail){
    protected void autoSaveDelBusinessFeeDetail(Business business, JSONObject businessFeeDetail) {
//自动插入DEL
        Map info = new HashMap();
        info.put("detailId",businessFeeDetail.getString("detailId"));
        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
        info.put("detailId", businessFeeDetail.getString("detailId"));
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        List<Map> currentFeeDetailInfos = getFeeDetailServiceDaoImpl().getFeeDetailInfo(info);
        if(currentFeeDetailInfos == null || currentFeeDetailInfos.size() != 1){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息,入参错误或数据有问题,请检查"+info);
        if (currentFeeDetailInfos == null || currentFeeDetailInfos.size() != 1) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息,入参错误或数据有问题,请检查" + info);
        }
        Map currentFeeDetailInfo = currentFeeDetailInfos.get(0);
        currentFeeDetailInfo.put("bId",business.getbId());
        currentFeeDetailInfo.put("bId", business.getbId());
        currentFeeDetailInfo.put("operate",currentFeeDetailInfo.get("operate"));
currentFeeDetailInfo.put("primeRate",currentFeeDetailInfo.get("prime_rate"));
currentFeeDetailInfo.put("detailId",currentFeeDetailInfo.get("detail_id"));
currentFeeDetailInfo.put("receivableAmount",currentFeeDetailInfo.get("receivable_amount"));
currentFeeDetailInfo.put("cycles",currentFeeDetailInfo.get("cycles"));
currentFeeDetailInfo.put("remark",currentFeeDetailInfo.get("remark"));
currentFeeDetailInfo.put("receivedAmount",currentFeeDetailInfo.get("received_amount"));
currentFeeDetailInfo.put("communityId",currentFeeDetailInfo.get("community_id"));
currentFeeDetailInfo.put("feeId",currentFeeDetailInfo.get("fee_id"));
        currentFeeDetailInfo.put("operate", currentFeeDetailInfo.get("operate"));
        currentFeeDetailInfo.put("primeRate", currentFeeDetailInfo.get("prime_rate"));
        currentFeeDetailInfo.put("detailId", currentFeeDetailInfo.get("detail_id"));
        currentFeeDetailInfo.put("receivableAmount", currentFeeDetailInfo.get("receivable_amount"));
        currentFeeDetailInfo.put("cycles", currentFeeDetailInfo.get("cycles"));
        currentFeeDetailInfo.put("remark", currentFeeDetailInfo.get("remark"));
        currentFeeDetailInfo.put("receivedAmount", currentFeeDetailInfo.get("received_amount"));
        currentFeeDetailInfo.put("communityId", currentFeeDetailInfo.get("community_id"));
        currentFeeDetailInfo.put("feeId", currentFeeDetailInfo.get("fee_id"));
        currentFeeDetailInfo.put("operate",StatusConstant.OPERATE_DEL);
        currentFeeDetailInfo.put("operate", StatusConstant.OPERATE_DEL);
        getFeeDetailServiceDaoImpl().saveBusinessFeeDetailInfo(currentFeeDetailInfo);
        for (Object key : currentFeeDetailInfo.keySet()) {
            if (businessFeeDetail.get(key) == null) {
                businessFeeDetail.put(key.toString(), currentFeeDetailInfo.get(key));
            }
        }
    }
}
FeeService/src/main/java/com/java110/fee/listener/detail/DeleteFeeDetailInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 删除费用明细信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessFeeDetail:{} 费用明细基本信息节点
 * 2、businessFeeDetailAttr:[{}] 费用明细属性信息节点
@@ -51,36 +51,35 @@
    /**
     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeDetail 节点
        if(data.containsKey("businessFeeDetail")){
            //处理 businessFeeDetail 节点
            if(data.containsKey("businessFeeDetail")){
                Object _obj = data.get("businessFeeDetail");
                JSONArray businessFeeDetails = null;
                if(_obj instanceof JSONObject){
                    businessFeeDetails = new JSONArray();
                    businessFeeDetails.add(_obj);
                }else {
                    businessFeeDetails = (JSONArray)_obj;
                }
                //JSONObject businessFeeDetail = data.getJSONObject("businessFeeDetail");
                for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetails.size();_feeDetailIndex++) {
                    JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                    doBusinessFeeDetail(business, businessFeeDetail);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_DETAIL)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_DETAIL);
            JSONArray businessFeeDetails = null;
            if (_obj instanceof JSONObject) {
                businessFeeDetails = new JSONArray();
                businessFeeDetails.add(_obj);
            } else {
                businessFeeDetails = (JSONArray) _obj;
            }
            //JSONObject businessFeeDetail = data.getJSONObject("businessFeeDetail");
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetails.size(); _feeDetailIndex++) {
                JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                doBusinessFeeDetail(business, businessFeeDetail);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                }
            }
        }
@@ -88,8 +87,9 @@
    /**
     * 删除 instance数据
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -98,17 +98,17 @@
        //费用明细信息
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_DEL);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_DEL);
        //费用明细信息
        List<Map> businessFeeDetailInfos = feeDetailServiceDaoImpl.getBusinessFeeDetailInfo(info);
        if( businessFeeDetailInfos != null && businessFeeDetailInfos.size() >0) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size();_feeDetailIndex++) {
        if (businessFeeDetailInfos != null && businessFeeDetailInfos.size() > 0) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size(); _feeDetailIndex++) {
                Map businessFeeDetailInfo = businessFeeDetailInfos.get(_feeDetailIndex);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_INVALID);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo, StatusConstant.STATUS_CD_INVALID);
                feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
                dataFlowContext.addParamOut("detailId",businessFeeDetailInfo.get("detail_id"));
                dataFlowContext.addParamOut("detailId", businessFeeDetailInfo.get("detail_id"));
            }
        }
@@ -117,54 +117,55 @@
    /**
     * 撤单
     * 从business表中查询到DEL的数据 将instance中的数据更新回来
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //费用明细信息
        List<Map> feeDetailInfo = feeDetailServiceDaoImpl.getFeeDetailInfo(info);
        if(feeDetailInfo != null && feeDetailInfo.size() > 0){
        if (feeDetailInfo != null && feeDetailInfo.size() > 0) {
            //费用明细信息
            List<Map> businessFeeDetailInfos = feeDetailServiceDaoImpl.getBusinessFeeDetailInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessFeeDetailInfos == null ||  businessFeeDetailInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(feeDetail),程序内部异常,请检查! "+delInfo);
            if (businessFeeDetailInfos == null || businessFeeDetailInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(feeDetail),程序内部异常,请检查! " + delInfo);
            }
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size();_feeDetailIndex++) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size(); _feeDetailIndex++) {
                Map businessFeeDetailInfo = businessFeeDetailInfos.get(_feeDetailIndex);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo, StatusConstant.STATUS_CD_VALID);
                feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
            }
        }
    }
    /**
     * 处理 businessFeeDetail 节点
     * @param business 总的数据节点
     *
     * @param business          总的数据节点
     * @param businessFeeDetail 费用明细节点
     */
    private void doBusinessFeeDetail(Business business,JSONObject businessFeeDetail){
    private void doBusinessFeeDetail(Business business, JSONObject businessFeeDetail) {
        Assert.jsonObjectHaveKey(businessFeeDetail,"detailId","businessFeeDetail 节点下没有包含 detailId 节点");
        Assert.jsonObjectHaveKey(businessFeeDetail, "detailId", "businessFeeDetail 节点下没有包含 detailId 节点");
        if(businessFeeDetail.getString("detailId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"detailId 错误,不能自动生成(必须已经存在的detailId)"+businessFeeDetail);
        if (businessFeeDetail.getString("detailId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "detailId 错误,不能自动生成(必须已经存在的detailId)" + businessFeeDetail);
        }
        //自动插入DEL
        autoSaveDelBusinessFeeDetail(business,businessFeeDetail);
        autoSaveDelBusinessFeeDetail(business, businessFeeDetail);
    }
    public IFeeDetailServiceDao getFeeDetailServiceDaoImpl() {
FeeService/src/main/java/com/java110/fee/listener/detail/SaveFeeDetailInfoListener.java
@@ -53,8 +53,8 @@
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeDetail 节点
        if(data.containsKey("businessFeeDetail")){
            Object bObj = data.get("businessFeeDetail");
        if(data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL)){
            Object bObj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_DETAIL);
            JSONArray businessFeeDetails = null;
            if(bObj instanceof JSONObject){
                businessFeeDetails = new JSONArray();
FeeService/src/main/java/com/java110/fee/listener/detail/UpdateFeeDetailInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 修改费用明细信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessFeeDetail:{} 费用明细基本信息节点
 * 2、businessFeeDetailAttr:[{}] 费用明细属性信息节点
@@ -51,45 +51,45 @@
    /**
     * business过程
     *
     * @param dataFlowContext 上下文对象
     * @param business 业务对象
     * @param business        业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFeeDetail 节点
        if(data.containsKey("businessFeeDetail")){
            //处理 businessFeeDetail 节点
            if(data.containsKey("businessFeeDetail")){
                Object _obj = data.get("businessFeeDetail");
                JSONArray businessFeeDetails = null;
                if(_obj instanceof JSONObject){
                    businessFeeDetails = new JSONArray();
                    businessFeeDetails.add(_obj);
                }else {
                    businessFeeDetails = (JSONArray)_obj;
                }
                //JSONObject businessFeeDetail = data.getJSONObject("businessFeeDetail");
                for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetails.size();_feeDetailIndex++) {
                    JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                    doBusinessFeeDetail(business, businessFeeDetail);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_DETAIL)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_DETAIL);
            JSONArray businessFeeDetails = null;
            if (_obj instanceof JSONObject) {
                businessFeeDetails = new JSONArray();
                businessFeeDetails.add(_obj);
            } else {
                businessFeeDetails = (JSONArray) _obj;
            }
            //JSONObject businessFeeDetail = data.getJSONObject("businessFeeDetail");
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetails.size(); _feeDetailIndex++) {
                JSONObject businessFeeDetail = businessFeeDetails.getJSONObject(_feeDetailIndex);
                doBusinessFeeDetail(business, businessFeeDetail);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("detailId", businessFeeDetail.getString("detailId"));
                }
            }
        }
    }
    /**
     * business to instance 过程
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -97,17 +97,17 @@
        JSONObject data = business.getDatas();
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_ADD);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_ADD);
        //费用明细信息
        List<Map> businessFeeDetailInfos = feeDetailServiceDaoImpl.getBusinessFeeDetailInfo(info);
        if( businessFeeDetailInfos != null && businessFeeDetailInfos.size() >0) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size();_feeDetailIndex++) {
        if (businessFeeDetailInfos != null && businessFeeDetailInfos.size() > 0) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size(); _feeDetailIndex++) {
                Map businessFeeDetailInfo = businessFeeDetailInfos.get(_feeDetailIndex);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo, StatusConstant.STATUS_CD_VALID);
                feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
                if(businessFeeDetailInfo.size() == 1) {
                if (businessFeeDetailInfo.size() == 1) {
                    dataFlowContext.addParamOut("detailId", businessFeeDetailInfo.get("detail_id"));
                }
            }
@@ -117,8 +117,9 @@
    /**
     * 撤单
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
@@ -126,24 +127,24 @@
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //费用明细信息
        List<Map> feeDetailInfo = feeDetailServiceDaoImpl.getFeeDetailInfo(info);
        if(feeDetailInfo != null && feeDetailInfo.size() > 0){
        if (feeDetailInfo != null && feeDetailInfo.size() > 0) {
            //费用明细信息
            List<Map> businessFeeDetailInfos = feeDetailServiceDaoImpl.getBusinessFeeDetailInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessFeeDetailInfos == null || businessFeeDetailInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(feeDetail),程序内部异常,请检查! "+delInfo);
            if (businessFeeDetailInfos == null || businessFeeDetailInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(feeDetail),程序内部异常,请检查! " + delInfo);
            }
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size();_feeDetailIndex++) {
            for (int _feeDetailIndex = 0; _feeDetailIndex < businessFeeDetailInfos.size(); _feeDetailIndex++) {
                Map businessFeeDetailInfo = businessFeeDetailInfos.get(_feeDetailIndex);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeDetailInfo(businessFeeDetailInfo, StatusConstant.STATUS_CD_VALID);
                feeDetailServiceDaoImpl.updateFeeDetailInfoInstance(businessFeeDetailInfo);
            }
        }
@@ -151,30 +152,28 @@
    }
    /**
     * 处理 businessFeeDetail 节点
     * @param business 总的数据节点
     *
     * @param business          总的数据节点
     * @param businessFeeDetail 费用明细节点
     */
    private void doBusinessFeeDetail(Business business,JSONObject businessFeeDetail){
    private void doBusinessFeeDetail(Business business, JSONObject businessFeeDetail) {
        Assert.jsonObjectHaveKey(businessFeeDetail,"detailId","businessFeeDetail 节点下没有包含 detailId 节点");
        Assert.jsonObjectHaveKey(businessFeeDetail, "detailId", "businessFeeDetail 节点下没有包含 detailId 节点");
        if(businessFeeDetail.getString("detailId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"detailId 错误,不能自动生成(必须已经存在的detailId)"+businessFeeDetail);
        if (businessFeeDetail.getString("detailId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "detailId 错误,不能自动生成(必须已经存在的detailId)" + businessFeeDetail);
        }
        //自动保存DEL
        autoSaveDelBusinessFeeDetail(business,businessFeeDetail);
        autoSaveDelBusinessFeeDetail(business, businessFeeDetail);
        businessFeeDetail.put("bId",business.getbId());
        businessFeeDetail.put("bId", business.getbId());
        businessFeeDetail.put("operate", StatusConstant.OPERATE_ADD);
        //保存费用明细信息
        feeDetailServiceDaoImpl.saveBusinessFeeDetailInfo(businessFeeDetail);
    }
    public IFeeDetailServiceDao getFeeDetailServiceDaoImpl() {
@@ -184,7 +183,6 @@
    public void setFeeDetailServiceDaoImpl(IFeeDetailServiceDao feeDetailServiceDaoImpl) {
        this.feeDetailServiceDaoImpl = feeDetailServiceDaoImpl;
    }
}
FeeService/src/main/java/com/java110/fee/listener/fee/AbstractFeeBusinessServiceDataFlowListener.java
@@ -50,6 +50,8 @@
        businessFeeInfo.put("feeFlag", businessFeeInfo.get("fee_flag"));
        businessFeeInfo.put("state", businessFeeInfo.get("state"));
        businessFeeInfo.put("configId", businessFeeInfo.get("config_id"));
        businessFeeInfo.put("billType", businessFeeInfo.get("bill_type"));
        businessFeeInfo.remove("bId");
        businessFeeInfo.put("statusCd", statusCd);
    }
@@ -88,9 +90,16 @@
        currentFeeInfo.put("feeFlag", currentFeeInfo.get("fee_flag"));
        currentFeeInfo.put("state", currentFeeInfo.get("state"));
        currentFeeInfo.put("configId", currentFeeInfo.get("config_id"));
        currentFeeInfo.put("billType", currentFeeInfo.get("bill_type"));
        currentFeeInfo.put("operate", StatusConstant.OPERATE_DEL);
        getFeeServiceDaoImpl().saveBusinessFeeInfo(currentFeeInfo);
        for(Object key : currentFeeInfo.keySet()) {
            if(businessFee.get(key) == null) {
                businessFee.put(key.toString(), currentFeeInfo.get(key));
            }
        }
    }
FeeService/src/main/java/com/java110/fee/listener/fee/DeleteFeeInfoListener.java
@@ -22,7 +22,7 @@
/**
 * 删除费用信息 侦听
 *
 * <p>
 * 处理节点
 * 1、businessFee:{} 费用基本信息节点
 * 2、businessFeeAttr:[{}] 费用属性信息节点
@@ -51,36 +51,36 @@
    /**
     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
        JSONObject data = business.getDatas();
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFee 节点
        if(data.containsKey("businessFee")){
            //处理 businessFee 节点
            if(data.containsKey("businessFee")){
                Object _obj = data.get("businessFee");
                JSONArray businessFees = null;
                if(_obj instanceof JSONObject){
                    businessFees = new JSONArray();
                    businessFees.add(_obj);
                }else {
                    businessFees = (JSONArray)_obj;
                }
                //JSONObject businessFee = data.getJSONObject("businessFee");
                for (int _feeIndex = 0; _feeIndex < businessFees.size();_feeIndex++) {
                    JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
                    doBusinessFee(business, businessFee);
                    if(_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
                    }
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_DELETE_FEE_INFO);
            JSONArray businessFees = null;
            if (_obj instanceof JSONObject) {
                businessFees = new JSONArray();
                businessFees.add(_obj);
            } else {
                businessFees = (JSONArray) _obj;
            }
            //JSONObject businessFee = data.getJSONObject("businessFee");
            for (int _feeIndex = 0; _feeIndex < businessFees.size(); _feeIndex++) {
                JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
                doBusinessFee(business, businessFee);
                if (_obj instanceof JSONObject) {
                    dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
                }
            }
        }
@@ -88,8 +88,9 @@
    /**
     * 删除 instance数据
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -98,17 +99,17 @@
        //费用信息
        Map info = new HashMap();
        info.put("bId",business.getbId());
        info.put("operate",StatusConstant.OPERATE_DEL);
        info.put("bId", business.getbId());
        info.put("operate", StatusConstant.OPERATE_DEL);
        //费用信息
        List<Map> businessFeeInfos = feeServiceDaoImpl.getBusinessFeeInfo(info);
        if( businessFeeInfos != null && businessFeeInfos.size() >0) {
            for (int _feeIndex = 0; _feeIndex < businessFeeInfos.size();_feeIndex++) {
        if (businessFeeInfos != null && businessFeeInfos.size() > 0) {
            for (int _feeIndex = 0; _feeIndex < businessFeeInfos.size(); _feeIndex++) {
                Map businessFeeInfo = businessFeeInfos.get(_feeIndex);
                flushBusinessFeeInfo(businessFeeInfo,StatusConstant.STATUS_CD_INVALID);
                flushBusinessFeeInfo(businessFeeInfo, StatusConstant.STATUS_CD_INVALID);
                feeServiceDaoImpl.updateFeeInfoInstance(businessFeeInfo);
                dataFlowContext.addParamOut("feeId",businessFeeInfo.get("fee_id"));
                dataFlowContext.addParamOut("feeId", businessFeeInfo.get("fee_id"));
            }
        }
@@ -117,54 +118,55 @@
    /**
     * 撤单
     * 从business表中查询到DEL的数据 将instance中的数据更新回来
     *
     * @param dataFlowContext 数据对象
     * @param business 当前业务对象
     * @param business        当前业务对象
     */
    @Override
    protected void doRecover(DataFlowContext dataFlowContext, Business business) {
        String bId = business.getbId();
        //Assert.hasLength(bId,"请求报文中没有包含 bId");
        Map info = new HashMap();
        info.put("bId",bId);
        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
        info.put("bId", bId);
        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
        Map delInfo = new HashMap();
        delInfo.put("bId",business.getbId());
        delInfo.put("operate",StatusConstant.OPERATE_DEL);
        delInfo.put("bId", business.getbId());
        delInfo.put("operate", StatusConstant.OPERATE_DEL);
        //费用信息
        List<Map> feeInfo = feeServiceDaoImpl.getFeeInfo(info);
        if(feeInfo != null && feeInfo.size() > 0){
        if (feeInfo != null && feeInfo.size() > 0) {
            //费用信息
            List<Map> businessFeeInfos = feeServiceDaoImpl.getBusinessFeeInfo(delInfo);
            //除非程序出错了,这里不会为空
            if(businessFeeInfos == null ||  businessFeeInfos.size() == 0){
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(fee),程序内部异常,请检查! "+delInfo);
            if (businessFeeInfos == null || businessFeeInfos.size() == 0) {
                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败(fee),程序内部异常,请检查! " + delInfo);
            }
            for (int _feeIndex = 0; _feeIndex < businessFeeInfos.size();_feeIndex++) {
            for (int _feeIndex = 0; _feeIndex < businessFeeInfos.size(); _feeIndex++) {
                Map businessFeeInfo = businessFeeInfos.get(_feeIndex);
                flushBusinessFeeInfo(businessFeeInfo,StatusConstant.STATUS_CD_VALID);
                flushBusinessFeeInfo(businessFeeInfo, StatusConstant.STATUS_CD_VALID);
                feeServiceDaoImpl.updateFeeInfoInstance(businessFeeInfo);
            }
        }
    }
    /**
     * 处理 businessFee 节点
     * @param business 总的数据节点
     *
     * @param business    总的数据节点
     * @param businessFee 费用节点
     */
    private void doBusinessFee(Business business,JSONObject businessFee){
    private void doBusinessFee(Business business, JSONObject businessFee) {
        Assert.jsonObjectHaveKey(businessFee,"feeId","businessFee 节点下没有包含 feeId 节点");
        Assert.jsonObjectHaveKey(businessFee, "feeId", "businessFee 节点下没有包含 feeId 节点");
        if(businessFee.getString("feeId").startsWith("-")){
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"feeId 错误,不能自动生成(必须已经存在的feeId)"+businessFee);
        if (businessFee.getString("feeId").startsWith("-")) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "feeId 错误,不能自动生成(必须已经存在的feeId)" + businessFee);
        }
        //自动插入DEL
        autoSaveDelBusinessFee(business,businessFee);
        autoSaveDelBusinessFee(business, businessFee);
    }
    public IFeeServiceDao getFeeServiceDaoImpl() {
FeeService/src/main/java/com/java110/fee/listener/fee/SaveFeeInfoListener.java
@@ -53,8 +53,8 @@
        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
        //处理 businessFee 节点
        if(data.containsKey("businessFee")){
            Object bObj = data.get("businessFee");
        if(data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO)){
            Object bObj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
            JSONArray businessFees = null;
            if(bObj instanceof JSONObject){
                businessFees = new JSONArray();
FeeService/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java
@@ -72,27 +72,26 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessFee 节点
        if (data.containsKey("businessFee")) {
            //处理 businessFee 节点
            if (data.containsKey("businessFee")) {
                Object _obj = data.get("businessFee");
                JSONArray businessFees = null;
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
            JSONArray businessFees = null;
            if (_obj instanceof JSONObject) {
                businessFees = new JSONArray();
                businessFees.add(_obj);
            } else {
                businessFees = (JSONArray) _obj;
            }
            //JSONObject businessFee = data.getJSONObject("businessFee");
            for (int _feeIndex = 0; _feeIndex < businessFees.size(); _feeIndex++) {
                JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
                doBusinessFee(business, businessFee);
                if (_obj instanceof JSONObject) {
                    businessFees = new JSONArray();
                    businessFees.add(_obj);
                } else {
                    businessFees = (JSONArray) _obj;
                }
                //JSONObject businessFee = data.getJSONObject("businessFee");
                for (int _feeIndex = 0; _feeIndex < businessFees.size(); _feeIndex++) {
                    JSONObject businessFee = businessFees.getJSONObject(_feeIndex);
                    doBusinessFee(business, businessFee);
                    if (_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
                    }
                    dataFlowContext.addParamOut("feeId", businessFee.getString("feeId"));
                }
            }
        }
    }
@@ -148,12 +147,12 @@
                    Assert.listOnlyOne(feeInfo, "查询到多条数据或未查询到数据" + feeMap);
                    //根据当前的结束时间 修改
                    Date endTime = (Date) feeInfo.get(0).get("end_time");
                    if(cycles > 0) {
                    if (cycles > 0) {
                        Calendar endCalender = Calendar.getInstance();
                        endCalender.setTime(endTime);
                        if(StringUtil.isNumber(cyclesStr)) {
                        if (StringUtil.isNumber(cyclesStr)) {
                            endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
                        }else{
                        } else {
                            int hours = new Double(cycles * DateUtil.getCurrentMonthDay() * 24).intValue();
                            endCalender.add(Calendar.HOUR, hours);
                        }
@@ -161,14 +160,14 @@
                    }
                    // 一次性收费类型,缴费后,则设置费用状态为收费结束、设置结束日期为费用项终止日期
                    if(FeeFlagTypeConstant.ONETIME.equals(feeInfo.get(0).get("feeFlag"))){
                    if (FeeFlagTypeConstant.ONETIME.equals(feeInfo.get(0).get("feeFlag"))) {
                        businessFeeInfo.put("state", FeeStateConstant.END);
                        businessFeeInfo.put("end_time", feeInfo.get(0).get("configEndTime"));
                    }
                    // 周期性收费、缴费后,到期日期在费用项终止日期后,则设置缴费状态结束,设置结束日期为费用项终止日期
                    if(FeeFlagTypeConstant.CYCLE.equals(feeInfo.get(0).get("feeFlag"))){
                        if(((Date)businessFeeInfo.get("endTime")).after((Date)feeInfo.get(0).get("configEndTime"))) {
                    if (FeeFlagTypeConstant.CYCLE.equals(feeInfo.get(0).get("feeFlag"))) {
                        if (((Date) businessFeeInfo.get("endTime")).after((Date) feeInfo.get(0).get("configEndTime"))) {
                            businessFeeInfo.put("state", FeeStateConstant.END);
                            businessFeeInfo.put("end_time", feeInfo.get(0).get("configEndTime"));
                        }
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/AddFeeConfigSMOImpl.java
@@ -39,6 +39,7 @@
        Assert.hasKeyAndValue(paramIn, "squarePrice", "必填,请填写计费单价");
        Assert.hasKeyAndValue(paramIn, "additionalAmount", "必填,请填写附加费用");
        Assert.hasKeyAndValue(paramIn, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(paramIn, "billType", "未包含出账类型");
        //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_FEECONFIG);
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/EditFeeConfigSMOImpl.java
@@ -37,6 +37,7 @@
        Assert.hasKeyAndValue(paramIn, "squarePrice", "必填,请填写计费单价");
        Assert.hasKeyAndValue(paramIn, "additionalAmount", "必填,请填写附加费用");
        Assert.hasKeyAndValue(paramIn, "communityId", "未包含小区ID");
        Assert.hasKeyAndValue(paramIn, "billType", "必填,请填写出账类型");
        //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST__FEECONFIG);
FrontService/src/main/java/com/java110/front/smo/feeConfig/impl/RoomCreateFeeSMOImpl.java
@@ -37,7 +37,7 @@
        Assert.hasKeyAndValue(paramIn, "locationTypeCd", "未包含收费范围");
        Assert.hasKeyAndValue(paramIn, "locationObjId", "未包含收费对象");
        Assert.hasKeyAndValue(paramIn, "configId", "未包含收费项目");
        Assert.hasKeyAndValue(paramIn, "billType", "未包含出账类型");
//        Assert.hasKeyAndValue(paramIn, "billType", "未包含出账类型");
    }
    @Override
StoreService/src/main/java/com/java110/store/listener/complaint/AbstractComplaintBusinessServiceDataFlowListener.java
@@ -83,6 +83,11 @@
        currentComplaintInfo.put("operate", StatusConstant.OPERATE_DEL);
        getComplaintServiceDaoImpl().saveBusinessComplaintInfo(currentComplaintInfo);
        for(Object key : currentComplaintInfo.keySet()) {
            if(businessComplaint.get(key) == null) {
                businessComplaint.put(key.toString(), currentComplaintInfo.get(key));
            }
        }
    }
StoreService/src/main/java/com/java110/store/listener/complaint/DeleteComplaintInfoListener.java
@@ -61,25 +61,23 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessComplaint 节点
        if (data.containsKey("businessComplaint")) {
            //处理 businessComplaint 节点
            if (data.containsKey("businessComplaint")) {
                Object _obj = data.get("businessComplaint");
                JSONArray businessComplaints = null;
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMPLAINT)) {
            Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMPLAINT);
            JSONArray businessComplaints = null;
            if (_obj instanceof JSONObject) {
                businessComplaints = new JSONArray();
                businessComplaints.add(_obj);
            } else {
                businessComplaints = (JSONArray) _obj;
            }
            //JSONObject businessComplaint = data.getJSONObject("businessComplaint");
            for (int _complaintIndex = 0; _complaintIndex < businessComplaints.size(); _complaintIndex++) {
                JSONObject businessComplaint = businessComplaints.getJSONObject(_complaintIndex);
                doBusinessComplaint(business, businessComplaint);
                if (_obj instanceof JSONObject) {
                    businessComplaints = new JSONArray();
                    businessComplaints.add(_obj);
                } else {
                    businessComplaints = (JSONArray) _obj;
                }
                //JSONObject businessComplaint = data.getJSONObject("businessComplaint");
                for (int _complaintIndex = 0; _complaintIndex < businessComplaints.size(); _complaintIndex++) {
                    JSONObject businessComplaint = businessComplaints.getJSONObject(_complaintIndex);
                    doBusinessComplaint(business, businessComplaint);
                    if (_obj instanceof JSONObject) {
                        dataFlowContext.addParamOut("complaintId", businessComplaint.getString("complaintId"));
                    }
                    dataFlowContext.addParamOut("complaintId", businessComplaint.getString("complaintId"));
                }
            }
        }
StoreService/src/main/java/com/java110/store/listener/complaint/SaveComplaintInfoListener.java
@@ -54,8 +54,8 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessComplaint 节点
        if (data.containsKey("businessComplaint")) {
            Object bObj = data.get("businessComplaint");
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMPLAINT)) {
            Object bObj = data.get(BusinessTypeConstant.BUSINESS_TYPE_SAVE_COMPLAINT);
            JSONArray businessComplaints = null;
            if (bObj instanceof JSONObject) {
                businessComplaints = new JSONArray();
StoreService/src/main/java/com/java110/store/listener/complaint/UpdateComplaintInfoListener.java
@@ -63,10 +63,10 @@
        Assert.notEmpty(data, "没有datas 节点,或没有子节点需要处理");
        //处理 businessComplaint 节点
        if (data.containsKey("businessComplaint")) {
        if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT)) {
            //处理 businessComplaint 节点
            if (data.containsKey("businessComplaint")) {
                Object _obj = data.get("businessComplaint");
            if (data.containsKey(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT)) {
                Object _obj = data.get(BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMPLAINT);
                JSONArray businessComplaints = null;
                if (_obj instanceof JSONObject) {
                    businessComplaints = new JSONArray();
java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
@@ -29,6 +29,10 @@
    private String feeTypeCdName;
    private String feeFlagName;
    private String billType;
    private String billTypeName;
    private Date createTime;
@@ -155,4 +159,20 @@
    public void setFeeFlagName(String feeFlagName) {
        this.feeFlagName = feeFlagName;
    }
    public String getBillType() {
        return billType;
    }
    public void setBillType(String billType) {
        this.billType = billType;
    }
    public String getBillTypeName() {
        return billTypeName;
    }
    public void setBillTypeName(String billTypeName) {
        this.billTypeName = billTypeName;
    }
}
java110-bean/src/main/java/com/java110/po/complaint/ComplaintPo.java
New file
@@ -0,0 +1,87 @@
package com.java110.po.complaint;
import java.io.Serializable;
/**
 * @ClassName ComplaintPo
 * @Description TODO
 * @Author wuxw
 * @Date 2020/5/27 22:08
 * @Version 1.0
 * add by wuxw 2020/5/27
 **/
public class ComplaintPo implements Serializable {
    private String complaintId;
    private String storeId;
    private String typeCd;
    private String roomId;
    private String complaintName;
    private String tel;
    private String context;
    private String state;
    public String getComplaintId() {
        return complaintId;
    }
    public void setComplaintId(String complaintId) {
        this.complaintId = complaintId;
    }
    public String getStoreId() {
        return storeId;
    }
    public void setStoreId(String storeId) {
        this.storeId = storeId;
    }
    public String getTypeCd() {
        return typeCd;
    }
    public void setTypeCd(String typeCd) {
        this.typeCd = typeCd;
    }
    public String getRoomId() {
        return roomId;
    }
    public void setRoomId(String roomId) {
        this.roomId = roomId;
    }
    public String getComplaintName() {
        return complaintName;
    }
    public void setComplaintName(String complaintName) {
        this.complaintName = complaintName;
    }
    public String getTel() {
        return tel;
    }
    public void setTel(String tel) {
        this.tel = tel;
    }
    public String getContext() {
        return context;
    }
    public void setContext(String context) {
        this.context = context;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
}
java110-bean/src/main/java/com/java110/po/fee/PayFeeConfigPo.java
New file
@@ -0,0 +1,126 @@
package com.java110.po.fee;
import java.io.Serializable;
/**
 * @ClassName PayFeeConfig
 * @Description TODO
 * @Author wuxw
 * @Date 2020/5/27 21:43
 * @Version 1.0
 * add by wuxw 2020/5/27
 **/
public class PayFeeConfigPo implements Serializable {
    private String configId;
    private String communityId;
    private String feeTypeCd;
    private String squarePrice;
    private String additionalAmount;
    private String isDefault;
    private String startTime;
    private String endTime;
    private String feeFlag;
    private String feeName;
    private String computingFormula;
    private String billType;
    public String getConfigId() {
        return configId;
    }
    public void setConfigId(String configId) {
        this.configId = configId;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
    public String getFeeTypeCd() {
        return feeTypeCd;
    }
    public void setFeeTypeCd(String feeTypeCd) {
        this.feeTypeCd = feeTypeCd;
    }
    public String getSquarePrice() {
        return squarePrice;
    }
    public void setSquarePrice(String squarePrice) {
        this.squarePrice = squarePrice;
    }
    public String getAdditionalAmount() {
        return additionalAmount;
    }
    public void setAdditionalAmount(String additionalAmount) {
        this.additionalAmount = additionalAmount;
    }
    public String getIsDefault() {
        return isDefault;
    }
    public void setIsDefault(String isDefault) {
        this.isDefault = isDefault;
    }
    public String getStartTime() {
        return startTime;
    }
    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
    public String getEndTime() {
        return endTime;
    }
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    public String getFeeFlag() {
        return feeFlag;
    }
    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }
    public String getFeeName() {
        return feeName;
    }
    public void setFeeName(String feeName) {
        this.feeName = feeName;
    }
    public String getComputingFormula() {
        return computingFormula;
    }
    public void setComputingFormula(String computingFormula) {
        this.computingFormula = computingFormula;
    }
    public String getBillType() {
        return billType;
    }
    public void setBillType(String billType) {
        this.billType = billType;
    }
}
java110-bean/src/main/java/com/java110/po/fee/PayFeeDetailPo.java
New file
@@ -0,0 +1,97 @@
package com.java110.po.fee;
import java.io.Serializable;
/**
 * @ClassName PayFeeDetailPo
 * @Description TODO
 * @Author wuxw
 * @Date 2020/5/27 23:10
 * @Version 1.0
 * add by wuxw 2020/5/27
 **/
public class PayFeeDetailPo implements Serializable {
    private String detailId;
    private String feeId;
    private String communityId;
    private String cycles;
    private String receivableAmount;
    private String receivedAmount;
    private String primeRate;
    private String remark;
    private String state;
    public String getDetailId() {
        return detailId;
    }
    public void setDetailId(String detailId) {
        this.detailId = detailId;
    }
    public String getFeeId() {
        return feeId;
    }
    public void setFeeId(String feeId) {
        this.feeId = feeId;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
    public String getCycles() {
        return cycles;
    }
    public void setCycles(String cycles) {
        this.cycles = cycles;
    }
    public String getReceivableAmount() {
        return receivableAmount;
    }
    public void setReceivableAmount(String receivableAmount) {
        this.receivableAmount = receivableAmount;
    }
    public String getReceivedAmount() {
        return receivedAmount;
    }
    public void setReceivedAmount(String receivedAmount) {
        this.receivedAmount = receivedAmount;
    }
    public String getPrimeRate() {
        return primeRate;
    }
    public void setPrimeRate(String primeRate) {
        this.primeRate = primeRate;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
}
java110-bean/src/main/java/com/java110/po/fee/PayFeePo.java
New file
@@ -0,0 +1,133 @@
package com.java110.po.fee;
import java.io.Serializable;
/**
 * @ClassName PayFeePo
 * @Description TODO
 * @Author wuxw
 * @Date 2020/5/27 22:57
 * @Version 1.0
 * add by wuxw 2020/5/27
 **/
public class PayFeePo implements Serializable {
    private String feeId;
    private String feeTypeCd;
    private String communityId;
    private String payerObjId;
    private String incomeObjId;
    private String startTime;
    private String endTime;
    private String amount;
    private String userId;
    private String feeFlag;
    private String state;
    private String configId;
    private String payerObjType;
    public String getFeeId() {
        return feeId;
    }
    public void setFeeId(String feeId) {
        this.feeId = feeId;
    }
    public String getFeeTypeCd() {
        return feeTypeCd;
    }
    public void setFeeTypeCd(String feeTypeCd) {
        this.feeTypeCd = feeTypeCd;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
    public String getPayerObjId() {
        return payerObjId;
    }
    public void setPayerObjId(String payerObjId) {
        this.payerObjId = payerObjId;
    }
    public String getIncomeObjId() {
        return incomeObjId;
    }
    public void setIncomeObjId(String incomeObjId) {
        this.incomeObjId = incomeObjId;
    }
    public String getStartTime() {
        return startTime;
    }
    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
    public String getEndTime() {
        return endTime;
    }
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    public String getAmount() {
        return amount;
    }
    public void setAmount(String amount) {
        this.amount = amount;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getFeeFlag() {
        return feeFlag;
    }
    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getConfigId() {
        return configId;
    }
    public void setConfigId(String configId) {
        this.configId = configId;
    }
    public String getPayerObjType() {
        return payerObjType;
    }
    public void setPayerObjType(String payerObjType) {
        this.payerObjType = payerObjType;
    }
}
java110-bean/src/main/java/com/java110/po/floor/FloorPo.java
New file
@@ -0,0 +1,69 @@
package com.java110.po.floor;
import java.io.Serializable;
/**
 * @ClassName FloorPo
 * @Description TODO
 * @Author wuxw
 * @Date 2020/5/28 13:09
 * @Version 1.0
 * add by wuxw 2020/5/28
 **/
public class FloorPo implements Serializable {
    private String floorId;
    private String floorNum;
    private String name;
    private String userId;
    private String remark;
    private String communityId;
    public String getFloorId() {
        return floorId;
    }
    public void setFloorId(String floorId) {
        this.floorId = floorId;
    }
    public String getFloorNum() {
        return floorNum;
    }
    public void setFloorNum(String floorNum) {
        this.floorNum = floorNum;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
}
java110-bean/src/main/java/com/java110/po/inspection/InspectionPlanPo.java
New file
@@ -0,0 +1,123 @@
package com.java110.po.inspection;
import java.io.Serializable;
/**
 * @ClassName InspectionPlanPo
 * @Description TODO 巡检计划对象
 * @Author wuxw
 * @Date 2020/5/28 14:23
 * @Version 1.0
 * add by wuxw 2020/5/28
 **/
public class InspectionPlanPo implements Serializable {
    private String inspectionPlanId;
    private String inspectionPlanName;
    private String inspectionRouteId;
    private String communityId;
    private String startTime;
    private String endTime;
    private String inspectionPlanPeriod;
    private String signType;
    private String state;
    private String remark;
    private String createUserId;
    private String createUserName;
    public String getInspectionPlanId() {
        return inspectionPlanId;
    }
    public void setInspectionPlanId(String inspectionPlanId) {
        this.inspectionPlanId = inspectionPlanId;
    }
    public String getInspectionPlanName() {
        return inspectionPlanName;
    }
    public void setInspectionPlanName(String inspectionPlanName) {
        this.inspectionPlanName = inspectionPlanName;
    }
    public String getInspectionRouteId() {
        return inspectionRouteId;
    }
    public void setInspectionRouteId(String inspectionRouteId) {
        this.inspectionRouteId = inspectionRouteId;
    }
    public String getCommunityId() {
        return communityId;
    }
    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
    public String getStartTime() {
        return startTime;
    }
    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }
    public String getEndTime() {
        return endTime;
    }
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    public String getInspectionPlanPeriod() {
        return inspectionPlanPeriod;
    }
    public void setInspectionPlanPeriod(String inspectionPlanPeriod) {
        this.inspectionPlanPeriod = inspectionPlanPeriod;
    }
    public String getSignType() {
        return signType;
    }
    public void setSignType(String signType) {
        this.signType = signType;
    }
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public String getCreateUserId() {
        return createUserId;
    }
    public void setCreateUserId(String createUserId) {
        this.createUserId = createUserId;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
}
java110-bean/src/main/java/com/java110/vo/api/feeConfig/ApiFeeConfigDataVo.java
@@ -18,6 +18,10 @@
    private String feeFlagName;
    private String isDefault;
    private String billType;
    private String billTypeName;
    public String getConfigId() {
        return configId;
    }
@@ -113,4 +117,20 @@
    public void setIsDefault(String isDefault) {
        this.isDefault = isDefault;
    }
    public String getBillType() {
        return billType;
    }
    public void setBillType(String billType) {
        this.billType = billType;
    }
    public String getBillTypeName() {
        return billTypeName;
    }
    public void setBillTypeName(String billTypeName) {
        this.billTypeName = billTypeName;
    }
}
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
    <!-- 保存费用配置信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessFeeConfigInfo" parameterType="Map">
        insert into business_pay_fee_config(
        fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
        fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id,bill_type
        ) values (
        #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId}
        #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId},#{billType}
        )
    </insert>
@@ -20,7 +20,7 @@
        computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
        squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
        feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType
        from business_pay_fee_config t
        where 1 =1
        <if test="feeTypeCd !=null and feeTypeCd != ''">
@@ -50,6 +50,9 @@
        <if test="feeName !=null and feeName != ''">
            and t.fee_name= #{feeName}
        </if>
        <if test="billType !=null and billType != ''">
            and t.bill_type= #{billType}
        </if>
        <if test="startTime !=null ">
            and t.start_time= #{startTime}
        </if>
@@ -70,8 +73,10 @@
    <insert id="saveFeeConfigInfoInstance" parameterType="Map">
        insert into pay_fee_config(
        fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
        ,bill_type
        ) select
        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,t.b_id
        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,
        t.b_id,t.bill_type
        from business_pay_fee_config t where 1=1
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
@@ -98,6 +103,9 @@
        <if test="feeName !=null and feeName != ''">
            and t.fee_name= #{feeName}
        </if>
        <if test="billType !=null and billType != ''">
            and t.bill_type= #{billType}
        </if>
        <if test="startTime !=null ">
            and t.start_time= #{startTime}
        </if>
@@ -121,8 +129,8 @@
        statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
        configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
        startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
        td1.name feeTypeCdName,td2.name feeFlagName
        from pay_fee_config t,t_dict td1,t_dict td2
        td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,t.name billTypeName
        from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
        where 1 =1
        and t.fee_type_cd = td1.status_cd
        and td1.table_name = 'pay_fee_config'
@@ -130,6 +138,9 @@
        and t.fee_flag = td2.status_cd
        and td2.table_name = 'pay_fee_config'
        and td2.table_columns = 'fee_flag'
        and t.bill_type = td3.status_cd
        and td3.table_name = 'pay_fee_config'
        and td3.table_columns = 'bill_type'
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
        </if>
@@ -204,6 +215,9 @@
        <if test="feeName !=null and feeName != ''">
            , t.fee_name= #{feeName}
        </if>
        <if test="billType !=null and billType != ''">
            , t.bill_type= #{billType}
        </if>
        <if test="startTime !=null ">
            , t.start_time= #{startTime}
        </if>
@@ -226,7 +240,7 @@
    <!-- 查询费用配置数量 add by wuxw 2018-07-03 -->
    <select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
        select count(1) count
        from pay_fee_config t,t_dict td1,t_dict td2
        from pay_fee_config t,t_dict td1,t_dict td2,t_dict td3
        where 1 =1
        and t.fee_type_cd = td1.status_cd
        and td1.table_name = 'pay_fee_config'
@@ -234,6 +248,9 @@
        and t.fee_flag = td2.status_cd
        and td2.table_name = 'pay_fee_config'
        and td2.table_columns = 'fee_flag'
        and t.bill_type = td3.status_cd
        and td3.table_name = 'pay_fee_config'
        and td3.table_columns = 'bill_type'
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
        </if>