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 7f82fb00b..7abfae6ed 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 @@ -46,6 +46,16 @@ public class AchievementsController extends BaseController { return getDataTable(list); } + /** + * 查询成果列表 + */ + @GetMapping("/frontList") + public TableDataInfo frontList(Achievements achievements) { + startPage(); + List list = achievementsService.selectAchievementsFrontList(achievements); + return getDataTable(list); + } + /** * 导出成果列表 */ 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 0bf0fd249..052a4d253 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 @@ -62,4 +62,6 @@ public interface IAchievementsService public int deleteAchievementsById(Long id); void buildFileInfoByIdents(String img, String att, Map map); + + List selectAchievementsFrontList(Achievements achievements); } 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 a9a245799..8d924776f 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 @@ -52,6 +52,17 @@ public class AchievementsServiceImpl implements IAchievementsService { return list; } + + @Override + public List selectAchievementsFrontList(Achievements achievements) { + List list = achievementsMapper.selectAchievementsList(achievements); + for (Achievements a : list) { + a.setDetails(null); + buildFileInfoByIdents(a.getImages(), a.getAttachments(), a.getParams()); + } + return list; + } + /** * 新增成果 * diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/DmsConstants.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/DmsConstants.java new file mode 100644 index 000000000..02550305e --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/DmsConstants.java @@ -0,0 +1,5 @@ +package com.microservices.dms.constant; + +public class DmsConstants { + +} diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/TaskConstant.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/TaskConstant.java index 9002c9cf2..b70c6bdaa 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/TaskConstant.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/constant/TaskConstant.java @@ -18,4 +18,8 @@ public class TaskConstant { public static final String MARKER_SPACE_DOWNLOAD_API_BY_NAME = "%s/busiAttachments/downloadAttachment/%s"; public static final String MARKER_SPACE_DOWNLOAD_API_BY_ID = "%s/busiAttachments/download/%s"; + //favorites + public static final String EXPERTS = "Experts"; + public static final String ACHIEVEMENTS = "Achievements"; + } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CollectUserActDataController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CollectUserActDataController.java index 80629cb1b..adfa474e7 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CollectUserActDataController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CollectUserActDataController.java @@ -2,9 +2,7 @@ package com.microservices.dms.resourceLibrary.controller; import com.microservices.common.core.web.domain.AjaxResult; -import com.microservices.dms.resourceLibrary.domain.Clicker; -import com.microservices.dms.resourceLibrary.domain.Downloader; -import com.microservices.dms.resourceLibrary.domain.Searcher; +import com.microservices.dms.resourceLibrary.domain.*; import com.microservices.dms.resourceLibrary.service.TaskResourceLibraryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -25,7 +23,7 @@ public class CollectUserActDataController { @PostMapping("/addClicker") @ApiImplicitParams({ - @ApiImplicitParam(name = "clickType", value = "点击类型(任务：makerSpaceTask、竞赛：CompetitionInfo、项目：Project)", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "clickType", value = "点击类型(任务：makerSpaceTask、竞赛：CompetitionInfo、项目：Project、成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "clickId", value = "点击对象ID", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "extInfo", value = "补充信息", paramType = "query", dataTypeClass = String.class) @@ -38,7 +36,7 @@ public class CollectUserActDataController { @PostMapping("/addDownloader") @ApiOperation(value = "记录下载次数") @ApiImplicitParams({ - @ApiImplicitParam(name = "downloadType", value = "下载类型(任务：makerSpaceTask、竞赛作品：CompetitionOpusDownload)", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "downloadType", value = "下载类型(任务：makerSpaceTask、竞赛作品：CompetitionOpusDownload、成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "downloadId", value = "下载对象ID", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "extInfo", value = "补充信息", paramType = "query", dataTypeClass = String.class) @@ -58,4 +56,28 @@ public class CollectUserActDataController { public AjaxResult addSearcher(Searcher searcher) { return AjaxResult.success(taskResourceLibraryService.addSearcher(searcher)); } + + @PostMapping("/addFavorite") + @ApiOperation(value = "记录搜索次数") + @ApiImplicitParams({ + @ApiImplicitParam(name = "favoriteType", value = "收藏类型(成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "favoriteId", value = "对象ID", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "extInfo", value = "补充信息", paramType = "query", dataTypeClass = String.class) + }) + public AjaxResult addFavorite(Favorite favorite) { + return AjaxResult.success(taskResourceLibraryService.addFavorite(favorite)); + } + + @PostMapping("/addWatcher") + @ApiOperation(value = "记录搜索次数") + @ApiImplicitParams({ + @ApiImplicitParam(name = "favoriteType", value = "关注类型(成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "favoriteId", value = "对象ID", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "userId", value = "用户ID", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "extInfo", value = "补充信息", paramType = "query", dataTypeClass = String.class) + }) + public AjaxResult addFavorite(Watcher watcher) { + return AjaxResult.success(taskResourceLibraryService.addWatcher(watcher)); + } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CompetitionResourceLibraryController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CompetitionResourceLibraryController.java index abf1a9ca0..e177bdd47 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CompetitionResourceLibraryController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/CompetitionResourceLibraryController.java @@ -105,9 +105,9 @@ public class CompetitionResourceLibraryController extends BaseController { */ @ApiOperation(value = "返回开放竞赛总数") @GetMapping(value = "/getTotalOpenCompetitions") - public long getTotalOpenCompetitions() { + public AjaxResult getTotalOpenCompetitions() { // 这里替换成你的实际逻辑，例如从数据库查询 - return competitionResourceLibraryService.getTotalOpenCompetitions(); + return AjaxResult.success(competitionResourceLibraryService.getTotalOpenCompetitions()); } /** @@ -117,9 +117,9 @@ public class CompetitionResourceLibraryController extends BaseController { */ @ApiOperation(value = "返回竞赛转换成果数") @GetMapping(value = "/getTotalCompetitionAchievements") - public long getTotalCompetitionAchievements() { + public AjaxResult getTotalCompetitionAchievements() { // 这里替换成你的实际逻辑 - return competitionResourceLibraryService.getTotalCompetitionAchievements(); + return AjaxResult.success(competitionResourceLibraryService.getTotalCompetitionAchievements()); } /** @@ -129,9 +129,9 @@ public class CompetitionResourceLibraryController extends BaseController { */ @ApiOperation(value = "返回竞赛提交作品数") @GetMapping(value = "/getTotalCompetitionSubmissions") - public long getTotalCompetitionSubmissions() { + public AjaxResult getTotalCompetitionSubmissions() { // 这里替换成你的实际逻辑 - return competitionResourceLibraryService.getTotalCompetitionSubmissions(); + return AjaxResult.success(competitionResourceLibraryService.getTotalCompetitionSubmissions()); } /** @@ -141,9 +141,9 @@ public class CompetitionResourceLibraryController extends BaseController { */ @ApiOperation(value = "返回已结束竞赛数") @GetMapping(value = "/getTotalFinishedCompetitions") - public long getTotalFinishedCompetitions() { + public AjaxResult getTotalFinishedCompetitions() { // 这里替换成你的实际逻辑 - return competitionResourceLibraryService.getTotalFinishedCompetitions(); + return AjaxResult.success(competitionResourceLibraryService.getTotalFinishedCompetitions()); } /** @@ -153,8 +153,8 @@ public class CompetitionResourceLibraryController extends BaseController { */ @ApiOperation(value = "需评审竞赛数") @GetMapping(value = "/getReviewCompetitionCount") - public long getReviewCompetitionCount() { + public AjaxResult getReviewCompetitionCount() { // 这里替换成你的实际逻辑 - return competitionResourceLibraryService.getReviewCompetitionCount(); + return AjaxResult.success(competitionResourceLibraryService.getReviewCompetitionCount()); } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ExpertResourceLibraryController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ExpertResourceLibraryController.java index 7ceb2eab9..c7014998c 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ExpertResourceLibraryController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ExpertResourceLibraryController.java @@ -8,6 +8,7 @@ import com.microservices.common.log.annotation.Log; import com.microservices.common.log.enums.BusinessType; import com.microservices.dms.resourceLibrary.domain.ExpertResourceLibrary; import com.microservices.dms.resourceLibrary.service.IExpertResourceLibraryService; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,8 +21,9 @@ import java.util.List; * @author microservices * @date 2025-04-11 */ +@Api(tags = "数据管理体系-优质专家库") @RestController -@RequestMapping("/library") +@RequestMapping("/expertResourceLibrary") public class ExpertResourceLibraryController extends BaseController { @Autowired diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ProjectResourceLibraryController.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ProjectResourceLibraryController.java index 50e3717be..ca9640057 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ProjectResourceLibraryController.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/controller/ProjectResourceLibraryController.java @@ -92,7 +92,6 @@ public class ProjectResourceLibraryController extends BaseController { @ApiImplicitParam(name = "itemType", value = "类型(Project)", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "itemId", value = "对象ID", paramType = "query", dataTypeClass = Integer.class), }) - public GenericsTableDataInfo selectPraisesCondition(UserActionDataVo taskJournals) { PageUtils.startPage(); List userActionDataVos = projectResourceLibraryService.selectPraisesCondition(taskJournals); diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Favorite.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Favorite.java new file mode 100644 index 000000000..5a7dadc84 --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Favorite.java @@ -0,0 +1,19 @@ +package com.microservices.dms.resourceLibrary.domain; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class Favorite { + private Long id; + private String favoriteType; + private Long favoriteId; + private Long userId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "") + private Date createdAt; + private String extInfo; +} + diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Watcher.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Watcher.java new file mode 100644 index 000000000..5ba6210a0 --- /dev/null +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/domain/Watcher.java @@ -0,0 +1,19 @@ +package com.microservices.dms.resourceLibrary.domain; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class Watcher { + private Long id; + private String watchableType; + private Long watchableId; + private Long userId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "") + private Date createdAt; + private String extInfo; +} + diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java index e5b8ec31f..b303846c7 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/TaskResourceLibraryMapper.java @@ -1,10 +1,7 @@ package com.microservices.dms.resourceLibrary.mapper; import com.microservices.common.datasource.annotation.Slave; -import com.microservices.dms.resourceLibrary.domain.Clicker; -import com.microservices.dms.resourceLibrary.domain.Downloader; -import com.microservices.dms.resourceLibrary.domain.Searcher; -import com.microservices.dms.resourceLibrary.domain.TaskResourceLibrary; +import com.microservices.dms.resourceLibrary.domain.*; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import com.microservices.dms.resourceLibrary.domain.vo.TaskListVo; import com.microservices.dms.resourceLibrary.domain.vo.UserActionDataVo; @@ -102,4 +99,8 @@ public interface TaskResourceLibraryMapper { * @return 需评审任务数 */ long getReviewTaskCount(); + + int insertFavorite(Favorite favorite); + + int insertWatcher(Watcher watcher); } 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 14f91c5db..6af30dbbe 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 @@ -104,7 +104,7 @@ public class TaskResourceLibraryService { for (TaskResourceLibrary l : list) { List> attachments = taskResourceLibraryMapper.getAttachments(l.getPaperId()); for (KeyValVo a : attachments) { - String v = a.getV(); + Object v = a.getV(); a.setV(String.format(MARKER_SPACE_DOWNLOAD_API_BY_ID, markerSpaceUrl, v)); } l.setAttachmentList(attachments); @@ -138,7 +138,7 @@ public class TaskResourceLibraryService { * * @return 任务总数 */ - public long getTotalTasks() { + public Long getTotalTasks() { return taskResourceLibraryMapper.getTotalTasks(); } @@ -147,7 +147,7 @@ public class TaskResourceLibraryService { * * @return 转换成果任务金额 */ - public double getConvertedTaskAmount() { + public Double getConvertedTaskAmount() { return taskResourceLibraryMapper.getConvertedTaskAmount(); } @@ -156,7 +156,7 @@ public class TaskResourceLibraryService { * * @return 任务转换成果数 */ - public long getConvertedTasksCount() { + public Long getConvertedTasksCount() { return taskResourceLibraryMapper.getConvertedTasksCount(); } @@ -165,13 +165,22 @@ public class TaskResourceLibraryService { * * @return 任务金额 */ - public long getTaskAmount() { + public Long getTaskAmount() { return taskResourceLibraryMapper.getTaskAmount(); } - public long getReviewTaskCount() { + public Long getReviewTaskCount() { return taskResourceLibraryMapper.getReviewTaskCount(); } + public int addFavorite(Favorite favorite) { + favorite.setCreatedAt(DateUtils.getNowDate()); + return taskResourceLibraryMapper.insertFavorite(favorite); + } + + public int addWatcher(Watcher watcher) { + watcher.setCreatedAt(DateUtils.getNowDate()); + return taskResourceLibraryMapper.insertWatcher(watcher); + } } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsConstants.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsConstants.java deleted file mode 100644 index 83bdcc2bd..000000000 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DmsConstants.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.microservices.dms.utils; - -public class DmsConstants { - -} diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml index e1cd01e80..8d0f607a8 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/CompetitionResourceLibraryMapper.xml @@ -122,7 +122,7 @@ select click_type as itemType, click_id as itemId, user_id as userId, created_at as createAt, (select login from users where id = user_id) as userName from clickers @@ -344,10 +422,10 @@ select b.file_name as k, b.id as v - from paper_details pd join busi_attachments b on pd.files = b.id + from paper_details pd + join busi_attachments b on pd.files = b.id where pd.paper_id = #{id}