Browse Source

Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw 6 years ago
parent
commit
cb6a733a88
18 changed files with 1802 additions and 0 deletions
  1. 81 0
      CommunityService/src/main/java/com/java110/community/dao/IInspectionServiceDao.java
  2. 129 0
      CommunityService/src/main/java/com/java110/community/dao/impl/InspectionServiceDaoImpl.java
  3. 84 0
      CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/AbstractInspectionBusinessServiceDataFlowListener.java
  4. 177 0
      CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/DeleteInspectionInfoListener.java
  5. 175 0
      CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/SaveInspectionInfoListener.java
  6. 190 0
      CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/UpdateInspectionInfoListener.java
  7. 72 0
      CommunityService/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java
  8. 58 0
      docs/document/api/other/CheckUserHasResource.md
  9. 63 0
      docs/document/api/other/listMyEnteredCommunitys.md
  10. 114 0
      docs/document/services/inspectionPoint/DeleteInspectionInfo.md
  11. 122 0
      docs/document/services/inspectionPoint/SaveInspectionInfo.md
  12. 122 0
      docs/document/services/inspectionPoint/UpdateInspectionInfo.md
  13. 77 0
      java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java
  14. 81 0
      java110-code-generator/src/main/java/com/java110/InspectionPointGeneratorApplication.java
  15. 42 0
      java110-core/src/main/java/com/java110/core/smo/inspectionPoint/IInspectionInnerServiceSMO.java
  16. 27 0
      java110-db/db/CommunityService/inspection_point.sql
  17. 172 0
      java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml
  18. 16 0
      java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

+ 81 - 0
CommunityService/src/main/java/com/java110/community/dao/IInspectionServiceDao.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 IInspectionServiceDao {
+
+    /**
+     * 保存 巡检点信息
+     * @param businessInspectionInfo 巡检点信息 封装
+     * @throws DAOException 操作数据库异常
+     */
+    void saveBusinessInspectionInfo(Map businessInspectionInfo) throws DAOException;
+
+
+
+    /**
+     * 查询巡检点信息(business过程)
+     * 根据bId 查询巡检点信息
+     * @param info bId 信息
+     * @return 巡检点信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getBusinessInspectionInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 保存 巡检点信息 Business数据到 Instance中
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveInspectionInfoInstance(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询巡检点信息(instance过程)
+     * 根据bId 查询巡检点信息
+     * @param info bId 信息
+     * @return 巡检点信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getInspectionInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改巡检点信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateInspectionInfoInstance(Map info) throws DAOException;
+
+
+    /**
+     * 查询巡检点总数
+     *
+     * @param info 巡检点信息
+     * @return 巡检点数量
+     */
+    int queryInspectionsCount(Map info);
+
+}

+ 129 - 0
CommunityService/src/main/java/com/java110/community/dao/impl/InspectionServiceDaoImpl.java

