邮件调整

src/main/java/com/izouma/nineth/repo/MetaEmailRepo.java

@@ -15,7 +15,7 @@ public interface MetaEmailRepo extends JpaRepository<MetaEmail, Long>, JpaSpecif
     @Transactional
     void softDelete(Long id);
 
-    List<MetaEmail> findAllByDelAndIdNotIn(boolean del, List<Long> id);
+    List<MetaEmail> findAllByPublishAndDelAndIdNotIn(boolean publish, boolean del, List<Long> id);
 
-    List<MetaEmail> findAllByDel(boolean del);
+    List<MetaEmail> findAllByPublishAndDel(boolean publish, boolean del);
 }

src/main/java/com/izouma/nineth/service/MetaEmailService.java

@@ -30,7 +30,7 @@ public class MetaEmailService {
         Long userId = SecurityUtils.getAuthenticatedUser().getId();
         List<Long> delIds = metaEmailRecordRepo.findEmailIdByDel(userId, true);
         List<MetaEmail> metaEmails;
-        metaEmails = CollectionUtils.isEmpty(delIds) ? metaEmailRepo.findAllByDel(false) : metaEmailRepo.findAllByDelAndIdNotIn(false, delIds);
+        metaEmails = CollectionUtils.isEmpty(delIds) ? metaEmailRepo.findAllByPublishAndDel(true, false) : metaEmailRepo.findAllByPublishAndDelAndIdNotIn(true, false, delIds);
         if (CollectionUtils.isEmpty(metaEmails)) {
             return MetaRestResult.returnSuccess(metaEmails);
         }

src/main/java/com/izouma/nineth/web/MetaEmailRecordController.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.MetaEmailRecord;
+import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.MetaEmailRecordRepo;
 import com.izouma.nineth.service.MetaEmailRecordService;
@@ -38,20 +39,22 @@ public class MetaEmailRecordController extends BaseController {
     }
 
     @PostMapping("/{emailId}/readEmail")
-    public void readEmail(@PathVariable Long emailId) {
+    public MetaRestResult<Void> readEmail(@PathVariable Long emailId) {
         metaEmailRecordRepo.save(new MetaEmailRecord(SecurityUtils.getAuthenticatedUser().getId(), emailId, false, true));
+        return MetaRestResult.returnSuccess("邮件读取成功！");
     }
 
     @PostMapping("/{emailId}/delEmail")
-    public void delEmail(@PathVariable Long emailId) {
+    public MetaRestResult<Void> delEmail(@PathVariable Long emailId) {
         Long userId = SecurityUtils.getAuthenticatedUser().getId();
         MetaEmailRecord metaEmailRecord = metaEmailRecordRepo.findByUserIdAndEmailId(userId, emailId);
         if (Objects.isNull(metaEmailRecord)) {
             metaEmailRecordRepo.save(new MetaEmailRecord(userId, emailId, true, true));
-            return;
+            return MetaRestResult.returnSuccess("邮件删除成功！");
         }
         metaEmailRecord.setEmailDel(true);
         metaEmailRecordRepo.save(metaEmailRecord);
+        return MetaRestResult.returnSuccess("邮件删除成功！");
     }
 }
 

src/main/java/com/izouma/nineth/web/MetaZouMaLightController.java

@@ -71,9 +71,9 @@ public class MetaZouMaLightController extends BaseController {
         metaZouMaLightRepo.save(metaZouMaLight);
     }
 
-    @PostMapping("/metaQuery")
+    @GetMapping("/metaQuery")
     public MetaRestResult<String> metaQuery() {
-        return MetaRestResult.returnSuccess(metaZouMaLightRepo.findDescriptionByPublishAndDel(true, false));
+        return MetaRestResult.returnSuccess("查询成功！", metaZouMaLightRepo.findDescriptionByPublishAndDel(true, false));
     }
 }