Browse Source

加入单元属性

java110 5 years ago
parent
commit
a78dbbd30f
23 changed files with 2134 additions and 14 deletions
  1. 175 0
      docs/document/services/unitAttr/DeleteUnitAttrInfo.md
  2. 175 0
      docs/document/services/unitAttr/SaveUnitAttrInfo.md
  3. 188 0
      docs/document/services/unitAttr/UpdateUnitAttrInfo.md
  4. 69 0
      java110-bean/src/main/java/com/java110/dto/unitAttr/UnitAttrDto.java
  5. 39 0
      java110-bean/src/main/java/com/java110/po/unitAttr/UnitAttrPo.java
  6. 42 0
      java110-core/src/main/java/com/java110/core/smo/community/IUnitAttrInnerServiceSMO.java
  7. 157 0
      java110-db/src/main/resources/mapper/community/UnitAttrServiceDaoImplMapper.xml
  8. 13 14
      java110-generator/src/main/resources/back/template_1.json
  9. 17 0
      java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java
  10. 31 0
      java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeUnitAttrConstant.java
  11. 38 0
      service-api/src/main/java/com/java110/api/bmo/unitAttr/IUnitAttrBMO.java
  12. 61 0
      service-api/src/main/java/com/java110/api/bmo/unitAttr/impl/UnitAttrBMOImpl.java
  13. 49 0
      service-api/src/main/java/com/java110/api/listener/unit/DeleteUnitAttrListener.java
  14. 82 0
      service-api/src/main/java/com/java110/api/listener/unit/ListUnitAttrsListener.java
  15. 47 0
      service-api/src/main/java/com/java110/api/listener/unit/SaveUnitAttrListener.java
  16. 48 0
      service-api/src/main/java/com/java110/api/listener/unit/UpdateUnitAttrListener.java
  17. 81 0
      service-community/src/main/java/com/java110/community/dao/IUnitAttrServiceDao.java
  18. 130 0
      service-community/src/main/java/com/java110/community/dao/impl/UnitAttrServiceDaoImpl.java
  19. 86 0
      service-community/src/main/java/com/java110/community/listener/unitAttr/AbstractUnitAttrBusinessServiceDataFlowListener.java
  20. 176 0
      service-community/src/main/java/com/java110/community/listener/unitAttr/DeleteUnitAttrInfoListener.java
  21. 176 0
      service-community/src/main/java/com/java110/community/listener/unitAttr/SaveUnitAttrInfoListener.java
  22. 189 0
      service-community/src/main/java/com/java110/community/listener/unitAttr/UpdateUnitAttrInfoListener.java
  23. 65 0
      service-community/src/main/java/com/java110/community/smo/impl/UnitAttrInnerServiceSMOImpl.java

+ 175 - 0
docs/document/services/unitAttr/DeleteUnitAttrInfo.md

@@ -0,0 +1,175 @@
+package com.java110.community.listener.unitAttr;
+
+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.community.dao.IUnitAttrServiceDao;
+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、businessUnitAttr:{} 单元属性基本信息节点
+ * 2、businessUnitAttrAttr:[{}] 单元属性属性信息节点
+ * 3、businessUnitAttrPhoto:[{}] 单元属性照片信息节点
+ * 4、businessUnitAttrCerdentials:[{}] 单元属性证件信息节点
+ * 协议地址 :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("deleteUnitAttrInfoListener")
+@Transactional
+public class DeleteUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteUnitAttrInfoListener.class);
+    @Autowired
+    IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_UNIT_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 节点,或没有子节点需要处理");
+
+            //处理 businessUnitAttr 节点
+            if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+                Object _obj = data.get(UnitAttrPo.class.getSimpleName());
+                JSONArray businessUnitAttrs = null;
+                if(_obj instanceof JSONObject){
+                    businessUnitAttrs = new JSONArray();
+                    businessUnitAttrs.add(_obj);
+                }else {
+                    businessUnitAttrs = (JSONArray)_obj;
+                }
+                //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+                for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrs.size();_unitAttrIndex++) {
+                    JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(_unitAttrIndex);
+                    doBusinessUnitAttr(business, businessUnitAttr);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfos != null && businessUnitAttrInfos.size() >0) {
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_INVALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+                dataFlowContext.addParamOut("attrId",businessUnitAttrInfo.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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+
+            //单元属性信息
+            List<Map> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUnitAttrInfos == null ||  businessUnitAttrInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(unitAttr),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+            }
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessUnitAttr);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessUnitAttr(business,businessUnitAttr);
+    }
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+}

+ 175 - 0
docs/document/services/unitAttr/SaveUnitAttrInfo.md

