java110 hace 5 años
padre
commit
c351e59bb1

+ 0 - 175
docs/document/services/tempCarFeeConfigAttr/DeleteTempCarFeeConfigAttrInfo.md

@@ -1,175 +0,0 @@
-package com.java110.fee.listener.tempCarFeeConfigAttr;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.Business;
-import com.java110.fee.dao.ITempCarFeeConfigAttrServiceDao;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 删除临时车收费标准属性信息 侦听
- *
- * 处理节点
- * 1、businessTempCarFeeConfigAttr:{} 临时车收费标准属性基本信息节点
- * 2、businessTempCarFeeConfigAttrAttr:[{}] 临时车收费标准属性属性信息节点
- * 3、businessTempCarFeeConfigAttrPhoto:[{}] 临时车收费标准属性照片信息节点
- * 4、businessTempCarFeeConfigAttrCerdentials:[{}] 临时车收费标准属性证件信息节点
- * 协议地址 :https://github.com/java110/MicroCommunity/wiki/%E5%88%A0%E9%99%A4%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("deleteTempCarFeeConfigAttrInfoListener")
-@Transactional
-public class DeleteTempCarFeeConfigAttrInfoListener extends AbstractTempCarFeeConfigAttrBusinessServiceDataFlowListener {
-
-    private final static Logger logger = LoggerFactory.getLogger(DeleteTempCarFeeConfigAttrInfoListener.class);
-    @Autowired
-    ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 3;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_TEMP_CAR_FEE_CONFIG_ATTR_INFO;
-    }
-
-    /**
-     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-
-        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
-
-            //处理 businessTempCarFeeConfigAttr 节点
-            if(data.containsKey(TempCarFeeConfigAttrPo.class.getSimpleName())){
-                Object _obj = data.get(TempCarFeeConfigAttrPo.class.getSimpleName());
-                JSONArray businessTempCarFeeConfigAttrs = null;
-                if(_obj instanceof JSONObject){
-                    businessTempCarFeeConfigAttrs = new JSONArray();
-                    businessTempCarFeeConfigAttrs.add(_obj);
-                }else {
-                    businessTempCarFeeConfigAttrs = (JSONArray)_obj;
-                }
-                //JSONObject businessTempCarFeeConfigAttr = data.getJSONObject(TempCarFeeConfigAttrPo.class.getSimpleName());
-                for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrs.size();_tempCarFeeConfigAttrIndex++) {
-                    JSONObject businessTempCarFeeConfigAttr = businessTempCarFeeConfigAttrs.getJSONObject(_tempCarFeeConfigAttrIndex);
-                    doBusinessTempCarFeeConfigAttr(business, businessTempCarFeeConfigAttr);
-                    if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("attrId", businessTempCarFeeConfigAttr.getString("attrId"));
-                    }
-                }
-
-        }
-
-
-    }
-
-    /**
-     * 删除 instance数据
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-        String bId = business.getbId();
-        //Assert.hasLength(bId,"请求报文中没有包含 bId");
-
-        //临时车收费标准属性信息
-        Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_DEL);
-
-        //临时车收费标准属性信息
-        List<Map> businessTempCarFeeConfigAttrInfos = tempCarFeeConfigAttrServiceDaoImpl.getBusinessTempCarFeeConfigAttrInfo(info);
-        if( businessTempCarFeeConfigAttrInfos != null && businessTempCarFeeConfigAttrInfos.size() >0) {
-            for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrInfos.size();_tempCarFeeConfigAttrIndex++) {
-                Map businessTempCarFeeConfigAttrInfo = businessTempCarFeeConfigAttrInfos.get(_tempCarFeeConfigAttrIndex);
-                flushBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttrInfo,StatusConstant.STATUS_CD_INVALID);
-                tempCarFeeConfigAttrServiceDaoImpl.updateTempCarFeeConfigAttrInfoInstance(businessTempCarFeeConfigAttrInfo);
-                dataFlowContext.addParamOut("attrId",businessTempCarFeeConfigAttrInfo.get("attr_id"));
-            }
-        }
-
-    }
-
-    /**
-     * 撤单
-     * 从business表中查询到DEL的数据 将instance中的数据更新回来
-     * @param dataFlowContext 数据对象
-     * @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);
-
-        Map delInfo = new HashMap();
-        delInfo.put("bId",business.getbId());
-        delInfo.put("operate",StatusConstant.OPERATE_DEL);
-        //临时车收费标准属性信息
-        List<Map> tempCarFeeConfigAttrInfo = tempCarFeeConfigAttrServiceDaoImpl.getTempCarFeeConfigAttrInfo(info);
-        if(tempCarFeeConfigAttrInfo != null && tempCarFeeConfigAttrInfo.size() > 0){
-
-            //临时车收费标准属性信息
-            List<Map> businessTempCarFeeConfigAttrInfos = tempCarFeeConfigAttrServiceDaoImpl.getBusinessTempCarFeeConfigAttrInfo(delInfo);
-            //除非程序出错了,这里不会为空
-            if(businessTempCarFeeConfigAttrInfos == null ||  businessTempCarFeeConfigAttrInfos.size() == 0){
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(tempCarFeeConfigAttr),程序内部异常,请检查! "+delInfo);
-            }
-            for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrInfos.size();_tempCarFeeConfigAttrIndex++) {
-                Map businessTempCarFeeConfigAttrInfo = businessTempCarFeeConfigAttrInfos.get(_tempCarFeeConfigAttrIndex);
-                flushBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttrInfo,StatusConstant.STATUS_CD_VALID);
-                tempCarFeeConfigAttrServiceDaoImpl.updateTempCarFeeConfigAttrInfoInstance(businessTempCarFeeConfigAttrInfo);
-            }
-        }
-    }
-
-
-
-    /**
-     * 处理 businessTempCarFeeConfigAttr 节点
-     * @param business 总的数据节点
-     * @param businessTempCarFeeConfigAttr 临时车收费标准属性节点
-     */
-    private void doBusinessTempCarFeeConfigAttr(Business business,JSONObject businessTempCarFeeConfigAttr){
-
-        Assert.jsonObjectHaveKey(businessTempCarFeeConfigAttr,"attrId","businessTempCarFeeConfigAttr 节点下没有包含 attrId 节点");
-
-        if(businessTempCarFeeConfigAttr.getString("attrId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessTempCarFeeConfigAttr);
-        }
-        //自动插入DEL
-        autoSaveDelBusinessTempCarFeeConfigAttr(business,businessTempCarFeeConfigAttr);
-    }
-    @Override
-    public ITempCarFeeConfigAttrServiceDao getTempCarFeeConfigAttrServiceDaoImpl() {
-        return tempCarFeeConfigAttrServiceDaoImpl;
-    }
-
-    public void setTempCarFeeConfigAttrServiceDaoImpl(ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl) {
-        this.tempCarFeeConfigAttrServiceDaoImpl = tempCarFeeConfigAttrServiceDaoImpl;
-    }
-}

