添加取消已读功能

hx-mail/src/main/java/com/fjhx/mail/controller/message/MailController.java

@@ -12,7 +12,6 @@ import com.fjhx.mail.entity.message.dto.SendDto;
 import com.fjhx.mail.entity.message.dto.SetSeenDto;
 import com.fjhx.mail.service.message.InfoService;
 import com.ruoyi.common.annotation.NonInterception;
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +44,7 @@ public class MailController {
     public Object getMessagePage(@RequestBody JSONObject dtoJson) {
         dtoJson.remove("id");//解决前端传的字符串id
         GetMessagePageDto dto = BeanUtil.copyProperties(dtoJson, GetMessagePageDto.class);
-        return R.ok(infoService.getMessagePage(dto));
+        return infoService.getMessagePage(dto);
 
 //        String post = HttpUtil.post(MailServiceConfig.urlPrefix + "getMessagePage", JSONObject.toJSONString(dto));
 //        return JSON.parseObject(post);
@@ -96,4 +95,13 @@ public class MailController {
         return infoService.setSeen(dto);
     }
 
+    /**
+     * 取消已读
+     */
+    @NonInterception
+    @PostMapping("/cancelSeen")
+    public JSONObject cancelSeen(@Validated @RequestBody SetSeenDto dto) {
+        return infoService.cancelSeen(dto);
+    }
+
 }

hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MessageVo.java

@@ -16,6 +16,11 @@ public class MessageVo {
     private Long id;
 
     /**
+     * 邮件uid
+     */
+    private Long uid;
+
+    /**
      * 邮件标题
      */
     private String subject;

hx-mail/src/main/java/com/fjhx/mail/service/message/InfoService.java

@@ -42,6 +42,11 @@ public interface InfoService {
      */
     JSONObject setSeen(SetSeenDto dto);
 
+    /**
+     * 取消已读
+     */
+    JSONObject cancelSeen(SetSeenDto dto);
+
     Object getMessagePage(GetMessagePageDto dto);
 
 }

hx-mail/src/main/java/com/fjhx/mail/service/message/impl/InfoServiceImpl.java

@@ -35,6 +35,7 @@ import com.fjhx.mail.service.message.InfoService;
 import com.fjhx.mail.service.personal.PersonalFolderService;
 import com.fjhx.mail.service.personal.PersonalMailboxService;
 import com.fjhx.mail.service.personal.PersonalMessageService;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
@@ -177,6 +178,13 @@ public class InfoServiceImpl implements InfoService {
         return JSONObject.parseObject(post);
     }
 
+    @Override
+    public JSONObject cancelSeen(SetSeenDto dto) {
+        String url = getUrl("cancelSeen", dto.getType(), dto.getMailboxId());
+        String post = HttpUtil.post(url, JSON.toJSONString(dto));
+        return JSONObject.parseObject(post);
+    }
+
     private void subordinateDeptId(Long deptId, Set<Long> deptSet, Map<Long, List<SysDept>> parentDeptMap) {
         deptSet.add(deptId);
 
@@ -304,8 +312,7 @@ public class InfoServiceImpl implements InfoService {
             record.setCustomerInfo(customerInfoMap.get(record.getCustomerId()));
         }
 
-        return page;
+        return R.ok(page);
     }
 
-
 }

hx-mail/src/main/resources/mapper/my/MyFolderMessageMapper.xml

@@ -12,7 +12,8 @@
         m.send_date,
         mfm.id myFolderMessageId,
         cu.customer_id,
-        m.is_attachments
+        m.is_attachments,
+        m.uid
         from my_folder_message mfm
         left join
         <if test="type eq 1">

hx-mail/src/main/resources/mapper/my/MyTagMessageMapper.xml

@@ -11,7 +11,8 @@
         m.send_date,
         mtm.id myTagMessageId,
         cu.customer_id,
-        m.is_attachments
+        m.is_attachments,
+        m.uid
         from my_tag_message mtm
         left join
         <if test="type eq 1">