增加租户筛选条件

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -142,6 +142,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
         List<Long> sceneIds = pages.getList().stream().map(OnlineDataDto::getSceneId).collect(Collectors.toList());
         monitorDataCollectDto.setType(2);
         monitorDataCollectDto.setSceneIds(sceneIds);
+        monitorDataCollectDto.setTenantId(loginUser.getTenantId());
         List<MonitorDataCollectDto> calculateRes=onlineMonitorMapper.selectSceneParam(monitorDataCollectDto);
 
         GetCalOnlineData(pages.getList(),calculateRes);//获取在线数据及计算数据

sms_water/src/main/resources/mapper/AlarmSettingMapper.xml

@@ -46,6 +46,9 @@
             <if test="alarm.id != null">
                 and t1.id = #{alarm.id}
             </if>
+            <if test="alarm.tenantId != null and alarm.tenantId != ''">
+                and t1.tenant_id = #{alarm.tenantId}
+            </if>
             <if test="alarm.attributeName != null and alarm.attributeName != ''">
                 and t4.name like CONCAT('%',#{alarm.attributeName},'%')
             </if>

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -81,6 +81,9 @@
         <if test="sceneName != null and sceneName != ''">
             and t1.scene_name  like concat('%',#{sceneName},'%')
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            and t1.tenant_id = #{tenantId}
+        </if>
         order by t1.scene_name
     </select>
     <!--查询实时报警数量-->
@@ -101,6 +104,9 @@
         <if test="sceneName != null and sceneName != ''">
             and t1.scene_name  like concat('%',#{sceneName},'%')
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            and t1.tenant_id = #{tenantId}
+        </if>
         group by t1.scene_name
         order by alalmCount desc
     </select>
@@ -122,6 +128,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            and t1.tenant_id = #{tenantId}
+        </if>
         order by t1.scene_name,t5.seq
     </select>
     <!--查询地图参数数据-->
@@ -159,6 +168,9 @@
         <if test="onlineDataDto.sceneName != null and onlineDataDto.sceneName != ''">
             and t1.scene_name  like concat('%',#{onlineDataDto.sceneName},'%')
         </if>
+        <if test="onlineDataDto.tenantId != null and onlineDataDto.tenantId != ''">
+            and t1.tenant_id = #{onlineDataDto.tenantId}
+        </if>
         order by  t1.date_create
     </select>
     <!--查询设备报警分析-->
@@ -226,6 +238,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            and t1.tenant_id = #{tenantId}
+        </if>
         order by t1.scene_name,t5.seq
     </select>
 </mapper>