+ 0 - 175
docs/document/services/tempCarFeeConfigAttr/SaveTempCarFeeConfigAttrInfo.md

@@ -1,175 +0,0 @@
-package com.java110.fee.listener.tempCarFeeConfigAttr;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.Assert;
-import com.java110.fee.dao.ITempCarFeeConfigAttrServiceDao;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.entity.center.Business;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 保存 临时车收费标准属性信息 侦听
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("saveTempCarFeeConfigAttrInfoListener")
-@Transactional
-public class SaveTempCarFeeConfigAttrInfoListener extends AbstractTempCarFeeConfigAttrBusinessServiceDataFlowListener{
-
-    private static Logger logger = LoggerFactory.getLogger(SaveTempCarFeeConfigAttrInfoListener.class);
-
-    @Autowired
-    private ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_TEMP_CAR_FEE_CONFIG_ATTR_INFO;
-    }
-
-    /**
-     * 保存临时车收费标准属性信息 business 表中
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
-
-        //处理 businessTempCarFeeConfigAttr 节点
-        if(data.containsKey(TempCarFeeConfigAttrPo.class.getSimpleName())){
-            Object bObj = data.get(TempCarFeeConfigAttrPo.class.getSimpleName());
-            JSONArray businessTempCarFeeConfigAttrs = null;
-            if(bObj instanceof JSONObject){
-                businessTempCarFeeConfigAttrs = new JSONArray();
-                businessTempCarFeeConfigAttrs.add(bObj);
-            }else {
-                businessTempCarFeeConfigAttrs = (JSONArray)bObj;
-            }
-            //JSONObject businessTempCarFeeConfigAttr = data.getJSONObject(TempCarFeeConfigAttrPo.class.getSimpleName());
-            for (int bTempCarFeeConfigAttrIndex = 0; bTempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrs.size();bTempCarFeeConfigAttrIndex++) {
-                JSONObject businessTempCarFeeConfigAttr = businessTempCarFeeConfigAttrs.getJSONObject(bTempCarFeeConfigAttrIndex);
-                doBusinessTempCarFeeConfigAttr(business, businessTempCarFeeConfigAttr);
-                if(bObj instanceof JSONObject) {
-                    dataFlowContext.addParamOut("attrId", businessTempCarFeeConfigAttr.getString("attrId"));
-                }
-            }
-        }
-    }
-
-    /**
-     * business 数据转移到 instance
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-        JSONObject data = business.getDatas();
-
-        Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_ADD);
-
-        //临时车收费标准属性信息
-        List<Map> businessTempCarFeeConfigAttrInfo = tempCarFeeConfigAttrServiceDaoImpl.getBusinessTempCarFeeConfigAttrInfo(info);
-        if( businessTempCarFeeConfigAttrInfo != null && businessTempCarFeeConfigAttrInfo.size() >0) {
-            reFreshShareColumn(info, businessTempCarFeeConfigAttrInfo.get(0));
-            tempCarFeeConfigAttrServiceDaoImpl.saveTempCarFeeConfigAttrInfoInstance(info);
-            if(businessTempCarFeeConfigAttrInfo.size() == 1) {
-                dataFlowContext.addParamOut("attrId", businessTempCarFeeConfigAttrInfo.get(0).get("attr_id"));
-            }
-        }
-    }
-
-
-    /**
-     * 刷 分片字段
-     *
-     * @param info         查询对象
-     * @param businessInfo 小区ID
-     */
-    private void reFreshShareColumn(Map info, Map businessInfo) {
-
-        if (info.containsKey("config_id")) {
-            return;
-        }
-
-        if (!businessInfo.containsKey("configId")) {
-            return;
-        }
-
-        info.put("config_id", businessInfo.get("configId"));
-    }
-    /**
-     * 撤单
-     * @param dataFlowContext 数据对象
-     * @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_VALID);
-        Map paramIn = new HashMap();
-        paramIn.put("bId",bId);
-        paramIn.put("statusCd",StatusConstant.STATUS_CD_INVALID);
-        //临时车收费标准属性信息
-        List<Map> tempCarFeeConfigAttrInfo = tempCarFeeConfigAttrServiceDaoImpl.getTempCarFeeConfigAttrInfo(info);
-        if(tempCarFeeConfigAttrInfo != null && tempCarFeeConfigAttrInfo.size() > 0){
-            reFreshShareColumn(paramIn, tempCarFeeConfigAttrInfo.get(0));
-            tempCarFeeConfigAttrServiceDaoImpl.updateTempCarFeeConfigAttrInfoInstance(paramIn);
-        }
-    }
-
-
-
-    /**
-     * 处理 businessTempCarFeeConfigAttr 节点
-     * @param business 总的数据节点
-     * @param businessTempCarFeeConfigAttr 临时车收费标准属性节点
-     */
-    private void doBusinessTempCarFeeConfigAttr(Business business,JSONObject businessTempCarFeeConfigAttr){
-
-        Assert.jsonObjectHaveKey(businessTempCarFeeConfigAttr,"attrId","businessTempCarFeeConfigAttr 节点下没有包含 attrId 节点");
-
-        if(businessTempCarFeeConfigAttr.getString("attrId").startsWith("-")){
-            //刷新缓存
-            //flushTempCarFeeConfigAttrId(business.getDatas());
-
-            businessTempCarFeeConfigAttr.put("attrId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-
-        }
-
-        businessTempCarFeeConfigAttr.put("bId",business.getbId());
-        businessTempCarFeeConfigAttr.put("operate", StatusConstant.OPERATE_ADD);
-        //保存临时车收费标准属性信息
-        tempCarFeeConfigAttrServiceDaoImpl.saveBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttr);
-
-    }
-    @Override
-    public ITempCarFeeConfigAttrServiceDao getTempCarFeeConfigAttrServiceDaoImpl() {
-        return tempCarFeeConfigAttrServiceDaoImpl;
-    }
-
-    public void setTempCarFeeConfigAttrServiceDaoImpl(ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl) {
-        this.tempCarFeeConfigAttrServiceDaoImpl = tempCarFeeConfigAttrServiceDaoImpl;
-    }
-}

