From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
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 68853c4..562a993 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,8 +3,10 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.read.listener.PageReadListener;
import com.ycl.handler.ImageResourceHandler;
+import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.entity.ImageResourceSecurity;
import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.mapper.ImageResourceSecurityMapper;
import com.ycl.platform.service.IImageResourceSecurityService;
@@ -17,9 +19,8 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* platformService涓氬姟灞傚鐞�
@@ -34,6 +35,7 @@
private final ImageResourceSecurityMapper imageResourceSecurityMapper;
private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
private final ISysDeptService deptService;
+ private final CheckIndexVideoMapper checkIndexVideoMapper;
@Override
public ImageResourceSecurity selectImageResourceSecurityById(Long id) {
@@ -42,7 +44,13 @@
@Override
public List<ImageResourceSecurity> selectImageResourceSecurityList(ImageResourceSecurity imageResourceSecurity) {
- return imageResourceSecurityMapper.selectImageResourceSecurityList(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)));
+ return list;
}
@Override
--
Gitblit v1.8.0