diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java index 88debee9e..d7c3829f6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java @@ -60,10 +60,12 @@ public class AuthDummyInventoryBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryBaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); - IPage pageList = authDummyInventoryBaseEOService.page(page, queryWrapper); - this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut); - return Result.OK(pageList); + IPage pageList = authDummyInventoryBaseEOService.getPageInfo(page, queryWrapper); +// this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut); + return Result.OK(authDummyInventoryBaseEO.getCut(),pageList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java index 43b6dfcc6..0b36891f8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java @@ -80,4 +80,8 @@ public class AuthDummyInventoryBaseEO implements Serializable { @TableField(exist = false) private String cut; + + /**订阅标识*/ + @TableField(exist = false) + private String readFlag; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java index 944bd629f..f04e825d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java @@ -1,6 +1,9 @@ package com.jero.modules.authDummy.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -92,4 +95,12 @@ public interface IAuthDummyInventoryBaseEOService extends IService getPageInfo(Page page, QueryWrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index 5d56eb3ca..2d2227610 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -3,8 +3,11 @@ package com.jero.modules.authDummy.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; @@ -25,6 +28,7 @@ import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.entity.DummyReadEO; import com.jero.modules.dummy.enums.InventoryStateEnum; +import com.jero.modules.dummy.enums.ReadFlagEnum; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.system.entity.SysAnnouncement; @@ -82,6 +86,9 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfo(Page page, QueryWrapper queryWrapper) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + IPage pageList = this.page(page, queryWrapper); + if (pageList.getRecords().size() != 0) { + List records = pageList.getRecords(); + //订阅标识 + List ids = records.stream().map(AuthDummyInventoryBaseEO::getId).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(AuthDummyReadEO::getAuthDummyInventoryBaseId, ids).in(AuthDummyReadEO::getCreateBy,sysUser.getUsername()); + List authDummyReadEOS = iAuthDummyReadEOService.list(wrapper); + List authDummyReadIdList = authDummyReadEOS.stream().map(AuthDummyReadEO::getAuthDummyInventoryBaseId).collect(Collectors.toList()); + for (AuthDummyInventoryBaseEO record : pageList.getRecords()) { + //订阅标识 + if(authDummyReadIdList.contains(record.getId())){ + record.setReadFlag(ReadFlagEnum.READ.getValue()); + }else{ + record.setReadFlag(ReadFlagEnum.CANCEL_READ.getValue()); + } + } + } + + return pageList; + } }