@@ -0,0 +1,175 @@
+package com.java110.community.listener.unitAttr;
+
+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.community.dao.IUnitAttrServiceDao;
+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("saveUnitAttrInfoListener")
+@Transactional
+public class SaveUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener{
+
+    private static Logger logger = LoggerFactory.getLogger(SaveUnitAttrInfoListener.class);
+
+    @Autowired
+    private IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_UNIT_ATTR_INFO;
+    }
+
+    /**
+     * 保存单元属性信息 business 表中
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessUnitAttr 节点
+        if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+            Object bObj = data.get(UnitAttrPo.class.getSimpleName());
+            JSONArray businessUnitAttrs = null;
+            if(bObj instanceof JSONObject){
+                businessUnitAttrs = new JSONArray();
+                businessUnitAttrs.add(bObj);
+            }else {
+                businessUnitAttrs = (JSONArray)bObj;
+            }
+            //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+            for (int bUnitAttrIndex = 0; bUnitAttrIndex < businessUnitAttrs.size();bUnitAttrIndex++) {
+                JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(bUnitAttrIndex);
+                doBusinessUnitAttr(business, businessUnitAttr);
+                if(bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfo = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfo != null && businessUnitAttrInfo.size() >0) {
+            reFreshShareColumn(info, businessUnitAttrInfo.get(0));
+            unitAttrServiceDaoImpl.saveUnitAttrInfoInstance(info);
+            if(businessUnitAttrInfo.size() == 1) {
+                dataFlowContext.addParamOut("attrId", businessUnitAttrInfo.get(0).get("attr_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("unitId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("unit_id")) {
+            return;
+        }
+
+        info.put("unitId", businessInfo.get("unit_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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+            reFreshShareColumn(paramIn, unitAttrInfo.get(0));
+            unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(paramIn);
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            //刷新缓存
+            //flushUnitAttrId(business.getDatas());
+
+            businessUnitAttr.put("attrId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+
+        }
+
+        businessUnitAttr.put("bId",business.getbId());
+        businessUnitAttr.put("operate", StatusConstant.OPERATE_ADD);
+        //保存单元属性信息
+        unitAttrServiceDaoImpl.saveBusinessUnitAttrInfo(businessUnitAttr);
+
+    }
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+}

+ 188 - 0
docs/document/services/unitAttr/UpdateUnitAttrInfo.md

@@ -0,0 +1,188 @@
+package com.java110.community.listener.unitAttr;
+
+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.community.dao.IUnitAttrServiceDao;
+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、businessUnitAttr:{} 单元属性基本信息节点
+ * 2、businessUnitAttrAttr:[{}] 单元属性属性信息节点
+ * 3、businessUnitAttrPhoto:[{}] 单元属性照片信息节点
+ * 4、businessUnitAttrCerdentials:[{}] 单元属性证件信息节点
+ * 协议地址 :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("updateUnitAttrInfoListener")
+@Transactional
+public class UpdateUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateUnitAttrInfoListener.class);
+    @Autowired
+    private IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_UNIT_ATTR_INFO;
+    }
+
+    /**
+     * business过程
+     * @param dataFlowContext 上下文对象
+     * @param business 业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+
+            //处理 businessUnitAttr 节点
+            if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+                Object _obj = data.get(UnitAttrPo.class.getSimpleName());
+                JSONArray businessUnitAttrs = null;
+                if(_obj instanceof JSONObject){
+                    businessUnitAttrs = new JSONArray();
+                    businessUnitAttrs.add(_obj);
+                }else {
+                    businessUnitAttrs = (JSONArray)_obj;
+                }
+                //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+                for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrs.size();_unitAttrIndex++) {
+                    JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(_unitAttrIndex);
+                    doBusinessUnitAttr(business, businessUnitAttr);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfos != null && businessUnitAttrInfos.size() >0) {
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+                if(businessUnitAttrInfo.size() == 1) {
+                    dataFlowContext.addParamOut("attrId", businessUnitAttrInfo.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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+
+            //单元属性信息
+            List<Map> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUnitAttrInfos == null || businessUnitAttrInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(unitAttr),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessUnitAttr);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessUnitAttr(business,businessUnitAttr);
+
+        businessUnitAttr.put("bId",business.getbId());
+        businessUnitAttr.put("operate", StatusConstant.OPERATE_ADD);
+        //保存单元属性信息
+        unitAttrServiceDaoImpl.saveBusinessUnitAttrInfo(businessUnitAttr);
+
+    }
+
+
+
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+
+
+
+}

+ 69 - 0
java110-bean/src/main/java/com/java110/dto/unitAttr/UnitAttrDto.java

@@ -0,0 +1,69 @@
+package com.java110.dto.unitAttr;
+
+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 UnitAttrDto extends PageDto implements Serializable {
+
+    private String attrId;
+private String unitId;
+private String specCd;
+private String value;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getAttrId() {
+        return attrId;
+    }
+public void setAttrId(String attrId) {
+        this.attrId = attrId;
+    }
+public String getUnitId() {
+        return unitId;
+    }
+public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+public String getSpecCd() {
+        return specCd;
+    }
+public void setSpecCd(String specCd) {
+        this.specCd = specCd;
+    }
+public String getValue() {
+        return value;
+    }
+public void setValue(String value) {
+        this.value = value;
+    }
+
+
+    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;
+    }
+}

+ 39 - 0
java110-bean/src/main/java/com/java110/po/unitAttr/UnitAttrPo.java

@@ -0,0 +1,39 @@
+package com.java110.po.unitAttr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UnitAttrPo implements Serializable {
+
+    private String attrId;
+private String unitId;
+private String specCd;
+private String value;
+public String getAttrId() {
+        return attrId;
+    }
+public void setAttrId(String attrId) {
+        this.attrId = attrId;
+    }
+public String getUnitId() {
+        return unitId;
+    }
+public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+public String getSpecCd() {
+        return specCd;
+    }
+public void setSpecCd(String specCd) {
+        this.specCd = specCd;
+    }
+public String getValue() {
+        return value;
+    }
+public void setValue(String value) {
+        this.value = value;
+    }
+
+
+
+}

+ 42 - 0
java110-core/src/main/java/com/java110/core/smo/community/IUnitAttrInnerServiceSMO.java

@@ -0,0 +1,42 @@
+package com.java110.core.smo.community;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.unitAttr.UnitAttrDto;
+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 IUnitAttrInnerServiceSMO
+ * @Description 单元属性接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/unitAttrApi")
+public interface IUnitAttrInnerServiceSMO {
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param unitAttrDto 数据对象分享
+     * @return UnitAttrDto 对象数据
+     */
+    @RequestMapping(value = "/queryUnitAttrs", method = RequestMethod.POST)
+    List<UnitAttrDto> queryUnitAttrs(@RequestBody UnitAttrDto unitAttrDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param unitAttrDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryUnitAttrsCount", method = RequestMethod.POST)
+    int queryUnitAttrsCount(@RequestBody UnitAttrDto unitAttrDto);
+}

