From fdc158a9903ce29bf2aa8894fab13ef4ea103847 Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 8 Aug 2024 10:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AF=B4=E6=98=8E=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/scale/domain/SysWarnRecord.java | 5 ++++- .../service/impl/SysInterveneRecordServiceImpl.java | 5 +++++ .../scale/service/impl/SysWarnRecordServiceImpl.java | 9 ++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java index 2112ef9..436f2c2 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysWarnRecord.java @@ -52,5 +52,8 @@ public class SysWarnRecord { */ private Date warnTime; - + /** + * 阅读状态 + */ + private Integer readFlag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index 2ee5bac..d819665 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.scale.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; @@ -130,6 +131,10 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService record.setInterveneStatus(StatusEnum.DISABLED.getValue()); userMapper.updateById(record); } + warnMapper.update(new LambdaUpdateWrapper() + .eq(SysWarnRecord::getBatchNo, add.getBatchNo()) + .eq(SysWarnRecord::getUserId, add.getUserId()) + .set(SysWarnRecord::getReadFlag, 0)); return flag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java index e96eb6f..454f2d0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysWarnRecordServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.scale.constant.StatusEnum; @@ -103,8 +102,12 @@ public class SysWarnRecordServiceImpl implements ISysWarnRecordService { */ @Override public Boolean updateByBo(SysWarnRecordBo bo) { - SysWarnRecord update = MapstructUtils.convert(bo, SysWarnRecord.class); - validEntityBeforeSave(update); + //SysWarnRecord update = MapstructUtils.convert(bo, SysWarnRecord.class); + //validEntityBeforeSave(update); + SysWarnRecord update = new SysWarnRecord(); + update.setWarnId(bo.getWarnId()); + update.setNote(bo.getNote()); + update.setReadFlag(1); return baseMapper.updateById(update) > 0; }