Kaynağa Gözat

加入个人物品管理工鞥

java110 5 yıl önce
ebeveyn
işleme
c9b36c8d49
25 değiştirilmiş dosya ile 2236 ekleme ve 27 silme
  1. 175 0
      docs/document/services/userStorehouse/DeleteUserStorehouseInfo.md
  2. 175 0
      docs/document/services/userStorehouse/SaveUserStorehouseInfo.md
  3. 188 0
      docs/document/services/userStorehouse/UpdateUserStorehouseInfo.md
  4. 83 0
      java110-bean/src/main/java/com/java110/dto/userStorehouse/UserStorehouseDto.java
  5. 53 0
      java110-bean/src/main/java/com/java110/po/userStorehouse/UserStorehousePo.java
  6. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  7. 0 0
      java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml
  8. 185 0
      java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml
  9. 19 27
      java110-generator/src/main/resources/back/template_1.json
  10. 41 0
      java110-interface/src/main/java/com/java110/intf/store/IUserStorehouseInnerServiceSMO.java
  11. 18 0
      java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java
  12. 31 0
      java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeUserStorehouseConstant.java
  13. 38 0
      service-api/src/main/java/com/java110/api/bmo/userStorehouse/IUserStorehouseBMO.java
  14. 61 0
      service-api/src/main/java/com/java110/api/bmo/userStorehouse/impl/UserStorehouseBMOImpl.java
  15. 49 0
      service-api/src/main/java/com/java110/api/listener/resourceStore/DeleteUserStorehouseListener.java
  16. 82 0
      service-api/src/main/java/com/java110/api/listener/resourceStore/ListUserStorehousesListener.java
  17. 50 0
      service-api/src/main/java/com/java110/api/listener/resourceStore/SaveUserStorehouseListener.java
  18. 50 0
      service-api/src/main/java/com/java110/api/listener/resourceStore/UpdateUserStorehouseListener.java
  19. 81 0
      service-store/src/main/java/com/java110/store/dao/IUserStorehouseServiceDao.java
  20. 130 0
      service-store/src/main/java/com/java110/store/dao/impl/UserStorehouseServiceDaoImpl.java
  21. 90 0
      service-store/src/main/java/com/java110/store/listener/userStorehouse/AbstractUserStorehouseBusinessServiceDataFlowListener.java
  22. 177 0
      service-store/src/main/java/com/java110/store/listener/userStorehouse/DeleteUserStorehouseInfoListener.java
  23. 176 0
      service-store/src/main/java/com/java110/store/listener/userStorehouse/SaveUserStorehouseInfoListener.java
  24. 190 0
      service-store/src/main/java/com/java110/store/listener/userStorehouse/UpdateUserStorehouseInfoListener.java
  25. 93 0
      service-store/src/main/java/com/java110/store/smo/impl/UserStorehouseInnerServiceSMOImpl.java

+ 175 - 0
docs/document/services/userStorehouse/DeleteUserStorehouseInfo.md