+ 157 - 0
java110-db/src/main/resources/mapper/community/UnitAttrServiceDaoImplMapper.xml

@@ -0,0 +1,157 @@
+<?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="unitAttrServiceDaoImpl">
+
+    <!-- 保存单元属性信息 add by wuxw 2018-07-03 -->
+       <insert id="saveBusinessUnitAttrInfo" parameterType="Map">
+           insert into business_building_unit_attr(
+attr_id,operate,unit_id,spec_cd,b_id,value
+) values (
+#{attrId},#{operate},#{unitId},#{specCd},#{bId},#{value}
+)
+       </insert>
+
+
+       <!-- 查询单元属性信息(Business) add by wuxw 2018-07-03 -->
+       <select id="getBusinessUnitAttrInfo" parameterType="Map" resultType="Map">
+           select  t.attr_id,t.attr_id attrId,t.operate,t.unit_id,t.unit_id unitId,t.spec_cd,t.spec_cd specCd,t.b_id,t.b_id bId,t.value 
+from business_building_unit_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="operate !=null and operate != ''">
+   and t.operate= #{operate}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+
+       </select>
+
+
+
+
+
+    <!-- 保存单元属性信息至 instance表中 add by wuxw 2018-07-03 -->
+    <insert id="saveUnitAttrInfoInstance" parameterType="Map">
+        insert into building_unit_attr(
+attr_id,unit_id,spec_cd,status_cd,b_id,value
+) select t.attr_id,t.unit_id,t.spec_cd,'0',t.b_id,t.value from business_building_unit_attr t where 1=1
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+   and t.operate= 'ADD'
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+
+    </insert>
+
+
+
+    <!-- 查询单元属性信息 add by wuxw 2018-07-03 -->
+    <select id="getUnitAttrInfo" parameterType="Map" resultType="Map">
+        select  t.attr_id,t.attr_id attrId,t.unit_id,t.unit_id unitId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.value 
+from building_unit_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</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="value !=null and value != ''">
+   and t.value= #{value}
+</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="updateUnitAttrInfoInstance" parameterType="Map">
+        update  building_unit_attr t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="unitId !=null and unitId != ''">
+, t.unit_id= #{unitId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+, t.spec_cd= #{specCd}
+</if> 
+<if test="value !=null and value != ''">
+, t.value= #{value}
+</if> 
+ where 1=1 <if test="attrId !=null and attrId != ''">
+and t.attr_id= #{attrId}
+</if> 
+<if test="bId !=null and bId != ''">
+and t.b_id= #{bId}
+</if> 
+
+    </update>
+
+    <!-- 查询单元属性数量 add by wuxw 2018-07-03 -->
+     <select id="queryUnitAttrsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from building_unit_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="unitId !=null and unitId != ''">
+   and t.unit_id= #{unitId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</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="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 13 - 14
java110-generator/src/main/resources/back/template_1.json

