1.修改保存生日报错问题
2.添加pc端获取消息列表
This commit is contained in:
@@ -62,7 +62,6 @@ public class AppUserController extends BaseController
|
||||
|
||||
@ApiOperation("保存简历")
|
||||
@PostMapping("/resume")
|
||||
@BussinessLog(title = "保存简历")
|
||||
public AjaxResult saveResume(@RequestBody AppUser appUser)
|
||||
{
|
||||
appUser.setUserId(SiteSecurityUtils.getUserId());
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
package com.ruoyi.cms.controller.cms;
|
||||
|
||||
import com.ruoyi.cms.domain.AppNotice;
|
||||
import com.ruoyi.cms.domain.Notice;
|
||||
import com.ruoyi.cms.service.IAppNoticeService;
|
||||
import com.ruoyi.cms.service.IAppUserService;
|
||||
import com.ruoyi.cms.util.RoleUtils;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.constant.HttpStatus;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.domain.entity.AppUser;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
@@ -25,6 +32,8 @@ public class CmsNoticeController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IAppNoticeService noticeService;
|
||||
@Autowired
|
||||
private IAppUserService appUserService;
|
||||
|
||||
/**
|
||||
* 获取通知公告列表
|
||||
@@ -82,4 +91,47 @@ public class CmsNoticeController extends BaseController
|
||||
{
|
||||
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation("pc端获取未读消息")
|
||||
@GetMapping("/appNoticList")
|
||||
public TableDataInfo list(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();
|
||||
List<Notice> notices = noticeService.selectListAppNotRead(notice);
|
||||
return getDataTable(notices);
|
||||
}
|
||||
|
||||
@ApiOperation("系统通知标记已读")
|
||||
@PostMapping("/read/sysNotice")
|
||||
public AjaxResult sysNotice(@RequestParam String id)
|
||||
{
|
||||
Long userId=null;
|
||||
if(!SecurityUtils.isLogin()){
|
||||
return AjaxResult.error("未登录!");
|
||||
}
|
||||
if(userId==null){
|
||||
String idCard= RoleUtils.getCurrentUseridCard();
|
||||
AppUser appUser=appUserService.selectAppuserByIdcard(idCard);
|
||||
if(appUser==null){
|
||||
return AjaxResult.error("用户信息未完善,请完善身份证信息!");
|
||||
}else{
|
||||
userId=appUser.getUserId();
|
||||
}
|
||||
}
|
||||
noticeService.readSysNotices(id,userId);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user