@@ -0,0 +1,175 @@
+package com.java110.store.listener.userUserStorehousehouse;
+
+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.store.dao.IUserStorehouseServiceDao;
+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、businessUserStorehouse:{} 个人物品基本信息节点
+ * 2、businessUserStorehouseAttr:[{}] 个人物品属性信息节点
+ * 3、businessUserStorehousePhoto:[{}] 个人物品照片信息节点
+ * 4、businessUserStorehouseCerdentials:[{}] 个人物品证件信息节点
+ * 协议地址 :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("deleteUserStorehouseInfoListener")
+@Transactional
+public class DeleteUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteUserStorehouseInfoListener.class);
+    @Autowired
+    IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_USER_STOREHOUSE;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+            //处理 businessUserStorehouse 节点
+            if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+                Object _obj = data.get(UserStorehousePo.class.getSimpleName());
+                JSONArray businessUserStorehouses = null;
+                if(_obj instanceof JSONObject){
+                    businessUserStorehouses = new JSONArray();
+                    businessUserStorehouses.add(_obj);
+                }else {
+                    businessUserStorehouses = (JSONArray)_obj;
+                }
+                //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+                for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouses.size();_userUserStorehousehouseIndex++) {
+                    JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
+                    doBusinessUserStorehouse(business, businessUserStorehouse);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                    }
+                }
+
+        }
+
+
+    }
+
+    /**
+     * 删除 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> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfos != null && businessUserStorehouseInfos.size() >0) {
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_INVALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+                dataFlowContext.addParamOut("userUserStorehousehouseId",businessUserStorehouseInfo.get("userUserStorehousehouse_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> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+
+            //个人物品信息
+            List<Map> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUserStorehouseInfos == null ||  businessUserStorehouseInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(userUserStorehousehouse),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+            }
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误,不能自动生成(必须已经存在的userUserStorehousehouseId)"+businessUserStorehouse);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);
+    }
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+}

+ 175 - 0
docs/document/services/userStorehouse/SaveUserStorehouseInfo.md

@@ -0,0 +1,175 @@
+package com.java110.store.listener.userUserStorehousehouse;
+
+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.store.dao.IUserStorehouseServiceDao;
+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("saveUserStorehouseInfoListener")
+@Transactional
+public class SaveUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener{
+
+    private static Logger logger = LoggerFactory.getLogger(SaveUserStorehouseInfoListener.class);
+
+    @Autowired
+    private IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_USER_STOREHOUSE;
+    }
+
+    /**
+     * 保存个人物品信息 business 表中
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessUserStorehouse 节点
+        if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+            Object bObj = data.get(UserStorehousePo.class.getSimpleName());
+            JSONArray businessUserStorehouses = null;
+            if(bObj instanceof JSONObject){
+                businessUserStorehouses = new JSONArray();
+                businessUserStorehouses.add(bObj);
+            }else {
+                businessUserStorehouses = (JSONArray)bObj;
+            }
+            //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+            for (int bUserStorehouseIndex = 0; bUserStorehouseIndex < businessUserStorehouses.size();bUserStorehouseIndex++) {
+                JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(bUserStorehouseIndex);
+                doBusinessUserStorehouse(business, businessUserStorehouse);
+                if(bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                }
+            }
+        }
+    }
+
+    /**
+     * 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> businessUserStorehouseInfo = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfo != null && businessUserStorehouseInfo.size() >0) {
+            reFreshShareColumn(info, businessUserStorehouseInfo.get(0));
+            userUserStorehousehouseServiceDaoImpl.saveUserStorehouseInfoInstance(info);
+            if(businessUserStorehouseInfo.size() == 1) {
+                dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get(0).get("userUserStorehousehouse_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("storeId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("store_id")) {
+            return;
+        }
+
+        info.put("storeId", businessInfo.get("store_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 paramIn = new HashMap();
+        paramIn.put("bId",bId);
+        paramIn.put("statusCd",StatusConstant.STATUS_CD_INVALID);
+        //个人物品信息
+        List<Map> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+            reFreshShareColumn(paramIn, userUserStorehousehouseInfo.get(0));
+            userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(paramIn);
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            //刷新缓存
+            //flushUserStorehouseId(business.getDatas());
+
+            businessUserStorehouse.put("userUserStorehousehouseId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userUserStorehousehouseId));
+
+        }
+
+        businessUserStorehouse.put("bId",business.getbId());
+        businessUserStorehouse.put("operate", StatusConstant.OPERATE_ADD);
+        //保存个人物品信息
+        userUserStorehousehouseServiceDaoImpl.saveBusinessUserStorehouseInfo(businessUserStorehouse);
+
+    }
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+}

+ 188 - 0
docs/document/services/userStorehouse/UpdateUserStorehouseInfo.md

@@ -0,0 +1,188 @@
+package com.java110.store.listener.userUserStorehousehouse;
+
+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.store.dao.IUserStorehouseServiceDao;
+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、businessUserStorehouse:{} 个人物品基本信息节点
+ * 2、businessUserStorehouseAttr:[{}] 个人物品属性信息节点
+ * 3、businessUserStorehousePhoto:[{}] 个人物品照片信息节点
+ * 4、businessUserStorehouseCerdentials:[{}] 个人物品证件信息节点
+ * 协议地址 :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("updateUserStorehouseInfoListener")
+@Transactional
+public class UpdateUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateUserStorehouseInfoListener.class);
+    @Autowired
+    private IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_USER_STOREHOUSE;
+    }
+
+    /**
+     * business过程
+     * @param dataFlowContext 上下文对象
+     * @param business 业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+
+            //处理 businessUserStorehouse 节点
+            if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+                Object _obj = data.get(UserStorehousePo.class.getSimpleName());
+                JSONArray businessUserStorehouses = null;
+                if(_obj instanceof JSONObject){
+                    businessUserStorehouses = new JSONArray();
+                    businessUserStorehouses.add(_obj);
+                }else {
+                    businessUserStorehouses = (JSONArray)_obj;
+                }
+                //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+                for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouses.size();_userUserStorehousehouseIndex++) {
+                    JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
+                    doBusinessUserStorehouse(business, businessUserStorehouse);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                    }
+                }
+            }
+    }
+
+
+    /**
+     * 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> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfos != null && businessUserStorehouseInfos.size() >0) {
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+                if(businessUserStorehouseInfo.size() == 1) {
+                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get("userUserStorehousehouse_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> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+
+            //个人物品信息
+            List<Map> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUserStorehouseInfos == null || businessUserStorehouseInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(userUserStorehousehouse),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误,不能自动生成(必须已经存在的userUserStorehousehouseId)"+businessUserStorehouse);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);
+
+        businessUserStorehouse.put("bId",business.getbId());
+        businessUserStorehouse.put("operate", StatusConstant.OPERATE_ADD);
+        //保存个人物品信息
+        userUserStorehousehouseServiceDaoImpl.saveBusinessUserStorehouseInfo(businessUserStorehouse);
+
+    }
+
+
+
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+
+
+
+}

+ 83 - 0
java110-bean/src/main/java/com/java110/dto/userStorehouse/UserStorehouseDto.java

@@ -0,0 +1,83 @@
+package com.java110.dto.userStorehouse;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 个人物品数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class UserStorehouseDto extends PageDto implements Serializable {
+
+    private String resName;
+private String storeId;
+private String stock;
+private String resId;
+private String userId;
+private String usId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getResName() {
+        return resName;
+    }
+public void setResName(String resName) {
+        this.resName = resName;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+public String getStock() {
+        return stock;
+    }
+public void setStock(String stock) {
+        this.stock = stock;
+    }
+public String getResId() {
+        return resId;
+    }
+public void setResId(String resId) {
+        this.resId = resId;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getUsId() {
+        return usId;
+    }
+public void setUsId(String usId) {
+        this.usId = usId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

+ 53 - 0
java110-bean/src/main/java/com/java110/po/userStorehouse/UserStorehousePo.java

@@ -0,0 +1,53 @@
+package com.java110.po.userStorehouse;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserStorehousePo implements Serializable {
+
+    private String resName;
+private String storeId;
+private String stock;
+private String resId;
+private String userId;
+private String usId;
+public String getResName() {
+        return resName;
+    }
+public void setResName(String resName) {
+        this.resName = resName;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+public String getStock() {
+        return stock;
+    }
+public void setStock(String stock) {
+        this.stock = stock;
+    }
+public String getResId() {
+        return resId;
+    }
+public void setResId(String resId) {
+        this.resId = resId;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getUsId() {
+        return usId;
+    }
+public void setUsId(String usId) {
+        this.usId = usId;
+    }
+
+
+
+}

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -191,6 +191,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_visitId = "24";
     public static final String CODE_PREFIX_shId = "25";
     public static final String CODE_PREFIX_allocationStorehouseId = "26";
+    public static final String CODE_PREFIX_usId = "27";
 
 
     /**

java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplMapper.xml → java110-db/src/main/resources/mapper/community/ResourceStoreServiceDaoImplBakMapper.xml


+ 185 - 0
java110-db/src/main/resources/mapper/store/UserStorehouseServiceDaoImplMapper.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="userStorehouseServiceDaoImpl">
+
+    <!-- 保存个人物品信息 add by wuxw 2018-07-03 -->
+    <insert id="saveBusinessUserStorehouseInfo" parameterType="Map">
+        insert into business_user_storehouse(
+        res_name,operate,b_id,store_id,stock,res_id,user_id,us_id
+        ) values (
+        #{resName},#{operate},#{bId},#{storeId},#{stock},#{resId},#{userId},#{usId}
+        )
+    </insert>
+
+
+    <!-- 查询个人物品信息(Business) add by wuxw 2018-07-03 -->
+    <select id="getBusinessUserStorehouseInfo" parameterType="Map" resultType="Map">
+        select t.res_name,t.res_name resName,t.operate,t.b_id,t.b_id bId,t.store_id,t.store_id
+        storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId
+        from business_user_storehouse t
+        where 1 =1
+        <if test="resName !=null and resName != ''">
+            and t.res_name= #{resName}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="stock !=null and stock != ''">
+            and t.stock= #{stock}
+        </if>
+        <if test="resId !=null and resId != ''">
+            and t.res_id= #{resId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="usId !=null and usId != ''">
+            and t.us_id= #{usId}
+        </if>
+
+    </select>
+
+
+    <!-- 保存个人物品信息至 instance表中 add by wuxw 2018-07-03 -->
+    <insert id="saveUserStorehouseInfoInstance" parameterType="Map">
+        insert into user_storehouse(
+        res_name,status_cd,b_id,store_id,stock,res_id,user_id,us_id
+        ) select t.res_name,'0',t.b_id,t.store_id,t.stock,t.res_id,t.user_id,t.us_id from business_user_storehouse t
+        where 1=1
+        <if test="resName !=null and resName != ''">
+            and t.res_name= #{resName}
+        </if>
+        and t.operate= 'ADD'
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="stock !=null and stock != ''">
+            and t.stock= #{stock}
+        </if>
+        <if test="resId !=null and resId != ''">
+            and t.res_id= #{resId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="usId !=null and usId != ''">
+            and t.us_id= #{usId}
+        </if>
+
+    </insert>
+
+
+    <!-- 查询个人物品信息 add by wuxw 2018-07-03 -->
+    <select id="getUserStorehouseInfo" parameterType="Map" resultType="Map">
+        select t.res_name,t.res_name resName,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.store_id,t.store_id
+        storeId,t.stock,t.res_id,t.res_id resId,t.user_id,t.user_id userId,t.us_id,t.us_id usId
+        from user_storehouse t
+        where 1 =1
+        <if test="resName !=null and resName != ''">
+            and t.res_name= #{resName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="stock !=null and stock != ''">
+            and t.stock= #{stock}
+        </if>
+        <if test="resId !=null and resId != ''">
+            and t.res_id= #{resId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="usId !=null and usId != ''">
+            and t.us_id= #{usId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改个人物品信息 add by wuxw 2018-07-03 -->
+    <update id="updateUserStorehouseInfoInstance" parameterType="Map">
+        update user_storehouse t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="resName !=null and resName != ''">
+            , t.res_name= #{resName}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="stock !=null and stock != ''">
+            , t.stock= #{stock}
+        </if>
+        <if test="resId !=null and resId != ''">
+            , t.res_id= #{resId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        where 1=1
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="usId !=null and usId != ''">
+            and t.us_id= #{usId}
+        </if>
+
+    </update>
+
+    <!-- 查询个人物品数量 add by wuxw 2018-07-03 -->
+    <select id="queryUserStorehousesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from user_storehouse t
+        where 1 =1
+        <if test="resName !=null and resName != ''">
+            and t.res_name= #{resName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="stock !=null and stock != ''">
+            and t.stock= #{stock}
+        </if>
+        <if test="resId !=null and resId != ''">
+            and t.res_id= #{resId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="usId !=null and usId != ''">
+            and t.us_id= #{usId}
+        </if>
+
+
+    </select>
+
+</mapper>

+ 19 - 27
java110-generator/src/main/resources/back/template_1.json

@@ -1,50 +1,42 @@
 {
   "autoMove": true,
-  "id": "asId",
-  "name": "allocationStorehouse",
-  "desc": "仓库调拨",
+  "id": "usId",
+  "name": "userStorehouse",
+  "desc": "个人物品",
   "shareParam": "storeId",
   "shareColumn": "store_id",
   "shareName": "store",
-  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_ALLOCATION_STOREHOUSE",
-  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_ALLOCATION_STOREHOUSE",
-  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_ALLOCATION_STOREHOUSE",
-  "newBusinessTypeCdValue": "671100030005",
-  "updateBusinessTypeCdValue": "671100040005",
-  "deleteBusinessTypeCdValue": "671100050005",
-  "businessTableName": "business_allocation_storehouse",
-  "tableName": "allocation_storehouse",
+  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_USER_STOREHOUSE",
+  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_USER_STOREHOUSE",
+  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_USER_STOREHOUSE",
+  "newBusinessTypeCdValue": "671100030006",
+  "updateBusinessTypeCdValue": "671100040006",
+  "deleteBusinessTypeCdValue": "671100050006",
+  "businessTableName": "business_user_storehouse",
+  "tableName": "user_storehouse",
   "param": {
-    "asId": "as_id",
-    "shIda": "sh_id_a",
-    "shIdz": "sh_id_z",
-    "bId": "b_id",
+    "usId": "us_id",
     "resId": "res_id",
     "resName": "res_name",
+    "bId": "b_id",
     "storeId": "store_id",
     "stock": "stock",
-    "state": "state",
-    "startUserId": "start_user_id",
-    "startUserName": "start_user_name",
+    "userId": "user_id",
     "statusCd": "status_cd",
     "operate": "operate"
   },
   "required": [
-    {
-      "code": "shIda",
-      "msg": "a端不能为空"
-    },
-    {
-      "code": "shIdz",
-      "msg": "z端不能为空"
-    },
     {
       "code": "resId",
       "msg": "物品不能为空"
     },
     {
       "code": "stock",
-      "msg": "数量不能为空"
+      "msg": "库存不能为空"
+    },
+    {
+      "code": "userId",
+      "msg": "用户不能为空"
     },
     {
       "code": "storeId",

+ 41 - 0
java110-interface/src/main/java/com/java110/intf/store/IUserStorehouseInnerServiceSMO.java

@@ -0,0 +1,41 @@
+package com.java110.intf.store;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.userStorehouse.UserStorehouseDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IUserStorehouseInnerServiceSMO
+ * @Description 个人物品接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/userUserStorehouseApi")
+public interface IUserStorehouseInnerServiceSMO {
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param userUserStorehousehouseDto 数据对象分享
+     * @return UserStorehouseDto 对象数据
+     */
+    @RequestMapping(value = "/queryUserStorehouses", method = RequestMethod.POST)
+    List<UserStorehouseDto> queryUserStorehouses(@RequestBody UserStorehouseDto userUserStorehousehouseDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param userUserStorehousehouseDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryUserStorehousesCount", method = RequestMethod.POST)
+    int queryUserStorehousesCount(@RequestBody UserStorehouseDto userUserStorehousehouseDto);
+}

