diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java index 8d9054b40..0d78904fa 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java @@ -37,6 +37,7 @@ import java.util.*; import static com.microservices.common.core.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; import static com.microservices.dms.constant.BlockChainFunConstants.*; +import static com.microservices.dms.utils.DateUtil.formatLocalDateTimePlusH; @Service @Slf4j @@ -327,7 +328,18 @@ public class BlockChainService { } public List> issueDataList(BlockchainListQueryVo queryVo) { - return inBlockchainDataMapper.issueDataList(queryVo); + List> maps = inBlockchainDataMapper.issueDataList(queryVo); + handleForgeDate(maps); + return maps; + } + + private void handleForgeDate(List> maps){ + for (Map m : maps) { + LocalDateTime updatedAt = (LocalDateTime) m.get("updated_at"); + LocalDateTime createdAt = (LocalDateTime) m.get("created_at"); + m.put("updated_at",formatLocalDateTimePlusH(updatedAt,8)); + m.put("created_at",formatLocalDateTimePlusH(createdAt,8)); + } } //定时任务,将commit数据入链 @@ -370,11 +382,15 @@ public class BlockChainService { } public List> commitDataList(BlockchainListQueryVo queryVo) { - return inBlockchainDataMapper.commitDataList(queryVo); + List> maps = inBlockchainDataMapper.commitDataList(queryVo); + handleForgeDate(maps); + return maps; } public List> prDataList(BlockchainListQueryVo queryVo) { - return inBlockchainDataMapper.prDataList(queryVo); + List> maps = inBlockchainDataMapper.prDataList(queryVo); + handleForgeDate(maps); + return maps; } public List userDataList(BlockchainListQueryVo queryVo) { diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java index d78bc7907..df96caaf0 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/service/TalentReferralService.java @@ -48,7 +48,7 @@ public class TalentReferralService { // 获取项目贡献者数量 JSONArray contributorsArray = dmsRequestHelper.getAllDataByPage(DmsGitLinkRequestUrl.CONTRIBUTORS(projectFullName), "list", "total_count"); - return contributorsArray.stream().map(o -> (JSONObject) o).map(s -> s.getString("contributions")).filter(StringUtils::isNotBlank).mapToLong(Long::parseLong).boxed().collect(Collectors.toSet()); + return contributorsArray.stream().map(o -> (JSONObject) o).map(s -> s.getString("id")).filter(StringUtils::isNotBlank).mapToLong(Long::parseLong).boxed().collect(Collectors.toSet()); } catch (ServiceException e) { logger.error("【{}】获取项目贡献者数量失败:{}", projectFullName, e.getMessage()); @@ -116,6 +116,7 @@ public class TalentReferralService { IssuesVo vo = new IssuesVo(); vo.setProjectId(projectId); vo.setStatusIds(Lists.newArrayList(ReferralConstant.ISSUE_CLOSED, ReferralConstant.ISSUE_RESOLVED)); + vo.setIssueClassify("issue"); List issuesVos = talentReferralMapper.selectIssuesCondition(vo); Map userFractionMap = new HashMap<>(); // 计算与解决issue的相似度, 标题+描述 diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/IssuesVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/IssuesVo.java index a3b9d8ce5..502d3598c 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/IssuesVo.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/referral/vo/IssuesVo.java @@ -13,4 +13,5 @@ public class IssuesVo { private Long statusId; private List statusIds; private Long num; + private String issueClassify; } diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DateUtil.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DateUtil.java index 18fb86961..c835eb632 100644 --- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DateUtil.java +++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/DateUtil.java @@ -112,4 +112,12 @@ public class DateUtil { LocalDateTime s = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); return Date.from(s.plusHours(plusHours).atZone(ZoneId.systemDefault()).toInstant()); } + + public static String formatLocalDateTimePlusH(LocalDateTime dateTime,long h) { + if (dateTime == null) {return null;} + + LocalDateTime localDateTime8 = dateTime.plusHours(h); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + return formatter.format(localDateTime8); + } } 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 afeb649f8..58925706c 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 @@ -401,8 +401,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml index 379ad3ff8..21be85171 100644 --- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml +++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ExpertResourceLibraryMapper.xml @@ -161,6 +161,7 @@ and erl.is_delete = #{isDelete} + order by erl.sort_no