From e1aaa4ac128f05d920f36e11af997a59426d2dc1 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Fri, 13 Dec 2024 15:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=AD=A3=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InspectionEquInfoServiceImpl.java  | 13 ++++++++++---
 .../mapper/inspection/WarnMessageMapper.xml         |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java
index 664fc4d2..e968e447 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionEquInfoServiceImpl.java
@@ -4,8 +4,11 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.util.DateUtils;
 import cn.iocoder.yudao.module.inspection.entity.WarnMessage;
 import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
+import io.prometheus.client.CollectorRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.iocoder.yudao.module.inspection.mapper.InspectionEquInfoMapper;
@@ -30,6 +34,7 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl<InspectionEquInfoM
 {
     @Autowired
     private IWarnMessageService messageService;
+    private CollectorRegistry collectorRegistry;
 
     /**
      * 查询equInfo
@@ -92,14 +97,16 @@ public class InspectionEquInfoServiceImpl extends ServiceImpl<InspectionEquInfoM
      * @return 结果
      */
     @Override
+    @DSTransactional
     public int updateInspectionEquInfo(InspectionEquInfo inspectionEquInfo)
     {
         LambdaQueryWrapper<WarnMessage> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(WarnMessage::getType,"equ").eq(WarnMessage::getObjectId,inspectionEquInfo.getId());
-        WarnMessage one = messageService.getOne(queryWrapper);
-        if (ObjectUtil.isNotEmpty(one)){
+        List<WarnMessage> list = messageService.list(queryWrapper);
+        if (CollUtil.isNotEmpty(list)){
             //更新处理
-            messageService.removeById(one.getId());
+            List<Long> ids = list.stream().map(WarnMessage::getId).collect(Collectors.toList());
+            messageService.removeBatchByIds(ids);
         }
         if (ObjectUtil.isNotEmpty(inspectionEquInfo.getNextCheckTime())){
             //同时处理提醒信息
diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/WarnMessageMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/WarnMessageMapper.xml
index ce8253bc..eb070d4e 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/WarnMessageMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/WarnMessageMapper.xml
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warnMessage.title != null  and warnMessage.title != ''"> and title = #{warnMessage.title}</if>
             <if test="warnMessage.partnerId != null "> and partner_id = #{warnMessage.partnerId}</if>
             <if test="warnMessage.isRead != null  and warnMessage.isRead != ''"> and is_read = #{warnMessage.isRead}</if>
+            and deleted = '0'
         </where>
         order by create_time desc
     </select>