@@ -0,0 +1,129 @@
+package com.java110.community.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IInspectionServiceDao;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡检点服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("inspectionServiceDaoImpl")
+//@Transactional
+public class InspectionServiceDaoImpl extends BaseServiceDao implements IInspectionServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(InspectionServiceDaoImpl.class);
+
+    /**
+     * 巡检点信息封装
+     * @param businessInspectionInfo 巡检点信息 封装
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveBusinessInspectionInfo(Map businessInspectionInfo) throws DAOException {
+        businessInspectionInfo.put("month", DateUtil.getCurrentMonth());
+        // 查询business_user 数据是否已经存在
+        logger.debug("保存巡检点信息 入参 businessInspectionInfo : {}",businessInspectionInfo);
+        int saveFlag = sqlSessionTemplate.insert("inspectionServiceDaoImpl.saveBusinessInspectionInfo",businessInspectionInfo);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存巡检点数据失败:"+ JSONObject.toJSONString(businessInspectionInfo));
+        }
+    }
+
+
+    /**
+     * 查询巡检点信息
+     * @param info bId 信息
+     * @return 巡检点信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getBusinessInspectionInfo(Map info) throws DAOException {
+
+        logger.debug("查询巡检点信息 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.getBusinessInspectionInfo",info);
+
+        return businessInspectionInfos;
+    }
+
+
+
+    /**
+     * 保存巡检点信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveInspectionInfoInstance(Map info) throws DAOException {
+        logger.debug("保存巡检点信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("inspectionServiceDaoImpl.saveInspectionInfoInstance",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> getInspectionInfo(Map info) throws DAOException {
+        logger.debug("查询巡检点信息 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.getInspectionInfo",info);
+
+        return businessInspectionInfos;
+    }
+
+
+    /**
+     * 修改巡检点信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateInspectionInfoInstance(Map info) throws DAOException {
+        logger.debug("修改巡检点信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("inspectionServiceDaoImpl.updateInspectionInfoInstance",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改巡检点信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询巡检点数量
+     * @param info 巡检点信息
+     * @return 巡检点数量
+     */
+    @Override
+    public int queryInspectionsCount(Map info) {
+        logger.debug("查询巡检点数据 入参 info : {}",info);
+
+        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.queryInspectionsCount", info);
+        if (businessInspectionInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessInspectionInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 84 - 0
CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/AbstractInspectionBusinessServiceDataFlowListener.java

@@ -0,0 +1,84 @@
+package com.java110.community.listener.inspectionPoint;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IInspectionServiceDao;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.exception.ListenerExecuteException;
+import com.java110.entity.center.Business;
+import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
+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 AbstractInspectionBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener{
+    private static Logger logger = LoggerFactory.getLogger(AbstractInspectionBusinessServiceDataFlowListener.class);
+
+
+    /**
+     * 获取 DAO工具类
+     * @return
+     */
+    public abstract IInspectionServiceDao getInspectionServiceDaoImpl();
+
+    /**
+     * 刷新 businessInspectionInfo 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     * @param businessInspectionInfo
+     */
+    protected void flushBusinessInspectionInfo(Map businessInspectionInfo,String statusCd){
+        businessInspectionInfo.put("newBId", businessInspectionInfo.get("b_id"));
+        businessInspectionInfo.put("inspectionId",businessInspectionInfo.get("inspection_id"));
+businessInspectionInfo.put("machineId",businessInspectionInfo.get("machine_id"));
+businessInspectionInfo.put("operate",businessInspectionInfo.get("operate"));
+businessInspectionInfo.put("remark",businessInspectionInfo.get("remark"));
+businessInspectionInfo.put("inspectionName",businessInspectionInfo.get("inspection_name"));
+businessInspectionInfo.put("communityId",businessInspectionInfo.get("community_id"));
+businessInspectionInfo.remove("bId");
+        businessInspectionInfo.put("statusCd", statusCd);
+    }
+
+
+    /**
+     * 当修改数据时,查询instance表中的数据 自动保存删除数据到business中
+     * @param businessInspection 巡检点信息
+     */
+    protected void autoSaveDelBusinessInspection(Business business, JSONObject businessInspection){
+//自动插入DEL
+        Map info = new HashMap();
+        info.put("inspectionId",businessInspection.getString("inspectionId"));
+        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
+        List<Map> currentInspectionInfos = getInspectionServiceDaoImpl().getInspectionInfo(info);
+        if(currentInspectionInfos == null || currentInspectionInfos.size() != 1){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息,入参错误或数据有问题,请检查"+info);
+        }
+
+        Map currentInspectionInfo = currentInspectionInfos.get(0);
+
+        currentInspectionInfo.put("bId",business.getbId());
+
+        currentInspectionInfo.put("inspectionId",currentInspectionInfo.get("inspection_id"));
+currentInspectionInfo.put("machineId",currentInspectionInfo.get("machine_id"));
+currentInspectionInfo.put("operate",currentInspectionInfo.get("operate"));
+currentInspectionInfo.put("remark",currentInspectionInfo.get("remark"));
+currentInspectionInfo.put("inspectionName",currentInspectionInfo.get("inspection_name"));
+currentInspectionInfo.put("communityId",currentInspectionInfo.get("community_id"));
+
+
+        currentInspectionInfo.put("operate",StatusConstant.OPERATE_DEL);
+        getInspectionServiceDaoImpl().saveBusinessInspectionInfo(currentInspectionInfo);
+    }
+
+
+
+
+
+}

+ 177 - 0
CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/DeleteInspectionInfoListener.java

@@ -0,0 +1,177 @@
+package com.java110.community.listener.inspectionPoint;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IInspectionServiceDao;
+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 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、businessInspection:{} 巡检点基本信息节点
+ * 2、businessInspectionAttr:[{}] 巡检点属性信息节点
+ * 3、businessInspectionPhoto:[{}] 巡检点照片信息节点
+ * 4、businessInspectionCerdentials:[{}] 巡检点证件信息节点
+ * 协议地址 :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("deleteInspectionInfoListener")
+@Transactional
+public class DeleteInspectionInfoListener extends AbstractInspectionBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteInspectionInfoListener.class);
+    @Autowired
+    IInspectionServiceDao inspectionServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 (状态写DEL) 方便撤单时直接更新回去
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessInspection 节点
+        if(data.containsKey("businessInspection")){
+            //处理 businessInspection 节点
+            if(data.containsKey("businessInspection")){
+                Object _obj = data.get("businessInspection");
+                JSONArray businessInspections = null;
+                if(_obj instanceof JSONObject){
+                    businessInspections = new JSONArray();
+                    businessInspections.add(_obj);
+                }else {
+                    businessInspections = (JSONArray)_obj;
+                }
+                //JSONObject businessInspection = data.getJSONObject("businessInspection");
+                for (int _inspectionIndex = 0; _inspectionIndex < businessInspections.size();_inspectionIndex++) {
+                    JSONObject businessInspection = businessInspections.getJSONObject(_inspectionIndex);
+                    doBusinessInspection(business, businessInspection);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("inspectionId", businessInspection.getString("inspectionId"));
+                    }
+                }
+            }
+        }
+
+
+    }
+
+    /**
+     * 删除 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> businessInspectionInfos = inspectionServiceDaoImpl.getBusinessInspectionInfo(info);
+        if( businessInspectionInfos != null && businessInspectionInfos.size() >0) {
+            for (int _inspectionIndex = 0; _inspectionIndex < businessInspectionInfos.size();_inspectionIndex++) {
+                Map businessInspectionInfo = businessInspectionInfos.get(_inspectionIndex);
+                flushBusinessInspectionInfo(businessInspectionInfo,StatusConstant.STATUS_CD_INVALID);
+                inspectionServiceDaoImpl.updateInspectionInfoInstance(businessInspectionInfo);
+                dataFlowContext.addParamOut("inspectionId",businessInspectionInfo.get("inspection_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> inspectionInfo = inspectionServiceDaoImpl.getInspectionInfo(info);
+        if(inspectionInfo != null && inspectionInfo.size() > 0){
+
+            //巡检点信息
+            List<Map> businessInspectionInfos = inspectionServiceDaoImpl.getBusinessInspectionInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessInspectionInfos == null ||  businessInspectionInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(inspection),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _inspectionIndex = 0; _inspectionIndex < businessInspectionInfos.size();_inspectionIndex++) {
+                Map businessInspectionInfo = businessInspectionInfos.get(_inspectionIndex);
+                flushBusinessInspectionInfo(businessInspectionInfo,StatusConstant.STATUS_CD_VALID);
+                inspectionServiceDaoImpl.updateInspectionInfoInstance(businessInspectionInfo);
+            }
+        }
+    }
+
+
+
+    /**
+     * 处理 businessInspection 节点
+     * @param business 总的数据节点
+     * @param businessInspection 巡检点节点
+     */
+    private void doBusinessInspection(Business business,JSONObject businessInspection){
+
+        Assert.jsonObjectHaveKey(businessInspection,"inspectionId","businessInspection 节点下没有包含 inspectionId 节点");
+
+        if(businessInspection.getString("inspectionId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"inspectionId 错误,不能自动生成(必须已经存在的inspectionId)"+businessInspection);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessInspection(business,businessInspection);
+    }
+
+    public IInspectionServiceDao getInspectionServiceDaoImpl() {
+        return inspectionServiceDaoImpl;
+    }
+
+    public void setInspectionServiceDaoImpl(IInspectionServiceDao inspectionServiceDaoImpl) {
+        this.inspectionServiceDaoImpl = inspectionServiceDaoImpl;
+    }
+}

+ 175 - 0
CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/SaveInspectionInfoListener.java

@@ -0,0 +1,175 @@
+package com.java110.community.listener.inspectionPoint;
+
+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.IInspectionServiceDao;
+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("saveInspectionInfoListener")
+@Transactional
+public class SaveInspectionInfoListener extends AbstractInspectionBusinessServiceDataFlowListener{
+
+    private static Logger logger = LoggerFactory.getLogger(SaveInspectionInfoListener.class);
+
+    @Autowired
+    private IInspectionServiceDao inspectionServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_INSPECTION;
+    }
+
+    /**
+     * 保存巡检点信息 business 表中
+     * @param dataFlowContext 数据对象
+     * @param business 当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessInspection 节点
+        if(data.containsKey("businessInspection")){
+            Object bObj = data.get("businessInspection");
+            JSONArray businessInspections = null;
+            if(bObj instanceof JSONObject){
+                businessInspections = new JSONArray();
+                businessInspections.add(bObj);
+            }else {
+                businessInspections = (JSONArray)bObj;
+            }
+            //JSONObject businessInspection = data.getJSONObject("businessInspection");
+            for (int bInspectionIndex = 0; bInspectionIndex < businessInspections.size();bInspectionIndex++) {
+                JSONObject businessInspection = businessInspections.getJSONObject(bInspectionIndex);
+                doBusinessInspection(business, businessInspection);
+                if(bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("inspectionId", businessInspection.getString("inspectionId"));
+                }
+            }
+        }
+    }
+
+    /**
+     * 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> businessInspectionInfo = inspectionServiceDaoImpl.getBusinessInspectionInfo(info);
+        if( businessInspectionInfo != null && businessInspectionInfo.size() >0) {
+            reFreshShareColumn(info, businessInspectionInfo.get(0));
+            inspectionServiceDaoImpl.saveInspectionInfoInstance(info);
+            if(businessInspectionInfo.size() == 1) {
+                dataFlowContext.addParamOut("inspectionId", businessInspectionInfo.get(0).get("inspection_id"));
+            }
+        }
+    }
+
+
+    /**
+     * 刷 分片字段
+     *
+     * @param info         查询对象
+     * @param businessInfo 小区ID
+     */
+    private void reFreshShareColumn(Map info, Map businessInfo) {
+
+        if (info.containsKey("communityId")) {
+            return;
+        }
+
+        if (!businessInfo.containsKey("community_id")) {
+            return;
+        }
+
+        info.put("communityId", businessInfo.get("community_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> inspectionInfo = inspectionServiceDaoImpl.getInspectionInfo(info);
+        if(inspectionInfo != null && inspectionInfo.size() > 0){
+            reFreshShareColumn(paramIn, inspectionInfo.get(0));
+            inspectionServiceDaoImpl.updateInspectionInfoInstance(paramIn);
+        }
+    }
+
+
+
+    /**
+     * 处理 businessInspection 节点
+     * @param business 总的数据节点
+     * @param businessInspection 巡检点节点
+     */
+    private void doBusinessInspection(Business business,JSONObject businessInspection){
+
+        Assert.jsonObjectHaveKey(businessInspection,"inspectionId","businessInspection 节点下没有包含 inspectionId 节点");
+
+        if(businessInspection.getString("inspectionId").startsWith("-")){
+            //刷新缓存
+            //flushInspectionId(business.getDatas());
+
+            businessInspection.put("inspectionId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inspectionId));
+
+        }
+
+        businessInspection.put("bId",business.getbId());
+        businessInspection.put("operate", StatusConstant.OPERATE_ADD);
+        //保存巡检点信息
+        inspectionServiceDaoImpl.saveBusinessInspectionInfo(businessInspection);
+
+    }
+
+    public IInspectionServiceDao getInspectionServiceDaoImpl() {
+        return inspectionServiceDaoImpl;
+    }
+
+    public void setInspectionServiceDaoImpl(IInspectionServiceDao inspectionServiceDaoImpl) {
+        this.inspectionServiceDaoImpl = inspectionServiceDaoImpl;
+    }
+}

+ 190 - 0
CommunityService/src/main/java/com/java110/community/listener/inspectionPoint/UpdateInspectionInfoListener.java

@@ -0,0 +1,190 @@
+package com.java110.community.listener.inspectionPoint;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IInspectionServiceDao;
+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 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、businessInspection:{} 巡检点基本信息节点
+ * 2、businessInspectionAttr:[{}] 巡检点属性信息节点
+ * 3、businessInspectionPhoto:[{}] 巡检点照片信息节点
+ * 4、businessInspectionCerdentials:[{}] 巡检点证件信息节点
+ * 协议地址 :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("updateInspectionInfoListener")
+@Transactional
+public class UpdateInspectionInfoListener extends AbstractInspectionBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateInspectionInfoListener.class);
+    @Autowired
+    private IInspectionServiceDao inspectionServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION;
+    }
+
+    /**
+     * business过程
+     * @param dataFlowContext 上下文对象
+     * @param business 业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data,"没有datas 节点,或没有子节点需要处理");
+
+        //处理 businessInspection 节点
+        if(data.containsKey("businessInspection")){
+            //处理 businessInspection 节点
+            if(data.containsKey("businessInspection")){
+                Object _obj = data.get("businessInspection");
+                JSONArray businessInspections = null;
+                if(_obj instanceof JSONObject){
+                    businessInspections = new JSONArray();
+                    businessInspections.add(_obj);
+                }else {
+                    businessInspections = (JSONArray)_obj;
+                }
+                //JSONObject businessInspection = data.getJSONObject("businessInspection");
+                for (int _inspectionIndex = 0; _inspectionIndex < businessInspections.size();_inspectionIndex++) {
+                    JSONObject businessInspection = businessInspections.getJSONObject(_inspectionIndex);
+                    doBusinessInspection(business, businessInspection);
+                    if(_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("inspectionId", businessInspection.getString("inspectionId"));
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 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> businessInspectionInfos = inspectionServiceDaoImpl.getBusinessInspectionInfo(info);
+        if( businessInspectionInfos != null && businessInspectionInfos.size() >0) {
+            for (int _inspectionIndex = 0; _inspectionIndex < businessInspectionInfos.size();_inspectionIndex++) {
+                Map businessInspectionInfo = businessInspectionInfos.get(_inspectionIndex);
+                flushBusinessInspectionInfo(businessInspectionInfo,StatusConstant.STATUS_CD_VALID);
+                inspectionServiceDaoImpl.updateInspectionInfoInstance(businessInspectionInfo);
+                if(businessInspectionInfo.size() == 1) {
+                    dataFlowContext.addParamOut("inspectionId", businessInspectionInfo.get("inspection_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> inspectionInfo = inspectionServiceDaoImpl.getInspectionInfo(info);
+        if(inspectionInfo != null && inspectionInfo.size() > 0){
+
+            //巡检点信息
+            List<Map> businessInspectionInfos = inspectionServiceDaoImpl.getBusinessInspectionInfo(delInfo);
+            //除非程序出错了,这里不会为空
+            if(businessInspectionInfos == null || businessInspectionInfos.size() == 0){
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败(inspection),程序内部异常,请检查! "+delInfo);
+            }
+            for (int _inspectionIndex = 0; _inspectionIndex < businessInspectionInfos.size();_inspectionIndex++) {
+                Map businessInspectionInfo = businessInspectionInfos.get(_inspectionIndex);
+                flushBusinessInspectionInfo(businessInspectionInfo,StatusConstant.STATUS_CD_VALID);
+                inspectionServiceDaoImpl.updateInspectionInfoInstance(businessInspectionInfo);
+            }
+        }
+
+    }
+
+
+
+    /**
+     * 处理 businessInspection 节点
+     * @param business 总的数据节点
+     * @param businessInspection 巡检点节点
+     */
+    private void doBusinessInspection(Business business,JSONObject businessInspection){
+
+        Assert.jsonObjectHaveKey(businessInspection,"inspectionId","businessInspection 节点下没有包含 inspectionId 节点");
+
+        if(businessInspection.getString("inspectionId").startsWith("-")){
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"inspectionId 错误,不能自动生成(必须已经存在的inspectionId)"+businessInspection);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessInspection(business,businessInspection);
+
+        businessInspection.put("bId",business.getbId());
+        businessInspection.put("operate", StatusConstant.OPERATE_ADD);
+        //保存巡检点信息
+        inspectionServiceDaoImpl.saveBusinessInspectionInfo(businessInspection);
+
+    }
+
+
+
+
+    public IInspectionServiceDao getInspectionServiceDaoImpl() {
+        return inspectionServiceDaoImpl;
+    }
+
+    public void setInspectionServiceDaoImpl(IInspectionServiceDao inspectionServiceDaoImpl) {
+        this.inspectionServiceDaoImpl = inspectionServiceDaoImpl;
+    }
+
+
+
+}