+ 0 - 188
docs/document/services/tempCarFeeConfigAttr/UpdateTempCarFeeConfigAttrInfo.md

@@ -1,188 +0,0 @@
-package com.java110.fee.listener.tempCarFeeConfigAttr;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.utils.util.Assert;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.Business;
-import com.java110.fee.dao.ITempCarFeeConfigAttrServiceDao;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 修改临时车收费标准属性信息 侦听
- *
- * 处理节点
- * 1、businessTempCarFeeConfigAttr:{} 临时车收费标准属性基本信息节点
- * 2、businessTempCarFeeConfigAttrAttr:[{}] 临时车收费标准属性属性信息节点
- * 3、businessTempCarFeeConfigAttrPhoto:[{}] 临时车收费标准属性照片信息节点
- * 4、businessTempCarFeeConfigAttrCerdentials:[{}] 临时车收费标准属性证件信息节点
- * 协议地址 :https://github.com/java110/MicroCommunity/wiki/%E4%BF%AE%E6%94%B9%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("updateTempCarFeeConfigAttrInfoListener")
-@Transactional
-public class UpdateTempCarFeeConfigAttrInfoListener extends AbstractTempCarFeeConfigAttrBusinessServiceDataFlowListener {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateTempCarFeeConfigAttrInfoListener.class);
-    @Autowired
-    private ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl;
-
-    @Override
-    public int getOrder() {
-        return 2;
-    }
-
-    @Override
-    public String getBusinessTypeCd() {
-        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_TEMP_CAR_FEE_CONFIG_ATTR_INFO;
-    }
-
-    /**
-     * business过程
-     * @param dataFlowContext 上下文对象
-     * @param business 业务对象
-     */
-    @Override
-    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
-
-        JSONObject data = business.getDatas();
-
-        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
-
-
-            //处理 businessTempCarFeeConfigAttr 节点
-            if(data.containsKey(TempCarFeeConfigAttrPo.class.getSimpleName())){
-                Object _obj = data.get(TempCarFeeConfigAttrPo.class.getSimpleName());
-                JSONArray businessTempCarFeeConfigAttrs = null;
-                if(_obj instanceof JSONObject){
-                    businessTempCarFeeConfigAttrs = new JSONArray();
-                    businessTempCarFeeConfigAttrs.add(_obj);
-                }else {
-                    businessTempCarFeeConfigAttrs = (JSONArray)_obj;
-                }
-                //JSONObject businessTempCarFeeConfigAttr = data.getJSONObject(TempCarFeeConfigAttrPo.class.getSimpleName());
-                for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrs.size();_tempCarFeeConfigAttrIndex++) {
-                    JSONObject businessTempCarFeeConfigAttr = businessTempCarFeeConfigAttrs.getJSONObject(_tempCarFeeConfigAttrIndex);
-                    doBusinessTempCarFeeConfigAttr(business, businessTempCarFeeConfigAttr);
-                    if(_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("attrId", businessTempCarFeeConfigAttr.getString("attrId"));
-                    }
-                }
-            }
-    }
-
-
-    /**
-     * business to instance 过程
-     * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
-     */
-    @Override
-    protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
-
-        JSONObject data = business.getDatas();
-
-        Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_ADD);
-
-        //临时车收费标准属性信息
-        List<Map> businessTempCarFeeConfigAttrInfos = tempCarFeeConfigAttrServiceDaoImpl.getBusinessTempCarFeeConfigAttrInfo(info);
-        if( businessTempCarFeeConfigAttrInfos != null && businessTempCarFeeConfigAttrInfos.size() >0) {
-            for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrInfos.size();_tempCarFeeConfigAttrIndex++) {
-                Map businessTempCarFeeConfigAttrInfo = businessTempCarFeeConfigAttrInfos.get(_tempCarFeeConfigAttrIndex);
-                flushBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttrInfo,StatusConstant.STATUS_CD_VALID);
-                tempCarFeeConfigAttrServiceDaoImpl.updateTempCarFeeConfigAttrInfoInstance(businessTempCarFeeConfigAttrInfo);
-                if(businessTempCarFeeConfigAttrInfo.size() == 1) {
-                    dataFlowContext.addParamOut("attrId", businessTempCarFeeConfigAttrInfo.get("attr_id"));
-                }
-            }
-        }
-
-    }
-
-    /**
-     * 撤单
-     * @param dataFlowContext 数据对象
-     * @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_VALID);
-        Map delInfo = new HashMap();
-        delInfo.put("bId",business.getbId());
-        delInfo.put("operate",StatusConstant.OPERATE_DEL);
-        //临时车收费标准属性信息
-        List<Map> tempCarFeeConfigAttrInfo = tempCarFeeConfigAttrServiceDaoImpl.getTempCarFeeConfigAttrInfo(info);
-        if(tempCarFeeConfigAttrInfo != null && tempCarFeeConfigAttrInfo.size() > 0){
-
-            //临时车收费标准属性信息
-            List<Map> businessTempCarFeeConfigAttrInfos = tempCarFeeConfigAttrServiceDaoImpl.getBusinessTempCarFeeConfigAttrInfo(delInfo);
-            //除非程序出错了,这里不会为空
-            if(businessTempCarFeeConfigAttrInfos == null || businessTempCarFeeConfigAttrInfos.size() == 0){
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(tempCarFeeConfigAttr),程序内部异常,请检查! "+delInfo);
-            }
-            for (int _tempCarFeeConfigAttrIndex = 0; _tempCarFeeConfigAttrIndex < businessTempCarFeeConfigAttrInfos.size();_tempCarFeeConfigAttrIndex++) {
-                Map businessTempCarFeeConfigAttrInfo = businessTempCarFeeConfigAttrInfos.get(_tempCarFeeConfigAttrIndex);
-                flushBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttrInfo,StatusConstant.STATUS_CD_VALID);
-                tempCarFeeConfigAttrServiceDaoImpl.updateTempCarFeeConfigAttrInfoInstance(businessTempCarFeeConfigAttrInfo);
-            }
-        }
-
-    }
-
-
-
-    /**
-     * 处理 businessTempCarFeeConfigAttr 节点
-     * @param business 总的数据节点
-     * @param businessTempCarFeeConfigAttr 临时车收费标准属性节点
-     */
-    private void doBusinessTempCarFeeConfigAttr(Business business,JSONObject businessTempCarFeeConfigAttr){
-
-        Assert.jsonObjectHaveKey(businessTempCarFeeConfigAttr,"attrId","businessTempCarFeeConfigAttr 节点下没有包含 attrId 节点");
-
-        if(businessTempCarFeeConfigAttr.getString("attrId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessTempCarFeeConfigAttr);
-        }
-        //自动保存DEL
-        autoSaveDelBusinessTempCarFeeConfigAttr(business,businessTempCarFeeConfigAttr);
-
-        businessTempCarFeeConfigAttr.put("bId",business.getbId());
-        businessTempCarFeeConfigAttr.put("operate", StatusConstant.OPERATE_ADD);
-        //保存临时车收费标准属性信息
-        tempCarFeeConfigAttrServiceDaoImpl.saveBusinessTempCarFeeConfigAttrInfo(businessTempCarFeeConfigAttr);
-
-    }
-
-
-
-    @Override
-    public ITempCarFeeConfigAttrServiceDao getTempCarFeeConfigAttrServiceDaoImpl() {
-        return tempCarFeeConfigAttrServiceDaoImpl;
-    }
-
-    public void setTempCarFeeConfigAttrServiceDaoImpl(ITempCarFeeConfigAttrServiceDao tempCarFeeConfigAttrServiceDaoImpl) {
-        this.tempCarFeeConfigAttrServiceDaoImpl = tempCarFeeConfigAttrServiceDaoImpl;
-    }
-
-
-
-}

