diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java index 3a929189f..829855efe 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/AchievementsController.java @@ -210,8 +210,9 @@ public class AchievementsController extends BaseController { } @ApiOperation("根据成果ID,获取近7日成果点击数量(折线图)") @GetMapping("/get7AddClickById") - public AjaxResult get7AddClickById(String id) { - return success(achievementsService.get7AddClickById(id)); + public AjaxResult get7AddClickById(String id,@RequestParam(value = "clickType",required = false, defaultValue = "Achievements") + String clickType) { + return success(achievementsService.get7AddClickById(id,clickType)); } @ApiOperation("根据成果ID,获取成果的相关行为数据统计(点击量、搜索量、附件下载量、收藏、关注)") diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java index 1c861574c..0d6b02e0c 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/IAchievementsService.java @@ -94,7 +94,7 @@ public interface IAchievementsService { AchievementBehaviorSumVo getActDataStatisticById(Long id); - List> get7AddClickById(String id); + List> get7AddClickById(String id, String clickType); AchievementBehaviorSumVo getWatchFavoriteStatusById(Long id, Long userId); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java index 9fa38bfbc..f660e259a 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/impl/AchievementsServiceImpl.java @@ -389,10 +389,13 @@ public class AchievementsServiceImpl implements IAchievementsService { } @Override - public List> get7AddClickById(String id) { + public List> get7AddClickById(String id,String clickType) { + if (StringUtils.isEmpty(clickType)) { + clickType = "Achievements"; + } Date[] days = DateUtil.getDays(0, 6); - Map w = achievementsMapper.get7AddClickById(days[0], days[1], "Achievements", id) + Map w = achievementsMapper.get7AddClickById(days[0], days[1], clickType, id) .stream().collect(Collectors.toMap(KeyValVo::getK, KeyValVo::getV)); List dateStr = DateUtil.getDateStrMMDD(days[0], days[1]);