+ 18 - 0
java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -1470,4 +1470,22 @@ public class BusinessTypeConstant {
     public static final String BUSINESS_TYPE_DELETE_ALLOCATION_STOREHOUSE="671100050005";
 
 
+    /**
+     *  修改工作流节点 处理员工
+     *  3保存
+     */
+    public static final String BUSINESS_TYPE_SAVE_USER_STOREHOUSE="671100030006";
+
+    /**
+     *  修改工作流节点 处理员工
+     *  3保存
+     */
+    public static final String BUSINESS_TYPE_UPDATE_USER_STOREHOUSE="671100040006";
+
+    /**
+     * 删除工作流节点 处理员工
+     */
+    public static final String BUSINESS_TYPE_DELETE_USER_STOREHOUSE="671100050006";
+
+
 }

+ 31 - 0
java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeUserStorehouseConstant.java

@@ -0,0 +1,31 @@
+package com.java110.utils.constant;
+
+/**
+ * 个人物品常量类
+ * Created by wuxw on 2017/5/20.
+ */
+public class ServiceCodeUserStorehouseConstant {
+
+    /**
+     * 添加 个人物品
+     */
+    public static final String ADD_USERSTOREHOUSE = "userStorehouse.saveUserStorehouse";
+
+
+    /**
+     * 修改 个人物品
+     */
+    public static final String UPDATE_USERSTOREHOUSE = "userStorehouse.updateUserStorehouse";
+    /**
+     * 删除 个人物品
+     */
+    public static final String DELETE_USERSTOREHOUSE = "userStorehouse.deleteUserStorehouse";
+
+
+    /**
+     * 查询 个人物品
+     */
+    public static final String LIST_USERSTOREHOUSES = "userStorehouse.listUserStorehouses";
+
+
+}

