bug修改

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

@@ -543,7 +543,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
             //处理通道或者动环传感器信息
             for (SubDeviceInfo subDeviceInfo : subDeviceList) {
                 //动环中 控电箱按钮与 市电总回路/八小时总回路通电状态不同步
-                boolean isFusDevice = ProductEnums.FSU_GATEWAY.getProductName().contains(dvsBaseInfo.getProductName()) && (!list.contains(dvsBaseInfo.getProductName()));
+                boolean isFusDevice = ProductEnums.FSU_GATEWAY.getProductName().contains(dvsBaseInfo.getProductName()) && (!list.contains(subDeviceInfo.getType()));
                 String productName = isFusDevice ? subDeviceInfo.getType() : dvsBaseInfo.getProductName();
                 IotDeviceInfo channelInfo = selectByTypeAndHostAndCode(serverInfo.getIotCode(), subDeviceInfo.getParentCode(), productName, subDeviceInfo.getDeviceCode());
 

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

@@ -129,7 +129,7 @@
     </select>
 
     <select id="selectDeviceTypeCount" resultType="com.xunmei.iot.vo.alarmData.DeviceTypeCountVo">
-        SELECT
+        SELECT a.id,
             a.device_type as deviceType,
             count(1) as deviceTypeCount,
             t.alarmNums as deviceTypeAlarmCount
@@ -149,9 +149,9 @@
         <if test="  query.checkSub != null and query.checkSub == false">
             and a.org_id = #{query.orgId}
         </if>
-        GROUP BY a.device_type
+        GROUP BY a.id
         union all
-        SELECT
+        SELECT a.id,
             a.sensor_type as deviceType,
             count(1) as deviceTypeCount,
             t.alarmNums as deviceTypeAlarmCount
@@ -166,7 +166,7 @@
         <if test="  query.checkSub != null and query.checkSub == false">
             and a.org_id = #{query.orgId}
         </if>
-        GROUP BY a.sensor_type;
+        GROUP BY a.id;
     </select>
     <select id="selectSensorAlarmPageList" resultType="com.xunmei.iot.vo.alarm.IotAlarmDataVo">
         SELECT