diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java index 1cdc52bc..3783433f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java @@ -165,8 +165,7 @@ public class CasesRecommendApi extends ApiBaseController { if (CollectionUtil.isEmpty(casesRecommendLaunch.getPushUserIdList())) { throw new RuntimeException("参数错误"); } - - return success(iCasesRecommendPushRecordService.launchPush(casesRecommendLaunch)); + return success(iCasesRecommendPushRecordService.launchPush(casesRecommendLaunch, getCurrent())); } /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java index ca60c161..5e3991dc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java @@ -1,5 +1,6 @@ package com.xboe.module.boecase.service; +import com.xboe.core.CurrentUser; import com.xboe.module.boecase.entity.CasesRecommendPushRecord; import com.xboe.module.boecase.vo.CasesRecommendLaunchVo; @@ -11,10 +12,10 @@ public interface ICasesRecommendPushRecordService { /** * 案例推送 * - * @param casesRecommendLaunch + * @param * @return */ - boolean launchPush(CasesRecommendLaunchVo casesRecommendLaunch); + boolean launchPush(CasesRecommendLaunchVo casesRecommendLaunch, CurrentUser currentUser); /** * 根据案例推荐ID查询案例推送列表信息 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index e11c6d7c..c8ab2105 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -1,8 +1,8 @@ package com.xboe.module.boecase.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.xboe.core.CurrentUser; import com.xboe.core.orm.FieldFilters; -import com.xboe.data.dto.UserData; import com.xboe.data.outside.IOutSideDataService; import com.xboe.enums.CasesPushStatusEnum; import com.xboe.module.boecase.dao.CasesDao; @@ -51,13 +51,12 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR private CasesRecommendPushRecordDao casesRecommendPushRecordDao; @Override - public boolean launchPush(CasesRecommendLaunchVo casesRecommendLaunch) { - //当前用户登录信息 - UserData userInfoByUserId = outSideDataService.getUserInfoByUserId(null); + public boolean launchPush(CasesRecommendLaunchVo casesRecommendLaunch, CurrentUser currentUser) { + CasesRecommend casesRecommend = new CasesRecommend(); - casesRecommend.setRecommendId(userInfoByUserId.getId()); - casesRecommend.setRecommendBy(userInfoByUserId.getName()); + casesRecommend.setRecommendId(currentUser.getAccountId()); + casesRecommend.setRecommendBy(currentUser.getName()); casesRecommend.setRecommendTime(LocalDateTime.now()); casesRecommend.setCaseCount(casesRecommendLaunch.getCasesIdList().size()); casesRecommend.setUserCount(casesRecommendLaunch.getPushUserIdList().size()); @@ -86,6 +85,8 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR casesRecommendPushRecord.setPushUserId(userId); casesRecommendPushRecord.setPushUserName(userMap.get(userId) != null ? userMap.get(userId).toString() : null); casesRecommendPushRecord.setPushStatus(CasesPushStatusEnum.WAIT_PUSH.getStatus()); + //默认未查看 + casesRecommendPushRecord.setReadFlag(0); pushRecords.add(casesRecommendPushRecord); } if (CollectionUtil.isNotEmpty(pushRecords)) {