From 3b149340989e484cef12763ce5014d5ae244bec4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 12 Apr 2022 16:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E9=A1=B5--=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DummyInventoryBaseEOController.java | 20 +- .../dummy/entity/DummyInventoryBaseEO.java | 5 + .../modules/dummy/enums/ReadFlagEnum.java | 37 ++++ .../impl/DummyInventoryBaseEOServiceImpl.java | 174 ++++++++++-------- 4 files changed, 153 insertions(+), 83 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/ReadFlagEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java index ca05806ab..7fd3c2f11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java @@ -176,15 +176,25 @@ public class DummyInventoryBaseEOController extends JeroController read(@RequestParam(name="id",required=true) String id){ + try { + dummyInventoryBaseEOService.read(id); + } catch (Exception e) { + return Result.OK("订阅失败"); + } + return Result.OK("订阅成功"); } @AutoLog(value = "取消订阅") @ApiOperation(value="取消订阅", notes="取消订阅") @GetMapping(value = "/cancelRead") - public void cancelRead(String dummyId){ - dummyInventoryBaseEOService.cancelRead(dummyId); - } + public Result cancelRead(String id){ + try { + dummyInventoryBaseEOService.cancelRead(id); + } catch (Exception e) { + return Result.OK("取消订阅失败"); + } + return Result.OK("取消订阅成功"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java index 224016ba1..b79b8d0db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java @@ -1,6 +1,7 @@ package com.jero.modules.dummy.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -75,4 +76,8 @@ public class DummyInventoryBaseEO implements Serializable { @Dict(dicCode ="dummy_inventory_state") private java.lang.String state; + /**订阅标识*/ + @TableField(exist = false) + private String readFlag; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/ReadFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/ReadFlagEnum.java new file mode 100644 index 000000000..65cb9382e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/ReadFlagEnum.java @@ -0,0 +1,37 @@ +package com.jero.modules.dummy.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum ReadFlagEnum { + CANCEL_READ("取消订阅","0"), + READ("订阅","1"); + + + + String name; + String value; + + private ReadFlagEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index bc473af37..dfc71c10e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -7,13 +7,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.system.vo.LoginUser; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyReadEO; +import com.jero.modules.dummy.enums.ReadFlagEnum; import com.jero.modules.dummy.mapper.DummyInventoryBaseEOMapper; import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; +import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -23,25 +26,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 虚拟清单基础表 * @Author: jero-boot - * @Date: 2022-04-08 + * @Date: 2022-04-08 * @Version: V1.0 */ @Service public class DummyInventoryBaseEOServiceImpl extends ServiceImpl implements IDummyInventoryBaseEOService { - @Autowired - private ISysUserService sysUserService; - @Autowired - private DummyReadEOServiceImpl dummyReadEOService; + @Autowired + private ISysUserService sysUserService; + @Autowired + private DummyReadEOServiceImpl dummyReadEOService; + @Autowired + private IDummyReadEOService iDummyReadEOService; - /** - * 保存 - * - * @param dummyInventoryBaseEO - * @return - */ - @Override + /** + * 保存 + * + * @param dummyInventoryBaseEO + * @return + */ + @Override public void add(DummyInventoryBaseEO dummyInventoryBaseEO) { Date now = new Date(); dummyInventoryBaseEO.setCreateTime(now); @@ -49,94 +54,107 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public DummyInventoryBaseEO queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } - @Override - public IPage getPageInfo(Page page,QueryWrapper queryWrapper) { - IPage pageList = this.page(page,queryWrapper); - if(pageList.getRecords().size() != 0){ - List records = pageList.getRecords(); - List createByList = records.stream().map(DummyInventoryBaseEO::getCreateBy).collect(Collectors.toList()); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.in(SysUser::getUsername,createByList); - List userList = sysUserService.list(lambdaQueryWrapper); - for (DummyInventoryBaseEO record : pageList.getRecords()) { - String createBy = record.getCreateBy(); - List sysUserList = userList.stream().filter(e -> createBy.equals(e.getUsername())).collect(Collectors.toList()); - if(sysUserList.size() == 1){ - record.setCreateBy(sysUserList.get(0).getRealname()); + @Override + public IPage getPageInfo(Page page, QueryWrapper queryWrapper) { + IPage pageList = this.page(page, queryWrapper); + if (pageList.getRecords().size() != 0) { + List records = pageList.getRecords(); + List createByList = records.stream().map(DummyInventoryBaseEO::getCreateBy).collect(Collectors.toList()); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.in(SysUser::getUsername, createByList); + List userList = sysUserService.list(lambdaQueryWrapper); + //订阅标识 + List ids = records.stream().map(DummyInventoryBaseEO::getId).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids); + List dummyReadEOS = iDummyReadEOService.list(wrapper); + List dummyReadIdList = dummyReadEOS.stream().map(DummyReadEO::getDummyInventoryBaseId).collect(Collectors.toList()); + for (DummyInventoryBaseEO record : pageList.getRecords()) { + String createBy = record.getCreateBy(); + List sysUserList = userList.stream().filter(e -> createBy.equals(e.getUsername())).collect(Collectors.toList()); + if (sysUserList.size() == 1) { + record.setCreateBy(sysUserList.get(0).getRealname()); + } + //订阅标识 + if(dummyReadIdList.contains(record.getId())){ + record.setReadFlag(ReadFlagEnum.READ.getValue()); + }else{ + record.setReadFlag(ReadFlagEnum.CANCEL_READ.getValue()); } - } - } - return pageList; - } + } + } - @Override - public void read(String dummyId) { - DummyReadEO dummyReadEO = new DummyReadEO(); - dummyReadEO.setDummyInventoryBaseId(dummyId); - dummyReadEOService.add(dummyReadEO); - } + return pageList; + } - @Override - public void cancelRead(String dummyId) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(DummyReadEO::getDummyInventoryBaseId,dummyId).in(DummyReadEO::getCreateBy,sysUser.getUsername()); - dummyReadEOService.remove(wrapper); - } + @Override + public void read(String dummyId) { + DummyReadEO dummyReadEO = new DummyReadEO(); + dummyReadEO.setDummyInventoryBaseId(dummyId); + dummyReadEOService.add(dummyReadEO); + } + + @Override + public void cancelRead(String dummyId) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(DummyReadEO::getDummyInventoryBaseId, dummyId).in(DummyReadEO::getCreateBy, sysUser.getUsername()); + dummyReadEOService.remove(wrapper); + } }