调整厂家信息，设备类型，设备型号同步功能

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDeviceclassService.java

@@ -36,7 +36,7 @@ public interface ITosDeviceclassService {
      * @param tosDeviceclass 设备类型
      * @return 结果
      */
-    public int insertTosDeviceclass(TosDeviceclass tosDeviceclass);
+    public int insertTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass);
 
     /**
      * 修改设备类型
@@ -44,7 +44,7 @@ public interface ITosDeviceclassService {
      * @param tosDeviceclass 设备类型
      * @return 结果
      */
-    public int updateTosDeviceclass(TosDeviceclass tosDeviceclass);
+    public int updateTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass);
 
 
     /**
@@ -60,5 +60,5 @@ public interface ITosDeviceclassService {
      * @param tosDeviceclass 设备类型
      * @return 结果
      */
-    public int deleteTosDeviceclassByDevclassBid(TosDeviceclass tosDeviceclass);
+    public int deleteTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDevicetypeService.java

@@ -37,7 +37,7 @@ public interface ITosDevicetypeService {
      * @param tosDevicetype 设备类型
      * @return 结果
      */
-    public int insertTosDevicetype(TosDevicetype tosDevicetype);
+    public int insertTosDevicetypeByTosMsg(TosDevicetype tosDevicetype);
 
     /**
      * 修改设备类型
@@ -45,7 +45,7 @@ public interface ITosDevicetypeService {
      * @param tosDevicetype 设备类型
      * @return 结果
      */
-    public int updateTosDevicetype(TosDevicetype tosDevicetype);
+    public int updateTosDevicetypeByTosMsg(TosDevicetype tosDevicetype);
 
 
     /**
@@ -58,6 +58,6 @@ public interface ITosDevicetypeService {
     /**
      * 删除设备类型信息
      * */
-    public int deleteTosDevicetypeByDevtypeBid(TosDevicetype tosDevicetype);
+    public int deleteTosDevicetypeByTosMsg(TosDevicetype tosDevicetype);
     List<TosDevicetypeResVo> selectTosDevicetypeResVoList(TosDevicetype tosDevicetype);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosFirmService.java

@@ -36,7 +36,7 @@ public interface ITosFirmService {
      * @param tosFirm 厂家信息
      * @return 结果
      */
-    public int insertTosFirm(TosFirm tosFirm);
+    public int insertTosFirmByTosMsg(TosFirm tosFirm);
 
     /**
      * 修改厂家信息
@@ -44,7 +44,7 @@ public interface ITosFirmService {
      * @param tosFirm 厂家信息
      * @return 结果
      */
-    public int updateTosFirm(TosFirm tosFirm);
+    public int updateTosFirmByTosMsg(TosFirm tosFirm);
 
 
     /**
@@ -53,12 +53,12 @@ public interface ITosFirmService {
      * @param Bid 厂家信息主键
      * @return 结果
      */
-    public int deleteTosFirmByFirmBid(String Bid);
+    public int deleteTosFirmByFirmBidByFirmBid(String firmBid);
     /**
      * 删除厂家信息信息
      *
      * @param tosFirm 厂家信息
      * @return 结果
      */
-    public int deleteTosFirmByFirmBid(TosFirm tosFirm);
+    public int deleteTosFirmByFirmBidByTosMsg(TosFirm tosFirm);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosDeviceclassServiceImpl.java

@@ -7,7 +7,6 @@ import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -51,7 +50,7 @@ public class TosDeviceclassServiceImpl implements ITosDeviceclassService {
      * @return 结果
      */
     @Override
-    public int insertTosDeviceclass(TosDeviceclass tosDeviceclass) {
+    public int insertTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass) {
         return tosDeviceclassMapper.insertTosDeviceclass(tosDeviceclass);
     }
 
@@ -62,7 +61,7 @@ public class TosDeviceclassServiceImpl implements ITosDeviceclassService {
      * @return 结果
      */
     @Override
-    public int updateTosDeviceclass(TosDeviceclass tosDeviceclass) {
+    public int updateTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass) {
         return tosDeviceclassMapper.updateTosDeviceclass(tosDeviceclass);
     }
 
@@ -74,12 +73,11 @@ public class TosDeviceclassServiceImpl implements ITosDeviceclassService {
      */
     @Override
     public int deleteTosDeviceclassByDevclassBid(String devclassBid) {
-        TosDeviceclass tosDeviceclass = tosDeviceclassMapper.selectTosDeviceclassByDevclassBid(devclassBid);
-        return deleteTosDeviceclassByDevclassBid(tosDeviceclass);
+        return tosDeviceclassMapper.deleteTosDeviceclassByDevclassBid(devclassBid);
     }
 
     @Override
-    public int deleteTosDeviceclassByDevclassBid(TosDeviceclass tosDeviceclass) {
+    public int deleteTosDeviceclassByTosMsg(TosDeviceclass tosDeviceclass) {
         if(null == tosDeviceclass){
           return 0;
         }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosDevicetypeServiceImpl.java

@@ -8,7 +8,6 @@ import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -54,9 +53,8 @@ public class TosDevicetypeServiceImpl implements ITosDevicetypeService
      * @return 结果
      */
     @Override
-    public int insertTosDevicetype(TosDevicetype tosDevicetype){
+    public int insertTosDevicetypeByTosMsg(TosDevicetype tosDevicetype){
         return tosDevicetypeMapper.insertTosDevicetype(tosDevicetype);
-
     }
 
     /**
@@ -66,7 +64,7 @@ public class TosDevicetypeServiceImpl implements ITosDevicetypeService
      * @return 结果
      */
     @Override
-    public int updateTosDevicetype(TosDevicetype tosDevicetype){
+    public int updateTosDevicetypeByTosMsg(TosDevicetype tosDevicetype){
         return tosDevicetypeMapper.updateTosDevicetype(tosDevicetype);
     }
 
@@ -80,12 +78,11 @@ public class TosDevicetypeServiceImpl implements ITosDevicetypeService
      */
     @Override
     public int deleteTosDevicetypeByDevtypeBid(String devtypeBid){
-        TosDevicetype tosDevicetype = tosDevicetypeMapper.selectTosDevicetypeByDevtypeBid(devtypeBid);
-        return deleteTosDevicetypeByDevtypeBid(tosDevicetype);
+        return tosDevicetypeMapper.deleteTosDevicetypeByDevtypeBid(devtypeBid);
     }
 
     @Override
-    public int deleteTosDevicetypeByDevtypeBid(TosDevicetype tosDevicetype) {
+    public int deleteTosDevicetypeByTosMsg(TosDevicetype tosDevicetype) {
         if(null == tosDevicetype){
            return 0;
         }

src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosFirmServiceImpl.java

@@ -7,7 +7,6 @@ import com.yunfeiyun.agmp.iotm.device.service.ITosFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -53,7 +52,7 @@ public class TosFirmServiceImpl implements ITosFirmService
      * @return 结果
      */
     @Override
-    public int insertTosFirm(TosFirm tosFirm){
+    public int insertTosFirmByTosMsg(TosFirm tosFirm){
         return tosFirmMapper.insertTosFirm(tosFirm);
     }
 
@@ -64,7 +63,7 @@ public class TosFirmServiceImpl implements ITosFirmService
      * @return 结果
      */
     @Override
-    public int updateTosFirm(TosFirm tosFirm){
+    public int updateTosFirmByTosMsg(TosFirm tosFirm){
         return tosFirmMapper.updateTosFirm(tosFirm);
     }
 
@@ -77,13 +76,12 @@ public class TosFirmServiceImpl implements ITosFirmService
      * @return 结果
      */
     @Override
-    public int deleteTosFirmByFirmBid(String firmBid){
-        TosFirm tosFirm = tosFirmMapper.selectTosFirmByFirmBid(firmBid);
-        return deleteTosFirmByFirmBid(tosFirm);
+    public int deleteTosFirmByFirmBidByFirmBid(String firmBid){
+        return tosFirmMapper.deleteTosFirmByFirmBid(firmBid);
     }
 
     @Override
-    public int deleteTosFirmByFirmBid(TosFirm tosFirm) {
+    public int deleteTosFirmByFirmBidByTosMsg(TosFirm tosFirm) {
         if(null == tosFirm) {
             return 0;
         }

src/main/java/com/yunfeiyun/agmp/iotm/mq/listener/TosChannelGlobalAwareMessageListener.java

@@ -51,31 +51,31 @@ public class TosChannelGlobalAwareMessageListener implements ChannelAwareMessage
             if (tosActionEnums != null) {
                 switch (tosActionEnums) {
                     case TOS_DEVICE_TYPE_CREATE:
-                        tosDevicetypeService.insertTosDevicetype(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        tosDevicetypeService.insertTosDevicetypeByTosMsg(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
                         break;
                     case TOS_DEVICE_TYPE_UPDATE:
-                        tosDevicetypeService.updateTosDevicetype(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        tosDevicetypeService.updateTosDevicetypeByTosMsg(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
                         break;
                     case TOS_DEVICE_TYPE_DELETE:
-                        tosDevicetypeService.deleteTosDevicetypeByDevtypeBid(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        tosDevicetypeService.deleteTosDevicetypeByTosMsg(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
                         break;
                     case TOS_DEVICE_CLASS_CREATE:
-                        tosDeviceclassService.insertTosDeviceclass(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        tosDeviceclassService.insertTosDeviceclassByTosMsg(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
                         break;
                     case TOS_DEVICE_CLASS_UPDATE:
-                        tosDeviceclassService.updateTosDeviceclass(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        tosDeviceclassService.updateTosDeviceclassByTosMsg(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
                         break;
                     case TOS_DEVICE_CLASS_DELETE:
-                        tosDeviceclassService.deleteTosDeviceclassByDevclassBid(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        tosDeviceclassService.deleteTosDeviceclassByTosMsg(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
                         break;
                     case TOS_FIRM_CREATE:
-                        tosFirmService.insertTosFirm(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        tosFirmService.insertTosFirmByTosMsg(synGlobalTenantInfoDto.getData().to(TosFirm.class));
                         break;
                     case TOS_FIRM_UPDATE:
-                        tosFirmService.updateTosFirm(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        tosFirmService.updateTosFirmByTosMsg(synGlobalTenantInfoDto.getData().to(TosFirm.class));
                         break;
                     case TOS_FIRM_DELETE:
-                        tosFirmService.deleteTosFirmByFirmBid(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        tosFirmService.deleteTosFirmByFirmBidByTosMsg(synGlobalTenantInfoDto.getData().to(TosFirm.class));
                         break;
                 }
             } else {