修改pc已读消息列表

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java

@@ -2,10 +2,11 @@ package com.ruoyi.cms.controller.cms;
 
 import com.ruoyi.cms.domain.AppNotice;
 import com.ruoyi.cms.domain.Notice;
+import com.ruoyi.cms.domain.vo.NoticeTotal;
 import com.ruoyi.cms.service.IAppNoticeService;
 import com.ruoyi.cms.service.IAppUserService;
+import com.ruoyi.cms.util.NoticeUtils;
 import com.ruoyi.cms.util.RoleUtils;
-import com.ruoyi.cms.util.StringUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.controller.BaseController;
@@ -152,7 +153,8 @@ public class CmsNoticeController extends BaseController
             }
         }
         startPage();
-        notice.setIsRead(StringUtil.NOTICE_YD);
+        notice.setIsRead(NoticeUtils.NOTICE_YD);
+        notice.setRemark(NoticeUtils.NOTICE_TYPE);
         List<Notice> notices = noticeService.selectListAppNotices(notice);
         return getDataTable(notices);
     }
@@ -177,4 +179,33 @@ public class CmsNoticeController extends BaseController
         noticeService.readSysNotices(id,userId);
         return AjaxResult.success();
     }
+
+    /**
+     * 获取消息条数
+     */
+    @ApiOperation("获取移动端用户消息条数")
+    @GetMapping("/noticTotal")
+    public AjaxResult getNoticTotal(Notice notice){
+        if(!SecurityUtils.isLogin()){
+            error(HttpStatus.ERROR,"未登录!");
+        }
+        if(notice.getUserId()==null){
+            String idCard= RoleUtils.getCurrentUseridCard();
+            AppUser appUser=appUserService.selectAppuserByIdcard(idCard);
+            if(appUser==null){
+                error(HttpStatus.ERROR,"用户信息未完善,请完善身份证信息!");
+            }else{
+                notice.setUserId(appUser.getUserId());
+            }
+        }
+        startPage();
+        NoticeTotal notices = noticeService.noticTotal(notice);
+        return success(notices);
+    }
+
+    @ApiOperation("获取移动端用户消息条数")
+    @DeleteMapping("/deleteNotice/{ids}")
+    public AjaxResult deleteNotice(@PathVariable Long[] ids){
+        return success(noticeService.removeNotice(ids));
+    }
 }