From 368acedc240047c164036243fdfd4ad89aa7c7dd Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 13 Mar 2023 09:13:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=88=E8=AE=A2=E9=98=85=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryBaseEOController.java | 8 +++-- .../entity/AuthDummyInventoryBaseEO.java | 4 +++ .../IAuthDummyInventoryBaseEOService.java | 11 +++++++ .../AuthDummyInventoryBaseEOServiceImpl.java | 33 +++++++++++++++++++ 4 files changed, 53 insertions(+), 3 deletions(-) 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; + } } From 3aeb7b192c510d21e9bb85780a54591f99090337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 09:17:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 1d22e632a..348e013cb 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -259,7 +259,7 @@ export default { url:{ list: '/authDummy/authDummyInventoryInfoEO/page', logList: '',//更新log - exportTemplate: '',//模板下载 + exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载 exportData: '',//导出 addModel: '/authDummy/authDummyInventoryInfoEO/add',//添加 copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制 From c7ad0fa512bd4ce2143723c5c3e379071d2ad377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 13 Mar 2023 09:21:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/virtualAuthenticationList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue index d43b17256..0a32fa3b6 100644 --- a/jero-web/src/views/virtualAuthenticationList/index.vue +++ b/jero-web/src/views/virtualAuthenticationList/index.vue @@ -353,9 +353,9 @@ export default { onOk() { let url = '' if (val.readFlag == 0 || !val.readFlag) { - url = 'dummy/dummyInventoryBaseEO/read' + url = '/authDummy/authDummyInventoryBaseEO/read' } else { - url = 'dummy/dummyInventoryBaseEO/cancelRead' + url = '/authDummy/authDummyInventoryBaseEO/cancelRead' } getAction(url, { id: val.id }).then((res) => { if (res.success) {