+ 72 - 0
CommunityService/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java

@@ -0,0 +1,72 @@
+package com.java110.community.smo.impl;
+
+
+import com.java110.community.dao.IInspectionServiceDao;
+import com.java110.core.smo.inspectionPoint.IInspectionInnerServiceSMO;
+import com.java110.dto.inspectionPoint.InspectionDto;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.user.UserDto;
+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 InspectionInnerServiceSMOImpl extends BaseServiceSMO implements IInspectionInnerServiceSMO {
+
+    @Autowired
+    private IInspectionServiceDao inspectionServiceDaoImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Override
+    public List<InspectionDto> queryInspections(@RequestBody  InspectionDto inspectionDto) {
+
+        //校验是否传了 分页信息
+
+        int page = inspectionDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            inspectionDto.setPage((page - 1) * inspectionDto.getRow());
+        }
+
+        List<InspectionDto> inspections = BeanConvertUtil.covertBeanList(inspectionServiceDaoImpl.getInspectionInfo(BeanConvertUtil.beanCovertMap(inspectionDto)), InspectionDto.class);
+
+        return inspections;
+    }
+
+
+    @Override
+    public int queryInspectionsCount(@RequestBody InspectionDto inspectionDto) {
+        return inspectionServiceDaoImpl.queryInspectionsCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }
+
+    public IInspectionServiceDao getInspectionServiceDaoImpl() {
+        return inspectionServiceDaoImpl;
+    }
+
+    public void setInspectionServiceDaoImpl(IInspectionServiceDao inspectionServiceDaoImpl) {
+        this.inspectionServiceDaoImpl = inspectionServiceDaoImpl;
+    }
+
+    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
+        return userInnerServiceSMOImpl;
+    }
+
+    public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
+        this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
+    }
+}

