From ac14c3032afc7007b957662148c14a2a967b4d41 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Fri, 20 Sep 2024 14:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=97=E5=8E=8B=EF=BC=8C=E6=B8=97=E6=B5=81?= =?UTF-8?q?=EF=BC=8C=E4=BD=8D=E7=A7=BB=E5=91=8A=E8=AD=A6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=9B=E8=80=83=E6=A0=B8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=A2=AB=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/service/AssessTemplateService.java | 19 ++++++++++++ .../xyt/service/MessageCenterService.java | 31 +++++++++++++++++++ .../xyt/service/OsmoticWarnRService.java | 5 +++ 3 files changed, 55 insertions(+) diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java index 8a39826..750224e 100644 --- a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java +++ b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java @@ -10,8 +10,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.xyt.entity.dto.InspectItemDto; import com.gunshi.project.xyt.entity.so.AttCctvBasePage; +import com.gunshi.project.xyt.mapper.AssessTaskMapper; import com.gunshi.project.xyt.mapper.AssessTemplateMapper; import com.gunshi.project.xyt.model.AssessIndicator; +import com.gunshi.project.xyt.model.AssessTask; import com.gunshi.project.xyt.model.AssessTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +22,9 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * 描述: 考核模板 @@ -38,6 +42,9 @@ public class AssessTemplateService extends ServiceImpl res = this.page(page.getPageSo().toPage(), query); + if (res.getRecords() != null && res.getRecords().size() > 0) { + fillUsedInfo(res.getRecords()); + } return res; } + private void fillUsedInfo(List records) { + List ids = records.stream().map(AssessTemplate::getId).collect(Collectors.toList()); + List list = taskMapper.selectList(new QueryWrapper().in("template_id", ids)); + Map map = list.stream().collect(Collectors.groupingBy(AssessTask::getTemplateId, Collectors.counting())); + for (AssessTemplate record : records) { + record.setIsUsed(map.containsKey(record.getId()) ? 1 : 0); + } + } + public String startStop(InspectItemDto dto) { Integer status = dto.getStatus(); AssessTemplate template = super.getById(dto.getId()); diff --git a/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java b/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java index 8969000..2388fef 100644 --- a/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java @@ -12,6 +12,7 @@ import com.gunshi.project.xyt.mapper.AttResBaseMapper; import com.gunshi.project.xyt.mapper.MessageCenterMapper; import com.gunshi.project.xyt.model.AttResBase; import com.gunshi.project.xyt.model.MessageCenter; +import com.gunshi.project.xyt.model.OsmoticWarnR; import com.gunshi.project.xyt.model.StRsvrR; import com.gunshi.project.xyt.util.DateUtil; import lombok.extern.slf4j.Slf4j; @@ -136,6 +137,36 @@ public class MessageCenterService extends ServiceImpl queryPage(WarnPageSo warnPageSo) { return this.baseMapper.queryPage(warnPageSo.getPageSo().toPage(),warnPageSo); } @@ -158,6 +161,8 @@ public class OsmoticWarnRService extends ServiceImpl