From d2db6608a962209a01f7ea230be0bb184a077918 Mon Sep 17 00:00:00 2001
From: Guava <gongdexing@oxyzgroup.com>
Date: Mon, 3 Jul 2023 14:56:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=9D=9E=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E7=B1=BB=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xboe/system/user/api/MessageApi.java  | 38 ++++++++++++-------
 .../system/user/service/IMessageService.java  | 14 +++++--
 .../user/service/impl/MessageServiceImpl.java | 18 ++++++---
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java
index f52ee15e..ca1149dc 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java
@@ -1,18 +1,5 @@
 package com.xboe.system.user.api;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.common.utils.IDGenerator;
@@ -24,8 +11,14 @@ import com.xboe.system.user.entity.Message;
 import com.xboe.system.user.service.IMessageService;
 import com.xboe.system.user.service.MessageSender;
 import com.xboe.system.user.vo.BatchMessage;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -227,6 +220,23 @@ public class MessageApi extends ApiBaseController {
     }
 
 
+    @GetMapping("/clearMessageNotCase")
+    public JsonResponse<Integer> clearMessageNotCase(){
+
+        String  aid=getCurrent().getAccountId();
+        if(StringUtils.isBlank(aid)) {
+            return badRequest("获取用户信息异常");
+        }
+        try {
+            Integer type = service.clearMessageNotCase(aid);
+            return success(type);
+        } catch (Exception e) {
+            log.error("清空消息错误",e);
+            return error("清空消息失败",e.getMessage());
+        }
+    }
+
+
     /**
      * 移动端
      * 消息页面，按用户分组返回  暂时不用
diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java
index 8e7692fe..f0d01748 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java
@@ -1,11 +1,10 @@
 package com.xboe.system.user.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.xboe.common.PageList;
 import com.xboe.system.user.entity.Message;
-import com.xboe.system.user.vo.BatchMessage;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 消息接口
@@ -61,6 +60,13 @@ public interface IMessageService {
      * @return
      */
     void cleanByAcceptId(String aid);
+
+    /**
+     * 清楚消息排除推荐消息
+     * @param aid
+     * @return
+     */
+    Integer clearMessageNotCase(String aid);
     
     /**
      * 批量设置已读
diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java
index 389490eb..bac12ef4 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java
@@ -166,15 +166,21 @@ public class MessageServiceImpl implements IMessageService {
     @Override
     @Transactional
     public void cleanByAcceptId(String aid) {
-        List<Message> list = dao.findList(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
-        if (CollectionUtils.isNotEmpty(list)) {
-            throw new RuntimeException("此类消息不支持删除");
-        }
-        dao.deleteByFilter(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
-//        dao.deleteByField("acceptId", aid);
+        dao.deleteByField("acceptId", aid);
 
     }
 
+    @Override
+    @Transactional
+    public Integer clearMessageNotCase(String aid) {
+        List<Message> list = dao.findList(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
+        dao.deleteByFilter(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
+        if (CollectionUtils.isNotEmpty(list)) {
+            return 1;
+        }
+        return 2;
+    }
+
     @Override
     @Transactional
     public void batchSave(List<Message> list) {