瀏覽代碼

fix:报警次数最多的十条记录租户隔离

陈长荣 4 月之前
父節點
當前提交
4576828c9a

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/mapper/SensorAlarmMapper.java

@@ -19,5 +19,5 @@ public interface SensorAlarmMapper extends BaseMapper<SensorAlarm> {
     /**
      * 获取报警次数最多的十条记录
      */
-    List<TopWarningDto> getTop10Warning(@Param("month") String month, @Param("types") List<String> types);
+    List<TopWarningDto> getTop10Warning(@Param("orgId") String orgId, @Param("month") String month, @Param("types") List<String> types);
 }

+ 1 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/mapper/mapping/SensorAlarmMapper.xml

@@ -21,6 +21,7 @@
       <if test="month != null">
         AND alarm_time LIKE concat(#{month}, '%')
       </if>
+      AND CREATE_ORG = #{orgId}
       GROUP BY device_id , sensor_route) tmp
     ORDER BY tmp.totalWarnings DESC
     limit 10

+ 2 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/SensorAlarmServiceImpl.java

@@ -114,7 +114,8 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
 
     @Override
     public List<TopWarningDto> topWarning(String month, List<String> types) {
-        return getBaseMapper().getTop10Warning(month, types);
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+        return getBaseMapper().getTop10Warning(loginUser.getOrgId(), month, types);
     }
 
     public Page<SensorAlarm> getSensorAlarmPage(MessagePageParam messagePageParam) {