@@ -1,22 +1,21 @@
 {
   "autoMove": true,
   "id": "attrId",
-  "name": "floorAttr",
-  "desc": "考勤班组属性",
-  "shareParam": "communityId",
-  "shareColumn": "community_id",
+  "name": "unitAttr",
+  "desc": "单元属性",
+  "shareParam": "unitId",
+  "shareColumn": "unit_id",
   "shareName": "community",
-  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_FLOOR_ATTR_INFO",
-  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_FLOOR_ATTR_INFO",
-  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_FLOOR_ATTR_INFO",
-  "newBusinessTypeCdValue": "510100030002",
-  "updateBusinessTypeCdValue": "510100040002",
-  "deleteBusinessTypeCdValue": "510100050002",
-  "businessTableName": "business_floor_attr",
-  "tableName": "f_floor_attr",
+  "newBusinessTypeCd": "BUSINESS_TYPE_SAVE_UNIT_ATTR_INFO",
+  "updateBusinessTypeCd": "BUSINESS_TYPE_UPDATE_UNIT_ATTR_INFO",
+  "deleteBusinessTypeCd": "BUSINESS_TYPE_DELETE_UNIT_ATTR_INFO",
+  "newBusinessTypeCdValue": "520100030002",
+  "updateBusinessTypeCdValue": "520100040002",
+  "deleteBusinessTypeCdValue": "520100050002",
+  "businessTableName": "business_building_unit_attr",
+  "tableName": "building_unit_attr",
   "param": {
-    "communityId": "community_id",
-    "floorId": "floor_id",
+    "unitId": "unit_id",
     "bId": "b_id",
     "attrId": "attr_id",
     "specCd": "spec_cd",

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

@@ -387,6 +387,23 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_DELETE_UNIT_INFO = "520100050001";
 
+
+    /**
+     * 增加小区单元 属性
+     */
+    public static final String BUSINESS_TYPE_SAVE_UNIT_ATTR_INFO = "520100030002";
+
+    /**
+     * 修改小区单元 属性
+     */
+    public static final String BUSINESS_TYPE_UPDATE_UNIT_ATTR_INFO = "520100040002";
+
+
+    /**
+     * 删除小区单元 属性
+     */
+    public static final String BUSINESS_TYPE_DELETE_UNIT_ATTR_INFO = "520100050002";
+
     /**
      * 增加房屋
      */

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

@@ -0,0 +1,31 @@
+package com.java110.utils.constant;
+
+/**
+ * 单元属性常量类
+ * Created by wuxw on 2017/5/20.
+ */
+public class ServiceCodeUnitAttrConstant {
+
+    /**
+     * 添加 单元属性
+     */
+    public static final String ADD_UNITATTR = "unit.saveUnitAttr";
+
+
+    /**
+     * 修改 单元属性
+     */
+    public static final String UPDATE_UNITATTR = "unit.updateUnitAttr";
+    /**
+     * 删除 单元属性
+     */
+    public static final String DELETE_UNITATTR = "unit.deleteUnitAttr";
+
+
+    /**
+     * 查询 单元属性
+     */
+    public static final String LIST_UNITATTRS = "unit.listUnitAttrs";
+
+
+}

+ 38 - 0
service-api/src/main/java/com/java110/api/bmo/unitAttr/IUnitAttrBMO.java

@@ -0,0 +1,38 @@
+package com.java110.api.bmo.unitAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.IApiBaseBMO;
+import com.java110.core.context.DataFlowContext;
+
+public interface IUnitAttrBMO extends IApiBaseBMO {
+
+
+    /**
+     * 添加单元属性
+     * @param paramInJson
+     * @param dataFlowContext
+     * @return
+     */
+     void addUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+    /**
+     * 添加单元属性信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+     void updateUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+    /**
+     * 删除单元属性
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+     void deleteUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext);
+
+
+
+}

+ 61 - 0
service-api/src/main/java/com/java110/api/bmo/unitAttr/impl/UnitAttrBMOImpl.java

@@ -0,0 +1,61 @@
+package com.java110.api.bmo.unitAttr.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.ApiBaseBMO;
+import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.community.IUnitAttrInnerServiceSMO;
+import com.java110.po.unitAttr.UnitAttrPo;
+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("unitAttrBMOImpl")
+public class UnitAttrBMOImpl extends ApiBaseBMO implements IUnitAttrBMO {
+
+    @Autowired
+    private IUnitAttrInnerServiceSMO unitAttrInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void addUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        paramInJson.put("attrId", "-1");
+        UnitAttrPo unitAttrPo = BeanConvertUtil.covertBean(paramInJson, UnitAttrPo.class);
+        super.insert(dataFlowContext, unitAttrPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_UNIT_ATTR_INFO);
+    }
+
+
+    /**
+     * 添加活动信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void updateUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+        UnitAttrPo unitAttrPo = BeanConvertUtil.covertBean(paramInJson, UnitAttrPo.class);
+        super.update(dataFlowContext, unitAttrPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_UNIT_ATTR_INFO);
+    }
+
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    public void deleteUnitAttr(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+        UnitAttrPo unitAttrPo = BeanConvertUtil.covertBean(paramInJson, UnitAttrPo.class);
+        super.update(dataFlowContext, unitAttrPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_UNIT_ATTR_INFO);
+    }
+
+}

+ 49 - 0
service-api/src/main/java/com/java110/api/listener/unit/DeleteUnitAttrListener.java

@@ -0,0 +1,49 @@
+package com.java110.api.listener.unit;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
+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.ServiceCodeUnitAttrConstant;
+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("deleteUnitAttrListener")
+public class DeleteUnitAttrListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUnitAttrBMO unitAttrBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        unitAttrBMOImpl.deleteUnitAttr(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUnitAttrConstant.DELETE_UNITATTR;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+}

+ 82 - 0
service-api/src/main/java/com/java110/api/listener/unit/ListUnitAttrsListener.java

@@ -0,0 +1,82 @@
+package com.java110.api.listener.unit;
+
+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.core.smo.community.IUnitAttrInnerServiceSMO;
+import com.java110.dto.unitAttr.UnitAttrDto;
+import com.java110.utils.constant.ServiceCodeUnitAttrConstant;
+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("listUnitAttrsListener")
+public class ListUnitAttrsListener extends AbstractServiceApiListener {
+
+    @Autowired
+    private IUnitAttrInnerServiceSMO unitAttrInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUnitAttrConstant.LIST_UNITATTRS;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET;
+    }
+
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    public IUnitAttrInnerServiceSMO getUnitAttrInnerServiceSMOImpl() {
+        return unitAttrInnerServiceSMOImpl;
+    }
+
+    public void setUnitAttrInnerServiceSMOImpl(IUnitAttrInnerServiceSMO unitAttrInnerServiceSMOImpl) {
+        this.unitAttrInnerServiceSMOImpl = unitAttrInnerServiceSMOImpl;
+    }
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        UnitAttrDto unitAttrDto = BeanConvertUtil.covertBean(reqJson, UnitAttrDto.class);
+
+        int count = unitAttrInnerServiceSMOImpl.queryUnitAttrsCount(unitAttrDto);
+
+        List<UnitAttrDto> unitAttrDtos = null;
+
+        if (count > 0) {
+            unitAttrDtos = unitAttrInnerServiceSMOImpl.queryUnitAttrs(unitAttrDto);
+        } else {
+            unitAttrDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, unitAttrDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+
+    }
+}

+ 47 - 0
service-api/src/main/java/com/java110/api/listener/unit/SaveUnitAttrListener.java

@@ -0,0 +1,47 @@
+package com.java110.api.listener.unit;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
+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.ServiceCodeUnitAttrConstant;
+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("saveUnitAttrListener")
+public class SaveUnitAttrListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUnitAttrBMO unitAttrBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+        unitAttrBMOImpl.addUnitAttr(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUnitAttrConstant.ADD_UNITATTR;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+}

+ 48 - 0
service-api/src/main/java/com/java110/api/listener/unit/UpdateUnitAttrListener.java

@@ -0,0 +1,48 @@
+package com.java110.api.listener.unit;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.bmo.unitAttr.IUnitAttrBMO;
+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.ServiceCodeUnitAttrConstant;
+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("updateUnitAttrListener")
+public class UpdateUnitAttrListener extends AbstractServiceApiPlusListener {
+
+    @Autowired
+    private IUnitAttrBMO unitAttrBMOImpl;
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
+        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        unitAttrBMOImpl.updateUnitAttr(reqJson, context);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeUnitAttrConstant.UPDATE_UNITATTR;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+}

+ 81 - 0
service-community/src/main/java/com/java110/community/dao/IUnitAttrServiceDao.java

@@ -0,0 +1,81 @@
+package com.java110.community.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 IUnitAttrServiceDao {
+
+    /**
+     * 保存 单元属性信息
+     * @param businessUnitAttrInfo 单元属性信息 封装
+     * @throws DAOException 操作数据库异常
+     */
+    void saveBusinessUnitAttrInfo(Map businessUnitAttrInfo) throws DAOException;
+
+
+
+    /**
+     * 查询单元属性信息(business过程)
+     * 根据bId 查询单元属性信息
+     * @param info bId 信息
+     * @return 单元属性信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getBusinessUnitAttrInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 保存 单元属性信息 Business数据到 Instance中
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveUnitAttrInfoInstance(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询单元属性信息(instance过程)
+     * 根据bId 查询单元属性信息
+     * @param info bId 信息
+     * @return 单元属性信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getUnitAttrInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改单元属性信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateUnitAttrInfoInstance(Map info) throws DAOException;
+
+
+    /**
+     * 查询单元属性总数
+     *
+     * @param info 单元属性信息
+     * @return 单元属性数量
+     */
+    int queryUnitAttrsCount(Map info);
+
+}

+ 130 - 0
service-community/src/main/java/com/java110/community/dao/impl/UnitAttrServiceDaoImpl.java

@@ -0,0 +1,130 @@
+package com.java110.community.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.community.dao.IUnitAttrServiceDao;
+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("unitAttrServiceDaoImpl")
+//@Transactional
+public class UnitAttrServiceDaoImpl extends BaseServiceDao implements IUnitAttrServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(UnitAttrServiceDaoImpl.class);
+
+    /**
+     * 单元属性信息封装
+     * @param businessUnitAttrInfo 单元属性信息 封装
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveBusinessUnitAttrInfo(Map businessUnitAttrInfo) throws DAOException {
+        businessUnitAttrInfo.put("month", DateUtil.getCurrentMonth());
+        // 查询business_user 数据是否已经存在
+        logger.debug("保存单元属性信息 入参 businessUnitAttrInfo : {}",businessUnitAttrInfo);
+        int saveFlag = sqlSessionTemplate.insert("unitAttrServiceDaoImpl.saveBusinessUnitAttrInfo",businessUnitAttrInfo);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存单元属性数据失败:"+ JSONObject.toJSONString(businessUnitAttrInfo));
+        }
+    }
+
+
+    /**
+     * 查询单元属性信息
+     * @param info bId 信息
+     * @return 单元属性信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getBusinessUnitAttrInfo(Map info) throws DAOException {
+
+        logger.debug("查询单元属性信息 入参 info : {}",info);
+
+        List<Map> businessUnitAttrInfos = sqlSessionTemplate.selectList("unitAttrServiceDaoImpl.getBusinessUnitAttrInfo",info);
+
+        return businessUnitAttrInfos;
+    }
+
+
+
+    /**
+     * 保存单元属性信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveUnitAttrInfoInstance(Map info) throws DAOException {
+        logger.debug("保存单元属性信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("unitAttrServiceDaoImpl.saveUnitAttrInfoInstance",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> getUnitAttrInfo(Map info) throws DAOException {
+        logger.debug("查询单元属性信息 入参 info : {}",info);
+
+        List<Map> businessUnitAttrInfos = sqlSessionTemplate.selectList("unitAttrServiceDaoImpl.getUnitAttrInfo",info);
+
+        return businessUnitAttrInfos;
+    }
+
+
+    /**
+     * 修改单元属性信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateUnitAttrInfoInstance(Map info) throws DAOException {
+        logger.debug("修改单元属性信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("unitAttrServiceDaoImpl.updateUnitAttrInfoInstance",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改单元属性信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询单元属性数量
+     * @param info 单元属性信息
+     * @return 单元属性数量
+     */
+    @Override
+    public int queryUnitAttrsCount(Map info) {
+        logger.debug("查询单元属性数据 入参 info : {}",info);
+
+        List<Map> businessUnitAttrInfos = sqlSessionTemplate.selectList("unitAttrServiceDaoImpl.queryUnitAttrsCount", info);
+        if (businessUnitAttrInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessUnitAttrInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 86 - 0
service-community/src/main/java/com/java110/community/listener/unitAttr/AbstractUnitAttrBusinessServiceDataFlowListener.java

@@ -0,0 +1,86 @@
+package com.java110.community.listener.unitAttr;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IUnitAttrServiceDao;
+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 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 AbstractUnitAttrBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
+    private static Logger logger = LoggerFactory.getLogger(AbstractUnitAttrBusinessServiceDataFlowListener.class);
+
+
+    /**
+     * 获取 DAO工具类
+     *
+     * @return
+     */
+    public abstract IUnitAttrServiceDao getUnitAttrServiceDaoImpl();
+
+    /**
+     * 刷新 businessUnitAttrInfo 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
+     * @param businessUnitAttrInfo
+     */
+    protected void flushBusinessUnitAttrInfo(Map businessUnitAttrInfo, String statusCd) {
+        businessUnitAttrInfo.put("newBId", businessUnitAttrInfo.get("b_id"));
+        businessUnitAttrInfo.put("attrId", businessUnitAttrInfo.get("attr_id"));
+        businessUnitAttrInfo.put("operate", businessUnitAttrInfo.get("operate"));
+        businessUnitAttrInfo.put("unitId", businessUnitAttrInfo.get("unit_id"));
+        businessUnitAttrInfo.put("specCd", businessUnitAttrInfo.get("spec_cd"));
+        businessUnitAttrInfo.put("value", businessUnitAttrInfo.get("value"));
+        businessUnitAttrInfo.remove("bId");
+        businessUnitAttrInfo.put("statusCd", statusCd);
+    }
+
+
+    /**
+     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
+     *
+     * @param businessUnitAttr 单元属性信息
+     */
+    protected void autoSaveDelBusinessUnitAttr(Business business, JSONObject businessUnitAttr) {
+//自动插入DEL
+        Map info = new HashMap();
+        info.put("attrId", businessUnitAttr.getString("attrId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        List<Map> currentUnitAttrInfos = getUnitAttrServiceDaoImpl().getUnitAttrInfo(info);
+        if (currentUnitAttrInfos == null || currentUnitAttrInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息,入参错误或数据有问题,请检查" + info);
+        }
+
+        Map currentUnitAttrInfo = currentUnitAttrInfos.get(0);
+
+        currentUnitAttrInfo.put("bId", business.getbId());
+
+        currentUnitAttrInfo.put("attrId", currentUnitAttrInfo.get("attr_id"));
+        currentUnitAttrInfo.put("operate", currentUnitAttrInfo.get("operate"));
+        currentUnitAttrInfo.put("unitId", currentUnitAttrInfo.get("unit_id"));
+        currentUnitAttrInfo.put("specCd", currentUnitAttrInfo.get("spec_cd"));
+        currentUnitAttrInfo.put("value", currentUnitAttrInfo.get("value"));
+
+
+        currentUnitAttrInfo.put("operate", StatusConstant.OPERATE_DEL);
+        getUnitAttrServiceDaoImpl().saveBusinessUnitAttrInfo(currentUnitAttrInfo);
+        for (Object key : currentUnitAttrInfo.keySet()) {
+            if (businessUnitAttr.get(key) == null) {
+                businessUnitAttr.put(key.toString(), currentUnitAttrInfo.get(key));
+            }
+        }
+    }
+
+
+}

+ 176 - 0
service-community/src/main/java/com/java110/community/listener/unitAttr/DeleteUnitAttrInfoListener.java

@@ -0,0 +1,176 @@
+package com.java110.community.listener.unitAttr;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.unitAttr.UnitAttrPo;
+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.community.dao.IUnitAttrServiceDao;
+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、businessUnitAttr:{} 单元属性基本信息节点
+ * 2、businessUnitAttrAttr:[{}] 单元属性属性信息节点
+ * 3、businessUnitAttrPhoto:[{}] 单元属性照片信息节点
+ * 4、businessUnitAttrCerdentials:[{}] 单元属性证件信息节点
+ * 协议地址 :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("deleteUnitAttrInfoListener")
+@Transactional
+public class DeleteUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteUnitAttrInfoListener.class);
+    @Autowired
+    IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_UNIT_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 节点,或没有子节点需要处理");
+
+            //处理 businessUnitAttr 节点
+            if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+                Object _obj = data.get(UnitAttrPo.class.getSimpleName());
+                JSONArray businessUnitAttrs = null;
+                if(_obj instanceof JSONObject){
+                    businessUnitAttrs = new JSONArray();
+                    businessUnitAttrs.add(_obj);
+                }else {
+                    businessUnitAttrs = (JSONArray)_obj;
+                }
+                //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+                for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrs.size();_unitAttrIndex++) {
+                    JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(_unitAttrIndex);
+                    doBusinessUnitAttr(business, businessUnitAttr);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfos != null && businessUnitAttrInfos.size() >0) {
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_INVALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+                dataFlowContext.addParamOut("attrId",businessUnitAttrInfo.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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+
+            //单元属性信息
+            List<Map> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUnitAttrInfos == null ||  businessUnitAttrInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(unitAttr),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+            }
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessUnitAttr);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessUnitAttr(business,businessUnitAttr);
+    }
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+}

+ 176 - 0
service-community/src/main/java/com/java110/community/listener/unitAttr/SaveUnitAttrInfoListener.java

@@ -0,0 +1,176 @@
+package com.java110.community.listener.unitAttr;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.unitAttr.UnitAttrPo;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
+import com.java110.community.dao.IUnitAttrServiceDao;
+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("saveUnitAttrInfoListener")
+@Transactional
+public class SaveUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener{
+
+    private static Logger logger = LoggerFactory.getLogger(SaveUnitAttrInfoListener.class);
+
+    @Autowired
+    private IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_UNIT_ATTR_INFO;
+    }
+
+    /**
+     * 保存单元属性信息 business 表中
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessUnitAttr 节点
+        if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+            Object bObj = data.get(UnitAttrPo.class.getSimpleName());
+            JSONArray businessUnitAttrs = null;
+            if(bObj instanceof JSONObject){
+                businessUnitAttrs = new JSONArray();
+                businessUnitAttrs.add(bObj);
+            }else {
+                businessUnitAttrs = (JSONArray)bObj;
+            }
+            //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+            for (int bUnitAttrIndex = 0; bUnitAttrIndex < businessUnitAttrs.size();bUnitAttrIndex++) {
+                JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(bUnitAttrIndex);
+                doBusinessUnitAttr(business, businessUnitAttr);
+                if(bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfo = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfo != null && businessUnitAttrInfo.size() >0) {
+            reFreshShareColumn(info, businessUnitAttrInfo.get(0));
+            unitAttrServiceDaoImpl.saveUnitAttrInfoInstance(info);
+            if(businessUnitAttrInfo.size() == 1) {
+                dataFlowContext.addParamOut("attrId", businessUnitAttrInfo.get(0).get("attr_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("unitId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("unit_id")) {
+            return;
+        }
+
+        info.put("unitId", businessInfo.get("unit_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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+            reFreshShareColumn(paramIn, unitAttrInfo.get(0));
+            unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(paramIn);
+        }
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            //刷新缓存
+            //flushUnitAttrId(business.getDatas());
+
+            businessUnitAttr.put("attrId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+
+        }
+
+        businessUnitAttr.put("bId",business.getbId());
+        businessUnitAttr.put("operate", StatusConstant.OPERATE_ADD);
+        //保存单元属性信息
+        unitAttrServiceDaoImpl.saveBusinessUnitAttrInfo(businessUnitAttr);
+
+    }
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+}

+ 189 - 0
service-community/src/main/java/com/java110/community/listener/unitAttr/UpdateUnitAttrInfoListener.java

@@ -0,0 +1,189 @@
+package com.java110.community.listener.unitAttr;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.po.unitAttr.UnitAttrPo;
+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.community.dao.IUnitAttrServiceDao;
+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、businessUnitAttr:{} 单元属性基本信息节点
+ * 2、businessUnitAttrAttr:[{}] 单元属性属性信息节点
+ * 3、businessUnitAttrPhoto:[{}] 单元属性照片信息节点
+ * 4、businessUnitAttrCerdentials:[{}] 单元属性证件信息节点
+ * 协议地址 :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("updateUnitAttrInfoListener")
+@Transactional
+public class UpdateUnitAttrInfoListener extends AbstractUnitAttrBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateUnitAttrInfoListener.class);
+    @Autowired
+    private IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_UNIT_ATTR_INFO;
+    }
+
+    /**
+     * business过程
+     * @param dataFlowContext 上下文对象
+     * @param business 业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+
+            //处理 businessUnitAttr 节点
+            if(data.containsKey(UnitAttrPo.class.getSimpleName())){
+                Object _obj = data.get(UnitAttrPo.class.getSimpleName());
+                JSONArray businessUnitAttrs = null;
+                if(_obj instanceof JSONObject){
+                    businessUnitAttrs = new JSONArray();
+                    businessUnitAttrs.add(_obj);
+                }else {
+                    businessUnitAttrs = (JSONArray)_obj;
+                }
+                //JSONObject businessUnitAttr = data.getJSONObject(UnitAttrPo.class.getSimpleName());
+                for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrs.size();_unitAttrIndex++) {
+                    JSONObject businessUnitAttr = businessUnitAttrs.getJSONObject(_unitAttrIndex);
+                    doBusinessUnitAttr(business, businessUnitAttr);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("attrId", businessUnitAttr.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> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(info);
+        if( businessUnitAttrInfos != null && businessUnitAttrInfos.size() >0) {
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+                if(businessUnitAttrInfo.size() == 1) {
+                    dataFlowContext.addParamOut("attrId", businessUnitAttrInfo.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> unitAttrInfo = unitAttrServiceDaoImpl.getUnitAttrInfo(info);
+        if(unitAttrInfo != null && unitAttrInfo.size() > 0){
+
+            //单元属性信息
+            List<Map> businessUnitAttrInfos = unitAttrServiceDaoImpl.getBusinessUnitAttrInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessUnitAttrInfos == null || businessUnitAttrInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(unitAttr),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _unitAttrIndex = 0; _unitAttrIndex < businessUnitAttrInfos.size();_unitAttrIndex++) {
+                Map businessUnitAttrInfo = businessUnitAttrInfos.get(_unitAttrIndex);
+                flushBusinessUnitAttrInfo(businessUnitAttrInfo,StatusConstant.STATUS_CD_VALID);
+                unitAttrServiceDaoImpl.updateUnitAttrInfoInstance(businessUnitAttrInfo);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 处理 businessUnitAttr 节点
+     * @param business 总的数据节点
+     * @param businessUnitAttr 单元属性节点
+     */
+    private void doBusinessUnitAttr(Business business,JSONObject businessUnitAttr){
+
+        Assert.jsonObjectHaveKey(businessUnitAttr,"attrId","businessUnitAttr 节点下没有包含 attrId 节点");
+
+        if(businessUnitAttr.getString("attrId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"attrId 错误,不能自动生成(必须已经存在的attrId)"+businessUnitAttr);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessUnitAttr(business,businessUnitAttr);
+
+        businessUnitAttr.put("bId",business.getbId());
+        businessUnitAttr.put("operate", StatusConstant.OPERATE_ADD);
+        //保存单元属性信息
+        unitAttrServiceDaoImpl.saveBusinessUnitAttrInfo(businessUnitAttr);
+
+    }
+
+
+
+    @Override
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+
+
+
+}

+ 65 - 0
service-community/src/main/java/com/java110/community/smo/impl/UnitAttrInnerServiceSMOImpl.java

@@ -0,0 +1,65 @@
+package com.java110.community.smo.impl;
+
+
+import com.java110.community.dao.IUnitAttrServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.community.IUnitAttrInnerServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.unitAttr.UnitAttrDto;
+import com.java110.dto.user.UserDto;
+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 UnitAttrInnerServiceSMOImpl extends BaseServiceSMO implements IUnitAttrInnerServiceSMO {
+
+    @Autowired
+    private IUnitAttrServiceDao unitAttrServiceDaoImpl;
+
+
+    @Override
+    public List<UnitAttrDto> queryUnitAttrs(@RequestBody UnitAttrDto unitAttrDto) {
+
+        //校验是否传了 分页信息
+
+        int page = unitAttrDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            unitAttrDto.setPage((page - 1) * unitAttrDto.getRow());
+        }
+
+        List<UnitAttrDto> unitAttrs = BeanConvertUtil.covertBeanList(unitAttrServiceDaoImpl.getUnitAttrInfo(BeanConvertUtil.beanCovertMap(unitAttrDto)), UnitAttrDto.class);
+
+
+        return unitAttrs;
+    }
+
+
+
+    @Override
+    public int queryUnitAttrsCount(@RequestBody UnitAttrDto unitAttrDto) {
+        return unitAttrServiceDaoImpl.queryUnitAttrsCount(BeanConvertUtil.beanCovertMap(unitAttrDto));
+    }
+
+    public IUnitAttrServiceDao getUnitAttrServiceDaoImpl() {
+        return unitAttrServiceDaoImpl;
+    }
+
+    public void setUnitAttrServiceDaoImpl(IUnitAttrServiceDao unitAttrServiceDaoImpl) {
+        this.unitAttrServiceDaoImpl = unitAttrServiceDaoImpl;
+    }
+
+}