From 229b7373b308802b04732496953690e7e59784bc Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Tue, 5 Nov 2024 15:04:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=EF=BC=8C=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=B6=88=E6=81=AF=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8CAPP-=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MessageCenterController.java | 9 ++++++++- .../xyt/service/AssessTaskService.java | 18 ++++++++++-------- .../xyt/service/InspectTaskService.java | 2 +- .../xyt/service/MessageCenterService.java | 19 +++++++++++++++++-- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/MessageCenterController.java b/src/main/java/com/gunshi/project/xyt/controller/MessageCenterController.java index e70ecb2..dc6e157 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/MessageCenterController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/MessageCenterController.java @@ -2,6 +2,7 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; +import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.project.xyt.entity.so.MessageCenterPageSo; import com.gunshi.project.xyt.model.MessageCenter; import com.gunshi.project.xyt.service.MessageCenterService; @@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 描述: 消息中心 * author: xusan @@ -44,5 +47,9 @@ public class MessageCenterController { return R.ok(service.allRead(receiveUserId)); } - + @Operation(summary = "APP-消息中心") + @PostMapping("/list") + public R> listMes(@Validated @RequestBody DateTimeRangeSo dateTimeRangeSo) { + return R.ok(service.listMes(dateTimeRangeSo)); + } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java index ce7cb40..ad11be2 100644 --- a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java +++ b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java @@ -124,7 +124,16 @@ public class AssessTaskService extends ServiceImpl assessObjectService.updateTeams(teams); //考核指标 List ratings = new ArrayList<>(); - List messages = new ArrayList<>(); + List teamUserIds = teams.stream().map(AssessTeam::getTeamUserId).distinct().collect(Collectors.toList()); + List messages = teamUserIds.stream().map(o->{ + MessageCenter center = new MessageCenter(); + center.setPublishUserId(task.getCreateUserId()); + center.setPublishUserName(task.getCreateUserName()); + center.setReceiveUserId(o); + center.setTitle("评分任务"); + center.setContent("您收到一条考核评分任务的提醒："+task.getTaskName()+"，请及时处理。"); + return center; + }).collect(Collectors.toList()); List indicatorIds = this.baseMapper.queryIndicators(task.getTemplateId()); for(AssessTeam team : teams){ for(AssessIndicator indicator : indicatorIds){ @@ -135,13 +144,6 @@ public class AssessTaskService extends ServiceImpl rating.setStandardScore(indicator.getStandardScore()); ratings.add(rating); } - MessageCenter center = new MessageCenter(); - center.setPublishUserId(task.getCreateUserId()); - center.setPublishUserName(task.getCreateUserName()); - center.setReceiveUserId(team.getTeamUserId()); - center.setTitle("评分任务"); - center.setContent("您收到一条考核评分任务的提醒："+task.getTaskName()+"，请及时处理。"); - messages.add(center); } teamRatingService.saveBatch(ratings); messageCenterService.insertMessage(messages); diff --git a/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java b/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java index 81ffe62..7765ca8 100644 --- a/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java +++ b/src/main/java/com/gunshi/project/xyt/service/InspectTaskService.java @@ -97,7 +97,7 @@ public class InspectTaskService extends ServiceImpl messageCenters = list.stream().filter(o -> o.getIsHandle() == 1).map(t->{ + List messageCenters = list.stream().filter(o -> o.getIsNormal() == 0 && o.getIsHandle() == 0).map(t->{ MessageCenter center = new MessageCenter(); center.setPublishUserId(task.getInspectUserId()); center.setPublishUserName(task.getInspectUserName()); 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 9206413..9234f00 100644 --- a/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java +++ b/src/main/java/com/gunshi/project/xyt/service/MessageCenterService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.project.xyt.entity.so.MessageCenterPageSo; import com.gunshi.project.xyt.mapper.AttResBaseMapper; import com.gunshi.project.xyt.mapper.MessageCenterMapper; @@ -15,6 +16,7 @@ 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 com.ruoyi.common.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -78,7 +80,7 @@ public class MessageCenterService extends ServiceImpl listMes(DateTimeRangeSo dateTimeRangeSo) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(MessageCenter::getReceiveUserId, SecurityUtils.getUserId()); + if (ObjectUtils.isNotNull(dateTimeRangeSo) && ObjectUtils.isNotNull(dateTimeRangeSo.getStart())) { + queryWrapper.gt(MessageCenter::getPublishTime, dateTimeRangeSo.getStart()); + } + if (ObjectUtils.isNotNull(dateTimeRangeSo) && ObjectUtils.isNotNull(dateTimeRangeSo.getEnd())) { + queryWrapper.lt(MessageCenter::getPublishTime, dateTimeRangeSo.getEnd()); + } + queryWrapper.orderByAsc(MessageCenter::getStatus).orderByDesc(MessageCenter::getPublishTime); + return this.list(queryWrapper); + } }