Merge branch 'V1.0.11' of http://10.87.21.221:8000/jzyd_yyds/soc into V1.0.11

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/IotWebStatisticBoardMapper.java

@@ -26,7 +26,7 @@ public interface IotWebStatisticBoardMapper {
 
     BoardAlarmRateVo alarmRate(Long orgId);
 
-    List<BoardAlarmInfoVo> alarmList(Long orgId);
+    List<BoardAlarmInfoVo> alarmList(@Param("orgId") Long orgId,@Param("productTypeList") List<String> productTypeList);
 
     List<BoardDeviceCountDto> orgDeviceCount(Long orgId);
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotWebStatisticBoardServiceImpl.java

@@ -2,6 +2,7 @@ package com.xunmei.iot.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.enums.iot.BaseDeviceTypeEnum;
 import com.xunmei.common.core.enums.iot.DeviceTypeEnum;
@@ -254,7 +255,8 @@ public class IotWebStatisticBoardServiceImpl implements IIotWebStatisticBoardSer
 
     @Override
     public List<BoardAlarmInfoVo> alarmList(Long orgId) {
-        return iotWebStatisticBoardMapper.alarmList(orgId);
+        List<String> productTypeList = Lists.newArrayList("FSU_Water", "FSU_TemperatureAndHumidity", "FSU_Smoke", "FSU_Gas", "FSU_DoorMagnetic", "FSU_Theft","FSU_DoPowerCollection8Hour","FSU_DoPowerCollection24Hour","FSU_Ups");
+        return iotWebStatisticBoardMapper.alarmList(orgId,productTypeList);
     }
 
     @Override

soc-modules/soc-modules-iot/src/main/resources/mapper/IotWebStatisticBoardMapper.xml

@@ -139,6 +139,12 @@
                  INNER JOIN iot_device_info di ON ad.device_id = di.id
         where di.deleted = 0
           and di.enable=0
+          <if test="productTypeList != null and productTypeList.size() > 0">
+              and ad.source_type in
+              <foreach collection="productTypeList" item="item" index="index" open="(" separator="," close=")">
+                  #{item}
+              </foreach>
+          </if>
         ORDER BY time DESC
         LIMIT 50
     </select>