From 1c06f123c3d29ec4d7f778dcd5de2aed05faef3d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 05:49:34 +0800
Subject: [PATCH] 视频安全资源优化

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java |   20 +++++++++++++++-----
 ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java                  |    5 +++--
 ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml                          |    2 +-
 ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ImageResourceDTO.java                     |   11 +++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ImageResourceDTO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ImageResourceDTO.java
new file mode 100644
index 0000000..e171cbf
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/dto/ImageResourceDTO.java
@@ -0,0 +1,11 @@
+package com.ycl.platform.domain.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ImageResourceDTO {
+    private Long deptId;
+    private BigDecimal imageResourceSecurity;
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
index 407dcb1..8d95a9b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
@@ -1,10 +1,12 @@
 package com.ycl.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.dto.ImageResourceDTO;
 import com.ycl.platform.domain.entity.CheckIndexVideo;
 import com.ycl.platform.domain.query.DashboardQuery;
 import org.apache.ibatis.annotations.MapKey;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +85,5 @@
      * 鏌ヨ姣忎釜閮ㄩ棬鏈�鏂版暟鎹�
      * @return 鏁版嵁Map
      */
-    @MapKey(value = "deptId")
-    Map<Long, CheckIndexVideo> selectLastOneByDept();
+    List<ImageResourceDTO> selectLastOneByDept();
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java
index 562a993..dfa4d7a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java
@@ -3,6 +3,7 @@
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.read.listener.PageReadListener;
 import com.ycl.handler.ImageResourceHandler;
+import com.ycl.platform.domain.dto.ImageResourceDTO;
 import com.ycl.platform.domain.entity.CheckIndexVideo;
 import com.ycl.platform.domain.entity.ImageResourceSecurity;
 import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
@@ -45,11 +46,20 @@
     @Override
     public List<ImageResourceSecurity> selectImageResourceSecurityList(ImageResourceSecurity imageResourceSecurity) {
         List<ImageResourceSecurity> list = imageResourceSecurityMapper.selectImageResourceSecurityList(imageResourceSecurity);
-        Map<Long, CheckIndexVideo> map = checkIndexVideoMapper.selectLastOneByDept();
-        list.forEach(item -> item.setImageResourceSecurity(
-                Optional.ofNullable(map.get(item.getDeptId()))
-                        .map(CheckIndexVideo::getImageResourceSecurity)
-                        .orElse(BigDecimal.ZERO)));
+        List<ImageResourceDTO> dtos = checkIndexVideoMapper.selectLastOneByDept();
+        for (ImageResourceSecurity item : list) {
+            Long deptId = item.getDeptId();
+            boolean flag = false;
+            for (ImageResourceDTO dto : dtos) {
+                if(dto.getDeptId().equals(deptId)){
+                    item.setImageResourceSecurity(dto.getImageResourceSecurity());
+                    flag = true;
+                }
+                if(!flag){
+                    item.setImageResourceSecurity(BigDecimal.ZERO);
+                }
+            }
+        }
         return list;
     }
 
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 9f137f1..d9428bf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -208,7 +208,7 @@
             rn = 1;
     </select>
 
-    <select id="selectLastOneByDept" resultType="java.util.Map">
+    <select id="selectLastOneByDept" resultType="com.ycl.platform.domain.dto.ImageResourceDTO">
         WITH temp AS (
             SELECT
                 image_resource_security AS imageResourceSecurity,

--
Gitblit v1.8.0