add

梅州市东山医院不接收开机数据

nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -39,7 +39,7 @@ import static org.springframework.web.context.request.RequestAttributes.SCOPE_RE
 @Configuration
 public class DefaultTenantLineInnerInterceptor {
     private final List<String> ignoreUrlTenantId= Arrays.asList("/login","/getUserInfo","/token","/bus/device/info/hospitalCode",
-            "/bus/device/info/hospitalCodeAndAlias","/getAccountInfo","/bus/hospital/add");
+            "/bus/device/info/hospitalCodeAndAlias","/getAccountInfo","/bus/hospital/add","/updatePass");
     private final List<Class<?>> tableClass;
 
     private Set<String> ignoreTableName;

nb-service/iot-service/src/main/java/com/nb/aliyun/service/consumer/NBAndFourGConsumerGroupService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.nb.aliyun.service.pojo.AliIotConsumerPojo;
+import com.nb.core.exception.CustomException;
 import com.nb.web.api.bean.AliIotConfig;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.entity.BusHospitalLogEntity;
@@ -195,8 +196,9 @@ public class NBAndFourGConsumerGroupService extends AbstractAliConsumer {
                 log.warn("阿里云数据【{}】，未知的topic:【{}】",content.toJSONString(),topic);
             }
             hospitalLog.setSuccess(true);
+        } catch (CustomException c){
+
         } catch (Exception e) {
-            e.printStackTrace();
             hospitalLog.setSuccess(false);
             hospitalLog.setMessage(ExceptionUtil.getExceptionMsg(e));
             log.error("阿里云数据【{}】数据处理失败 ", JSONUtil.toJsonStr(message), e);

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceCustomizedService.java

@@ -0,0 +1,25 @@
+package com.nb.web.service.bus.listener;
+
+import com.aliyun.oss.ServiceException;
+import com.nb.core.exception.CustomException;
+import com.nb.web.api.entity.common.BusDeviceRunningEntity;
+import com.nb.web.api.enums.DeviceStatusEnum;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName : DeviceCuctomized
+ * @Description :
+ * @Author : LF
+ * @Date: 2025年03月10日
+ */
+@Service
+public class DeviceCustomizedService {
+    public void customized(BusDeviceRunningEntity device){
+        //梅州市东山医院不接收开机数据包
+        if("1857617693577392129".equals(device.getTenantId())){
+            if(DeviceStatusEnum.StartUp.equals(device.getRunState())){
+                throw new CustomException("梅州市东山医院不接收开机包数据");
+            }
+        }
+    }
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -78,6 +78,7 @@ public class DeviceInfoListener implements IIotMsgHandler {
 
     private final HospitalManagerRegister hospitalManagerRegister;
 
+    private final DeviceCustomizedService deviceCustomizedService;
     /**
      * 监听上传的数据信息，
      * 若设备详情发生变化，则及时通知相应的ws通道
@@ -102,6 +103,9 @@ public class DeviceInfoListener implements IIotMsgHandler {
             //对设备数据的一些参数进行初始化设置
             deviceOperator.refreshHospitalCode(device.getUserId());
             device.setTenantId(deviceOperator.getTenantId());
+            deviceCustomizedService.customized(device);
+
+
             init(device);
 
             //缓存操作