Browse Source

fix 修复一些问题

A17404李放 3 years ago
parent
commit
721f0fae36

+ 1 - 1
nb-system/src/main/java/com/nb/aliyun/AliyunConsumerGroupService.java

@@ -170,7 +170,7 @@ public class AliyunConsumerGroupService {
             }else if (topic.matches("[\\w\\/]*event/property/post$")){//设备属性上报
                 // 设备属性集合
                 Items items = new Items(content.getJSONObject("items"));
-                log.info("上传设备属性:【{}】",items);
+                log.info("上传设备属性:【{}】",JSONUtil.toJsonStr(items));
                 BusDeviceRunningEntity deviceRunning = new BusDeviceRunningEntity();
                 deviceRunning.updateFieldsByItems(deviceName,items);
                 hospitalLog.setTenantId(deviceInfoListener.deviceInfoDetail(new DeviceInfoEvent(this,deviceRunning,deviceName)));

+ 2 - 2
nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -146,13 +146,13 @@ public class HospitalFunctionExtraConfigHandler  extends  AbstractHospitalConfig
                 .set(BusInfusionHistoryEntity::getRunState, DeviceStatusEnum.NoSignal));
         //报警/提醒缓存重置
         if(update){
-            log.info("消息【】处理成功,输注【】变为【不在服务区】状态",source.getId(),source.getInfusionId());
+            log.info("消息【{}】处理成功,输注【{}】变为【不在服务区】状态",source.getId(),source.getInfusionId());
             wsPublishUtils.publishPatientMonitor(infusionHistory.getPatientId(), infusionHistory.getTenantId());
             //不在服务区
             monitorConfigHandler.judgeNoSignalAutoFinish(infusionHistory.getPatientId(),deviceId,source.getPatientCode(),source.getTenantId(),source.getInfusionId(),source.getUploadTime());
             autoUndoConfigHandler.judgeNoSignalAutoUndo(deviceId,source.getPatientCode(),source.getTenantId(),source.getInfusionId());
         }else {
-            log.info("消息【】处理失败,输注【】变为【不在服务区】状态失败",source.getInfusionId());
+            log.info("消息【{}】处理失败,输注【{}】变为【不在服务区】状态失败",source.getId(),source.getInfusionId());
         }
     }
 

+ 0 - 2
nb-system/src/main/java/com/nb/bus/registry/Operator.java

@@ -36,8 +36,6 @@ public interface Operator {
     }
 
     default void put(String key,Value value){
-//        getCache()
-//                .put(key,value,DEFAULT_TTL, TimeUnit.HOURS);
         getCache().put(key,value);
     }
 }

+ 3 - 4
nb-system/src/main/java/com/nb/bus/service/LocalBusDeviceService.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.nb.aliyun.sdk.AliyunIotSdk;
 import com.nb.bus.bean.AliIotConfig;
+import com.nb.bus.registry.constant.DeviceKeyConstant;
 import com.nb.bus.registry.device.DeviceRegistry;
 import com.nb.bus.entity.BusDeviceEntity;
 import com.nb.bus.mapper.BusDeviceMapper;
@@ -85,9 +86,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         if(entity.getEnable()!=null){
             deviceOperator.setEnable(entity.getEnable());
         }
-        if(CharSequenceUtil.isNotEmpty(entity.getTenantId())){
-            deviceOperator.setTenantId(entity.getTenantId());
-        }
+        deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID);
     }
 
     @Override
@@ -332,6 +331,6 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         operators
                 .stream()
                 .filter(Objects::nonNull)
-                .forEach(deviceOperator -> deviceOperator.setTenantId(afterTenantId));
+                .forEach(deviceOperator -> deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID));
     }
 }