更新下发消息为线程池发送

device-manager/src/main/java/com/mortals/xhx/base/framework/config/RabbitConfig.java

@@ -82,7 +82,7 @@ public class RabbitConfig {
             }
         });*/
 
-        rabbitTemplate.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
+/*        rabbitTemplate.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
             @Override
             public void confirm(CorrelationData correlationData, boolean ack, String cause) {
                 if(!ObjectUtils.isEmpty(correlationData)){
@@ -90,7 +90,7 @@ public class RabbitConfig {
                     log.info("发送消息id:{},ack:{}",correlationData.getId(),ack);
                 }
             }
-        });
+        });*/
 
         rabbitTemplate.setReturnCallback(messageCallbackService);
 

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

 package com.mortals.xhx.module.device.service.impl;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -297,7 +296,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
         deviceEntity.setUpdateTime(new Date());
         deviceEntity.setUpdateUserId(getContextUserId(context));
         this.getDeviceDao().update(deviceEntity);
-        this.putCache(deviceEntity.getId().toString(),deviceEntity);
+        this.putCache(deviceEntity.getId().toString(), deviceEntity);
         PlatformEntity platformEntity = platformService.getCache(deviceEntity.getPlatformId() == null ? "-1" : deviceEntity.getPlatformId().toString());
         ProductEntity productEntity = productService.getCache(deviceEntity.getProductId() == null ? "-1" : deviceEntity.getProductId().toString());
         if (enabled == YesNoEnum.YES.getValue()) {
@@ -306,12 +305,12 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             this.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.STOP);
         }
 
-        if(enabled==EnabledEnum.停止.getValue()){
+        if (enabled == EnabledEnum.停止.getValue()) {
             ErrorLogPdu errorLogPdu = new ErrorLogPdu();
             errorLogPdu.initAttrValue();
             errorLogPdu.setTraceID(IdUtil.objectId());
             errorLogPdu.setAppName(productEntity.getProductCode());
-            errorLogPdu.setMessage(deviceEntity.getDeviceName()+"设备停用!");
+            errorLogPdu.setMessage(deviceEntity.getDeviceName() + "设备停用!");
             errorLogPdu.setPlatform("webos");
             errorLogPdu.setCulprit("");
             errorLogPdu.setTags("");
@@ -320,7 +319,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             errorLogPdu.setReleaseVersion("");
             errorLogPdu.setFingerprint(LogTypeEnum.上报事件.name());
             errorLogPdu.setThreadNo(Thread.currentThread().toString());
-            errorLogPdu.setErrorStack(Thread.currentThread()+deviceEntity.getDeviceName()+"设备停用!");
+            errorLogPdu.setErrorStack(Thread.currentThread() + deviceEntity.getDeviceName() + "设备停用!");
             errorLogPdu.setContext("");
             errorLogPdu.setExtra("");
             errorLogPdu.setLogTime(new Date());
@@ -506,7 +505,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     }
 
 
-
     @Override
     protected void removeBefore(Long[] ids, Context context) throws AppException {
         Long[] removeIds = Arrays.asList(ids).stream().map(id -> {
@@ -693,11 +691,10 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     @Override
     public void downMsg(List<DeviceMsgReq> list) {
         try {
-            ArrayList<DeviceLogEntity> deviceLogList = new ArrayList<>();
+           // ArrayList<DeviceLogEntity> deviceLogList = new ArrayList<>();
             List<DeviceMsgReq> collect = list.stream().sorted(Comparator.comparing(DeviceMsgReq::getTimestamp)).collect(Collectors.toList());
-            List<List<DeviceMsgReq>> partition = ListUtil.partition(collect, 10);
-            for (List<DeviceMsgReq> deviceMsgReqs : partition) {
-                for (DeviceMsgReq item : deviceMsgReqs) {
+
+            for (DeviceMsgReq item : collect) {
                 //根据设备编码查询设备
                 DeviceEntity deviceEntity = null;
                 try {
@@ -718,9 +715,9 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                     CorrelationData correlationData = new CorrelationData();
                     correlationData.setId(deviceEntity.getDeviceCode());
                     log.info("send rabbitmq msg:{}", item.getDeviceCode());
-                        messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE, Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(), JSON.toJSONString(queueMsg),correlationData);
+                    messageProducer.sendMsg(QueueKey.DEFAULT_EXCHANGE, Constant.DOWN_TOPIC + deviceEntity.getDeviceCode(), JSON.toJSONString(queueMsg), correlationData);
 
-                        DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
+/*                    DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
                     deviceLogEntity.initAttrValue();
                     deviceLogEntity.setTraceID(IdUtil.fastSimpleUUID());
                     deviceLogEntity.setSiteId(deviceEntity.getSiteId());
@@ -732,15 +729,13 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                     deviceLogEntity.setLogType(LogTypeEnum.下发服务.getValue());
                     deviceLogEntity.setCreateUserId(1L);
                     deviceLogEntity.setCreateTime(new Date());
-                        deviceLogList.add(deviceLogEntity);
+                    deviceLogList.add(deviceLogEntity);*/
                     // deviceLogService.save(deviceLogEntity, null);
                 } else {
                     log.info("未找到设备，deviceCode:{}", item.getDeviceCode());
                 }
             }
 
-                //TimeUnit.SECONDS.sleep(1);
-            }
 
     /*        if (!ObjectUtils.isEmpty(deviceLogList)) {
                 List<List<DeviceLogEntity>> partitionlogs = ListUtil.partition(deviceLogList, 100);