Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlink.org.cn/Gitlink/microservices into ccf_tmp

This commit is contained in:
otto 2026-07-29 13:49:26 +08:00
parent 9603d42295 0e13149981
commit db32b93ae7
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/detail/service/impl/ZoneDetailServiceImpl.java
View File

@ -224,13 +224,13 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
Date[] lastWeek = getLastWeek();
//专区文章数统计
ZoneDetailDataVo articlesGroupByKey = zoneDetailMapper
.countArticlesGroupByKey(lastWeek[0],lastWeek[1],zoneDetail.getKey()) ;
.countArticlesGroupByKey(lastWeek[0], lastWeek[1], zoneDetail.getKey());
if (articlesGroupByKey != null) {
zoneDetailDataVo.setWeekArticles(articlesGroupByKey.getWeekArticles());
}
//专区浏览数据统计
ZoneDetailDataVo puVsGroupByKey = zoneDetailMapper
.countPUVsGroupByKey(lastWeek[0],lastWeek[1],zoneDetail.getKey()) ;
.countPUVsGroupByKey(lastWeek[0], lastWeek[1], zoneDetail.getKey());
if (puVsGroupByKey != null) {
zoneDetailDataVo.setWeekPV(puVsGroupByKey.getWeekPV());
zoneDetailDataVo.setWeekUV(puVsGroupByKey.getWeekUV());
@ -923,26 +923,11 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
ZoneDetail zoneDetail = zoneDetailMapper.selectZoneDetailById(zoneId);
Set<String> usernameSet = new HashSet<>();
// 获取专区会员数
ZoneMemberSearchVo zoneMemberSearchVo = new ZoneMemberSearchVo();
zoneMemberSearchVo.setZoneId(zoneId);
List<ZoneMember> zoneMemberList = zoneMemberMapper.selectZoneMemberList(zoneMemberSearchVo);
zoneMemberList.forEach(x -> {
if (x.getSysUser() != null) {
usernameSet.add(x.getSysUser().getUserName());
}
});
ZoneMember zoneMemberSearch = new ZoneMember();
zoneMemberSearch.setZoneId(zoneId);
zoneMemberSearch.setIsAudit(ZoneConstants.MEMBER_AUDIT_PASS);
Integer zoneMemberCount = zoneMemberMapper.selectCountByZoneId(zoneMemberSearch);
// 获取专区内用户列表
GenericsTableDataInfo<SysUserDeptRole> userTable = FeignUtils.getReturnData(
remoteUserService.searchUserIdentifierListByDept(zoneDetail.getDeptId(), null, null, null, SecurityConstants.INNER)
);
if (userTable != null && userTable.getTotal() > 0) {
userTable.getRows().forEach(x -> {
if (x.getSysUser() != null) {
usernameSet.add(x.getSysUser().getUserName());
}
});
}
// 获取仓库贡献者数量
ZoneProjectSearchVo zoneProjectSearchVo = new ZoneProjectSearchVo();
zoneProjectSearchVo.setZoneId(zoneId);
@ -963,7 +948,7 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
}
}
}
zoneStatisticsVo.setCommunityUserCount((long) usernameSet.size());
zoneStatisticsVo.setCommunityUserCount((long) usernameSet.size() + zoneMemberCount);
Long cmsDocCount = FeignUtils.getReturnData(remoteCmsService.getCmsCountByDeptId(zoneDetail.getDeptId(), SecurityConstants.INNER));
zoneStatisticsVo.setCmsDocCount(cmsDocCount == null ? 0L : cmsDocCount);
Long cmsDocVisits = FeignUtils.getReturnData(remoteCmsService.getCmsDocVisitsByDeptId(zoneDetail.getDeptId(), SecurityConstants.INNER));
@ -971,8 +956,7 @@ public class ZoneDetailServiceImpl implements IZoneDetailService {
ZoneResource zoneResource = new ZoneResource();
zoneResource.setZoneId(zoneId);
List<ZoneResource> zoneResourceList = zoneResourceMapper.selectZoneResourceList(zoneResource);
zoneStatisticsVo.setResourceCount((long) zoneResourceList.size());
zoneStatisticsVo.setResourceCount(Long.valueOf(zoneResourceMapper.selectZoneResourceCount(zoneResource)));
ZoneSpecialProject zoneSpecialProject = new ZoneSpecialProject();
zoneSpecialProject.setZoneId(zoneId);