From 8d566adaa62ca6483fdda12d112101937a33bd28 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 6 Mar 2025 16:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8D=A1=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bgt/AppBgtMessageController.java | 14 +- .../impl/WgzReissueacardServiceImpl.java | 160 ++++++++++-------- 2 files changed, 101 insertions(+), 73 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java index 36954fe..ac5eef5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtMessageController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.bgt; +import com.ruoyi.bgt.domain.BgtMessage; import com.ruoyi.bgt.domain.dto.BgtMessageDetailDTO; import com.ruoyi.bgt.domain.dto.BgtMessageMyListDTO; import com.ruoyi.bgt.domain.vo.BgtMessageCountVO; @@ -13,9 +14,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 消息Controller @@ -49,5 +48,14 @@ public class AppBgtMessageController extends BaseController { return iBgtMessageService.queryDetailPageList(dto); } + @ApiOperation("已读") + @PutMapping("/read/{id}") + public AjaxResult read(@PathVariable(value = "id") Long id) { + BgtMessage bgtMessage = new BgtMessage(); + bgtMessage.setId(id); + bgtMessage.setReadStatus("1"); + return AjaxResult.success(iBgtMessageService.updateById(bgtMessage)); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java index 45c08c3..866db30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java @@ -72,72 +72,71 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl queryPageList(WgzReissueacardQueryBo bo) { + Page result = page(PageUtils.buildPage(), buildQueryWrapper(bo)); + return PageUtils.buildDataInfo(result); + } - @Override - public TableDataInfo queryPageList(WgzReissueacardQueryBo bo) { - Page result = page(PageUtils.buildPage(), buildQueryWrapper(bo)); - return PageUtils.buildDataInfo(result); - } + @Override + public List queryList(WgzReissueacardQueryBo bo) { + return list(buildQueryWrapper(bo)); + } - @Override - public List queryList(WgzReissueacardQueryBo bo) { - return list(buildQueryWrapper(bo)); - } + private LambdaQueryWrapper buildQueryWrapper(WgzReissueacardQueryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getRecruitId() != null, WgzReissueacard::getRecruitId, bo.getRecruitId()); + lqw.eq(bo.getUserId() != null, WgzReissueacard::getUserId, bo.getUserId()); + lqw.eq(bo.getAttendanceId() != null, WgzReissueacard::getAttendanceId, bo.getAttendanceId()); + lqw.eq(StrUtil.isNotBlank(bo.getType()), WgzReissueacard::getType, bo.getType()); + lqw.like(StrUtil.isNotBlank(bo.getRecruitName()), WgzReissueacard::getRecruitName, bo.getRecruitName()); + lqw.eq(StrUtil.isNotBlank(bo.getRawTime()), WgzReissueacard::getRawTime, bo.getRawTime()); + lqw.eq(bo.getNowTime() != null, WgzReissueacard::getNowTime, bo.getNowTime()); + lqw.eq(StrUtil.isNotBlank(bo.getReason()), WgzReissueacard::getReason, bo.getReason()); + lqw.eq(bo.getAuditorUserId() != null, WgzReissueacard::getAuditorUserId, bo.getAuditorUserId()); + lqw.eq(StrUtil.isNotBlank(bo.getAuditorType()), WgzReissueacard::getAuditorType, bo.getAuditorType()); + lqw.eq(StrUtil.isNotBlank(bo.getAuditorOpinion()), WgzReissueacard::getAuditorOpinion, bo.getAuditorOpinion()); + lqw.eq(bo.getAuditorTime() != null, WgzReissueacard::getAuditorTime, bo.getAuditorTime()); + return lqw; + } - private LambdaQueryWrapper buildQueryWrapper(WgzReissueacardQueryBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getRecruitId() != null, WgzReissueacard::getRecruitId, bo.getRecruitId()); - lqw.eq(bo.getUserId() != null, WgzReissueacard::getUserId, bo.getUserId()); - lqw.eq(bo.getAttendanceId() != null, WgzReissueacard::getAttendanceId, bo.getAttendanceId()); - lqw.eq(StrUtil.isNotBlank(bo.getType()), WgzReissueacard::getType, bo.getType()); - lqw.like(StrUtil.isNotBlank(bo.getRecruitName()), WgzReissueacard::getRecruitName, bo.getRecruitName()); - lqw.eq(StrUtil.isNotBlank(bo.getRawTime()), WgzReissueacard::getRawTime, bo.getRawTime()); - lqw.eq(bo.getNowTime() != null, WgzReissueacard::getNowTime, bo.getNowTime()); - lqw.eq(StrUtil.isNotBlank(bo.getReason()), WgzReissueacard::getReason, bo.getReason()); - lqw.eq(bo.getAuditorUserId() != null, WgzReissueacard::getAuditorUserId, bo.getAuditorUserId()); - lqw.eq(StrUtil.isNotBlank(bo.getAuditorType()), WgzReissueacard::getAuditorType, bo.getAuditorType()); - lqw.eq(StrUtil.isNotBlank(bo.getAuditorOpinion()), WgzReissueacard::getAuditorOpinion, bo.getAuditorOpinion()); - lqw.eq(bo.getAuditorTime() != null, WgzReissueacard::getAuditorTime, bo.getAuditorTime()); - return lqw; - } + @Override + public Boolean insert(WgzReissueacard bo) { + WgzReissueacard add = BeanUtil.toBean(bo, WgzReissueacard.class); + validEntityBeforeSave(add); + return save(add); + } - @Override - public Boolean insert(WgzReissueacard bo) { - WgzReissueacard add = BeanUtil.toBean(bo, WgzReissueacard.class); - validEntityBeforeSave(add); - return save(add); - } + @Override + public Boolean update(WgzReissueacard bo) { + WgzReissueacard update = BeanUtil.toBean(bo, WgzReissueacard.class); + validEntityBeforeSave(update); + return updateById(update); + } - @Override - public Boolean update(WgzReissueacard bo) { - WgzReissueacard update = BeanUtil.toBean(bo, WgzReissueacard.class); - validEntityBeforeSave(update); - return updateById(update); - } + /** + * 保存前的数据校验 + * + * @param entity 实体类数据 + */ + private void validEntityBeforeSave(WgzReissueacard entity) { + //TODO 做一些数据校验,如唯一约束 + } - /** - * 保存前的数据校验 - * - * @param entity 实体类数据 - */ - private void validEntityBeforeSave(WgzReissueacard entity){ - //TODO 做一些数据校验,如唯一约束 - } - - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return removeByIds(ids); - } + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return removeByIds(ids); + } /** * APP相关 @@ -162,7 +161,7 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl mp = new HashMap<>(); mp.put("projectName", recruit.getRecruitName()); mp.put("userName", byId.getUsername()); - mp.put("data",String.valueOf(req.getNowTime())); + mp.put("data", String.valueOf(req.getNowTime())); if (insert > 0) { WgzMessage wgzMessage = new WgzMessage(). setSenderType(USERTYPE_SYSTEM). setRecipientType(USERTYPE_WGZ). setRecipientId(appUserId). - setHeadline(WgzAndBgtMessageConstant.wgzMessage(mp,"109")). - setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp,"110")). + setHeadline(WgzAndBgtMessageConstant.wgzMessage(mp, "109")). + setSubheading(WgzAndBgtMessageConstant.wgzMessage(mp, "110")). setTableId(wgzReissueacard.getId()). setTableName(SqlHelper.table(WgzReissueacard.class).getTableName()). setMessageLargeType(LARGE_OTHER). setMessageSmallType(SMALL_CARD); - if (!iWgzMessageService.sendAMessage(wgzMessage)){ + if (!iWgzMessageService.sendAMessage(wgzMessage)) { throw new RuntimeException("系统补卡消息发送失败！"); } BgtMessage bgtMessage = new BgtMessage(). @@ -202,13 +201,13 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl queryDTOPage = new Page<>(); queryDTOPage.setCurrent(req.getPageNum()); queryDTOPage.setSize(req.getPageSize()); - return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage,userId)); + return PageUtils.buildDataInfo(baseMapper.userReplacementCardRecordListPage(queryDTOPage, userId)); } @Override @@ -232,7 +231,7 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl queryDTOPage = new Page<>(); queryDTOPage.setCurrent(dto.getPageNum()); queryDTOPage.setSize(dto.getPageSize()); - return PageUtils.buildDataInfo(baseMapper.appQueryPageList(queryDTOPage,dto)); + return PageUtils.buildDataInfo(baseMapper.appQueryPageList(queryDTOPage, dto)); } @Override @@ -241,10 +240,31 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl mp = new HashMap<>(); - mp.put("projectName",iBgtProjectRecruitService.getById(byId.getRecruitId()).getRecruitName()); - mp.put("auditor",SecurityUtils.getUsername()); + mp.put("projectName", iBgtProjectRecruitService.getById(byId.getRecruitId()).getRecruitName()); + mp.put("auditor", SecurityUtils.getUsername()); Map map = bgtMessage(mp, BGT_TYPE_MAKE_UP, true); WgzMessage wgzMessage = new WgzMessage() .setSenderType(USERTYPE_BGT)