From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 24 六月 2025 14:09:07 +0800 Subject: [PATCH] 每日录像可用指标添加日志,修改大屏为查看当前月平均 --- ycl-server/src/main/java/com/ycl/platform/service/impl/ImageResourceSecurityServiceImpl.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 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 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; } -- Gitblit v1.8.0