From a708082d1e1951816c6d940d13cadb8118880ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E4=B8=AD?= Date: Thu, 15 May 2025 16:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feat=E3=80=90=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E3=80=91=E7=AB=9E=E8=B5=9B=E5=92=8C=E5=88=9B=E5=AE=A2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=9A=E7=9B=B8=E5=85=B3=E6=88=90=E6=9E=9C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E3=80=81=E4=B8=93=E5=AE=B6=EF=BC=9A=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AchievementsController.java | 30 +++++++++++ .../mapper/AchievementsMapper.java | 10 ++++ .../service/IAchievementsService.java | 10 ++++ .../service/impl/AchievementsServiceImpl.java | 50 +++++++++++++++++++ .../service/TaskResourceLibraryService.java | 2 + .../mapper/dms/AchievementsMapper.xml | 40 +++++++++++++++ 6 files changed, 142 insertions(+) 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 829855efe..e1995e580 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 @@ -240,6 +240,36 @@ public class AchievementsController extends BaseController { return success(achievementsService.getRelatedAch(id,sourceId)); } + + @ApiOperation(value = "获取开源竞赛的相关成果") + @GetMapping("/getRelatedAchCompetition") + public AjaxResult getRelatedAchCompetition(Long id,Long sourceId) + { + return success(achievementsService.getRelatedAchCompetition(id,sourceId)); + } + + + @ApiOperation(value = "获取创客任务的相关成果") + @GetMapping("/getRelatedAchTask") + public AjaxResult getRelatedAchTask(Long id,Long sourceId) + { + return success(achievementsService.getRelatedAchTask(id,sourceId)); + } + + @ApiOperation(value = "获取专家-创客任务的相关成果") + @GetMapping("/getRelatedAchTaskOfExpert") + public AjaxResult getRelatedAchTaskOfExpert(Long expertId) + { + return success(achievementsService.getRelatedAchTaskOfExpert(expertId)); + } + + @ApiOperation(value = "获取专家-开源竞赛的相关成果") + @GetMapping("/getRelatedAchCompetitionOfExpert") + public AjaxResult getRelatedAchCompetitionOfExpert(Long expertId) + { + return success(achievementsService.getRelatedAchCompetitionOfExpert(expertId)); + } + @ApiOperation(value = "搜索行为数据记录") @GetMapping("/getSearchResult") public AjaxResult getSearchResult(String achName,Long userId) diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java index da95d73c7..5ba9393f9 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/AchievementsMapper.java @@ -9,6 +9,8 @@ import com.microservices.common.datasource.annotation.Master; import com.microservices.common.datasource.annotation.Slave; import com.microservices.dms.achievementLibrary.domain.*; import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; +import com.microservices.dms.resourceLibrary.domain.CompetitionResourceLibrary; +import com.microservices.dms.resourceLibrary.domain.TaskResourceLibrary; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; @@ -140,4 +142,12 @@ public interface AchievementsMapper { List getExpertAreasByName(@Param("areaName") String areaName); List getAllSourceId(@Param("id")Long id, @Param("sourceId")Long sourceId); + + List getAllSourceIdCompetition(@Param("id")Long id, @Param("sourceId")Long sourceId); + + List getAllSourceIdTask(@Param("id")Long id, @Param("sourceId")Long sourceId); + + List getRelatedAchTaskOfExpert(@Param("id")Long id); + + List getRelatedAchCompetitionOfExpert(@Param("id")Long 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 0d6b02e0c..59ecb66ac 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 @@ -5,6 +5,8 @@ import java.util.Map; import com.microservices.dms.achievementLibrary.domain.*; import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; +import com.microservices.dms.resourceLibrary.domain.CompetitionResourceLibrary; +import com.microservices.dms.resourceLibrary.domain.TaskResourceLibrary; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; /** @@ -107,4 +109,12 @@ public interface IAchievementsService { List getProjectAreasByName(String areaName); List getExpertAreasByName(String areaName); + + List getRelatedAchCompetition(Long id, Long sourceId); + + List getRelatedAchTask(Long id, Long sourceId); + + List getRelatedAchTaskOfExpert(Long id); + + List getRelatedAchCompetitionOfExpert(Long id); } 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 f660e259a..36b764b5c 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 @@ -13,7 +13,9 @@ import com.microservices.dms.behaviorImage.domain.AchievementBehaviorSumVo; import com.microservices.dms.behaviorImage.domain.AchievementImageVo; import com.microservices.dms.behaviorImage.service.IBehaviorImageService; import com.microservices.dms.resourceLibrary.domain.Clicker; +import com.microservices.dms.resourceLibrary.domain.CompetitionResourceLibrary; import com.microservices.dms.resourceLibrary.domain.Searcher; +import com.microservices.dms.resourceLibrary.domain.TaskResourceLibrary; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import com.microservices.dms.resourceLibrary.mapper.ExpertResourceLibraryMapper; import com.microservices.dms.resourceLibrary.mapper.ProjectResourceLibraryMapper; @@ -454,6 +456,54 @@ public class AchievementsServiceImpl implements IAchievementsService { return relatedResultList; } + @Override + public List getRelatedAchCompetition(Long id, Long sourceId) { + List relatedResultList = new ArrayList<>(); + //想根据开源项目id，获取对应的年度信息 + List allSourceId = achievementsMapper.getAllSourceIdCompetition(id, sourceId); + List allYear = achievementsMapper.getDistinctYear(id, allSourceId); + if (StringUtils.isNotNull(allYear)) { + //遍历年度信息，获取年度成果数据 + for (String paramYear : allYear) { + AchRelatedResult relatedResult = new AchRelatedResult(); + relatedResult.setYear(paramYear); + List tmpList = achievementsMapper.getRelatedAch(id, allSourceId, paramYear); + relatedResult.setAchRelatedVoList(tmpList); + relatedResultList.add(relatedResult); + } + } + return relatedResultList; + } + + @Override + public List getRelatedAchTask(Long id, Long sourceId) { + List relatedResultList = new ArrayList<>(); + //想根据开源项目id，获取对应的年度信息 + List allSourceId = achievementsMapper.getAllSourceIdTask(id, sourceId); + List allYear = achievementsMapper.getDistinctYear(id, allSourceId); + if (StringUtils.isNotNull(allYear)) { + //遍历年度信息，获取年度成果数据 + for (String paramYear : allYear) { + AchRelatedResult relatedResult = new AchRelatedResult(); + relatedResult.setYear(paramYear); + List tmpList = achievementsMapper.getRelatedAch(id, allSourceId, paramYear); + relatedResult.setAchRelatedVoList(tmpList); + relatedResultList.add(relatedResult); + } + } + return relatedResultList; + } + + @Override + public List getRelatedAchTaskOfExpert(Long id) { + return achievementsMapper.getRelatedAchTaskOfExpert(id); + } + + @Override + public List getRelatedAchCompetitionOfExpert(Long id) { + return achievementsMapper.getRelatedAchCompetitionOfExpert(id); + } + /** * 根据查询内容，调用搜索行为接口 * diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java index ef16e8fe3..3b505ee7e 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/service/TaskResourceLibraryService.java @@ -122,6 +122,8 @@ public class TaskResourceLibraryService { public int updateTaskResourceLibrary(TaskResourceLibrary taskResourceLibrary) { + taskResourceLibrary.setUpdateTime(DateUtils.getNowDate()); + taskResourceLibrary.setUpdateBy(SecurityUtils.getUsername()); return taskResourceLibraryMapper.updateTaskResourceLibrary(taskResourceLibrary); } diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml index a35f2bed6..be34d134a 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/AchievementsMapper.xml @@ -568,6 +568,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where project_id = (select project_id from project_resource_library where id = #{sourceId}) + + + + + + + +