+ 11 - 0
java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -18,6 +18,8 @@ public class RoomDto extends PageDto implements Serializable {
     public static final String STATE_FREE = "2002"; //未入住
     public static final String STATE_DELIVERY = "2003";//已交房
     public static final String STATE_RENOVATION = "2005";//已装修
+    public static final String ROOM_TYPE_ROOM = "1010301";//普通房屋
+    public static final String ROOM_TYPE_SHOPS = "2020602";//商铺
 
 
     private String feeCoefficient;
@@ -42,6 +44,7 @@ public class RoomDto extends PageDto implements Serializable {
     private String ownerName;
     private String idCard;
     private String link;
+    private String roomType;
 
 
     private String state;
@@ -291,4 +294,12 @@ public class RoomDto extends PageDto implements Serializable {
     public void setStates(String[] states) {
         this.states = states;
     }
+
+    public String getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(String roomType) {
+        this.roomType = roomType;
+    }
 }

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

@@ -25,6 +25,7 @@ public class RoomPo implements Serializable {
     private String remark;
     private String state;
     private String communityId;
+    private String roomType;
 
 
     public String getRoomId() {
@@ -84,7 +85,6 @@ public class RoomPo implements Serializable {
     }
 
 
-
     public String getUserId() {
         return userId;
     }
@@ -124,4 +124,12 @@ public class RoomPo implements Serializable {
     public void setFeeCoefficient(String feeCoefficient) {
         this.feeCoefficient = feeCoefficient;
     }
+
+    public String getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(String roomType) {
+        this.roomType = roomType;
+    }
 }

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

@@ -7,20 +7,22 @@
     <!-- 保存小区房屋信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessRoomInfo" parameterType="Map">
         insert into business_building_room(
-        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
+        room_type
         ) values (
         #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
-        #{communityId}
+        #{communityId},#{roomType}
         )
     </insert>
 
 
     <!-- 查询小区房屋信息(Business) add by wuxw 2018-07-03 -->
     <select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
-        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
+        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id
+        userId,t.room_id,t.room_id
         roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.operate,t.room_num,t.room_num
         roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
-        communityId
+        communityId,t.room_type,t.room_type roomType
         from business_building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -62,6 +64,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -72,9 +77,11 @@
     <!-- 保存小区房屋信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveRoomInfoInstance" parameterType="Map">
         insert into building_room(
-        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
+        room_type
         ) select
-        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id
+        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
+        t.room_type
         from business_building_room t where 1=1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
             and t.fee_coefficient= #{feeCoefficient}
@@ -113,6 +120,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -125,7 +135,7 @@
         select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
         statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
         builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
-        bId,t.apartment,t.state,t.community_id,t.community_id communityId
+        bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType
         from building_room t
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -174,6 +184,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -282,6 +295,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
 
 
     </select>
@@ -292,7 +308,8 @@
         select count(1) count
         FROM building_room t
         inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
+        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
+        '0'
         left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -338,6 +355,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="states != null">
             and t.state in
             <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -365,7 +385,8 @@
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
+        '0'
         LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -411,6 +432,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -426,7 +450,8 @@
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
+        '0'
         LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -472,6 +497,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -482,13 +510,15 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithOutSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
+        statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
+        '0'
         LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -534,6 +564,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -546,13 +579,15 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
+        statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
+        '0'
         LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -598,6 +633,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -611,13 +649,16 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
+        statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
-        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name stateName
+        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
+        stateName
         FROM building_room t
         inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
+        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
+        '0'
         left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         WHERE 1 =1
         AND t.`community_id` = #{communityId}
@@ -672,6 +713,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="states != null">
             and t.state in
             <foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -691,10 +735,11 @@
     <!-- 根据业主查询房屋信息 -->
     <select id="getRoomInfoByOwner" parameterType="Map" resultType="Map">
         SELECT
-        t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
+        statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
-        unitNum,f.`floor_num` floorNum
+        unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type
         FROM
         building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
         WHERE
@@ -707,6 +752,9 @@
         AND t.`status_cd` = '0'
         AND bo.`status_cd` = '0'
         AND bo.`owner_type_cd` = '1001'
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and borr.`status_cd` = #{statusCd}
         </if>
@@ -748,13 +796,16 @@
 
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfos" parameterType="Map" resultType="Map">
-        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
+        statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
-        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
+        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
+        t.room_type roomType,t.room_type
         FROM
         building_room t
         INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
-        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
+        '0'
         WHERE t.status_cd= '0'
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
@@ -783,6 +834,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

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

@@ -1,12 +1,12 @@
 package com.java110.community.listener.room;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IRoomServiceDao;
+import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
+import com.java110.entity.center.Business;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
-import com.java110.community.dao.IRoomServiceDao;
-import com.java110.entity.center.Business;
-import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,7 +19,7 @@ import java.util.Map;
  * Created by wuxw on 2018/7/4.
  */
 public abstract class AbstractRoomBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
-    private  static Logger logger = LoggerFactory.getLogger(AbstractRoomBusinessServiceDataFlowListener.class);
+    private static Logger logger = LoggerFactory.getLogger(AbstractRoomBusinessServiceDataFlowListener.class);
 
 
     /**
@@ -50,6 +50,7 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         businessRoomInfo.put("unitId", businessRoomInfo.get("unit_id"));
         businessRoomInfo.put("apartment", businessRoomInfo.get("apartment"));
         businessRoomInfo.put("communityId", businessRoomInfo.get("community_id"));
+        businessRoomInfo.put("roomType", businessRoomInfo.get("room_type"));
         businessRoomInfo.remove("bId");
         businessRoomInfo.put("statusCd", statusCd);
     }
@@ -60,7 +61,7 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
      *
      * @param businessRoom 小区房屋信息
      */
-    protected Map<String,String> autoSaveDelBusinessRoom(Business business, JSONObject businessRoom) {
+    protected Map<String, String> autoSaveDelBusinessRoom(Business business, JSONObject businessRoom) {
 //自动插入DEL
         Map info = new HashMap();
         info.put("roomId", businessRoom.getString("roomId"));
@@ -87,6 +88,7 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         currentRoomInfo.put("unitId", currentRoomInfo.get("unit_id"));
         currentRoomInfo.put("apartment", currentRoomInfo.get("apartment"));
         currentRoomInfo.put("communityId", currentRoomInfo.get("community_id"));
+        currentRoomInfo.put("roomType", currentRoomInfo.get("room_type"));
 
         currentRoomInfo.put("operate", StatusConstant.OPERATE_DEL);
         getRoomServiceDaoImpl().saveBusinessRoomInfo(currentRoomInfo);