去除硬件服务 设备单独有HC物联网平台去管理

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,12 +1,7 @@
-package com.java110.hardwareAdapation.dao;
+package com.java110.common.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;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IApplicationKeyServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.IApplicationKeyServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.ICarBlackWhiteServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.ICarInoutDetailServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.ICarInoutServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineAttrServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.IMachineAttrServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineRecordServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineServiceDao;
 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;

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

@@ -1,8 +1,8 @@
-package com.java110.hardwareAdapation.dao.impl;
+package com.java110.common.dao.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
 import com.java110.utils.util.DateUtil;
@@ -25,6 +25,7 @@ public class MachineTranslateServiceDaoImpl extends BaseServiceDao implements IM
 
     /**
      * 设备同步信息封装
+     *
      * @param businessMachineTranslateInfo 设备同步信息 封装
      * @throws DAOException DAO异常
      */
@@ -32,17 +33,18 @@ public class MachineTranslateServiceDaoImpl extends BaseServiceDao implements IM
     public void saveBusinessMachineTranslateInfo(Map businessMachineTranslateInfo) throws DAOException {
         businessMachineTranslateInfo.put("month", DateUtil.getCurrentMonth());
         // 查询business_user 数据是否已经存在
-        logger.debug("保存设备同步信息 入参 businessMachineTranslateInfo : {}",businessMachineTranslateInfo);
-        int saveFlag = sqlSessionTemplate.insert("machineTranslateServiceDaoImpl.saveBusinessMachineTranslateInfo",businessMachineTranslateInfo);
+        logger.debug("保存设备同步信息 入参 businessMachineTranslateInfo : {}", businessMachineTranslateInfo);
+        int saveFlag = sqlSessionTemplate.insert("machineTranslateServiceDaoImpl.saveBusinessMachineTranslateInfo", businessMachineTranslateInfo);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存设备同步数据失败："+ JSONObject.toJSONString(businessMachineTranslateInfo));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存设备同步数据失败：" + JSONObject.toJSONString(businessMachineTranslateInfo));
         }
     }
 
 
     /**
      * 查询设备同步信息
+     *
      * @param info bId 信息
      * @return 设备同步信息
      * @throws DAOException DAO异常
@@ -50,43 +52,44 @@ public class MachineTranslateServiceDaoImpl extends BaseServiceDao implements IM
     @Override
     public List<Map> getBusinessMachineTranslateInfo(Map info) throws DAOException {
 
-        logger.debug("查询设备同步信息 入参 info : {}",info);
+        logger.debug("查询设备同步信息 入参 info : {}", info);
 
-        List<Map> businessMachineTranslateInfos = sqlSessionTemplate.selectList("machineTranslateServiceDaoImpl.getBusinessMachineTranslateInfo",info);
+        List<Map> businessMachineTranslateInfos = sqlSessionTemplate.selectList("machineTranslateServiceDaoImpl.getBusinessMachineTranslateInfo", info);
 
         return businessMachineTranslateInfos;
     }
 
 
-
     /**
      * 保存设备同步信息 到 instance
-     * @param info   bId 信息
+     *
+     * @param info bId 信息
      * @throws DAOException DAO异常
      */
     @Override
     public void saveMachineTranslateInfoInstance(Map info) throws DAOException {
-        logger.debug("保存设备同步信息Instance 入参 info : {}",info);
+        logger.debug("保存设备同步信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.insert("machineTranslateServiceDaoImpl.saveMachineTranslateInfoInstance",info);
+        int saveFlag = sqlSessionTemplate.insert("machineTranslateServiceDaoImpl.saveMachineTranslateInfoInstance", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存设备同步信息Instance数据失败："+ JSONObject.toJSONString(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> getMachineTranslateInfo(Map info) throws DAOException {
-        logger.debug("查询设备同步信息 入参 info : {}",info);
+        logger.debug("查询设备同步信息 入参 info : {}", info);
 
-        List<Map> businessMachineTranslateInfos = sqlSessionTemplate.selectList("machineTranslateServiceDaoImpl.getMachineTranslateInfo",info);
+        List<Map> businessMachineTranslateInfos = sqlSessionTemplate.selectList("machineTranslateServiceDaoImpl.getMachineTranslateInfo", info);
 
         return businessMachineTranslateInfos;
     }
@@ -94,28 +97,30 @@ public class MachineTranslateServiceDaoImpl extends BaseServiceDao implements IM
 
     /**
      * 修改设备同步信息
+     *
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
     @Override
     public void updateMachineTranslateInfoInstance(Map info) throws DAOException {
-        logger.debug("修改设备同步信息Instance 入参 info : {}",info);
+        logger.debug("修改设备同步信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslateInfoInstance",info);
+        int saveFlag = sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslateInfoInstance", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改设备同步信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改设备同步信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
-     /**
+    /**
      * 查询设备同步数量
+     *
      * @param info 设备同步信息
      * @return 设备同步数量
      */
     @Override
     public int queryMachineTranslatesCount(Map info) {
-        logger.debug("查询设备同步数据 入参 info : {}",info);
+        logger.debug("查询设备同步数据 入参 info : {}", info);
 
         List<Map> businessMachineTranslateInfos = sqlSessionTemplate.selectList("machineTranslateServiceDaoImpl.queryMachineTranslatesCount", info);
         if (businessMachineTranslateInfos.size() < 1) {
@@ -127,23 +132,23 @@ public class MachineTranslateServiceDaoImpl extends BaseServiceDao implements IM
 
     @Override
     public int updateMachineTranslateState(Map info) {
-        logger.debug("updateMachineTranslateState 入参 info : {}",info);
+        logger.debug("updateMachineTranslateState 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslateState",info);
+        int saveFlag = sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslateState", info);
 
         return saveFlag;
     }
 
     @Override
     public void saveMachineTranslate(Map info) throws DAOException {
-        logger.debug("saveMachineTranslate 入参 info : {}",info);
-         sqlSessionTemplate.update("machineTranslateServiceDaoImpl.saveMachineTranslate",info);
+        logger.debug("saveMachineTranslate 入参 info : {}", info);
+        sqlSessionTemplate.update("machineTranslateServiceDaoImpl.saveMachineTranslate", info);
     }
 
     @Override
     public void updateMachineTranslate(Map info) throws DAOException {
-        logger.debug("updateMachineTranslate 入参 info : {}",info);
-        sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslate",info);
+        logger.debug("updateMachineTranslate 入参 info : {}", info);
+        sqlSessionTemplate.update("machineTranslateServiceDaoImpl.updateMachineTranslate", info);
     }
 
 

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/applicationKey/AbstractApplicationKeyBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.applicationKey;
+package com.java110.common.listener.applicationKey;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IApplicationKeyServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.IApplicationKeyServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
@@ -94,12 +94,11 @@ public abstract class AbstractApplicationKeyBusinessServiceDataFlowListener exte
         currentApplicationKeyInfo.put("pwd", currentApplicationKeyInfo.get("pwd"));
 
 
-
         currentApplicationKeyInfo.put("operate", StatusConstant.OPERATE_DEL);
         getApplicationKeyServiceDaoImpl().saveBusinessApplicationKeyInfo(currentApplicationKeyInfo);
 
-        for(Object key : currentApplicationKeyInfo.keySet()) {
-            if(businessApplicationKey.get(key) == null) {
+        for (Object key : currentApplicationKeyInfo.keySet()) {
+            if (businessApplicationKey.get(key) == null) {
                 businessApplicationKey.put(key.toString(), currentApplicationKeyInfo.get(key));
             }
         }

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/applicationKey/DeleteApplicationKeyInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.applicationKey;
+package com.java110.common.listener.applicationKey;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IApplicationKeyServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IApplicationKeyServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/applicationKey/SaveApplicationKeyInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.applicationKey;
+package com.java110.common.listener.applicationKey;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IApplicationKeyServiceDao;
 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.IApplicationKeyServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/applicationKey/UpdateApplicationKeyInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.applicationKey;
+package com.java110.common.listener.applicationKey;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IApplicationKeyServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IApplicationKeyServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carBlackWhite/AbstractCarBlackWhiteBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.carBlackWhite;
+package com.java110.common.listener.carBlackWhite;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.ICarBlackWhiteServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
@@ -80,8 +80,8 @@ public abstract class AbstractCarBlackWhiteBusinessServiceDataFlowListener exten
         currentCarBlackWhiteInfo.put("operate", StatusConstant.OPERATE_DEL);
         getCarBlackWhiteServiceDaoImpl().saveBusinessCarBlackWhiteInfo(currentCarBlackWhiteInfo);
 
-        for(Object key : currentCarBlackWhiteInfo.keySet()) {
-            if(businessCarBlackWhite.get(key) == null) {
+        for (Object key : currentCarBlackWhiteInfo.keySet()) {
+            if (businessCarBlackWhite.get(key) == null) {
                 businessCarBlackWhite.put(key.toString(), currentCarBlackWhiteInfo.get(key));
             }
         }

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carBlackWhite/DeleteCarBlackWhiteInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carBlackWhite;
+package com.java110.common.listener.carBlackWhite;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarBlackWhiteServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carBlackWhite/SaveCarBlackWhiteInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.carBlackWhite;
+package com.java110.common.listener.carBlackWhite;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 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.ICarBlackWhiteServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carBlackWhite/UpdateCarBlackWhiteInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carBlackWhite;
+package com.java110.common.listener.carBlackWhite;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarBlackWhiteServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInout/AbstractCarInoutBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.carInout;
+package com.java110.common.listener.carInout;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.ICarInoutServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInout/DeleteCarInoutInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carInout;
+package com.java110.common.listener.carInout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarInoutServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInout/SaveCarInoutInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.carInout;
+package com.java110.common.listener.carInout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutServiceDao;
 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.ICarInoutServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInout/UpdateCarInoutInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carInout;
+package com.java110.common.listener.carInout;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarInoutServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInoutDetail/AbstractCarInoutDetailBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.carInoutDetail;
+package com.java110.common.listener.carInoutDetail;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.ICarInoutDetailServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInoutDetail/DeleteCarInoutDetailInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carInoutDetail;
+package com.java110.common.listener.carInoutDetail;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarInoutDetailServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInoutDetail/SaveCarInoutDetailInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.carInoutDetail;
+package com.java110.common.listener.carInoutDetail;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 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.ICarInoutDetailServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/carInoutDetail/UpdateCarInoutDetailInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.carInoutDetail;
+package com.java110.common.listener.carInoutDetail;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.ICarInoutDetailServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

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

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.machine;
+package com.java110.common.listener.machine;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineServiceDao;
 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;

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

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machine;
+package com.java110.common.listener.machine;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineServiceDao;
 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;

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.machine;
+package com.java110.common.listener.machine;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineServiceDao;
 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;

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

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machine;
+package com.java110.common.listener.machine;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineServiceDao;
 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;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineAttr/AbstractMachineAttrBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.machineAttr;
+package com.java110.common.listener.machineAttr;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineAttrServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.IMachineAttrServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineAttr/DeleteMachineAttrInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineAttr;
+package com.java110.common.listener.machineAttr;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineAttrServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineAttrServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineAttr/SaveMachineAttrInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.machineAttr;
+package com.java110.common.listener.machineAttr;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineAttrServiceDao;
 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.IMachineAttrServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Java110Listener("saveMachineAttrInfoListener")
 @Transactional
-public class SaveMachineAttrInfoListener extends AbstractMachineAttrBusinessServiceDataFlowListener{
+public class SaveMachineAttrInfoListener extends AbstractMachineAttrBusinessServiceDataFlowListener {
 
     private static Logger logger = LoggerFactory.getLogger(SaveMachineAttrInfoListener.class);
 
@@ -44,29 +44,30 @@ public class SaveMachineAttrInfoListener extends AbstractMachineAttrBusinessServ
 
     /**
      * 保存设备属性信息 business 表中
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
         JSONObject data = business.getDatas();
-        Assert.notEmpty(data,"没有datas 节点，或没有子节点需要处理");
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
 
         //处理 businessMachineAttr 节点
-        if(data.containsKey("businessMachineAttr")){
+        if (data.containsKey("businessMachineAttr")) {
             Object bObj = data.get("businessMachineAttr");
             JSONArray businessMachineAttrs = null;
-            if(bObj instanceof JSONObject){
+            if (bObj instanceof JSONObject) {
                 businessMachineAttrs = new JSONArray();
                 businessMachineAttrs.add(bObj);
-            }else {
-                businessMachineAttrs = (JSONArray)bObj;
+            } else {
+                businessMachineAttrs = (JSONArray) bObj;
             }
             //JSONObject businessMachineAttr = data.getJSONObject("businessMachineAttr");
-            for (int bMachineAttrIndex = 0; bMachineAttrIndex < businessMachineAttrs.size();bMachineAttrIndex++) {
+            for (int bMachineAttrIndex = 0; bMachineAttrIndex < businessMachineAttrs.size(); bMachineAttrIndex++) {
                 JSONObject businessMachineAttr = businessMachineAttrs.getJSONObject(bMachineAttrIndex);
                 doBusinessMachineAttr(business, businessMachineAttr);
-                if(bObj instanceof JSONObject) {
+                if (bObj instanceof JSONObject) {
                     dataFlowContext.addParamOut("attrId", businessMachineAttr.getString("attrId"));
                 }
             }
@@ -75,23 +76,24 @@ public class SaveMachineAttrInfoListener extends AbstractMachineAttrBusinessServ
 
     /**
      * business 数据转移到 instance
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @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);
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_ADD);
 
         //设备属性信息
         List<Map> businessMachineAttrInfo = machineAttrServiceDaoImpl.getBusinessMachineAttrInfo(info);
-        if( businessMachineAttrInfo != null && businessMachineAttrInfo.size() >0) {
+        if (businessMachineAttrInfo != null && businessMachineAttrInfo.size() > 0) {
             reFreshShareColumn(info, businessMachineAttrInfo.get(0));
             machineAttrServiceDaoImpl.saveMachineAttrInfoInstance(info);
-            if(businessMachineAttrInfo.size() == 1) {
+            if (businessMachineAttrInfo.size() == 1) {
                 dataFlowContext.addParamOut("attrId", businessMachineAttrInfo.get(0).get("attr_id"));
             }
         }
@@ -116,49 +118,51 @@ public class SaveMachineAttrInfoListener extends AbstractMachineAttrBusinessServ
 
         info.put("communityId", businessInfo.get("community_id"));
     }
+
     /**
      * 撤单
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @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);
+        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);
+        paramIn.put("bId", bId);
+        paramIn.put("statusCd", StatusConstant.STATUS_CD_INVALID);
         //设备属性信息
         List<Map> machineAttrInfo = machineAttrServiceDaoImpl.getMachineAttrInfo(info);
-        if(machineAttrInfo != null && machineAttrInfo.size() > 0){
+        if (machineAttrInfo != null && machineAttrInfo.size() > 0) {
             reFreshShareColumn(paramIn, machineAttrInfo.get(0));
             machineAttrServiceDaoImpl.updateMachineAttrInfoInstance(paramIn);
         }
     }
 
 
-
     /**
      * 处理 businessMachineAttr 节点
-     * @param business 总的数据节点
+     *
+     * @param business            总的数据节点
      * @param businessMachineAttr 设备属性节点
      */
-    private void doBusinessMachineAttr(Business business,JSONObject businessMachineAttr){
+    private void doBusinessMachineAttr(Business business, JSONObject businessMachineAttr) {
 
-        Assert.jsonObjectHaveKey(businessMachineAttr,"attrId","businessMachineAttr 节点下没有包含 attrId 节点");
+        Assert.jsonObjectHaveKey(businessMachineAttr, "attrId", "businessMachineAttr 节点下没有包含 attrId 节点");
 
-        if(businessMachineAttr.getString("attrId").startsWith("-")){
+        if (businessMachineAttr.getString("attrId").startsWith("-")) {
             //刷新缓存
             //flushMachineAttrId(business.getDatas());
 
-            businessMachineAttr.put("attrId",GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            businessMachineAttr.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
 
         }
 
-        businessMachineAttr.put("bId",business.getbId());
+        businessMachineAttr.put("bId", business.getbId());
         businessMachineAttr.put("operate", StatusConstant.OPERATE_ADD);
         //保存设备属性信息
         machineAttrServiceDaoImpl.saveBusinessMachineAttrInfo(businessMachineAttr);

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineAttr/UpdateMachineAttrInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineAttr;
+package com.java110.common.listener.machineAttr;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineAttrServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineAttrServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineRecord/AbstractMachineRecordBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.machineRecord;
+package com.java110.common.listener.machineRecord;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineRecordServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;
@@ -90,8 +90,8 @@ public abstract class AbstractMachineRecordBusinessServiceDataFlowListener exten
         currentMachineRecordInfo.put("operate", StatusConstant.OPERATE_DEL);
         getMachineRecordServiceDaoImpl().saveBusinessMachineRecordInfo(currentMachineRecordInfo);
 
-        for(Object key : currentMachineRecordInfo.keySet()) {
-            if(businessMachineRecord.get(key) == null) {
+        for (Object key : currentMachineRecordInfo.keySet()) {
+            if (businessMachineRecord.get(key) == null) {
                 businessMachineRecord.put(key.toString(), currentMachineRecordInfo.get(key));
             }
         }

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineRecord/DeleteMachineRecordInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineRecord;
+package com.java110.common.listener.machineRecord;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineRecordServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineRecord/SaveMachineRecordInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.machineRecord;
+package com.java110.common.listener.machineRecord;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineRecordServiceDao;
 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.IMachineRecordServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineRecord/UpdateMachineRecordInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineRecord;
+package com.java110.common.listener.machineRecord;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineRecordServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineTranslate/AbstractMachineTranslateBusinessServiceDataFlowListener.java

@@ -1,9 +1,9 @@
-package com.java110.hardwareAdapation.listener.machineTranslate;
+package com.java110.common.listener.machineTranslate;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.entity.center.Business;
 import com.java110.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.exception.ListenerExecuteException;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineTranslate/DeleteMachineTranslateInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineTranslate;
+package com.java110.common.listener.machineTranslate;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineTranslate/SaveMachineTranslateInfoListener.java

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.listener.machineTranslate;
+package com.java110.common.listener.machineTranslate;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 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.IMachineTranslateServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/listener/machineTranslate/UpdateMachineTranslateInfoListener.java

@@ -1,11 +1,11 @@
-package com.java110.hardwareAdapation.listener.machineTranslate;
+package com.java110.common.listener.machineTranslate;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.entity.center.Business;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.StatusConstant;

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.IApplicationKeyServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
-import com.java110.hardwareAdapation.dao.IApplicationKeyServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,19 +1,17 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.ICarBlackWhiteInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.CarBlackWhiteDto;
-import com.java110.dto.user.UserDto;
-import com.java110.hardwareAdapation.dao.ICarBlackWhiteServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.ICarInoutDetailServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.ICarInoutDetailInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.CarInoutDetailDto;
-import com.java110.hardwareAdapation.dao.ICarInoutDetailServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.ICarInoutServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.ICarInoutInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.CarInoutDto;
-import com.java110.hardwareAdapation.dao.ICarInoutServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.IMachineAttrServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IMachineAttrInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.MachineAttrDto;
-import com.java110.hardwareAdapation.dao.IMachineAttrServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,14 +1,14 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.IMachineServiceDao;
 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.user.UserDto;
 import com.java110.dto.demo.DemoDto;
 import com.java110.dto.hardwareAdapation.MachineDto;
-import com.java110.hardwareAdapation.dao.IMachineServiceDao;
+import com.java110.dto.user.UserDto;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.IMachineRecordServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IMachineRecordInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.MachineRecordDto;
-import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -49,7 +49,6 @@ public class MachineRecordInnerServiceSMOImpl extends BaseServiceSMO implements
     }
 
 
-
     @Override
     public int queryMachineRecordsCount(@RequestBody MachineRecordDto machineRecordDto) {
         return machineRecordServiceDaoImpl.queryMachineRecordsCount(BeanConvertUtil.beanCovertMap(machineRecordDto));

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

@@ -1,12 +1,12 @@
-package com.java110.hardwareAdapation.smo.impl;
+package com.java110.common.smo.impl;
 
 
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.hardwareAdapation.MachineTranslateDto;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateApplicationKeyToMachine.java

@@ -1,6 +1,7 @@
-package com.java110.hardwareAdapation.thread;
+package com.java110.common.thread;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
@@ -9,7 +10,6 @@ import com.java110.core.smo.room.IRoomInnerServiceSMO;
 import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
 import com.java110.dto.hardwareAdapation.MachineDto;
 import com.java110.dto.order.OrderDto;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
@@ -127,7 +127,7 @@ public class TranslateApplicationKeyToMachine implements Runnable {
         List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
 
         for (MachineDto tmpMachineDto : machineDtos) {
-            if("9996".equals(tmpMachineDto.getMachineTypeCd())){
+            if ("9996".equals(tmpMachineDto.getMachineTypeCd())) {
                 continue;
             }
             if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java

@@ -1,18 +1,18 @@
-package com.java110.hardwareAdapation.thread;
+package com.java110.common.thread;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
 import com.java110.core.smo.order.IOrderInnerServiceSMO;
 import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
 import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
 import com.java110.core.smo.room.IRoomInnerServiceSMO;
-import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.dto.RoomDto;
 import com.java110.dto.hardwareAdapation.MachineDto;
 import com.java110.dto.order.OrderDto;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;
@@ -22,7 +22,11 @@ import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 从订单中同步业主信息至设备中间表
@@ -93,18 +97,18 @@ public class TranslateOwnerToMachine implements Runnable {
                 List<OwnerDto> ownerDtos = null;
                 //根据bId 查询业主信息
                 //这种情况说明 业主已经删掉了 需要查询状态为 1 的数据
-                if(BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())){
+                if (BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
                     ownerDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
-                    ownerDtos =  ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+                    ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
                     MachineDto machineDto = new MachineDto();
                     machineDto.setMachineId("");
-                    deleteMachineTranslate(machineDto,ownerDtos.get(0));
+                    deleteMachineTranslate(machineDto, ownerDtos.get(0));
                     orderInnerServiceSMOImpl.updateBusinessStatusCd(tmpOrderDto);
                     logger.debug("没有数据数据直接刷为C1,当前为删除业主操作" + JSONObject.toJSONString(tmpOrderDto));
                     continue;
                 }
 
-                ownerDtos =  ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+                ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 
                 // 房屋信息
                 if (ownerDtos == null || ownerDtos.size() == 0) {
@@ -154,7 +158,7 @@ public class TranslateOwnerToMachine implements Runnable {
         for (OwnerDto ownerDto : ownerDtos) {
 
             for (MachineDto tmpMachineDto : machineDtos) {
-                if("9996".equals(tmpMachineDto.getMachineTypeCd())){
+                if ("9996".equals(tmpMachineDto.getMachineTypeCd())) {
                     continue;
                 }
                 if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java

@@ -1,16 +1,16 @@
-package com.java110.hardwareAdapation.thread;
+package com.java110.common.thread;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.common.dao.IMachineTranslateServiceDao;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
 import com.java110.core.smo.order.IOrderInnerServiceSMO;
 import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
 import com.java110.core.smo.room.IRoomInnerServiceSMO;
-import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.RoomDto;
 import com.java110.dto.hardwareAdapation.MachineDto;
 import com.java110.dto.order.OrderDto;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.StatusConstant;

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineFactory.java

@@ -1,4 +1,4 @@
-package com.java110.hardwareAdapation.thread;
+package com.java110.common.thread;
 
 public class TranslateOwnerToMachineFactory {
 

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/UpdateApplicationKeyPwd.java

@@ -1,30 +1,27 @@
-package com.java110.hardwareAdapation.thread;
+package com.java110.common.thread;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
-import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
-import com.java110.core.smo.order.IOrderInnerServiceSMO;
-import com.java110.core.smo.room.IRoomInnerServiceSMO;
 import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
-import com.java110.dto.hardwareAdapation.MachineDto;
-import com.java110.dto.order.OrderDto;
-import com.java110.hardwareAdapation.dao.IMachineTranslateServiceDao;
-import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 
 /**
  * 从订单中同步业主信息至设备中间表

HardwareAdapationService/docker/Dockerfile

@@ -1,10 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
-MAINTAINER wuxw <928255095@qq.com>
-
-
-ADD bin/start_hardwareAdapation.sh /root/
-
-
-RUN chmod u+x /root/start_hardwareAdapation.sh
-
-CMD ["/root/start_hardwareAdapation.sh","dev"]

HardwareAdapationService/docker/bin/start_hardwareAdapation.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-#### debug model prod
-#nohup java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -jar -Dspring.profiles.active=dev target/HardwareAdapationService.jar > hardwareAdapation.log 2>&1 &
-
-#### normal prod model
-#nohup java -jar -Dspring.profiles.active=prod target/HardwareAdapationService.jar > hardwareAdapation.log 2>&1 &
-
-#### normal test model
-#nohup java -jar -Dspring.profiles.active=test target/HardwareAdapationService.jar > hardwareAdapation.log 2>&1 &
-
-#### normal dev model
-nohup java -jar -Dspring.profiles.active=$1 target/HardwareAdapationService.jar > hardwareAdapation.log 2>&1 &
-
-tail -100f hardwareAdapation.log

HardwareAdapationService/docker/docker-compose.yml

@@ -1,25 +0,0 @@
-version: '2'
-services:
-   hardwareadapationserivce:
-       container_name: hardwareadapationserivce-1
-       build:
-          context: .
-          dockerfile: Dockerfile
-       restart: always
-       ports:
-       - "8011:8011"
-       volumes:
-       - ../target/HardwareAdapationService.jar:/root/target/HardwareAdapationService.jar
-       networks:
-       - java110-net
-#       mem_limit: 1024m
-#       extra_hosts:
-#       - "dev.java110.com:192.168.1.18"
-#       - "dev.db.java110.com:192.168.1.18"
-#       - "dev.zk.java110.com:192.168.1.18"
-#       - "dev.kafka.java110.com:192.168.1.18"
-#       - "dev.redis.java110.com:192.168.1.18"
-#       - "api.java110.com:92.168.1.18"
-networks:
-  java110-net:
-    external: true

HardwareAdapationService/docker/onStart.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cp -r ../bin .
-
-cp  -r ../target .
-
-docker build -t java110/hardwareAdapation .
-
-docker run -ti --name hardwareAdapation_test -p8010:8010 -idt java110/hardwareAdapation:latest
-
-docker logs -f hardwareAdapation_test

HardwareAdapationService/pom.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>MicroCommunity</artifactId>
-    <groupId>com.java110</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>HardwareAdapationService</artifactId>
-  <packaging>jar</packaging>
-
-  <name>HardwareAdapationService</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>com.java110</groupId>
-      <artifactId>java110-service</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.java110</groupId>
-      <artifactId>java110-event</artifactId>
-    </dependency>
-
-  </dependencies>
-
-
-  <build>
-    <finalName>HardwareAdapationService</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>com.java110</groupId>
-                  <artifactId>java110-config</artifactId>
-                  <version>${microcommunity.version}</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <mainClass>com.java110.hardwareAdapation.HardwareAdapationServiceApplicationStart</mainClass>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/HardwareAdapationServiceApplicationStart.java

@@ -1,72 +0,0 @@
-package com.java110.hardwareAdapation;
-
-import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.event.service.BusinessServiceDataFlowEventPublishing;
-import com.java110.hardwareAdapation.thread.TranslateOwnerToMachineFactory;
-import com.java110.service.init.ServiceStartInit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-
-import java.nio.charset.Charset;
-
-
-/**
- * spring boot 初始化启动类
- *
- * @version v0.1
- * @auther com.java110.wuxw
- * @mail 928255095@qq.com
- * @date 2016年8月6日
- * @tag
- */
-@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.hardwareAdapation",
-        "com.java110.core", "com.java110.cache", "com.java110.config.properties.code", "com.java110.db"})
-@EnableDiscoveryClient
-@Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
-        basePackages = {"com.java110.hardwareAdapation.listener"})
-@EnableFeignClients(basePackages = {
-        "com.java110.core.smo.user",
-        "com.java110.core.smo.order",
-        "com.java110.core.smo.owner",
-        "com.java110.core.smo.room"
-})
-public class HardwareAdapationServiceApplicationStart {
-
-    private static Logger logger = LoggerFactory.getLogger(HardwareAdapationServiceApplicationStart.class);
-
-
-    /**
-     * 实例化RestTemplate，通过@LoadBalanced注解开启均衡负载能力.
-     *
-     * @return restTemplate
-     */
-    @Bean
-    @LoadBalanced
-    public RestTemplate restTemplate() {
-        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
-        return restTemplate;
-    }
-
-    public static void main(String[] args) throws Exception {
-        try {
-            ApplicationContext context = SpringApplication.run(HardwareAdapationServiceApplicationStart.class, args);
-            ServiceStartInit.initSystemConfig(context);
-
-            //启动线程
-            TranslateOwnerToMachineFactory.startOwnerToMachine();
-        } catch (Throwable e) {
-            logger.error("系统启动失败", e);
-        }
-    }
-}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/api/HardwareAdapationApi.java

@@ -1,104 +0,0 @@
-package com.java110.hardwareAdapation.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.InitConfigDataException;
-import com.java110.utils.exception.InitDataFlowContextException;
-import com.java110.core.base.controller.BaseController;
-import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.factory.DataTransactionFactory;
-import com.java110.hardwareAdapation.smo.IHardwareAdapationServiceSMO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 用户服务类
- * Created by wuxw on 2018/5/14.
- */
-@RestController
-public class HardwareAdapationApi extends BaseController {
-    private final static Logger logger = LoggerFactory.getLogger(HardwareAdapationApi.class);
-
-    @Autowired
-    IHardwareAdapationServiceSMO hardwareAdapationServiceSMOImpl;
-
-    @RequestMapping(path = "/hardwareAdapationApi/service",method= RequestMethod.GET)
-    public String serviceGet(HttpServletRequest request) {
-        return DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
-    }
-
-    /**
-     * 用户服务统一处理接口
-     * @param orderInfo
-     * @param request
-     * @return
-     */
-    @RequestMapping(path = "/hardwareAdapationApi/service",method= RequestMethod.POST)
-    public String servicePost(@RequestBody String orderInfo, HttpServletRequest request) {
-        BusinessServiceDataFlow businessServiceDataFlow = null;
-        JSONObject responseJson = null;
-        try {
-            Map<String, String> headers = new HashMap<String, String>();
-            getRequestInfo(request, headers);
-            //预校验
-            preValiateOrderInfo(orderInfo);
-            businessServiceDataFlow = this.writeDataToDataFlowContext(orderInfo, headers);
-            responseJson = hardwareAdapationServiceSMOImpl.service(businessServiceDataFlow);
-        }catch (InitDataFlowContextException e){
-            logger.error("请求报文错误,初始化 BusinessServiceDataFlow失败"+orderInfo,e);
-            responseJson = DataTransactionFactory.createNoBusinessTypeBusinessResponseJson(orderInfo,ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
-        }catch (InitConfigDataException e){
-            logger.error("请求报文错误,加载配置信息失败"+orderInfo,e);
-            responseJson = DataTransactionFactory.createNoBusinessTypeBusinessResponseJson(orderInfo,ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
-        }catch (Exception e){
-            logger.error("请求订单异常",e);
-            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow,ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e,
-                    null);
-        }finally {
-            return responseJson.toJSONString();
-        }
-    }
-
-    /**
-     * 这里预校验，请求报文中不能有 dataFlowId
-     * @param orderInfo
-     */
-    private void preValiateOrderInfo(String orderInfo) {
-       /* if(JSONObject.parseObject(orderInfo).getJSONObject("orders").containsKey("dataFlowId")){
-            throw new BusinessException(ResponseConstant.RESULT_CODE_ERROR,"报文中不能存在dataFlowId节点");
-        }*/
-    }
-
-    /**
-     * 获取请求信息
-     * @param request
-     * @param headers
-     * @throws RuntimeException
-     */
-    private void getRequestInfo(HttpServletRequest request,Map headers) throws Exception{
-        try{
-            super.initHeadParam(request,headers);
-            super.initUrlParam(request,headers);
-        }catch (Exception e){
-            logger.error("加载头信息失败",e);
-            throw new InitConfigDataException(ResponseConstant.RESULT_PARAM_ERROR,"加载头信息失败");
-        }
-    }
-
-    public IHardwareAdapationServiceSMO getHardwareAdapationServiceSMOImpl() {
-        return hardwareAdapationServiceSMOImpl;
-    }
-
-    public void setHardwareAdapationServiceSMOImpl(IHardwareAdapationServiceSMO hardwareAdapationServiceSMOImpl) {
-        this.hardwareAdapationServiceSMOImpl = hardwareAdapationServiceSMOImpl;
-    }
-}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/kafka/HardwareAdapationServiceBean.java

@@ -1,16 +0,0 @@
-package com.java110.hardwareAdapation.kafka;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by wuxw on 2018/4/15.
- */
-@Configuration
-public class HardwareAdapationServiceBean {
-    @Bean
-    public HardwareAdapationServiceKafka listener() {
-        return new HardwareAdapationServiceKafka();
-    }
-
-}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/kafka/HardwareAdapationServiceKafka.java

@@ -1,92 +0,0 @@
-package com.java110.hardwareAdapation.kafka;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.KafkaConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.exception.InitConfigDataException;
-import com.java110.utils.exception.InitDataFlowContextException;
-import com.java110.utils.kafka.KafkaFactory;
-import com.java110.core.base.controller.BaseController;
-import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.factory.DataTransactionFactory;
-import com.java110.hardwareAdapation.smo.IHardwareAdapationServiceSMO;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.annotation.KafkaListener;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * kafka侦听
- * Created by wuxw on 2018/4/15.
- */
-public class HardwareAdapationServiceKafka extends BaseController {
-
-    private final static Logger logger = LoggerFactory.getLogger(HardwareAdapationServiceKafka.class);
-
-
-    @Autowired
-    private IHardwareAdapationServiceSMO hardwareAdapationServiceSMOImpl;
-
-    @KafkaListener(topics = {"hardwareAdapationServiceTopic"})
-    public void listen(ConsumerRecord<?, ?> record) {
-        logger.info("kafka的key: " + record.key());
-        logger.info("kafka的value: " + record.value().toString());
-        String orderInfo = record.value().toString();
-        BusinessServiceDataFlow businessServiceDataFlow = null;
-        JSONObject responseJson = null;
-        try {
-            Map<String, String> headers = new HashMap<String, String>();
-            //预校验
-            preValiateOrderInfo(orderInfo);
-            businessServiceDataFlow = this.writeDataToDataFlowContext(orderInfo, headers);
-            responseJson = hardwareAdapationServiceSMOImpl.service(businessServiceDataFlow);
-        }catch (InitDataFlowContextException e){
-            logger.error("请求报文错误,初始化 BusinessServiceDataFlow失败"+orderInfo,e);
-            responseJson = DataTransactionFactory.createNoBusinessTypeBusinessResponseJson(orderInfo,ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
-        }catch (InitConfigDataException e){
-            logger.error("请求报文错误,加载配置信息失败"+orderInfo,e);
-            responseJson = DataTransactionFactory.createNoBusinessTypeBusinessResponseJson(orderInfo,ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
-        }catch (Exception e){
-            logger.error("请求订单异常",e);
-            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow,ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e,
-                    null);
-        }finally {
-            logger.debug("当前请求报文：" + orderInfo +", 当前返回报文：" +responseJson.toJSONString());
-            //只有business 和 instance 过程才做通知消息
-            if(!StatusConstant.REQUEST_BUSINESS_TYPE_BUSINESS.equals(responseJson.getString("businessType"))
-                    && !StatusConstant.REQUEST_BUSINESS_TYPE_INSTANCE.equals(responseJson.getString("businessType"))){
-                return ;
-            }
-            try {
-                KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_NOTIFY_CENTER_SERVICE_NAME, "", responseJson.toJSONString());
-            }catch (Exception e){
-                logger.error("用户服务通知centerService失败"+responseJson,e);
-                //这里保存异常信息
-            }
-        }
-    }
-
-
-    /**
-     * 这里预校验，请求报文中不能有 dataFlowId
-     * @param orderInfo
-     */
-    private void preValiateOrderInfo(String orderInfo) {
-       /* if(JSONObject.parseObject(orderInfo).getJSONObject("orders").containsKey("dataFlowId")){
-            throw new BusinessException(ResponseConstant.RESULT_CODE_ERROR,"报文中不能存在dataFlowId节点");
-        }*/
-    }
-
-    public IHardwareAdapationServiceSMO getHardwareAdapationServiceSMOImpl() {
-        return hardwareAdapationServiceSMOImpl;
-    }
-
-    public void setHardwareAdapationServiceSMOImpl(IHardwareAdapationServiceSMO hardwareAdapationServiceSMOImpl) {
-        this.hardwareAdapationServiceSMOImpl = hardwareAdapationServiceSMOImpl;
-    }
-}

HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/IHardwareAdapationServiceSMO.java

@@ -1,17 +0,0 @@
-package com.java110.hardwareAdapation.smo;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.exception.SMOException;
-import com.java110.core.context.BusinessServiceDataFlow;
-
-/**
- *
- * 用户信息管理，服务
- * Created by wuxw on 2017/4/5.
- */
-public interface IHardwareAdapationServiceSMO {
-
-
-    public JSONObject service(BusinessServiceDataFlow businessServiceDataFlow) throws SMOException;
-
-}

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

@@ -1,112 +0,0 @@
-package com.java110.hardwareAdapation.smo.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.KafkaConstant;
-import com.java110.utils.constant.MappingConstant;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.SMOException;
-import com.java110.utils.kafka.KafkaFactory;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
-import com.java110.hardwareAdapation.smo.IHardwareAdapationServiceSMO;
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.context.BusinessServiceDataFlow;
-import com.java110.core.factory.DataFlowFactory;
-import com.java110.entity.center.DataFlowLinksCost;
-import com.java110.entity.center.DataFlowLog;
-import com.java110.event.service.BusinessServiceDataFlowEventPublishing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户服务信息管理业务信息实现
- * Created by wuxw on 2017/4/5.
- */
-@Service("hardwareAdapationServiceSMOImpl")
-@Transactional
-public class HardwareAdapationServiceSMOImpl extends BaseServiceSMO implements IHardwareAdapationServiceSMO {
-
-    private static Logger logger = LoggerFactory.getLogger(HardwareAdapationServiceSMOImpl.class);
-
-    @Override
-    public JSONObject service(BusinessServiceDataFlow businessServiceDataFlow) throws SMOException {
-        try {
-            Assert.hasLength(businessServiceDataFlow.getbId(), "bId 不能为空");
-
-            BusinessServiceDataFlowEventPublishing.multicastEvent(businessServiceDataFlow);
-            Assert.notEmpty(businessServiceDataFlow.getResJson(), "用户服务[" + businessServiceDataFlow.getCurrentBusiness().getServiceCode() + "]没有返回内容");
-        } catch (Exception e) {
-            logger.error("用户信息处理异常", e);
-            throw new SMOException(ResponseConstant.RESULT_PARAM_ERROR, "用户信息处理异常" + e.getMessage());
-        } finally {
-            if (businessServiceDataFlow == null) {
-                return null;
-            }
-
-            //这里记录日志
-            Date endDate = DateUtil.getCurrentDate();
-
-            businessServiceDataFlow.setEndDate(endDate);
-            //添加耗时
-            DataFlowFactory.addCostTime(businessServiceDataFlow, "service", "业务处理总耗时",
-                    businessServiceDataFlow.getStartDate(), businessServiceDataFlow.getEndDate());
-            //保存耗时
-            saveCostTimeLogMessage(businessServiceDataFlow);
-            //保存日志
-            saveLogMessage(businessServiceDataFlow);
-        }
-        return businessServiceDataFlow.getResJson();
-    }
-
-    /**
-     * 保存日志信息
-     *
-     * @param businessServiceDataFlow
-     */
-    private void saveLogMessage(BusinessServiceDataFlow businessServiceDataFlow) {
-
-        try {
-            if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_LOG_ON_OFF))) {
-                for (DataFlowLog dataFlowLog : businessServiceDataFlow.getLogDatas()) {
-                    KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_LOG_NAME, "", JSONObject.toJSONString(dataFlowLog));
-                }
-            }
-        } catch (Exception e) {
-            logger.error("报错日志出错了，", e);
-        }
-    }
-
-    /**
-     * 保存耗时信息
-     *
-     * @param businessServiceDataFlow
-     */
-    private void saveCostTimeLogMessage(BusinessServiceDataFlow businessServiceDataFlow) {
-        try {
-            if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_COST_TIME_ON_OFF))) {
-                List<DataFlowLinksCost> dataFlowLinksCosts = businessServiceDataFlow.getLinksCostDates();
-                JSONObject costDate = new JSONObject();
-                JSONArray costDates = new JSONArray();
-                JSONObject newObj = null;
-                for (DataFlowLinksCost dataFlowLinksCost : dataFlowLinksCosts) {
-                    newObj = JSONObject.parseObject(JSONObject.toJSONString(dataFlowLinksCost));
-                    newObj.put("dataFlowId", businessServiceDataFlow.getDataFlowId());
-                    newObj.put("transactionId", businessServiceDataFlow.getTransactionId());
-                    costDates.add(newObj);
-                }
-                costDate.put("costDates", costDates);
-
-                KafkaFactory.sendKafkaMessage(KafkaConstant.TOPIC_COST_TIME_LOG_NAME, "", costDate.toJSONString());
-            }
-        } catch (Exception e) {
-            logger.error("报错日志出错了，", e);
-        }
-    }
-}

HardwareAdapationService/src/main/resources/application-dev.yml

@@ -1,99 +0,0 @@
-jedis:
-  pool:
-    config:
-      maxTotal: 100
-      maxIdle: 20
-      maxWaitMillis: 20000
-    host: dev.redis.java110.com
-    port: 6379
-    timeout: 3000
-    password: hc
-
-eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    leaseExpirationDurationInSeconds: 30
-    preferIpAddress: true
-    instanceId: ${spring.cloud.client.ip-address}:${server.port}
-  client:
-    serviceUrl:
-      defaultZone: http://dev.java110.com:8761/eureka/
-      #defaultZone: http://localhost:8761/eureka/
-server:
-  port: 8011
-  tomcat:
-    uri-encoding: UTF-8
-
-spring:
-  profiles:
-    active: share
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  application:
-    name: hardwareAdapation-service
-  redis:
-    database: 0
-    host: dev.redis.java110.com
-    port: 6379
-    password: hc
-    pool:
-      max-active: 300
-      max-wait: 10000
-      max-idle: 100
-      min-idle: 0
-      timeout: 0
-#  datasource:
-#    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#    minIdle: 5
-#    validationQuery: SELECT 1 FROM DUAL
-#    initialSize: 5
-#    maxWait: 60000
-#    filters: stat,wall,log4j
-#    poolPreparedStatements: true
-#    type: com.alibaba.druid.pool.DruidDataSource
-#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-#    maxPoolPreparedStatementPerConnectionSize: 20
-#    password: TT@12345678
-#    testOnBorrow: false
-#    testWhileIdle: true
-#    minEvictableIdleTimeMillis: 300000
-#    timeBetweenEvictionRunsMillis: 60000
-#    testOnReturn: false
-#    driverClassName: com.mysql.jdbc.Driver
-#    maxActive: 20
-#    username: TT
-
-#============== kafka ===================
-kafka:
-  consumer:
-    zookeeper:
-      connect: dev.zk.java110.com:2181
-    servers: dev.kafka.java110.com:9092
-    enable:
-      auto:
-        commit: true
-    session:
-      timeout: 6000
-    auto:
-      commit:
-        interval: 100
-      offset:
-        reset: latest
-    topic: test
-    group:
-      id: hardwareAdapationBusinessStatus
-    concurrency: 10
-
-  producer:
-    zookeeper:
-      connect: dev.zk.java110.com:2181
-    servers: dev.kafka.java110.com:9092
-    retries: 0
-    batch:
-      size: 4096
-    linger: 1
-    buffer:
-      memory: 40960

HardwareAdapationService/src/main/resources/application-prod.yml

@@ -1,97 +0,0 @@
-jedis:
-  pool:
-    config:
-      maxTotal: 100
-      maxIdle: 20
-      maxWaitMillis: 20000
-    host: prod.redis.java110.com
-    port: 6379
-    timeout: 3000
-    password: hc
-
-eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    leaseExpirationDurationInSeconds: 30
-    preferIpAddress: true
-    instanceId: ${spring.cloud.client.ip-address}:${server.port}
-  client:
-    serviceUrl:
-      defaultZone: http://prod.java110.com:8761/eureka/
-      #defaultZone: http://localhost:8761/eureka/
-server:
-  port: 8011
-  tomcat:
-    uri-encoding: UTF-8
-
-spring:
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  application:
-    name: hardwareAdapation-service
-  redis:
-    database: 0
-    host: prod.redis.java110.com
-    port: 6379
-    password: hc
-    pool:
-      max-active: 300
-      max-wait: 10000
-      max-idle: 100
-      min-idle: 0
-      timeout: 0
-  datasource:
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-    type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://prod.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    maxPoolPreparedStatementPerConnectionSize: 20
-    password: TT@12345678
-    testOnBorrow: false
-    testWhileIdle: true
-    minEvictableIdleTimeMillis: 300000
-    timeBetweenEvictionRunsMillis: 60000
-    testOnReturn: false
-    driverClassName: com.mysql.jdbc.Driver
-    maxActive: 20
-    username: TT
-
-#============== kafka ===================
-kafka:
-  consumer:
-    zookeeper:
-      connect: prod.zk.java110.com:2181
-    servers: prod.kafka.java110.com:9092
-    enable:
-      auto:
-        commit: true
-    session:
-      timeout: 6000
-    auto:
-      commit:
-        interval: 100
-      offset:
-        reset: latest
-    topic: test
-    group:
-      id: hardwareAdapationBusinessStatus
-    concurrency: 10
-
-  producer:
-    zookeeper:
-      connect: prod.zk.java110.com:2181
-    servers: prod.kafka.java110.com:9092
-    retries: 0
-    batch:
-      size: 4096
-    linger: 1
-    buffer:
-      memory: 40960

HardwareAdapationService/src/main/resources/application-share.yml

@@ -1,61 +0,0 @@
-spring:
-  shardingsphere:
-    datasource:
-#      names: ds_master_0,ds_master_1,ds_master_0_slave_0,ds_master_0_slave_1,ds_master_1_slave_0,ds_master_1_slave_1
-      names: ds_master_0,ds_master_1
-#      ds_master_0_slave_0:
-#        jdbc-url: jdbc:mysql://localhost:3306/demo_ds_master_0_slave_0?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-#        password:
-#        type: com.zaxxer.hikari.HikariDataSource
-#        driver-class-name: com.mysql.jdbc.Driver
-#        username: root
-      ds_master_0:
-        driver-class-name: com.mysql.jdbc.Driver
-        type: com.alibaba.druid.pool.DruidDataSource
-        jdbc-url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8
-        username: hc_community
-        password: hc_community@12345678
-        minIdle: 5
-        validationQuery: SELECT 1 FROM DUAL
-        initialSize: 5
-        maxWait: 60000
-        filters: stat,wall,log4j
-        poolPreparedStatements: true
-      ds_master_1:
-        driver-class-name: com.mysql.jdbc.Driver
-        type: com.alibaba.druid.pool.DruidDataSource
-        jdbc-url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-        username: TT
-        password: TT@12345678
-        minIdle: 5
-        validationQuery: SELECT 1 FROM DUAL
-        initialSize: 5
-        maxWait: 60000
-        filters: stat,wall,log4j
-        poolPreparedStatements: true
-    sharding:
-      tables:
-        business_community:
-          actual-data-nodes: ds_master_$->{0..1}.business_community
-          database-strategy:
-            inline:
-              sharding-column: community_id
-              algorithm-expression: ds_master_$->{Long.parseLong(community_id) % 2}
-        community:
-          actual-data-nodes: ds_master_$->{0..1}.community
-          database-strategy:
-            inline:
-              sharding-column: community_id
-              algorithm-expression: ds_master_$->{Long.parseLong(community_id) % 2}
-      default-database-strategy:
-        none:
-      default-table-strategy:
-        none:
-      default-datasource-name: ds_master_0
-#      master-slave-rules:
-#        ds_1:
-#          slave-data-source-names: ds_master_1_slave_0, ds_master_1_slave_1
-#          master-data-source-name: ds_master_1
-#        ds_0:
-#          slave-data-source-names: ds_master_0_slave_0, ds_master_0_slave_1
-#          master-data-source-name: ds_master_0

HardwareAdapationService/src/main/resources/application-test.yml

@@ -1,97 +0,0 @@
-jedis:
-  pool:
-    config:
-      maxTotal: 100
-      maxIdle: 20
-      maxWaitMillis: 20000
-    host: test.redis.java110.com
-    port: 6379
-    timeout: 3000
-    password: hc
-
-eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    leaseExpirationDurationInSeconds: 30
-    preferIpAddress: true
-    instanceId: ${spring.cloud.client.ip-address}:${server.port}
-  client:
-    serviceUrl:
-      defaultZone: http://test.java110.com:8761/eureka/
-      #defaultZone: http://localhost:8761/eureka/
-server:
-  port: 8011
-  tomcat:
-    uri-encoding: UTF-8
-
-spring:
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  application:
-    name: hardwareAdapation-service
-  redis:
-    database: 0
-    host: test.redis.java110.com
-    port: 6379
-    password: hc
-    pool:
-      max-active: 300
-      max-wait: 10000
-      max-idle: 100
-      min-idle: 0
-      timeout: 0
-  datasource:
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-    type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://test.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    maxPoolPreparedStatementPerConnectionSize: 20
-    password: TT@12345678
-    testOnBorrow: false
-    testWhileIdle: true
-    minEvictableIdleTimeMillis: 300000
-    timeBetweenEvictionRunsMillis: 60000
-    testOnReturn: false
-    driverClassName: com.mysql.jdbc.Driver
-    maxActive: 20
-    username: TT
-
-#============== kafka ===================
-kafka:
-  consumer:
-    zookeeper:
-      connect: test.zk.java110.com:2181
-    servers: test.kafka.java110.com:9092
-    enable:
-      auto:
-        commit: true
-    session:
-      timeout: 6000
-    auto:
-      commit:
-        interval: 100
-      offset:
-        reset: latest
-    topic: test
-    group:
-      id: hardwareAdapationBusinessStatus
-    concurrency: 10
-
-  producer:
-    zookeeper:
-      connect: test.zk.java110.com:2181
-    servers: test.kafka.java110.com:9092
-    retries: 0
-    batch:
-      size: 4096
-    linger: 1
-    buffer:
-      memory: 40960

HardwareAdapationService/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

HardwareAdapationService/src/main/resources/banner.txt

@@ -1,15 +0,0 @@
-${AnsiColor.BRIGHT_RED}
-     __                    ____ ___________
-    |__|____ ___  _______ /_   /_   \   _  \
-    |  \__  \\  \/ /\__  \ |   ||   /  /_\  \
-    |  |/ __ \\   /  / __ \|   ||   \  \_/   \
-/\__|  (____  /\_/  (____  /___||___|\_____  /
-\______|    \/           \/                \/
- ____ ___                    _________                  .__
-|    |   \______ ___________/   _____/ ______________  _|__| ____  ____
-|    |   /  ___// __ \_  __ \_____  \_/ __ \_  __ \  \/ /  |/ ___\/ __ \
-|    |  /\___ \\  ___/|  | \/        \  ___/|  | \/\   /|  \  \__\  ___/
-|______//____  >\___  >__| /_______  /\___  >__|    \_/ |__|\___  >___  >
-             \/     \/             \/     \/                    \/    \/
-
- java110 UserService starting, more information scan https://github.com/java110/MicroCommunity

HardwareAdapationService/src/main/resources/dataSource.yml

@@ -1,75 +0,0 @@
-dataSources:
-  ds0: !!com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8
-    username: hc_community
-    password: hc_community@12345678
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-  #  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
-  #    driverClassName: com.mysql.jdbc.Driver
-  #    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-  #    username: TT
-  #    password: TT@12345678
-  #    connectionTimeoutMilliseconds: 30000
-  #    idleTimeoutMilliseconds: 60000
-  #    maxPoolSize: 50
-  #    minPoolSize: 1
-  #    maintenanceIntervalMilliseconds: 30000
-  ds1: !!com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    username: TT
-    password: TT@12345678
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
-#    driverClassName: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-#    username: TT
-#    password: TT@12345678
-#    connectionTimeoutMilliseconds: 30000
-#    idleTimeoutMilliseconds: 60000
-#    maxPoolSize: 50
-#    minPoolSize: 1
-#    maintenanceIntervalMilliseconds: 30000
-
-shardingRule:
-  tables:
-    business_xxx:
-      actualDataNodes: ds${0..1}.business_community
-      databaseStrategy:
-        inline:
-          shardingColumn: community_id
-          algorithmExpression: ds${Long.parseLong(community_id) % 2}
-
-  bindingTables:
-    - business_xxx
-
-  defaultDataSourceName: ds1
-  defaultDatabaseStrategy:
-    none:
-  defaultTableStrategy:
-    none:
-
-#  masterSlaveRules:
-#    ms_ds0:
-#     masterDataSourceName: ds0
-#     slaveDataSourceNames:
-#       - ds0_slave0
-#     loadBalanceAlgorithmType: ROUND_ROBIN
-#   ms_ds1:
-#     masterDataSourceName: ds1
-#     slaveDataSourceNames:
-#       - ds1_slave0
-#     loadBalanceAlgorithmType: ROUND_ROBIN
-props:
-  sql.show: true

HardwareAdapationService/src/main/resources/java110.properties

@@ -1,3 +0,0 @@
-java110.mappingPath=classpath:mapper/hardwareAdapation/*.xml
-
-

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/applicationKeyApi")
 public interface IApplicationKeyInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/carBlackWhiteApi")
 public interface ICarBlackWhiteInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/carInoutDetailApi")
 public interface ICarInoutDetailInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/carInoutApi")
 public interface ICarInoutInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/machineAttrApi")
 public interface IMachineAttrInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/machineApi")
 public interface IMachineInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/machineRecordApi")
 public interface IMachineRecordInnerServiceSMO {
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-@FeignClient(name = "hardwareAdapation-service", configuration = {FeignConfiguration.class})
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/machineTranslateApi")
 public interface IMachineTranslateInnerServiceSMO {
 

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

@@ -5,167 +5,165 @@
 <mapper namespace="machineAttrServiceDaoImpl">
 
     <!-- 保存设备属性信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessMachineAttrInfo" parameterType="Map">
-           insert into business_machine_attrs(
-machine_id,attr_id,operate,spec_cd,community_id,b_id,value
-) values (
-#{machineId},#{attrId},#{operate},#{specCd},#{communityId},#{bId},#{value}
-)
-       </insert>
-
-
-       <!-- 查询设备属性信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessMachineAttrInfo" parameterType="Map" resultType="Map">
-           select  t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.operate,t.spec_cd,t.spec_cd specCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value 
-from business_machine_attrs t 
-where 1 =1 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-
-       </select>
+    <insert id="saveBusinessMachineAttrInfo" parameterType="Map">
+        insert into business_machine_attrs(
+        machine_id,attr_id,operate,spec_cd,community_id,b_id,value
+        ) values (
+        #{machineId},#{attrId},#{operate},#{specCd},#{communityId},#{bId},#{value}
+        )
+    </insert>
 
 
+    <!-- 查询设备属性信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessMachineAttrInfo" parameterType="Map" resultType="Map">
+        select t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.operate,t.spec_cd,t.spec_cd
+        specCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value
+        from business_machine_attrs t
+        where 1 =1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
 
+    </select>
 
 
     <!-- 保存设备属性信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveMachineAttrInfoInstance" parameterType="Map">
         insert into machine_attrs(
-machine_id,attr_id,spec_cd,status_cd,community_id,b_id,value
-) select t.machine_id,t.attr_id,t.spec_cd,'0',t.community_id,t.b_id,t.value from business_machine_attrs t where 1=1
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-   and t.operate= 'ADD'
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</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="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
+        machine_id,attr_id,spec_cd,status_cd,community_id,b_id,value
+        ) select t.machine_id,t.attr_id,t.spec_cd,'0',t.community_id,t.b_id,t.value from business_machine_attrs t where
+        1=1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </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="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询设备属性信息 add by wuxw 2018-07-03 -->
     <select id="getMachineAttrInfo" parameterType="Map" resultType="Map">
-        select  t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value 
-from machine_attrs t 
-where 1 =1 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.machine_id,t.machine_id machineId,t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd
+        specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.value
+        from machine_attrs t
+        where 1 =1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改设备属性信息 add by wuxw 2018-07-03 -->
     <update id="updateMachineAttrInfoInstance" parameterType="Map">
-        update  machine_attrs 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="specCd !=null and specCd != ''">
-, t.spec_cd= #{specCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="value !=null and value != ''">
-, t.value= #{value}
-</if> 
- where 1=1 <if test="attrId !=null and attrId != ''">
-and t.attr_id= #{attrId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update machine_attrs 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="specCd !=null and specCd != ''">
+            , t.spec_cd= #{specCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="value !=null and value != ''">
+            , t.value= #{value}
+        </if>
+        where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 查询设备属性数量 add by wuxw 2018-07-03 -->
-     <select id="queryMachineAttrsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from machine_attrs t 
-where 1 =1 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-
-
-     </select>
+    <select id="queryMachineAttrsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from machine_attrs t
+        where 1 =1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+
+
+    </select>
 
 </mapper>

pom.xml

@@ -33,7 +33,6 @@
         <module>JobService</module>
         <module>CommonService</module>
         <module>ReportService</module>
-        <module>HardwareAdapationService</module>
         <module>FrontService</module>
     </modules>