物联总览bug修改

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

@@ -351,12 +351,12 @@ public class IotBoardServiceImpl implements IotBoardService {
         List<Map<String, String>> mapList = iotBoardMapper.countSensorNums(orgPath);
         List<IotBoardTotalData.SensorData> sensorDataList = new ArrayList<>();
         for (SensorType sensorType : SensorType.values()) {
-            Optional<Map<String, String>> mapOptional = mapList.stream().filter(m -> ObjectUtil.equal(sensorType.getCode().toString(), m.get(DEVICE_TYPE))).findAny();
+            Optional<Map<String, String>> mapOptional = mapList.stream().filter(m -> ObjectUtil.equal(sensorType.getCode().toString(), String.valueOf(m.get(DEVICE_TYPE)))).findAny();
             int sensorNum = 0;
             if (mapOptional.isPresent()) {
                 sensorNum = Integer.parseInt(mapOptional.get().get(MAP_VALUE));
             }
-            Optional<Map<String, String>> alarmNumoptional = alarmCountMap.stream().filter(m -> ObjectUtil.equal(sensorType.getCode().toString(), m.get(DEVICE_TYPE))).findAny();
+            Optional<Map<String, String>> alarmNumoptional = alarmCountMap.stream().filter(m -> ObjectUtil.equal(sensorType.getCode().toString(), String.valueOf(m.get(DEVICE_TYPE)))).findAny();
             int alarmNum = 0;
             if (alarmNumoptional.isPresent()) {
                 alarmNum = Integer.parseInt(alarmNumoptional.get().get(MAP_VALUE));
@@ -375,7 +375,7 @@ public class IotBoardServiceImpl implements IotBoardService {
 
         //录像天数存储
         List<Map<String, String>> videoCheckMap = iotBoardMapper.selectVideoDaysStorage(orgPath, new Date());
-        HashMap<Integer, Integer> hashMap = new HashMap<>();
+        HashMap<Integer, Integer> hashMap = new LinkedHashMap<>();
         for (Map<String, String> map : videoCheckMap) {
             hashMap.put(Integer.parseInt(map.get("planDays")), Integer.parseInt(map.get(MAP_VALUE)));
         }

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

@@ -179,10 +179,10 @@
     </select>
 
     <select id="selectAlarmCount" resultType="java.util.Map">
-        select d.field_code as deviceType, CAST(COUNT(1) AS CHAR) as nums
+        select d.source_type as deviceType, CAST(SUM(1) AS CHAR) as nums
         from iot_alarm_data d
                  inner join sys_org o on o.id = d.org_id
-        where o.deleted = 0
+        where o.deleted = 0 and data_type=0
           and (
             (
                 #{beginTime}   <![CDATA[<=]]> d.time
@@ -199,6 +199,6 @@
                 )
             )
           and o.path like concat(#{orgPath}, '%')
-        group by d.field_code
+        group by d.source_type
     </select>
 </mapper>

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

@@ -141,7 +141,7 @@
                  inner join sys_org o on o.id = c.org_id
         where o.deleted = 0
           and org_path like concat(#{orgPath}, '%')
-        group by c.plan_days
+        group by c.plan_days order by c.plan_days
     </select>
 
     <select id="selectVideoCheckSelf" resultType="com.xunmei.common.core.domain.video.MediatorVideoIntegrityCheckLog">