+ 38 - 0
service-api/src/main/java/com/java110/api/bmo/userStorehouse/IUserStorehouseBMO.java

@@ -0,0 +1,38 @@
+package com.java110.api.bmo.userStorehouse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.IApiBaseBMO;
+import com.java110.core.context.DataFlowContext;
+
+public interface IUserStorehouseBMO extends IApiBaseBMO {
+
+
+    /**
+     * 添加个人物品
+     * @param paramInJson
+     * @param dataFlowContext
+     * @return
+     */
+     void addUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+    /**
+     * 添加个人物品信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+     void updateUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+    /**
+     * 删除个人物品
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+     void deleteUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+
+
+}

+ 61 - 0
service-api/src/main/java/com/java110/api/bmo/userStorehouse/impl/UserStorehouseBMOImpl.java

@@ -0,0 +1,61 @@
+package com.java110.api.bmo.userStorehouse.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.ApiBaseBMO;
+import com.java110.api.bmo.userStorehouse.IUserStorehouseBMO;
+import com.java110.core.context.DataFlowContext;
+import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
+import com.java110.po.userStorehouse.UserStorehousePo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("userStorehouseBMOImpl")
+public class UserStorehouseBMOImpl extends ApiBaseBMO implements IUserStorehouseBMO {
+
+    @Autowired
+    private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void addUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        paramInJson.put("usId", "-1");
+        UserStorehousePo userStorehousePo = BeanConvertUtil.covertBean(paramInJson, UserStorehousePo.class);
+        super.insert(dataFlowContext, userStorehousePo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_USER_STOREHOUSE);
+    }
+
+
+    /**
+     * 添加活动信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void updateUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+        UserStorehousePo userStorehousePo = BeanConvertUtil.covertBean(paramInJson, UserStorehousePo.class);
+        super.update(dataFlowContext, userStorehousePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_USER_STOREHOUSE);
+    }
+
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void deleteUserStorehouse(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        UserStorehousePo userStorehousePo = BeanConvertUtil.covertBean(paramInJson, UserStorehousePo.class);
+        super.update(dataFlowContext, userStorehousePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_USER_STOREHOUSE);
+    }
+
+}

+ 49 - 0
service-api/src/main/java/com/java110/api/listener/resourceStore/DeleteUserStorehouseListener.java

@@ -0,0 +1,49 @@
+package com.java110.api.listener.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.userStorehouse.IUserStorehouseBMO;
+import com.java110.api.listener.AbstractServiceApiPlusListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.constant.ServiceCodeUserStorehouseConstant;
+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("deleteUserStorehouseListener")
+public class DeleteUserStorehouseListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUserStorehouseBMO userStorehouseBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "usId", "usId不能为空");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        userStorehouseBMOImpl.deleteUserStorehouse(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUserStorehouseConstant.DELETE_USERSTOREHOUSE;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+}

+ 82 - 0
service-api/src/main/java/com/java110/api/listener/resourceStore/ListUserStorehousesListener.java

@@ -0,0 +1,82 @@
+package com.java110.api.listener.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.userStorehouse.UserStorehouseDto;
+import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
+import com.java110.utils.constant.ServiceCodeUserStorehouseConstant;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询小区侦听类
+ */
+@Java110Listener("listUserStorehousesListener")
+public class ListUserStorehousesListener extends AbstractServiceApiListener {
+
+    @Autowired
+    private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUserStorehouseConstant.LIST_USERSTOREHOUSES;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET;
+    }
+
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    public IUserStorehouseInnerServiceSMO getUserStorehouseInnerServiceSMOImpl() {
+        return userStorehouseInnerServiceSMOImpl;
+    }
+
+    public void setUserStorehouseInnerServiceSMOImpl(IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl) {
+        this.userStorehouseInnerServiceSMOImpl = userStorehouseInnerServiceSMOImpl;
+    }
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        UserStorehouseDto userStorehouseDto = BeanConvertUtil.covertBean(reqJson, UserStorehouseDto.class);
+
+        int count = userStorehouseInnerServiceSMOImpl.queryUserStorehousesCount(userStorehouseDto);
+
+        List<UserStorehouseDto> userStorehouseDtos = null;
+
+        if (count > 0) {
+            userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
+        } else {
+            userStorehouseDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userStorehouseDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+
+    }
+}

