设备管理 服务端代码生成完成

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/dao/IMachineServiceDao.java

@@ -0,0 +1,81 @@
+package com.java110.hardwareAdapation.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 IMachineServiceDao {
+
+    /**
+     * 保存 设备信息
+     * @param businessMachineInfo 设备信息 封装
+     * @throws DAOException 操作数据库异常
+     */
+    void saveBusinessMachineInfo(Map businessMachineInfo) throws DAOException;
+
+
+
+    /**
+     * 查询设备信息（business过程）
+     * 根据bId 查询设备信息
+     * @param info bId 信息
+     * @return 设备信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getBusinessMachineInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 保存 设备信息 Business数据到 Instance中
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveMachineInfoInstance(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询设备信息（instance过程）
+     * 根据bId 查询设备信息
+     * @param info bId 信息
+     * @return 设备信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getMachineInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改设备信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateMachineInfoInstance(Map info) throws DAOException;
+
+
+    /**
+     * 查询设备总数
+     *
+     * @param info 设备信息
+     * @return 设备数量
+     */
+    int queryMachinesCount(Map info);
+
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/dao/impl/MachineServiceDaoImpl.java

@@ -0,0 +1,134 @@
+package com.java110.hardwareAdapation.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+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("machineServiceDaoImpl")
+//@Transactional
+public class MachineServiceDaoImpl extends BaseServiceDao implements IMachineServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(MachineServiceDaoImpl.class);
+
+    /**
+     * 设备信息封装
+     *
+     * @param businessMachineInfo 设备信息 封装
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveBusinessMachineInfo(Map businessMachineInfo) throws DAOException {
+        businessMachineInfo.put("month", DateUtil.getCurrentMonth());
+        // 查询business_user 数据是否已经存在
+        logger.debug("保存设备信息 入参 businessMachineInfo : {}", businessMachineInfo);
+        int saveFlag = sqlSessionTemplate.insert("machineServiceDaoImpl.saveBusinessMachineInfo", businessMachineInfo);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存设备数据失败：" + JSONObject.toJSONString(businessMachineInfo));
+        }
+    }
+
+
+    /**
+     * 查询设备信息
+     *
+     * @param info bId 信息
+     * @return 设备信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getBusinessMachineInfo(Map info) throws DAOException {
+
+        logger.debug("查询设备信息 入参 info : {}", info);
+
+        List<Map> businessMachineInfos = sqlSessionTemplate.selectList("machineServiceDaoImpl.getBusinessMachineInfo", info);
+
+        return businessMachineInfos;
+    }
+
+
+    /**
+     * 保存设备信息 到 instance
+     *
+     * @param info bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveMachineInfoInstance(Map info) throws DAOException {
+        logger.debug("保存设备信息Instance 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.insert("machineServiceDaoImpl.saveMachineInfoInstance", 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> getMachineInfo(Map info) throws DAOException {
+        logger.debug("查询设备信息 入参 info : {}", info);
+
+        List<Map> businessMachineInfos = sqlSessionTemplate.selectList("machineServiceDaoImpl.getMachineInfo", info);
+
+        return businessMachineInfos;
+    }
+
+
+    /**
+     * 修改设备信息
+     *
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateMachineInfoInstance(Map info) throws DAOException {
+        logger.debug("修改设备信息Instance 入参 info : {}", info);
+
+        int saveFlag = sqlSessionTemplate.update("machineServiceDaoImpl.updateMachineInfoInstance", info);
+
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改设备信息Instance数据失败：" + JSONObject.toJSONString(info));
+        }
+    }
+
+    /**
+     * 查询设备数量
+     *
+     * @param info 设备信息
+     * @return 设备数量
+     */
+    @Override
+    public int queryMachinesCount(Map info) {
+        logger.debug("查询设备数据 入参 info : {}", info);
+
+        List<Map> businessMachineInfos = sqlSessionTemplate.selectList("machineServiceDaoImpl.queryMachinesCount", info);
+        if (businessMachineInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessMachineInfos.get(0).get("count").toString());
+    }
+
+
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machine/AbstractMachineBusinessServiceDataFlowListener.java

@@ -0,0 +1,91 @@
+package com.java110.hardwareAdapation.listener.machine;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.entity.center.Business;
+import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
+import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+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 AbstractMachineBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
+    private static Logger logger = LoggerFactory.getLogger(AbstractMachineBusinessServiceDataFlowListener.class);
+
+
+    /**
+     * 获取 DAO工具类
+     *
+     * @return
+     */
+    public abstract IMachineServiceDao getMachineServiceDaoImpl();
+
+    /**
+     * 刷新 businessMachineInfo 数据
+     * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
+     * @param businessMachineInfo
+     */
+    protected void flushBusinessMachineInfo(Map businessMachineInfo, String statusCd) {
+        businessMachineInfo.put("newBId", businessMachineInfo.get("b_id"));
+        businessMachineInfo.put("machineMac", businessMachineInfo.get("machine_mac"));
+        businessMachineInfo.put("machineId", businessMachineInfo.get("machine_id"));
+        businessMachineInfo.put("machineCode", businessMachineInfo.get("machine_code"));
+        businessMachineInfo.put("authCode", businessMachineInfo.get("auth_code"));
+        businessMachineInfo.put("operate", businessMachineInfo.get("operate"));
+        businessMachineInfo.put("machineVersion", businessMachineInfo.get("machine_version"));
+        businessMachineInfo.put("communityId", businessMachineInfo.get("community_id"));
+        businessMachineInfo.put("machineName", businessMachineInfo.get("machine_name"));
+        businessMachineInfo.put("machineTypeCd", businessMachineInfo.get("machine_type_cd"));
+        businessMachineInfo.put("machineIp", businessMachineInfo.get("machine_ip"));
+        businessMachineInfo.remove("bId");
+        businessMachineInfo.put("statusCd", statusCd);
+    }
+
+
+    /**
+     * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
+     *
+     * @param businessMachine 设备信息
+     */
+    protected void autoSaveDelBusinessMachine(Business business, JSONObject businessMachine) {
+//自动插入DEL
+        Map info = new HashMap();
+        info.put("machineId", businessMachine.getString("machineId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
+        List<Map> currentMachineInfos = getMachineServiceDaoImpl().getMachineInfo(info);
+        if (currentMachineInfos == null || currentMachineInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息，入参错误或数据有问题，请检查" + info);
+        }
+
+        Map currentMachineInfo = currentMachineInfos.get(0);
+
+        currentMachineInfo.put("bId", business.getbId());
+
+        currentMachineInfo.put("machineMac", currentMachineInfo.get("machine_mac"));
+        currentMachineInfo.put("machineId", currentMachineInfo.get("machine_id"));
+        currentMachineInfo.put("machineCode", currentMachineInfo.get("machine_code"));
+        currentMachineInfo.put("authCode", currentMachineInfo.get("auth_code"));
+        currentMachineInfo.put("operate", currentMachineInfo.get("operate"));
+        currentMachineInfo.put("machineVersion", currentMachineInfo.get("machine_version"));
+        currentMachineInfo.put("communityId", currentMachineInfo.get("community_id"));
+        currentMachineInfo.put("machineName", currentMachineInfo.get("machine_name"));
+        currentMachineInfo.put("machineTypeCd", currentMachineInfo.get("machine_type_cd"));
+        currentMachineInfo.put("machineIp", currentMachineInfo.get("machine_ip"));
+
+
+        currentMachineInfo.put("operate", StatusConstant.OPERATE_DEL);
+        getMachineServiceDaoImpl().saveBusinessMachineInfo(currentMachineInfo);
+    }
+
+
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machine/DeleteMachineInfoListener.java

@@ -0,0 +1,180 @@
+package com.java110.hardwareAdapation.listener.machine;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.Business;
+import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+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 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;
+
+/**
+ * 删除设备信息 侦听
+ * <p>
+ * 处理节点
+ * 1、businessMachine:{} 设备基本信息节点
+ * 2、businessMachineAttr:[{}] 设备属性信息节点
+ * 3、businessMachinePhoto:[{}] 设备照片信息节点
+ * 4、businessMachineCerdentials:[{}] 设备证件信息节点
+ * 协议地址 ：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("deleteMachineInfoListener")
+@Transactional
+public class DeleteMachineInfoListener extends AbstractMachineBusinessServiceDataFlowListener {
+
+    private final static Logger logger = LoggerFactory.getLogger(DeleteMachineInfoListener.class);
+    @Autowired
+    IMachineServiceDao machineServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 3;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE;
+    }
+
+    /**
+     * 根据删除信息 查出Instance表中数据 保存至business表 （状态写DEL） 方便撤单时直接更新回去
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
+
+        //处理 businessMachine 节点
+        if (data.containsKey("businessMachine")) {
+            //处理 businessMachine 节点
+            if (data.containsKey("businessMachine")) {
+                Object _obj = data.get("businessMachine");
+                JSONArray businessMachines = null;
+                if (_obj instanceof JSONObject) {
+                    businessMachines = new JSONArray();
+                    businessMachines.add(_obj);
+                } else {
+                    businessMachines = (JSONArray) _obj;
+                }
+                //JSONObject businessMachine = data.getJSONObject("businessMachine");
+                for (int _machineIndex = 0; _machineIndex < businessMachines.size(); _machineIndex++) {
+                    JSONObject businessMachine = businessMachines.getJSONObject(_machineIndex);
+                    doBusinessMachine(business, businessMachine);
+                    if (_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("machineId", businessMachine.getString("machineId"));
+                    }
+                }
+            }
+        }
+
+
+    }
+
+    /**
+     * 删除 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> businessMachineInfos = machineServiceDaoImpl.getBusinessMachineInfo(info);
+        if (businessMachineInfos != null && businessMachineInfos.size() > 0) {
+            for (int _machineIndex = 0; _machineIndex < businessMachineInfos.size(); _machineIndex++) {
+                Map businessMachineInfo = businessMachineInfos.get(_machineIndex);
+                flushBusinessMachineInfo(businessMachineInfo, StatusConstant.STATUS_CD_INVALID);
+                machineServiceDaoImpl.updateMachineInfoInstance(businessMachineInfo);
+                dataFlowContext.addParamOut("machineId", businessMachineInfo.get("machine_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> machineInfo = machineServiceDaoImpl.getMachineInfo(info);
+        if (machineInfo != null && machineInfo.size() > 0) {
+
+            //设备信息
+            List<Map> businessMachineInfos = machineServiceDaoImpl.getBusinessMachineInfo(delInfo);
+            //除非程序出错了，这里不会为空
+            if (businessMachineInfos == null || businessMachineInfos.size() == 0) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败（machine），程序内部异常,请检查！ " + delInfo);
+            }
+            for (int _machineIndex = 0; _machineIndex < businessMachineInfos.size(); _machineIndex++) {
+                Map businessMachineInfo = businessMachineInfos.get(_machineIndex);
+                flushBusinessMachineInfo(businessMachineInfo, StatusConstant.STATUS_CD_VALID);
+                machineServiceDaoImpl.updateMachineInfoInstance(businessMachineInfo);
+            }
+        }
+    }
+
+
+    /**
+     * 处理 businessMachine 节点
+     *
+     * @param business        总的数据节点
+     * @param businessMachine 设备节点
+     */
+    private void doBusinessMachine(Business business, JSONObject businessMachine) {
+
+        Assert.jsonObjectHaveKey(businessMachine, "machineId", "businessMachine 节点下没有包含 machineId 节点");
+
+        if (businessMachine.getString("machineId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "machineId 错误，不能自动生成（必须已经存在的machineId）" + businessMachine);
+        }
+        //自动插入DEL
+        autoSaveDelBusinessMachine(business, businessMachine);
+    }
+
+    public IMachineServiceDao getMachineServiceDaoImpl() {
+        return machineServiceDaoImpl;
+    }
+
+    public void setMachineServiceDaoImpl(IMachineServiceDao machineServiceDaoImpl) {
+        this.machineServiceDaoImpl = machineServiceDaoImpl;
+    }
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machine/SaveMachineInfoListener.java

@@ -0,0 +1,179 @@
+package com.java110.hardwareAdapation.listener.machine;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+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 com.java110.hardwareAdapation.dao.IMachineServiceDao;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
+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("saveMachineInfoListener")
+@Transactional
+public class SaveMachineInfoListener extends AbstractMachineBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveMachineInfoListener.class);
+
+    @Autowired
+    private IMachineServiceDao machineServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE;
+    }
+
+    /**
+     * 保存设备信息 business 表中
+     *
+     * @param dataFlowContext 数据对象
+     * @param business        当前业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+        JSONObject data = business.getDatas();
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
+
+        //处理 businessMachine 节点
+        if (data.containsKey("businessMachine")) {
+            Object bObj = data.get("businessMachine");
+            JSONArray businessMachines = null;
+            if (bObj instanceof JSONObject) {
+                businessMachines = new JSONArray();
+                businessMachines.add(bObj);
+            } else {
+                businessMachines = (JSONArray) bObj;
+            }
+            //JSONObject businessMachine = data.getJSONObject("businessMachine");
+            for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
+                JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
+                doBusinessMachine(business, businessMachine);
+                if (bObj instanceof JSONObject) {
+                    dataFlowContext.addParamOut("machineId", businessMachine.getString("machineId"));
+                }
+            }
+        }
+    }
+
+    /**
+     * 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> businessMachineInfo = machineServiceDaoImpl.getBusinessMachineInfo(info);
+        if (businessMachineInfo != null && businessMachineInfo.size() > 0) {
+            reFreshShareColumn(info, businessMachineInfo.get(0));
+            machineServiceDaoImpl.saveMachineInfoInstance(info);
+            if (businessMachineInfo.size() == 1) {
+                dataFlowContext.addParamOut("machineId", businessMachineInfo.get(0).get("machine_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> machineInfo = machineServiceDaoImpl.getMachineInfo(info);
+        if (machineInfo != null && machineInfo.size() > 0) {
+            reFreshShareColumn(paramIn, machineInfo.get(0));
+            machineServiceDaoImpl.updateMachineInfoInstance(paramIn);
+        }
+    }
+
+
+    /**
+     * 处理 businessMachine 节点
+     *
+     * @param business        总的数据节点
+     * @param businessMachine 设备节点
+     */
+    private void doBusinessMachine(Business business, JSONObject businessMachine) {
+
+        Assert.jsonObjectHaveKey(businessMachine, "machineId", "businessMachine 节点下没有包含 machineId 节点");
+
+        if (businessMachine.getString("machineId").startsWith("-")) {
+            //刷新缓存
+            //flushMachineId(business.getDatas());
+
+            businessMachine.put("machineId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineId));
+
+        }
+
+        businessMachine.put("bId", business.getbId());
+        businessMachine.put("operate", StatusConstant.OPERATE_ADD);
+        //保存设备信息
+        machineServiceDaoImpl.saveBusinessMachineInfo(businessMachine);
+
+    }
+
+    public IMachineServiceDao getMachineServiceDaoImpl() {
+        return machineServiceDaoImpl;
+    }
+
+    public void setMachineServiceDaoImpl(IMachineServiceDao machineServiceDaoImpl) {
+        this.machineServiceDaoImpl = machineServiceDaoImpl;
+    }
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machine/UpdateMachineInfoListener.java

@@ -0,0 +1,190 @@
+package com.java110.hardwareAdapation.listener.machine;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.Business;
+import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+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 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;
+
+/**
+ * 修改设备信息 侦听
+ * <p>
+ * 处理节点
+ * 1、businessMachine:{} 设备基本信息节点
+ * 2、businessMachineAttr:[{}] 设备属性信息节点
+ * 3、businessMachinePhoto:[{}] 设备照片信息节点
+ * 4、businessMachineCerdentials:[{}] 设备证件信息节点
+ * 协议地址 ：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("updateMachineInfoListener")
+@Transactional
+public class UpdateMachineInfoListener extends AbstractMachineBusinessServiceDataFlowListener {
+
+    private static Logger logger = LoggerFactory.getLogger(UpdateMachineInfoListener.class);
+    @Autowired
+    private IMachineServiceDao machineServiceDaoImpl;
+
+    @Override
+    public int getOrder() {
+        return 2;
+    }
+
+    @Override
+    public String getBusinessTypeCd() {
+        return BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE;
+    }
+
+    /**
+     * business过程
+     *
+     * @param dataFlowContext 上下文对象
+     * @param business        业务对象
+     */
+    @Override
+    protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
+
+        JSONObject data = business.getDatas();
+
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
+
+        //处理 businessMachine 节点
+        if (data.containsKey("businessMachine")) {
+            //处理 businessMachine 节点
+            if (data.containsKey("businessMachine")) {
+                Object _obj = data.get("businessMachine");
+                JSONArray businessMachines = null;
+                if (_obj instanceof JSONObject) {
+                    businessMachines = new JSONArray();
+                    businessMachines.add(_obj);
+                } else {
+                    businessMachines = (JSONArray) _obj;
+                }
+                //JSONObject businessMachine = data.getJSONObject("businessMachine");
+                for (int _machineIndex = 0; _machineIndex < businessMachines.size(); _machineIndex++) {
+                    JSONObject businessMachine = businessMachines.getJSONObject(_machineIndex);
+                    doBusinessMachine(business, businessMachine);
+                    if (_obj instanceof JSONObject) {
+                        dataFlowContext.addParamOut("machineId", businessMachine.getString("machineId"));
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 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> businessMachineInfos = machineServiceDaoImpl.getBusinessMachineInfo(info);
+        if (businessMachineInfos != null && businessMachineInfos.size() > 0) {
+            for (int _machineIndex = 0; _machineIndex < businessMachineInfos.size(); _machineIndex++) {
+                Map businessMachineInfo = businessMachineInfos.get(_machineIndex);
+                flushBusinessMachineInfo(businessMachineInfo, StatusConstant.STATUS_CD_VALID);
+                machineServiceDaoImpl.updateMachineInfoInstance(businessMachineInfo);
+                if (businessMachineInfo.size() == 1) {
+                    dataFlowContext.addParamOut("machineId", businessMachineInfo.get("machine_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> machineInfo = machineServiceDaoImpl.getMachineInfo(info);
+        if (machineInfo != null && machineInfo.size() > 0) {
+
+            //设备信息
+            List<Map> businessMachineInfos = machineServiceDaoImpl.getBusinessMachineInfo(delInfo);
+            //除非程序出错了，这里不会为空
+            if (businessMachineInfos == null || businessMachineInfos.size() == 0) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败（machine），程序内部异常,请检查！ " + delInfo);
+            }
+            for (int _machineIndex = 0; _machineIndex < businessMachineInfos.size(); _machineIndex++) {
+                Map businessMachineInfo = businessMachineInfos.get(_machineIndex);
+                flushBusinessMachineInfo(businessMachineInfo, StatusConstant.STATUS_CD_VALID);
+                machineServiceDaoImpl.updateMachineInfoInstance(businessMachineInfo);
+            }
+        }
+
+    }
+
+
+    /**
+     * 处理 businessMachine 节点
+     *
+     * @param business        总的数据节点
+     * @param businessMachine 设备节点
+     */
+    private void doBusinessMachine(Business business, JSONObject businessMachine) {
+
+        Assert.jsonObjectHaveKey(businessMachine, "machineId", "businessMachine 节点下没有包含 machineId 节点");
+
+        if (businessMachine.getString("machineId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "machineId 错误，不能自动生成（必须已经存在的machineId）" + businessMachine);
+        }
+        //自动保存DEL
+        autoSaveDelBusinessMachine(business, businessMachine);
+
+        businessMachine.put("bId", business.getbId());
+        businessMachine.put("operate", StatusConstant.OPERATE_ADD);
+        //保存设备信息
+        machineServiceDaoImpl.saveBusinessMachineInfo(businessMachine);
+
+    }
+
+
+    public IMachineServiceDao getMachineServiceDaoImpl() {
+        return machineServiceDaoImpl;
+    }
+
+    public void setMachineServiceDaoImpl(IMachineServiceDao machineServiceDaoImpl) {
+        this.machineServiceDaoImpl = machineServiceDaoImpl;
+    }
+
+
+}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java

@@ -0,0 +1,71 @@
+package com.java110.hardwareAdapation.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
+import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.hardwareAdapation.MachineDto;
+import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+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.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 设备内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class MachineInnerServiceSMOImpl extends BaseServiceSMO implements IMachineInnerServiceSMO {
+
+    @Autowired
+    private IMachineServiceDao machineServiceDaoImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Override
+    public List<MachineDto> queryMachines(@RequestBody MachineDto machineDto) {
+
+        //校验是否传了 分页信息
+
+        int page = machineDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            machineDto.setPage((page - 1) * machineDto.getRow());
+        }
+
+        List<MachineDto> machines = BeanConvertUtil.covertBeanList(machineServiceDaoImpl.getMachineInfo(BeanConvertUtil.beanCovertMap(machineDto)), MachineDto.class);
+
+
+        return machines;
+    }
+
+    @Override
+    public int queryMachinesCount(@RequestBody MachineDto machineDto) {
+        return machineServiceDaoImpl.queryMachinesCount(BeanConvertUtil.beanCovertMap(machineDto));
+    }
+
+    public IMachineServiceDao getMachineServiceDaoImpl() {
+        return machineServiceDaoImpl;
+    }
+
+    public void setMachineServiceDaoImpl(IMachineServiceDao machineServiceDaoImpl) {
+        this.machineServiceDaoImpl = machineServiceDaoImpl;
+    }
+
+    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
+        return userInnerServiceSMOImpl;
+    }
+
+    public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
+        this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
+    }
+}

docs/document/services/machine/DeleteMachineInfo.md

@@ -0,0 +1,114 @@
+
+
+**1\. 删除设备**
+###### 接口功能
+> API服务做删除设备时调用该接口
+
+###### URL
+> [http://machine-service/machineApi/service](http://machine-service/machineApi/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|businessMachineInfo|1|Object|-|小区成员|小区成员|
+|businessMachineInfo|machineId|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+
+
+
+###### 举例
+> 地址：[http://machine-service/machineApi/service](http://machine-service/machineApi/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": "200200050001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessMachineInfo": {
+                "machineId":"填写存在的值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文：
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

docs/document/services/machine/SaveMachineInfo.md

@@ -0,0 +1,130 @@
+
+
+**1\. 保存设备**
+###### 接口功能
+> API服务做保存设备时调用该接口
+
+###### URL
+> [http://machine-service/machineApi/service](http://machine-service/machineApi/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|businessMachineInfo|1|Object|-|小区成员|小区成员|
+|businessMachineInfo|machineMac|1|String|30|-|-|
+|businessMachineInfo|machineId|1|String|30|-|-|
+|businessMachineInfo|machineCode|1|String|30|-|-|
+|businessMachineInfo|authCode|1|String|30|-|-|
+|businessMachineInfo|machineVersion|1|String|30|-|-|
+|businessMachineInfo|communityId|1|String|30|-|-|
+|businessMachineInfo|machineName|1|String|30|-|-|
+|businessMachineInfo|machineTypeCd|1|String|30|-|-|
+|businessMachineInfo|machineIp|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+
+
+
+###### 举例
+> 地址：[http://machine-service/machineApi/service](http://machine-service/machineApi/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": "200200030001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessMachineInfo": {
+                "machineMac":"填写具体值",
+        "machineId":"填写具体值",
+        "machineCode":"填写具体值",
+        "authCode":"填写具体值",
+        "machineVersion":"填写具体值",
+        "communityId":"填写具体值",
+        "machineName":"填写具体值",
+        "machineTypeCd":"填写具体值",
+        "machineIp":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文：
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

docs/document/services/machine/UpdateMachineInfo.md

@@ -0,0 +1,130 @@
+
+
+**1\. 修改设备**
+###### 接口功能
+> API服务做修改设备时调用该接口
+
+###### URL
+> [http://machine-service/machineApi/service](http://machine-service/machineApi/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|businessMachineInfo|1|Object|-|小区成员|小区成员|
+|businessMachineInfo|machineMac|1|String|30|-|-|
+|businessMachineInfo|machineId|1|String|30|-|-|
+|businessMachineInfo|machineCode|1|String|30|-|-|
+|businessMachineInfo|authCode|1|String|30|-|-|
+|businessMachineInfo|machineVersion|1|String|30|-|-|
+|businessMachineInfo|communityId|1|String|30|-|-|
+|businessMachineInfo|machineName|1|String|30|-|-|
+|businessMachineInfo|machineTypeCd|1|String|30|-|-|
+|businessMachineInfo|machineIp|1|String|30|-|-|
+
+
+###### 返回协议
+
+当http返回状态不为200 时请求处理失败 body内容为失败的原因
+
+当http返回状态为200时请求处理成功，body内容为返回内容，
+
+
+
+
+
+###### 举例
+> 地址：[http://machine-service/machineApi/service](http://machine-service/machineApi/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": "200200040001",
+    "bId":"1234567892",
+    "remark": "备注",
+    "datas": {
+      "businessMachineInfo": {
+                "machineMac":"填写具体值",
+        "machineId":"填写具体值",
+        "machineCode":"填写具体值",
+        "authCode":"填写具体值",
+        "machineVersion":"填写具体值",
+        "communityId":"填写具体值",
+        "machineName":"填写具体值",
+        "machineTypeCd":"填写具体值",
+        "machineIp":"填写具体值"
+      }
+    },
+    "attrs": [{
+      "specCd": "配置的字段ID",
+      "value": "具体值"
+    }]
+  }
+}
+
+返回报文：
+ {
+	"orderTypeCd": "D",
+	"response": {
+		"code": "0000",
+		"message": "成功"
+	},
+	"responseTime": "20190418102004",
+	"bId": "202019041810750003",
+	"businessType": "B",
+	"transactionId": "3a5a411ec65a4c3f895935638aa1d2bc",
+	"dataFlowId": "44fde86d39ce46f4b4aab5f6b14f3947"
+}
+
+```

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java

@@ -0,0 +1,122 @@
+package com.java110.dto.hardwareAdapation;
+
+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 MachineDto extends PageDto implements Serializable {
+
+    private String machineMac;
+    private String machineId;
+    private String machineCode;
+    private String authCode;
+    private String machineVersion;
+    private String communityId;
+    private String machineName;
+    private String machineTypeCd;
+    private String machineIp;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getMachineMac() {
+        return machineMac;
+    }
+
+    public void setMachineMac(String machineMac) {
+        this.machineMac = machineMac;
+    }
+
+    public String getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(String machineId) {
+        this.machineId = machineId;
+    }
+
+    public String getMachineCode() {
+        return machineCode;
+    }
+
+    public void setMachineCode(String machineCode) {
+        this.machineCode = machineCode;
+    }
+
+    public String getAuthCode() {
+        return authCode;
+    }
+
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
+    }
+
+    public String getMachineVersion() {
+        return machineVersion;
+    }
+
+    public void setMachineVersion(String machineVersion) {
+        this.machineVersion = machineVersion;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
+    public String getMachineTypeCd() {
+        return machineTypeCd;
+    }
+
+    public void setMachineTypeCd(String machineTypeCd) {
+        this.machineTypeCd = machineTypeCd;
+    }
+
+    public String getMachineIp() {
+        return machineIp;
+    }
+
+    public void setMachineIp(String machineIp) {
+        this.machineIp = machineIp;
+    }
+
+
+    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;
+    }
+}

java110-code-generator/src/main/java/com/java110/MachineGeneratorApplication.java

@@ -0,0 +1,85 @@
+package com.java110;
+
+
+import com.java110.code.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Hello world!
+ */
+public class MachineGeneratorApplication {
+
+    protected MachineGeneratorApplication() {
+        // prevents calls from subclass
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * 代码生成器 入口方法
+     *  此处生成的mapper文件包含过程表和实例表的sql,所以要求两张表的特殊字段也要写上
+     *   BusinessTypeCd
+     * @param args 参数
+     */
+    public static void main(String[] args) {
+        Data data = new Data();
+        data.setId("machineId");
+        data.setName("machine");
+        data.setDesc("设备");
+        data.setShareParam("communityId");
+        data.setShareColumn("community_id");
+        data.setNewBusinessTypeCd("BUSINESS_TYPE_SAVE_MACHINE");
+        data.setUpdateBusinessTypeCd("BUSINESS_TYPE_UPDATE_MACHINE");
+        data.setDeleteBusinessTypeCd("BUSINESS_TYPE_DELETE_MACHINE");
+        data.setNewBusinessTypeCdValue("200200030001");
+        data.setUpdateBusinessTypeCdValue("200200040001");
+        data.setDeleteBusinessTypeCdValue("200200050001");
+        data.setBusinessTableName("business_machine");
+        data.setTableName("machine");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("machineId", "machine_id");
+        param.put("machineCode", "machine_code");       //map的key为你自定义的字段名就是驼峰命名法的那个，value为数据库表的字段名
+        param.put("machineVersion", "machine_version");
+        param.put("machineTypeCd", "machine_type_cd");
+        param.put("communityId", "community_id");
+        param.put("machineName", "machine_name");
+        param.put("authCode", "auth_code");
+        param.put("machineIp", "machine_ip");
+        param.put("machineMac", "machine_mac");
+        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);
+    }
+}

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -79,13 +79,13 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_psId = "79";
     public static final String CODE_PREFIX_carId = "80";
     //测试用列
-    public static final String CODE_PREFIX_demoId="90";
-    public static final String CODE_PREFIX_noticeId="96";
+    public static final String CODE_PREFIX_demoId = "90";
+    public static final String CODE_PREFIX_noticeId = "96";
 
-    public static final String CODE_PREFIX_HCJOBId="96";
+    public static final String CODE_PREFIX_HCJOBId = "96";
     //BUSINESSTYPE
-    public static final String CODE_PREFIX_id="99";
-    public static final String CODE_PREFIX_service_id="98";
+    public static final String CODE_PREFIX_id = "99";
+    public static final String CODE_PREFIX_service_id = "98";
 
     public static final String MENU_GROUP = "80";
     public static final String MENU = "70";
@@ -100,8 +100,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_auditUserId = "86";
     public static final String CODE_PREFIX_auditMessageId = "87";
     public static final String CODE_PREFIX_complaintId = "88";
-
-
+    public static final String CODE_PREFIX_machineId = "89";
 
 
     /**

java110-core/src/main/java/com/java110/core/smo/hardwareAdapation/IMachineInnerServiceSMO.java

@@ -0,0 +1,41 @@
+package com.java110.core.smo.hardwareAdapation;
+
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.hardwareAdapation.MachineDto;
+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 IMachineInnerServiceSMO
+ * @Description 设备接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/machineApi")
+public interface IMachineInnerServiceSMO {
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param machineDto 数据对象分享
+     * @return MachineDto 对象数据
+     */
+    @RequestMapping(value = "/queryMachines", method = RequestMethod.POST)
+    List<MachineDto> queryMachines(@RequestBody MachineDto machineDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param machineDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryMachinesCount", method = RequestMethod.POST)
+    int queryMachinesCount(@RequestBody MachineDto machineDto);
+}

java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml

@@ -0,0 +1,231 @@
+<?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="machineServiceDaoImpl">
+
+    <!-- 保存设备信息 add by wuxw 2018-07-03 -->
+       <insert id="saveBusinessMachineInfo" parameterType="Map">
+           insert into business_machine(
+machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_id,b_id,machine_name,machine_type_cd,machine_ip
+) values (
+#{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},#{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp}
+)
+       </insert>
+
+
+       <!-- 查询设备信息（Business） add by wuxw 2018-07-03 -->
+       <select id="getBusinessMachineInfo" parameterType="Map" resultType="Map">
+           select  t.machine_mac,t.machine_mac machineMac,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code machineCode,t.auth_code,t.auth_code authCode,t.operate,t.machine_version,t.machine_version machineVersion,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_ip,t.machine_ip machineIp 
+from business_machine t 
+where 1 =1 
+<if test="machineMac !=null and machineMac != ''">
+   and t.machine_mac= #{machineMac}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="machineCode !=null and machineCode != ''">
+   and t.machine_code= #{machineCode}
+</if> 
+<if test="authCode !=null and authCode != ''">
+   and t.auth_code= #{authCode}
+</if> 
+<if test="operate !=null and operate != ''">
+   and t.operate= #{operate}
+</if> 
+<if test="machineVersion !=null and machineVersion != ''">
+   and t.machine_version= #{machineVersion}
+</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> 
+<if test="machineName !=null and machineName != ''">
+   and t.machine_name= #{machineName}
+</if> 
+<if test="machineTypeCd !=null and machineTypeCd != ''">
+   and t.machine_type_cd= #{machineTypeCd}
+</if> 
+<if test="machineIp !=null and machineIp != ''">
+   and t.machine_ip= #{machineIp}
+</if> 
+
+       </select>
+
+
+
+
+
+    <!-- 保存设备信息至 instance表中 add by wuxw 2018-07-03 -->
+    <insert id="saveMachineInfoInstance" parameterType="Map">
+        insert into machine(
+machine_mac,machine_id,machine_code,auth_code,machine_version,status_cd,community_id,b_id,machine_name,machine_type_cd,machine_ip
+) select t.machine_mac,t.machine_id,t.machine_code,t.auth_code,t.machine_version,'0',t.community_id,t.b_id,t.machine_name,t.machine_type_cd,t.machine_ip from business_machine t where 1=1
+<if test="machineMac !=null and machineMac != ''">
+   and t.machine_mac= #{machineMac}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="machineCode !=null and machineCode != ''">
+   and t.machine_code= #{machineCode}
+</if> 
+<if test="authCode !=null and authCode != ''">
+   and t.auth_code= #{authCode}
+</if> 
+   and t.operate= 'ADD'
+<if test="machineVersion !=null and machineVersion != ''">
+   and t.machine_version= #{machineVersion}
+</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> 
+<if test="machineName !=null and machineName != ''">
+   and t.machine_name= #{machineName}
+</if> 
+<if test="machineTypeCd !=null and machineTypeCd != ''">
+   and t.machine_type_cd= #{machineTypeCd}
+</if> 
+<if test="machineIp !=null and machineIp != ''">
+   and t.machine_ip= #{machineIp}
+</if> 
+
+    </insert>
+
+
+
+    <!-- 查询设备信息 add by wuxw 2018-07-03 -->
+    <select id="getMachineInfo" parameterType="Map" resultType="Map">
+        select  t.machine_mac,t.machine_mac machineMac,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code machineCode,t.auth_code,t.auth_code authCode,t.machine_version,t.machine_version machineVersion,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_ip,t.machine_ip machineIp 
+from machine t 
+where 1 =1 
+<if test="machineMac !=null and machineMac != ''">
+   and t.machine_mac= #{machineMac}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="machineCode !=null and machineCode != ''">
+   and t.machine_code= #{machineCode}
+</if> 
+<if test="authCode !=null and authCode != ''">
+   and t.auth_code= #{authCode}
+</if> 
+<if test="machineVersion !=null and machineVersion != ''">
+   and t.machine_version= #{machineVersion}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</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> 
+<if test="machineName !=null and machineName != ''">
+   and t.machine_name= #{machineName}
+</if> 
+<if test="machineTypeCd !=null and machineTypeCd != ''">
+   and t.machine_type_cd= #{machineTypeCd}
+</if> 
+<if test="machineIp !=null and machineIp != ''">
+   and t.machine_ip= #{machineIp}
+</if> 
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改设备信息 add by wuxw 2018-07-03 -->
+    <update id="updateMachineInfoInstance" parameterType="Map">
+        update  machine t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="machineMac !=null and machineMac != ''">
+, t.machine_mac= #{machineMac}
+</if> 
+<if test="machineCode !=null and machineCode != ''">
+, t.machine_code= #{machineCode}
+</if> 
+<if test="authCode !=null and authCode != ''">
+, t.auth_code= #{authCode}
+</if> 
+<if test="machineVersion !=null and machineVersion != ''">
+, t.machine_version= #{machineVersion}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="machineName !=null and machineName != ''">
+, t.machine_name= #{machineName}
+</if> 
+<if test="machineTypeCd !=null and machineTypeCd != ''">
+, t.machine_type_cd= #{machineTypeCd}
+</if> 
+<if test="machineIp !=null and machineIp != ''">
+, t.machine_ip= #{machineIp}
+</if> 
+ where 1=1 <if test="machineId !=null and machineId != ''">
+and t.machine_id= #{machineId}
+</if> 
+<if test="bId !=null and bId != ''">
+and t.b_id= #{bId}
+</if> 
+
+    </update>
+
+    <!-- 查询设备数量 add by wuxw 2018-07-03 -->
+     <select id="queryMachinesCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from machine t 
+where 1 =1 
+<if test="machineMac !=null and machineMac != ''">
+   and t.machine_mac= #{machineMac}
+</if> 
+<if test="machineId !=null and machineId != ''">
+   and t.machine_id= #{machineId}
+</if> 
+<if test="machineCode !=null and machineCode != ''">
+   and t.machine_code= #{machineCode}
+</if> 
+<if test="authCode !=null and authCode != ''">
+   and t.auth_code= #{authCode}
+</if> 
+<if test="machineVersion !=null and machineVersion != ''">
+   and t.machine_version= #{machineVersion}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</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> 
+<if test="machineName !=null and machineName != ''">
+   and t.machine_name= #{machineName}
+</if> 
+<if test="machineTypeCd !=null and machineTypeCd != ''">
+   and t.machine_type_cd= #{machineTypeCd}
+</if> 
+<if test="machineIp !=null and machineIp != ''">
+   and t.machine_ip= #{machineIp}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-utils/src/main/java/com/java110/utils/constant/BusinessTypeConstant.java

@@ -579,4 +579,19 @@ public class BusinessTypeConstant {
      */
     public static final String BUSINESS_TYPE_DELETE_COMPLAINT ="190200050001";
 
+
+    /**
+     *  保存 设备
+     * 14开头  3保存
+     */
+    public static final String BUSINESS_TYPE_SAVE_MACHINE="200200030001";
+
+    /**
+     * 修改 设备
+     */
+    public static final String BUSINESS_TYPE_UPDATE_MACHINE="200200040001";
+    /**
+     *  删除 设备
+     */
+    public static final String BUSINESS_TYPE_DELETE_MACHINE ="200200050001";
 }