+ 58 - 0
docs/document/api/other/CheckUserHasResource.md

@@ -0,0 +1,58 @@
+
+
+**1\. 检查用户是否资源权限(待更新)**
+###### 接口功能
+> 检查用户是否资源权限接口
+
+###### URL
+> []()
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配|
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数(body部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|-|-|-|-|-|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容
+
+
+
+###### 举例
+> 地址:[]()
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文:
+
+{
+	待更新
+}
+
+返回报文:
+
+成功
+
+```

+ 63 - 0
docs/document/api/other/listMyEnteredCommunitys.md

@@ -0,0 +1,63 @@
+
+
+**1\. 查询入驻并且有权限的小区(待更新)**
+###### 接口功能
+> 查询入驻并且有权限的小区接口
+
+###### URL
+> []()
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> GET
+
+###### 请求参数(header部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-:|
+|app_id|1|String|30|应用ID|Api服务分配                      |
+|transaction_id|1|String|30|请求流水号|不能重复 1000000000+YYYYMMDDhhmmss+6位序列 |
+|sign|1|String|-|签名|请参考签名说明|
+|req_time|1|String|-|请求时间|YYYYMMDDhhmmss|
+
+###### 请求参数(url部分)
+|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: |
+|storeId|1|String|30|商户ID|-|
+|userId|1|String|30|用户ID|-|
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+|父参数名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|-|-|-|-|-|-|
+
+
+
+
+###### 举例
+> 地址:[]()
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+USER_ID:1234
+APP_ID:8000418002
+TRANSACTION_ID:10029082726
+REQ_TIME:20181113225612
+SIGN:aabdncdhdbd878sbdudn898
+请求报文:
+
+无
+
+返回报文:
+{
+	待更新
+}
+
+```

+ 114 - 0
docs/document/services/inspectionPoint/DeleteInspectionInfo.md

@@ -0,0 +1,114 @@
+
+
+**1\. 删除巡检点**
+###### 接口功能
+> API服务做删除巡检点时调用该接口
+
+###### URL
+> [http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessInspectionInfo|1|Object|-|小区成员|小区成员|
+|businessInspectionInfo|inspectionId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "300200050001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessInspectionInfo": {
+                "inspectionId":"填写存在的值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 122 - 0
docs/document/services/inspectionPoint/SaveInspectionInfo.md

@@ -0,0 +1,122 @@
+
+
+**1\. 保存巡检点**
+###### 接口功能
+> API服务做保存巡检点时调用该接口
+
+###### URL
+> [http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessInspectionInfo|1|Object|-|小区成员|小区成员|
+|businessInspectionInfo|inspectionId|1|String|30|-|-|
+|businessInspectionInfo|machineId|1|String|30|-|-|
+|businessInspectionInfo|remark|1|String|30|-|-|
+|businessInspectionInfo|inspectionName|1|String|30|-|-|
+|businessInspectionInfo|communityId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "300200030001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessInspectionInfo": {
+                "inspectionId":"填写具体值",
+        "machineId":"填写具体值",
+        "remark":"填写具体值",
+        "inspectionName":"填写具体值",
+        "communityId":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 122 - 0
docs/document/services/inspectionPoint/UpdateInspectionInfo.md

@@ -0,0 +1,122 @@
+
+
+**1\. 修改巡检点**
+###### 接口功能
+> API服务做修改巡检点时调用该接口
+
+###### URL
+> [http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+###### 支持格式
+> JSON
+
+###### HTTP请求方式
+> POST
+
+###### 协议接口
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-:|
+|-|orders|1|Object|-|订单节点|-|
+|-|business|1|Array|-|业务节点|-|
+
+###### orders
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|orders|1|Object|-|订单节点|-|
+|orders|appId|1|String|10|系统ID|由中心服务提供|
+|orders|transactionId|1|String|30|交互流水|appId+'00'+YYYYMMDD+10位序列|
+|orders|userId|1|String|30|用户ID|已有用户ID|
+|orders|orderTypeCd|1|String|4|订单类型|查看订单类型说明|
+|orders|requestTime|1|String|14|请求时间|YYYYMMDDhhmmss|
+|orders|remark|1|String|200|备注|备注|
+|orders|sign|?|String|64|签名|查看加密说明|
+|orders|attrs|?|Array|-|订单属性|-|
+|attrs|specCd|1|String|12|规格编码|由中心服务提供|
+|attrs|value|1|String|50|属性值|-|
+|orders|response|1|Object|-|返回结果节点|-|
+|response|code|1|String|4|返回状态|查看状态说明|
+|response|message|1|String|200|返回状态描述|-|
+
+###### business
+|父元素名称|参数名称|约束|类型|长度|描述|取值说明|
+| :-: | :-: | :-: | :-: | :-: | :-: | :-: |
+|-|business|?|Array|-|业务节点|-|
+|business|businessTypeCd|1|String|12|业务类型编码|500100030002|
+|business|datas|1|Object|-|数据节点|不同的服务下的节点不一样|
+|datas|businessInspectionInfo|1|Object|-|小区成员|小区成员|
+|businessInspectionInfo|inspectionId|1|String|30|-|-|
+|businessInspectionInfo|machineId|1|String|30|-|-|
+|businessInspectionInfo|remark|1|String|30|-|-|
+|businessInspectionInfo|inspectionName|1|String|30|-|-|
+|businessInspectionInfo|communityId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功,body内容为返回内容,
+
+
+
+
+
+###### 举例
+> 地址:[http://inspection-service/inspectionApi/service](http://inspection-service/inspectionApi/service)
+
+``` javascript
+请求头信息:
+Content-Type:application/json
+
+请求报文:
+
+{
+  "orders": {
+    "appId": "外系统ID,分配得到",
+    "transactionId": "100000000020180409224736000001",
+    "userId": "用户ID",
+    "orderTypeCd": "订单类型,查询,受理",
+    "requestTime": "20180409224736",
+    "remark": "备注",
+    "sign": "这个服务是否要求MD5签名",
+    "businessType":"I",
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  },
+  "business": {
+    "businessTypeCd": "300200040001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessInspectionInfo": {
+                "inspectionId":"填写具体值",
+        "machineId":"填写具体值",
+        "remark":"填写具体值",
+        "inspectionName":"填写具体值",
+        "communityId":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文:
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

+ 77 - 0
java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java

@@ -0,0 +1,77 @@
+package com.java110.dto.inspectionPoint;
+
+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 InspectionDto extends PageDto implements Serializable {
+
+    private String inspectionId;
+private String machineId;
+private String remark;
+private String inspectionName;
+private String communityId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getInspectionId() {
+        return inspectionId;
+    }
+public void setInspectionId(String inspectionId) {
+        this.inspectionId = inspectionId;
+    }
+public String getMachineId() {
+        return machineId;
+    }
+public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getInspectionName() {
+        return inspectionName;
+    }
+public void setInspectionName(String inspectionName) {
+        this.inspectionName = inspectionName;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+    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;
+    }
+}

+ 81 - 0
java110-code-generator/src/main/java/com/java110/InspectionPointGeneratorApplication.java

@@ -0,0 +1,81 @@
+package com.java110;
+
+
+import com.java110.code.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Hello world!
+ */
+public class InspectionPointGeneratorApplication {
+
+    protected InspectionPointGeneratorApplication() {
+        // prevents calls from subclass
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * 代码生成器 入口方法
+     *  此处生成的mapper文件包含过程表和实例表的sql,所以要求两张表的特殊字段也要写上
+     *   BusinessTypeCd
+     * @param args 参数
+     */
+    public static void main(String[] args) {
+        Data data = new Data();
+        data.setId("inspectionId");
+        data.setName("inspection");
+        data.setDesc("巡检点");
+        data.setShareParam("communityId");
+        data.setShareColumn("community_id");
+        data.setNewBusinessTypeCd("BUSINESS_TYPE_SAVE_INSPECTION");
+        data.setUpdateBusinessTypeCd("BUSINESS_TYPE_UPDATE_INSPECTION");
+        data.setDeleteBusinessTypeCd("BUSINESS_TYPE_DELETE_INSPECTION");
+        data.setNewBusinessTypeCdValue("300200030001");
+        data.setUpdateBusinessTypeCdValue("300200040001");
+        data.setDeleteBusinessTypeCdValue("300200050001");
+        data.setBusinessTableName("business_inspection_point");
+        data.setTableName("inspection_point");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("inspectionId", "inspection_id");       //map的key为你自定义的字段名就是驼峰命名法的那个,value为数据库表的字段名
+        param.put("inspectionName", "inspection_name");
+        param.put("machineId", "machine_id");
+        param.put("communityId", "community_id");
+        param.put("remark", "remark");
+        param.put("statusCd", "status_cd");
+        param.put("operate", "operate");
+        param.put("bId", "b_id");
+        data.setParams(param);
+        GeneratorSaveInfoListener generatorSaveInfoListener = new GeneratorSaveInfoListener();
+        generatorSaveInfoListener.generator(data);
+
+        GeneratorAbstractBussiness generatorAbstractBussiness = new GeneratorAbstractBussiness();
+        generatorAbstractBussiness.generator(data);
+
+        GeneratorIServiceDaoListener generatorIServiceDaoListener = new GeneratorIServiceDaoListener();
+        generatorIServiceDaoListener.generator(data);
+
+        GeneratorServiceDaoImplListener generatorServiceDaoImplListener = new GeneratorServiceDaoImplListener();
+        generatorServiceDaoImplListener.generator(data);
+
+        GeneratorServiceDaoImplMapperListener generatorServiceDaoImplMapperListener = null;
+        generatorServiceDaoImplMapperListener = new GeneratorServiceDaoImplMapperListener();
+        generatorServiceDaoImplMapperListener.generator(data);
+
+        GeneratorUpdateInfoListener generatorUpdateInfoListener = new GeneratorUpdateInfoListener();
+        generatorUpdateInfoListener.generator(data);
+
+        GeneratorDeleteInfoListener generatorDeleteInfoListener = new GeneratorDeleteInfoListener();
+        generatorDeleteInfoListener.generator(data);
+
+        GeneratorInnerServiceSMOImpl generatorInnerServiceSMOImpl = new GeneratorInnerServiceSMOImpl();
+        generatorInnerServiceSMOImpl.generator(data);
+
+        GeneratorDtoBean generatorDtoBean = new GeneratorDtoBean();
+        generatorDtoBean.generator(data);
+
+        GeneratorIInnerServiceSMO generatorIInnerServiceSMO = new GeneratorIInnerServiceSMO();
+        generatorIInnerServiceSMO.generator(data);
+    }
+}

+ 42 - 0
java110-core/src/main/java/com/java110/core/smo/inspectionPoint/IInspectionInnerServiceSMO.java

@@ -0,0 +1,42 @@
+package com.java110.core.smo.inspectionPoint;
+
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.inspectionPoint.InspectionDto;
+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 IInspectionInnerServiceSMO
+ * @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("/inspectionApi")
+public interface IInspectionInnerServiceSMO {
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param inspectionDto 数据对象分享
+     * @return InspectionDto 对象数据
+     */
+    @RequestMapping(value = "/queryInspections", method = RequestMethod.POST)
+    List<InspectionDto> queryInspections(@RequestBody InspectionDto inspectionDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param inspectionDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryInspectionsCount", method = RequestMethod.POST)
+    int queryInspectionsCount(@RequestBody InspectionDto inspectionDto);
+}

+ 27 - 0
java110-db/db/CommunityService/inspection_point.sql

@@ -0,0 +1,27 @@
+--  巡检点表
+CREATE TABLE inspection_point(
+    `inspection_id` VARCHAR(30) NOT NULL UNIQUE COMMENT 'ID', `community_id` varchar(30) NOT NULL COMMENT '小区ID',
+    `b_id` varchar(30) NOT NULL COMMENT '业务Id',
+    `inspection_name` VARCHAR(100) NOT NULL COMMENT '巡检名称',
+    `machine_id` VARCHAR(30) NOT NULL COMMENT '设备ID',
+    `community_id` varchar(30) NOT NULL COMMENT '小区ID',
+    `remark` VARCHAR(200) COMMENT '备注说明',
+    `create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `status_cd` VARCHAR(2) NOT NULL COMMENT '数据状态,详细参考t_dict表0在用1失效',
+    KEY `idx_inspection_inspection_id` (`inspection_id`)
+);
+
+
+
+
+CREATE TABLE `business_inspection_point` (
+    `inspection_id` VARCHAR(30) NOT NULL UNIQUE COMMENT 'ID',
+    `b_id` varchar(30) NOT NULL COMMENT '业务Id',
+    `inspection_name` VARCHAR(100) NOT NULL COMMENT '巡检名称',
+    `machine_id` VARCHAR(30) NOT NULL COMMENT '设备ID',
+    `community_id` varchar(30) NOT NULL COMMENT '小区ID',
+    `remark` VARCHAR(200) COMMENT '备注说明',
+    `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `operate` varchar(4) NOT NULL COMMENT '数据状态,添加ADD,修改MOD 删除DEL',
+    KEY `idx_b_inspection_inspection_id` (`inspection_id`)
+);

+ 172 - 0
java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml

@@ -0,0 +1,172 @@
+<?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="inspectionServiceDaoImpl">
+
+    <!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
+       <insert id="saveBusinessInspectionInfo" parameterType="Map">
+           insert into business_inspection_point(
+inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id
+) values (
+#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId}
+)
+       </insert>
+
+
+       <!-- 查询巡检点信息(Business) add by wuxw 2018-07-03 -->
+       <select id="getBusinessInspectionInfo" parameterType="Map" resultType="Map">
+           select  t.inspection_id,t.inspection_id inspectionId,t.machine_id,t.machine_id machineId,t.operate,t.remark,t.inspection_name,t.inspection_name inspectionName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
+from business_inspection_point t 
+where 1 =1 
+<if test="inspectionId !=null and inspectionId != ''">
+   and t.inspection_id= #{inspectionId}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="operate !=null and operate != ''">
+   and t.operate= #{operate}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="inspectionName !=null and inspectionName != ''">
+   and t.inspection_name= #{inspectionName}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+
+       </select>
+
+
+
+
+
+    <!-- 保存巡检点信息至 instance表中 add by wuxw 2018-07-03 -->
+    <insert id="saveInspectionInfoInstance" parameterType="Map">
+        insert into inspection_point(
+inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
+) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from business_inspection_point t where 1=1
+<if test="inspectionId !=null and inspectionId != ''">
+   and t.inspection_id= #{inspectionId}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+   and t.operate= 'ADD'
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="inspectionName !=null and inspectionName != ''">
+   and t.inspection_name= #{inspectionName}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+
+    </insert>
+
+
+
+    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
+    <select id="getInspectionInfo" parameterType="Map" resultType="Map">
+        select  t.inspection_id,t.inspection_id inspectionId,t.machine_id,t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,t.inspection_name,t.inspection_name inspectionName,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
+from inspection_point t 
+where 1 =1 
+<if test="inspectionId !=null and inspectionId != ''">
+   and t.inspection_id= #{inspectionId}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="inspectionName !=null and inspectionName != ''">
+   and t.inspection_name= #{inspectionName}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</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="updateInspectionInfoInstance" parameterType="Map">
+        update  inspection_point t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="machineId !=null and machineId != ''">
+, t.machine_id= #{machineId}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="inspectionName !=null and inspectionName != ''">
+, t.inspection_name= #{inspectionName}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+ where 1=1 <if test="inspectionId !=null and inspectionId != ''">
+and t.inspection_id= #{inspectionId}
+</if> 
+<if test="bId !=null and bId != ''">
+and t.b_id= #{bId}
+</if> 
+
+    </update>
+
+    <!-- 查询巡检点数量 add by wuxw 2018-07-03 -->
+     <select id="queryInspectionsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from inspection_point t 
+where 1 =1 
+<if test="inspectionId !=null and inspectionId != ''">
+   and t.inspection_id= #{inspectionId}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="inspectionName !=null and inspectionName != ''">
+   and t.inspection_name= #{inspectionName}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="bId !=null and bId != ''">
+   and t.b_id= #{bId}
+</if> 
+
+
+     </select>
+
+</mapper>

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

@@ -815,4 +815,20 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_DELETE_ACTIVITIES ="290200050001";
 
+
+    /**
+     *  保存巡检点
+     * 14开头  3保存
+     */
+    public static final String BUSINESS_TYPE_SAVE_INSPECTION="300200030001";
+
+    /**
+     * 修改巡检点
+     */
+    public static final String BUSINESS_TYPE_UPDATE_INSPECTION="300200040001";
+    /**
+     *  删除巡检点
+     */
+    public static final String BUSINESS_TYPE_DELETE_INSPECTION ="300200050001";
+
 }