+ 50 - 0
service-api/src/main/java/com/java110/api/listener/resourceStore/SaveUserStorehouseListener.java

@@ -0,0 +1,50 @@
+package com.java110.api.listener.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.userStorehouse.IUserStorehouseBMO;
+import com.java110.api.listener.AbstractServiceApiPlusListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.constant.ServiceCodeUserStorehouseConstant;
+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("saveUserStorehouseListener")
+public class SaveUserStorehouseListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUserStorehouseBMO userStorehouseBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "resId", "请求报文中未包含resId");
+        Assert.hasKeyAndValue(reqJson, "stock", "请求报文中未包含stock");
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+        userStorehouseBMOImpl.addUserStorehouse(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUserStorehouseConstant.ADD_USERSTOREHOUSE;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+}

+ 50 - 0
service-api/src/main/java/com/java110/api/listener/resourceStore/UpdateUserStorehouseListener.java

@@ -0,0 +1,50 @@
+package com.java110.api.listener.resourceStore;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.userStorehouse.IUserStorehouseBMO;
+import com.java110.api.listener.AbstractServiceApiPlusListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.constant.ServiceCodeUserStorehouseConstant;
+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("updateUserStorehouseListener")
+public class UpdateUserStorehouseListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUserStorehouseBMO userStorehouseBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "usId", "usId不能为空");
+        Assert.hasKeyAndValue(reqJson, "resId", "请求报文中未包含resId");
+        Assert.hasKeyAndValue(reqJson, "stock", "请求报文中未包含stock");
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        userStorehouseBMOImpl.updateUserStorehouse(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUserStorehouseConstant.UPDATE_USERSTOREHOUSE;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+}

+ 81 - 0
service-store/src/main/java/com/java110/store/dao/IUserStorehouseServiceDao.java

@@ -0,0 +1,81 @@
+package com.java110.store.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 个人物品组件内部之间使用,没有给外围系统提供服务能力
+ * 个人物品服务接口类,要求全部以字符串传输,方便微服务化
+ * 新建客户,修改客户,删除客户,查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IUserStorehouseServiceDao {
+
+    /**
+     * 保存 个人物品信息
+     * @param businessUserStorehouseInfo 个人物品信息 封装
+     * @throws DAOException 操作数据库异常
+     */
+    void saveBusinessUserStorehouseInfo(Map businessUserStorehouseInfo) throws DAOException;
+
+
+
+    /**
+     * 查询个人物品信息(business过程)
+     * 根据bId 查询个人物品信息
+     * @param info bId 信息
+     * @return 个人物品信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getBusinessUserStorehouseInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 保存 个人物品信息 Business数据到 Instance中
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveUserStorehouseInfoInstance(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询个人物品信息(instance过程)
+     * 根据bId 查询个人物品信息
+     * @param info bId 信息
+     * @return 个人物品信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getUserStorehouseInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改个人物品信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateUserStorehouseInfoInstance(Map info) throws DAOException;
+
+
+    /**
+     * 查询个人物品总数
+     *
+     * @param info 个人物品信息
+     * @return 个人物品数量
+     */
+    int queryUserStorehousesCount(Map info);
+
+}

+ 130 - 0
service-store/src/main/java/com/java110/store/dao/impl/UserStorehouseServiceDaoImpl.java

