Procházet zdrojové kódy

add 增加设备信息离线补偿处理

18339543638 před 3 roky
rodič
revize
7b45750053

+ 1 - 1
nb-admin/src/main/resources/application-dev.yml

@@ -130,7 +130,7 @@ aliyun:
   # iotInstanceId:企业版实例请填写实例ID,公共实例请填空字符串""。
   iotInstanceId: "iot-060a0bgd"
   server-subscription:
-    enable: true  # 是否开启阿里云物联网服务端订阅
+    enable: false  # 是否开启阿里云物联网服务端订阅
   product:
     productKey: he1fACg7ySx
 

+ 3 - 3
nb-common/mq-common/src/main/java/com/nb/common/mq/RabbitMqConfig.java

@@ -22,11 +22,11 @@ public class RabbitMqConfig {
         rabbitTemplate.setConnectionFactory(connectionFactory);
         rabbitTemplate.setMandatory(true);
         //添加Confirm监听
-        rabbitTemplate.setConfirmCallback(null);
+//        rabbitTemplate.setConfirmCallback(null);
         //添加returnCallBack监听
-        rabbitTemplate.setReturnsCallback(null);
+//        rabbitTemplate.setReturnsCallback(null);
         //添加接受消息前处理器
-        rabbitTemplate.addAfterReceivePostProcessors(null);
+//        rabbitTemplate.addAfterReceivePostProcessors(null);
         //添加发送消息前处理器
         rabbitTemplate.addBeforePublishPostProcessors();
         return rabbitTemplate;

+ 1 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManager.java

@@ -108,6 +108,7 @@ public class HospitalManager {
                             .forEach(infusionInfo->{
                                 BusDeviceRunningEntity source = BeanUtil.toBean(infusionInfo, BusDeviceRunningEntity.class);
                                 source.setInfusionId(infusionInfo.getId());
+                                extraConfigHandler.handler(source);
                                 autoUndoConfigHandler.handler(source);
                                 finishMonitorConfigHandler.handler(source);
                             });

+ 0 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManagerRegister.java

@@ -1,10 +1,7 @@
 package com.nb.web.service.bus.hospital;
 
-import com.nb.web.service.bus.registry.device.DeviceRegistry;
 import com.nb.web.service.bus.hospital.script.ScriptManager;
-import com.nb.web.service.bus.utils.WsPublishUtils;
 import com.nb.core.cache.manager.ConfigStorageManager;
-import com.nb.common.config.utils.RedissonUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;