fix:

修改了一些bug

nb-admin/pom.xml

@@ -108,10 +108,10 @@
             <artifactId>spring-boot-autoconfigure-processor</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.flywaydb</groupId>-->
+            <!--<artifactId>flyway-core</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
 

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

@@ -85,7 +85,7 @@ spring:
       # 端口，默认为6379
     port: 9736
       # 数据库索引
-    database: 6
+    database: 8
     # 密码
     password: 6E6985E1F7CB40F24A\.
     # 连接超时时间

nb-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   application:
     name: nb
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
 

nb-auth/src/main/java/com/nb/auth/sa/SaTokenConfig.java

@@ -68,6 +68,7 @@ public class SaTokenConfig {
         IGNORE_URL.add("/system/sysDept/**");
         IGNORE_URL.add("/assist/phone/**");
         IGNORE_URL.add("/bus/device/info/hospitalCode");
+        IGNORE_URL.add("/iot/**");
     }
 
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java

@@ -155,7 +155,8 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
     /**
      * 4G 传输时会带上医院编码
      */
-    private String hospitalCode;
+    @TableField(exist = false)
+    private String userId;
 
     /**
      * @author 龙三郎
@@ -235,7 +236,7 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
             this.setWarnFlow(WarnFlowUtils.getAlarm(items.getInteger(PumpParams.warnFlow)));
         }
 
-        this.setHospitalCode(items.getStringReturnDefault(PumpParams.userId,null));
+        this.setUserId(items.getStringReturnDefault(PumpParams.userId,null));
     }
 
 

nb-service/iot-service/src/main/java/com/nb/aliyun/controller/IotController.java

@@ -2,6 +2,8 @@ package com.nb.aliyun.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -65,6 +67,7 @@ public class IotController {
         if(ObjectUtil.isNull(source.getRunState())){
             throw new CustomException("[runState]设备运行状态不能为空");
         }
+        source.setUserId(StrUtil.fill(source.getUserId(),'0',4,true));
         source.setTest(false);
         executorService.execute(()->{
             BusDeviceEntity device = new BusDeviceEntity();
@@ -80,6 +83,7 @@ public class IotController {
             hospitalLog.setTenantId(device.getTenantId());
             long startTime = System.currentTimeMillis();
             try {
+                source.setMsgId(IdUtil.getSnowflakeNextIdStr());
                 BusDeviceRunningEntity sync = iotMsgHandler.sync(source, source.getDeviceId());
                 hospitalLog.setResult(JSONUtil.toJsonStr(sync));
                 hospitalLog.setSuccess(true);

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

@@ -102,7 +102,8 @@ public class DeviceInfoListener implements IIotMsgHandler {
             long startTime = System.currentTimeMillis();
             DeviceOperator deviceOperator = deviceRegistry.getOperator(deviceId);
             //对设备数据的一些参数进行初始化设置
-            deviceOperator.refreshHospitalCode(device.getHospitalCode());
+            deviceOperator.refreshHospitalCode(device.getUserId());
+            device.setTenantId(deviceOperator.getTenantId());
             init(device);
 
             //缓存操作

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceManualService.java

@@ -61,6 +61,7 @@ public class LocalBusDeviceManualService extends BaseService<BusDeviceManualMapp
         if(StrUtil.isEmpty(clinic.getId())){
             throw new CustomException("请选择临床信息");
         }
+        manual.setClinicId(clinic.getId());
         clinicService.updateById(clinic);
         if(StrUtil.isNotBlank(manual.getId())){
             BusDeviceManualEntity one = this.getOne(new QueryWrapper<BusDeviceManualEntity>().lambda().eq(BusDeviceManualEntity::getClinicId, clinic.getId()).last("limit 1"));
@@ -69,7 +70,6 @@ public class LocalBusDeviceManualService extends BaseService<BusDeviceManualMapp
             }else {
                 manual.setId(null);
             }
-            manual.setClinicId(clinic.getId());
         }
         this.saveOrUpdate(manual);
     }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceService.java

@@ -190,6 +190,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         // 设备存在
         if (isExists){
             // 更新设备
+            entity.setTenantId(device.getTenantId());
             return this.updateDevice(entity);
         }else {
             // 添加设备