@@ -0,0 +1,130 @@
+package com.java110.store.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.store.dao.IUserStorehouseServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 个人物品服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("userStorehouseServiceDaoImpl")
+//@Transactional
+public class UserStorehouseServiceDaoImpl extends BaseServiceDao implements IUserStorehouseServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(UserStorehouseServiceDaoImpl.class);
+
+    /**
+     * 个人物品信息封装
+     * @param businessUserStorehouseInfo 个人物品信息 封装
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveBusinessUserStorehouseInfo(Map businessUserStorehouseInfo) throws DAOException {
+        businessUserStorehouseInfo.put("month", DateUtil.getCurrentMonth());
+        // 查询business_user 数据是否已经存在
+        logger.debug("保存个人物品信息 入参 businessUserStorehouseInfo : {}",businessUserStorehouseInfo);
+        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveBusinessUserStorehouseInfo",businessUserStorehouseInfo);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存个人物品数据失败:"+ JSONObject.toJSONString(businessUserStorehouseInfo));
+        }
+    }
+
+
+    /**
+     * 查询个人物品信息
+     * @param info bId 信息
+     * @return 个人物品信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getBusinessUserStorehouseInfo(Map info) throws DAOException {
+
+        logger.debug("查询个人物品信息 入参 info : {}",info);
+
+        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getBusinessUserStorehouseInfo",info);
+
+        return businessUserStorehouseInfos;
+    }
+
+
+
+    /**
+     * 保存个人物品信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveUserStorehouseInfoInstance(Map info) throws DAOException {
+        logger.debug("保存个人物品信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("userStorehouseServiceDaoImpl.saveUserStorehouseInfoInstance",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存个人物品信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询个人物品信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getUserStorehouseInfo(Map info) throws DAOException {
+        logger.debug("查询个人物品信息 入参 info : {}",info);
+
+        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.getUserStorehouseInfo",info);
+
+        return businessUserStorehouseInfos;
+    }
+
+
+    /**
+     * 修改个人物品信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateUserStorehouseInfoInstance(Map info) throws DAOException {
+        logger.debug("修改个人物品信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("userStorehouseServiceDaoImpl.updateUserStorehouseInfoInstance",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改个人物品信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询个人物品数量
+     * @param info 个人物品信息
+     * @return 个人物品数量
+     */
+    @Override
+    public int queryUserStorehousesCount(Map info) {
+        logger.debug("查询个人物品数据 入参 info : {}",info);
+
+        List<Map> businessUserStorehouseInfos = sqlSessionTemplate.selectList("userStorehouseServiceDaoImpl.queryUserStorehousesCount", info);
+        if (businessUserStorehouseInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessUserStorehouseInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 90 - 0
service-store/src/main/java/com/java110/store/listener/userStorehouse/AbstractUserStorehouseBusinessServiceDataFlowListener.java

@@ -0,0 +1,90 @@
+package com.java110.store.listener.userStorehouse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
+import com.java110.entity.center.Business;
+import com.java110.store.dao.IUserStorehouseServiceDao;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.exception.ListenerExecuteException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 个人物品 服务侦听 父类
+ * Created by wuxw on 2018/7/4.
+ */
+public abstract class AbstractUserStorehouseBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
+    private static Logger logger = LoggerFactory.getLogger(AbstractUserStorehouseBusinessServiceDataFlowListener.class);
+
+
+    /**
+     * 获取 DAO工具类
+     *
+     * @return
+     */
+    public abstract IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl();
+
+    /**
+     * 刷新 businessUserStorehouseInfo 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
+     * @param businessUserStorehouseInfo
+     */
+    protected void flushBusinessUserStorehouseInfo(Map businessUserStorehouseInfo, String statusCd) {
+        businessUserStorehouseInfo.put("newBId", businessUserStorehouseInfo.get("b_id"));
+        businessUserStorehouseInfo.put("resName", businessUserStorehouseInfo.get("res_name"));
+        businessUserStorehouseInfo.put("operate", businessUserStorehouseInfo.get("operate"));
+        businessUserStorehouseInfo.put("storeId", businessUserStorehouseInfo.get("store_id"));
+        businessUserStorehouseInfo.put("stock", businessUserStorehouseInfo.get("stock"));
+        businessUserStorehouseInfo.put("resId", businessUserStorehouseInfo.get("res_id"));
+        businessUserStorehouseInfo.put("userId", businessUserStorehouseInfo.get("user_id"));
+        businessUserStorehouseInfo.put("usId", businessUserStorehouseInfo.get("us_id"));
+        businessUserStorehouseInfo.remove("bId");
+        businessUserStorehouseInfo.put("statusCd", statusCd);
+    }
+
+
+    /**
+     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
+     *
+     * @param businessUserStorehouse 个人物品信息
+     */
+    protected void autoSaveDelBusinessUserStorehouse(Business business, JSONObject businessUserStorehouse) {
+//自动插入DEL
+        Map info = new HashMap();
+        info.put("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        List<Map> currentUserStorehouseInfos = getUserStorehouseServiceDaoImpl().getUserStorehouseInfo(info);
+        if (currentUserStorehouseInfos == null || currentUserStorehouseInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息,入参错误或数据有问题,请检查" + info);
+        }
+
+        Map currentUserStorehouseInfo = currentUserStorehouseInfos.get(0);
+
+        currentUserStorehouseInfo.put("bId", business.getbId());
+
+        currentUserStorehouseInfo.put("resName", currentUserStorehouseInfo.get("res_name"));
+        currentUserStorehouseInfo.put("operate", currentUserStorehouseInfo.get("operate"));
+        currentUserStorehouseInfo.put("storeId", currentUserStorehouseInfo.get("store_id"));
+        currentUserStorehouseInfo.put("stock", currentUserStorehouseInfo.get("stock"));
+        currentUserStorehouseInfo.put("resId", currentUserStorehouseInfo.get("res_id"));
+        currentUserStorehouseInfo.put("userId", currentUserStorehouseInfo.get("user_id"));
+        currentUserStorehouseInfo.put("usId", currentUserStorehouseInfo.get("us_id"));
+
+
+        currentUserStorehouseInfo.put("operate", StatusConstant.OPERATE_DEL);
+        getUserStorehouseServiceDaoImpl().saveBusinessUserStorehouseInfo(currentUserStorehouseInfo);
+        for (Object key : currentUserStorehouseInfo.keySet()) {
+            if (businessUserStorehouse.get(key) == null) {
+                businessUserStorehouse.put(key.toString(), currentUserStorehouseInfo.get(key));
+            }
+        }
+    }
+
+
+}

+ 177 - 0
service-store/src/main/java/com/java110/store/listener/userStorehouse/DeleteUserStorehouseInfoListener.java

@@ -0,0 +1,177 @@
+package com.java110.store.listener.userUserStorehousehouse;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.userStorehouse.UserStorehousePo;
+import com.java110.store.listener.userStorehouse.AbstractUserStorehouseBusinessServiceDataFlowListener;
+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.store.dao.IUserStorehouseServiceDao;
+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、businessUserStorehouse:{} 个人物品基本信息节点
+ * 2、businessUserStorehouseAttr:[{}] 个人物品属性信息节点
+ * 3、businessUserStorehousePhoto:[{}] 个人物品照片信息节点
+ * 4、businessUserStorehouseCerdentials:[{}] 个人物品证件信息节点
+ * 协议地址 :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("deleteUserStorehouseInfoListener")
+@Transactional
+public class DeleteUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteUserStorehouseInfoListener.class);
+    @Autowired
+    IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_USER_STOREHOUSE;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+            //处理 businessUserStorehouse 节点
+            if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+                Object _obj = data.get(UserStorehousePo.class.getSimpleName());
+                JSONArray businessUserStorehouses = null;
+                if(_obj instanceof JSONObject){
+                    businessUserStorehouses = new JSONArray();
+                    businessUserStorehouses.add(_obj);
+                }else {
+                    businessUserStorehouses = (JSONArray)_obj;
+                }
+                //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+                for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouses.size();_userUserStorehousehouseIndex++) {
+                    JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
+                    doBusinessUserStorehouse(business, businessUserStorehouse);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                    }
+                }
+
+        }
+
+
+    }
+
+    /**
+     * 删除 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> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfos != null && businessUserStorehouseInfos.size() >0) {
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_INVALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+                dataFlowContext.addParamOut("userUserStorehousehouseId",businessUserStorehouseInfo.get("userUserStorehousehouse_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> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+
+            //个人物品信息
+            List<Map> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUserStorehouseInfos == null ||  businessUserStorehouseInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(userUserStorehousehouse),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+            }
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误,不能自动生成(必须已经存在的userUserStorehousehouseId)"+businessUserStorehouse);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);
+    }
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+}

+ 176 - 0
service-store/src/main/java/com/java110/store/listener/userStorehouse/SaveUserStorehouseInfoListener.java

@@ -0,0 +1,176 @@
+package com.java110.store.listener.userStorehouse;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.userStorehouse.UserStorehousePo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
+import com.java110.store.dao.IUserStorehouseServiceDao;
+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("saveUserStorehouseInfoListener")
+@Transactional
+public class SaveUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener{
+
+    private static Logger logger = LoggerFactory.getLogger(SaveUserStorehouseInfoListener.class);
+
+    @Autowired
+    private IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_USER_STOREHOUSE;
+    }
+
+    /**
+     * 保存个人物品信息 business 表中
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessUserStorehouse 节点
+        if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+            Object bObj = data.get(UserStorehousePo.class.getSimpleName());
+            JSONArray businessUserStorehouses = null;
+            if(bObj instanceof JSONObject){
+                businessUserStorehouses = new JSONArray();
+                businessUserStorehouses.add(bObj);
+            }else {
+                businessUserStorehouses = (JSONArray)bObj;
+            }
+            //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+            for (int bUserStorehouseIndex = 0; bUserStorehouseIndex < businessUserStorehouses.size();bUserStorehouseIndex++) {
+                JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(bUserStorehouseIndex);
+                doBusinessUserStorehouse(business, businessUserStorehouse);
+                if(bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                }
+            }
+        }
+    }
+
+    /**
+     * 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> businessUserStorehouseInfo = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfo != null && businessUserStorehouseInfo.size() >0) {
+            reFreshShareColumn(info, businessUserStorehouseInfo.get(0));
+            userUserStorehousehouseServiceDaoImpl.saveUserStorehouseInfoInstance(info);
+            if(businessUserStorehouseInfo.size() == 1) {
+                dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get(0).get("userUserStorehousehouse_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("storeId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("store_id")) {
+            return;
+        }
+
+        info.put("storeId", businessInfo.get("store_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 paramIn = new HashMap();
+        paramIn.put("bId",bId);
+        paramIn.put("statusCd",StatusConstant.STATUS_CD_INVALID);
+        //个人物品信息
+        List<Map> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+            reFreshShareColumn(paramIn, userUserStorehousehouseInfo.get(0));
+            userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(paramIn);
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            //刷新缓存
+            //flushUserStorehouseId(business.getDatas());
+
+            businessUserStorehouse.put("userUserStorehousehouseId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
+
+        }
+
+        businessUserStorehouse.put("bId",business.getbId());
+        businessUserStorehouse.put("operate", StatusConstant.OPERATE_ADD);
+        //保存个人物品信息
+        userUserStorehousehouseServiceDaoImpl.saveBusinessUserStorehouseInfo(businessUserStorehouse);
+
+    }
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+}

+ 190 - 0
service-store/src/main/java/com/java110/store/listener/userStorehouse/UpdateUserStorehouseInfoListener.java

@@ -0,0 +1,190 @@
+package com.java110.store.listener.userUserStorehousehouse;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.userStorehouse.UserStorehousePo;
+import com.java110.store.listener.userStorehouse.AbstractUserStorehouseBusinessServiceDataFlowListener;
+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.store.dao.IUserStorehouseServiceDao;
+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、businessUserStorehouse:{} 个人物品基本信息节点
+ * 2、businessUserStorehouseAttr:[{}] 个人物品属性信息节点
+ * 3、businessUserStorehousePhoto:[{}] 个人物品照片信息节点
+ * 4、businessUserStorehouseCerdentials:[{}] 个人物品证件信息节点
+ * 协议地址 :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("updateUserStorehouseInfoListener")
+@Transactional
+public class UpdateUserStorehouseInfoListener extends AbstractUserStorehouseBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateUserStorehouseInfoListener.class);
+    @Autowired
+    private IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_USER_STOREHOUSE;
+    }
+
+    /**
+     * business过程
+     * @param dataFlowContext 上下文对象
+     * @param business 业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+
+            //处理 businessUserStorehouse 节点
+            if(data.containsKey(UserStorehousePo.class.getSimpleName())){
+                Object _obj = data.get(UserStorehousePo.class.getSimpleName());
+                JSONArray businessUserStorehouses = null;
+                if(_obj instanceof JSONObject){
+                    businessUserStorehouses = new JSONArray();
+                    businessUserStorehouses.add(_obj);
+                }else {
+                    businessUserStorehouses = (JSONArray)_obj;
+                }
+                //JSONObject businessUserStorehouse = data.getJSONObject(UserStorehousePo.class.getSimpleName());
+                for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouses.size();_userUserStorehousehouseIndex++) {
+                    JSONObject businessUserStorehouse = businessUserStorehouses.getJSONObject(_userUserStorehousehouseIndex);
+                    doBusinessUserStorehouse(business, businessUserStorehouse);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouse.getString("userUserStorehousehouseId"));
+                    }
+                }
+            }
+    }
+
+
+    /**
+     * 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> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(info);
+        if( businessUserStorehouseInfos != null && businessUserStorehouseInfos.size() >0) {
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+                if(businessUserStorehouseInfo.size() == 1) {
+                    dataFlowContext.addParamOut("userUserStorehousehouseId", businessUserStorehouseInfo.get("userUserStorehousehouse_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> userUserStorehousehouseInfo = userUserStorehousehouseServiceDaoImpl.getUserStorehouseInfo(info);
+        if(userUserStorehousehouseInfo != null && userUserStorehousehouseInfo.size() > 0){
+
+            //个人物品信息
+            List<Map> businessUserStorehouseInfos = userUserStorehousehouseServiceDaoImpl.getBusinessUserStorehouseInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUserStorehouseInfos == null || businessUserStorehouseInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(userUserStorehousehouse),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _userUserStorehousehouseIndex = 0; _userUserStorehousehouseIndex < businessUserStorehouseInfos.size();_userUserStorehousehouseIndex++) {
+                Map businessUserStorehouseInfo = businessUserStorehouseInfos.get(_userUserStorehousehouseIndex);
+                flushBusinessUserStorehouseInfo(businessUserStorehouseInfo,StatusConstant.STATUS_CD_VALID);
+                userUserStorehousehouseServiceDaoImpl.updateUserStorehouseInfoInstance(businessUserStorehouseInfo);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 处理 businessUserStorehouse 节点
+     * @param business 总的数据节点
+     * @param businessUserStorehouse 个人物品节点
+     */
+    private void doBusinessUserStorehouse(Business business,JSONObject businessUserStorehouse){
+
+        Assert.jsonObjectHaveKey(businessUserStorehouse,"userUserStorehousehouseId","businessUserStorehouse 节点下没有包含 userUserStorehousehouseId 节点");
+
+        if(businessUserStorehouse.getString("userUserStorehousehouseId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"userUserStorehousehouseId 错误,不能自动生成(必须已经存在的userUserStorehousehouseId)"+businessUserStorehouse);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessUserStorehouse(business,businessUserStorehouse);
+
+        businessUserStorehouse.put("bId",business.getbId());
+        businessUserStorehouse.put("operate", StatusConstant.OPERATE_ADD);
+        //保存个人物品信息
+        userUserStorehousehouseServiceDaoImpl.saveBusinessUserStorehouseInfo(businessUserStorehouse);
+
+    }
+
+
+
+    @Override
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return userUserStorehousehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao userUserStorehousehouseServiceDaoImpl) {
+        this.userUserStorehousehouseServiceDaoImpl = userUserStorehousehouseServiceDaoImpl;
+    }
+
+
+
+}

