Kaynağa Gözat

新增厂家信息,设备类型,设备型号同步功能

liuyaowen 1 yıl önce
ebeveyn
işleme
5feef659e4

+ 8 - 1
src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDeviceclassService.java

@@ -49,9 +49,16 @@ public interface ITosDeviceclassService {
 
     /**
      * 删除设备类型信息
-     * 
+     *
      * @param id 设备类型主键
      * @return 结果
      */
     public int deleteTosDeviceclassByDevclassBid(String devclassBid);
+    /**
+     * 删除设备类型信息
+     *
+     * @param tosDeviceclass 设备类型
+     * @return 结果
+     */
+    public int deleteTosDeviceclassByDevclassBid(TosDeviceclass tosDeviceclass);
 }

+ 4 - 1
src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDevicetypeService.java

@@ -55,6 +55,9 @@ public interface ITosDevicetypeService {
      * @return 结果
      */
     public int deleteTosDevicetypeByDevtypeBid(String devtypeBid);
-
+    /**
+     * 删除设备类型信息
+     * */
+    public int deleteTosDevicetypeByDevtypeBid(TosDevicetype tosDevicetype);
     List<TosDevicetypeResVo> selectTosDevicetypeResVoList(TosDevicetype tosDevicetype);
 }

+ 7 - 0
src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosFirmService.java

@@ -54,4 +54,11 @@ public interface ITosFirmService {
      * @return 结果
      */
     public int deleteTosFirmByFirmBid(String Bid);
+    /**
+     * 删除厂家信息信息
+     *
+     * @param tosFirm 厂家信息
+     * @return 结果
+     */
+    public int deleteTosFirmByFirmBid(TosFirm tosFirm);
 }

+ 10 - 1
src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosDeviceclassServiceImpl.java

@@ -74,6 +74,15 @@ public class TosDeviceclassServiceImpl implements ITosDeviceclassService {
      */
     @Override
     public int deleteTosDeviceclassByDevclassBid(String devclassBid) {
-        return tosDeviceclassMapper.deleteTosDeviceclassByDevclassBid(devclassBid);
+        TosDeviceclass tosDeviceclass = tosDeviceclassMapper.selectTosDeviceclassByDevclassBid(devclassBid);
+        return deleteTosDeviceclassByDevclassBid(tosDeviceclass);
+    }
+
+    @Override
+    public int deleteTosDeviceclassByDevclassBid(TosDeviceclass tosDeviceclass) {
+        if(null == tosDeviceclass){
+          return 0;
+        }
+        return tosDeviceclassMapper.deleteTosDeviceclassByDevclassBid(tosDeviceclass.getDevclassBid());
     }
 }

+ 6 - 2
src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosDevicetypeServiceImpl.java

@@ -81,11 +81,15 @@ public class TosDevicetypeServiceImpl implements ITosDevicetypeService
     @Override
     public int deleteTosDevicetypeByDevtypeBid(String devtypeBid){
         TosDevicetype tosDevicetype = tosDevicetypeMapper.selectTosDevicetypeByDevtypeBid(devtypeBid);
+        return deleteTosDevicetypeByDevtypeBid(tosDevicetype);
+    }
+
+    @Override
+    public int deleteTosDevicetypeByDevtypeBid(TosDevicetype tosDevicetype) {
         if(null == tosDevicetype){
            return 0;
         }
-
-        return tosDevicetypeMapper.deleteTosDevicetypeByDevtypeBid(devtypeBid);
+        return tosDevicetypeMapper.deleteTosDevicetypeByDevtypeBid(tosDevicetype.getDevtypeBid());
     }
 
     @Override

+ 6 - 1
src/main/java/com/yunfeiyun/agmp/iotm/device/service/impl/TosFirmServiceImpl.java

@@ -79,9 +79,14 @@ public class TosFirmServiceImpl implements ITosFirmService
     @Override
     public int deleteTosFirmByFirmBid(String firmBid){
         TosFirm tosFirm = tosFirmMapper.selectTosFirmByFirmBid(firmBid);
+        return deleteTosFirmByFirmBid(tosFirm);
+    }
+
+    @Override
+    public int deleteTosFirmByFirmBid(TosFirm tosFirm) {
         if(null == tosFirm) {
             return 0;
         }
-        return tosFirmMapper.deleteTosFirmByFirmBid(firmBid);
+        return tosFirmMapper.deleteTosFirmByFirmBid(tosFirm.getFirmBid());
     }
 }

+ 40 - 1
src/main/java/com/yunfeiyun/agmp/iotm/mq/listener/TosChannelGlobalAwareMessageListener.java

@@ -4,12 +4,19 @@ import com.rabbitmq.client.Channel;
 import com.yunfeiyun.agmp.common.framework.mq.rabbitmq.enums.TosActionEnums;
 import com.yunfeiyun.agmp.common.framework.mq.rabbitmq.model.SynGlobalTenantInfoDto;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
+import com.yunfeiyun.agmp.iot.common.domain.TosDeviceclass;
+import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
+import com.yunfeiyun.agmp.iot.common.domain.TosFirm;
+import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
+import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.device.service.ITosFirmService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 
 /**
@@ -24,6 +31,12 @@ import java.io.IOException;
 @ConditionalOnBean(name = "tosMqConfig")
 public class TosChannelGlobalAwareMessageListener implements ChannelAwareMessageListener {
 
+    @Resource
+    private ITosDevicetypeService tosDevicetypeService;
+    @Resource
+    private ITosDeviceclassService tosDeviceclassService;
+    @Resource
+    private ITosFirmService tosFirmService;
     @Override
     public void onMessage(Message message, Channel channel) throws Exception {
         try {
@@ -37,7 +50,33 @@ public class TosChannelGlobalAwareMessageListener implements ChannelAwareMessage
             TosActionEnums tosActionEnums = TosActionEnums.getAction(action);
             if (tosActionEnums != null) {
                 switch (tosActionEnums) {
-
+                    case TOS_DEVICE_TYPE_CREATE:
+                        tosDevicetypeService.insertTosDevicetype(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        break;
+                    case TOS_DEVICE_TYPE_UPDATE:
+                        tosDevicetypeService.updateTosDevicetype(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        break;
+                    case TOS_DEVICE_TYPE_DELETE:
+                        tosDevicetypeService.deleteTosDevicetypeByDevtypeBid(synGlobalTenantInfoDto.getData().to(TosDevicetype.class));
+                        break;
+                    case TOS_DEVICE_CLASS_CREATE:
+                        tosDeviceclassService.insertTosDeviceclass(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        break;
+                    case TOS_DEVICE_CLASS_UPDATE:
+                        tosDeviceclassService.updateTosDeviceclass(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        break;
+                    case TOS_DEVICE_CLASS_DELETE:
+                        tosDeviceclassService.deleteTosDeviceclassByDevclassBid(synGlobalTenantInfoDto.getData().to(TosDeviceclass.class));
+                        break;
+                    case TOS_FIRM_CREATE:
+                        tosFirmService.insertTosFirm(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        break;
+                    case TOS_FIRM_UPDATE:
+                        tosFirmService.updateTosFirm(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        break;
+                    case TOS_FIRM_DELETE:
+                        tosFirmService.deleteTosFirmByFirmBid(synGlobalTenantInfoDto.getData().to(TosFirm.class));
+                        break;
                 }
             } else {
                 log.error("【SAAS:】收到Tos:所有租户处理的消息:action 为空,忽略消息");