撤回邮件删除下消息中心代办

src/main/java/com/zq/email/controller/EmailManageController.java

@@ -14,6 +14,7 @@ import com.zq.email.enums.WhetherEnum;
 import com.zq.email.service.IEmailAttachService;
 import com.zq.email.service.IEmailAttachService;
 import com.zq.email.service.IEmailContentService;
 import com.zq.email.service.IEmailContentService;
 import com.zq.email.service.IEmailPersonService;
 import com.zq.email.service.IEmailPersonService;
+import com.zq.email.utils.MsgUtil;
 import com.zq.email.vo.EmailDetailVo;
 import com.zq.email.vo.EmailDetailVo;
 import com.zq.email.vo.EmailSearchReqVo;
 import com.zq.email.vo.EmailSearchReqVo;
 import com.zq.email.vo.UpdateBodyOrAttachVo;
 import com.zq.email.vo.UpdateBodyOrAttachVo;
@@ -39,6 +40,7 @@ public class EmailManageController {
     private final IEmailPersonService emailPersonService;
     private final IEmailPersonService emailPersonService;
     private final IEmailContentService emailContentService;
     private final IEmailContentService emailContentService;
     private final IEmailAttachService emailAttachService;
     private final IEmailAttachService emailAttachService;
+    private final MsgUtil msgUtil;
 
 
 
 
 
 
@@ -72,18 +74,20 @@ public class EmailManageController {
 
 
         @ApiOperation("撤回邮件并删除邮件记录")
         @ApiOperation("撤回邮件并删除邮件记录")
     @GetMapping("delete/{contentId}")
     @GetMapping("delete/{contentId}")
-    public ResultVo delete(@PathVariable("contentId") String contentId) {
+    public ResultVo delete(@PathVariable("contentId") Long contentId) {
         OnlineUserDto adminContext = TokenUtils.getAdminContext();
         OnlineUserDto adminContext = TokenUtils.getAdminContext();
         AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！");
         AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！");
         this.emailPersonService.lambdaUpdate().eq(EmailPerson::getEmailContentId, contentId).remove();
         this.emailPersonService.lambdaUpdate().eq(EmailPerson::getEmailContentId, contentId).remove();
         this.emailAttachService.lambdaUpdate().eq(EmailAttach::getEmailContentId, contentId).remove();
         this.emailAttachService.lambdaUpdate().eq(EmailAttach::getEmailContentId, contentId).remove();
         this.emailContentService.lambdaUpdate().eq(EmailContent::getId, contentId).remove();
         this.emailContentService.lambdaUpdate().eq(EmailContent::getId, contentId).remove();
+        //收回待办
+        this.msgUtil.revokeMsgByBusinessId(contentId);
         return ResultVo.success();
         return ResultVo.success();
     }
     }
 
 
     @ApiOperation("撤回邮件到收件箱")
     @ApiOperation("撤回邮件到收件箱")
     @GetMapping("revoke/{contentId}")
     @GetMapping("revoke/{contentId}")
-    public ResultVo revoke(@PathVariable("contentId") String contentId) {
+    public ResultVo revoke(@PathVariable("contentId") Long contentId) {
         OnlineUserDto adminContext = TokenUtils.getAdminContext();
         OnlineUserDto adminContext = TokenUtils.getAdminContext();
         AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！");
         AssertUtils.notNull(adminContext, "登录已失效，请重新登录后再次尝试！");
         this.emailPersonService.lambdaUpdate().eq(EmailPerson::getEmailContentId, contentId).set(EmailPerson::getIsSend, WhetherEnum.NO.getKey()).update();
         this.emailPersonService.lambdaUpdate().eq(EmailPerson::getEmailContentId, contentId).set(EmailPerson::getIsSend, WhetherEnum.NO.getKey()).update();
@@ -92,6 +96,7 @@ public class EmailManageController {
                 .eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_SEND)
                 .eq(EmailPerson::getPersonType, EmailConstant.TYPE_EMAIL_SEND)
                 .set(EmailPerson::getFolderId, EmailFolderEnum.FOLDER_OUTBOX.getKey())
                 .set(EmailPerson::getFolderId, EmailFolderEnum.FOLDER_OUTBOX.getKey())
                 .update();
                 .update();
+        this.msgUtil.revokeMsgByBusinessId(contentId);
         return ResultVo.success();
         return ResultVo.success();
     }
     }