+ 93 - 0
service-store/src/main/java/com/java110/store/smo/impl/UserStorehouseInnerServiceSMOImpl.java

@@ -0,0 +1,93 @@
+package com.java110.store.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.userStorehouse.UserStorehouseDto;
+import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
+import com.java110.store.dao.IUserStorehouseServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 个人物品内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class UserStorehouseInnerServiceSMOImpl extends BaseServiceSMO implements IUserStorehouseInnerServiceSMO {
+
+    @Autowired
+    private IUserStorehouseServiceDao useStorehouseServiceDaoImpl;
+
+
+
+    @Override
+    public List<UserStorehouseDto> queryUserStorehouses(@RequestBody UserStorehouseDto userUserStorehousehouseDto) {
+
+        //校验是否传了 分页信息
+
+        int page = userUserStorehousehouseDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            userUserStorehousehouseDto.setPage((page - 1) * userUserStorehousehouseDto.getRow());
+        }
+
+        List<UserStorehouseDto> userStorehouses = BeanConvertUtil.covertBeanList(useStorehouseServiceDaoImpl.getUserStorehouseInfo(BeanConvertUtil.beanCovertMap(userUserStorehousehouseDto)), UserStorehouseDto.class);
+
+
+        return userStorehouses;
+    }
+
+    /**
+     * 从用户列表中查询用户,将用户中的信息 刷新到 floor对象中
+     *
+     * @param userUserStorehousehouse 小区个人物品信息
+     * @param users                   用户列表
+     */
+    private void refreshUserStorehouse(UserStorehouseDto userUserStorehousehouse, List<UserDto> users) {
+        for (UserDto user : users) {
+            if (userUserStorehousehouse.getUsId().equals(user.getUserId())) {
+                BeanConvertUtil.covertBean(user, userUserStorehousehouse);
+            }
+        }
+    }
+
+    /**
+     * 获取批量userId
+     *
+     * @param userStorehouses 小区楼信息
+     * @return 批量userIds 信息
+     */
+    private String[] getUserIds(List<UserStorehouseDto> userStorehouses) {
+        List<String> userIds = new ArrayList<String>();
+        for (UserStorehouseDto userUserStorehousehouse : userStorehouses) {
+            userIds.add(userUserStorehousehouse.getUsId());
+        }
+
+        return userIds.toArray(new String[userIds.size()]);
+    }
+
+    @Override
+    public int queryUserStorehousesCount(@RequestBody UserStorehouseDto userUserStorehousehouseDto) {
+        return useStorehouseServiceDaoImpl.queryUserStorehousesCount(BeanConvertUtil.beanCovertMap(userUserStorehousehouseDto));
+    }
+
+    public IUserStorehouseServiceDao getUserStorehouseServiceDaoImpl() {
+        return useStorehouseServiceDaoImpl;
+    }
+
+    public void setUserStorehouseServiceDaoImpl(IUserStorehouseServiceDao useStorehouseServiceDaoImpl) {
+        this.useStorehouseServiceDaoImpl = useStorehouseServiceDaoImpl;
+    }
+
+}