fix(equip):视频排序接口优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoImportantEquipmentMapper.java

@@ -19,6 +19,4 @@ public interface VideoImportantEquipmentMapper extends BaseMapper<VideoImportant
 
 
     List<VideoImportantEquipmentVo> getVideoList(Map<String, Object> map);
-
-    List<String> getVideoAddressGroupList(Map<String, Object> map);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoImportantEquipmentServiceImpl.java

@@ -7,12 +7,7 @@ import com.yeejoin.equipmanage.mapper.VideoImportantEquipmentMapper;
 import com.yeejoin.equipmanage.service.IVideoImportantEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -33,19 +28,12 @@ public class VideoImportantEquipmentServiceImpl extends ServiceImpl<VideoImporta
 
     @Override
     public List<Map<String, List<VideoImportantEquipmentVo>>> getVideoList(Map<String, Object> map) {
-        ArrayList<Map<String, List<VideoImportantEquipmentVo>>> maps = new ArrayList<>();
         List<VideoImportantEquipmentVo> videoList = videoImportantEquipmentMapper.getVideoList(map);
-        List<String> videoAddressGroupList = videoImportantEquipmentMapper.getVideoAddressGroupList(map);
-        for (String address : videoAddressGroupList) {
-            if (!ObjectUtils.isEmpty(address)) {
-                List<VideoImportantEquipmentVo> collect = videoList.stream().filter(item -> item.getAddress().equals(address)).collect(Collectors.toList());
-                if (collect.size() > 0) {
-                    HashMap<String, List<VideoImportantEquipmentVo>> listMap = new HashMap<>();
-                    listMap.put(address, collect);
-                    maps.add(listMap);
-                }
-            }
-        }
-        return maps;
+        return videoList.stream()
+                .collect(Collectors.groupingBy(VideoImportantEquipmentVo::getAddress,LinkedHashMap::new,Collectors.toList()))
+                .entrySet().stream()
+                .map(entry -> Collections.singletonMap(entry.getKey(), entry.getValue()))
+                .collect(Collectors.toList());
+
     }
 }

amos-boot-system-equip/src/main/resources/mapper/VideoImportantEquipmentMapper.xml

@@ -44,18 +44,4 @@
         </where>
         ORDER BY v.create_date DESC
     </select>
-    <select id="getVideoAddressGroupList" resultType="java.lang.String">
-        						SELECT
-        v.address
-        FROM
-        wl_video v
-        <where>
-            <if test="importantEquipmentId != null">
-                v.id in (select video_id from wl_video_important_equipment
-                where important_equipment_id = #{importantEquipmentId})
-            </if>
-        </where>
-				GROUP BY v.address
-        ORDER BY v.create_date DESC
-    </select>
 </mapper>