数据新增是加上租户id

ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/IotSensorController.java

@@ -47,9 +47,9 @@ public class IotSensorController extends BaseController {
         return iotSensorService.queryPageList(bo, pageQuery);
     }
     /**
-     * 查询涉尘信息列表
+     * 查询所以传感器信息列表
      */
-    @SaCheckPermission("hazard:dustDustinfo:list")
+    @SaCheckPermission("hazard:sensor:list")
     @GetMapping("/query")
     public R<List<IotSensorVo>> queryList(IotSensorBo bo) {
         return R.ok(iotSensorService.queryList(bo));
@@ -57,7 +57,7 @@ public class IotSensorController extends BaseController {
     /**
      * 查询未被绑定的传感器
      */
-    @SaCheckPermission("hazard:dustDustinfo:list")
+    @SaCheckPermission("hazard:sensor:list")
     @GetMapping("/queryByNoBound")
     public R<List<IotSensorVo>> queryByNoBound(IotSensorBo bo) {
         return R.ok(iotSensorService.queryByNoBound(bo));

ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/domain/bo/IotSensorDataBo.java

@@ -1,5 +1,6 @@
 package org.dromara.hazard.domain.bo;
 
+import org.dromara.common.tenant.core.TenantEntity;
 import org.dromara.hazard.domain.IotSensorData;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -20,7 +21,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = IotSensorData.class, reverseConvertGenerate = false)
-public class IotSensorDataBo extends BaseEntity {
+public class IotSensorDataBo extends TenantEntity {
 
     /**
      * time主键

ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/domain/vo/IotDeviceVo.java

@@ -96,5 +96,9 @@ public class IotDeviceVo implements Serializable {
     @ExcelProperty(value = "备用字段3")
     private String txt3;
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
 
 }

ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/handler/HazardMqttMessageHandler.java

@@ -135,6 +135,7 @@ public class HazardMqttMessageHandler implements MqttMessageHandler {
                         iotSensorDataBo.setDeviceId(deviceId);
                         iotSensorDataBo.setSensorCode(sensorId);
                         iotSensorDataBo.setValue(dataBo.getValue());
+                        iotSensorDataBo.setTenantId(deviceVo.getTenantId());//设备的租户id
                         iotSensorDataBo.setRawJson(payload);//保存原始数据
                         iotSensorDataService.insertByBo(iotSensorDataBo);
 

ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/service/impl/IotSensorDataServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 import org.dromara.hazard.domain.bo.IotSensorDataBo;
 import org.dromara.hazard.domain.vo.IotSensorDataVo;