diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index ef99012d..1176baa6 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -214,6 +214,33 @@ public class CensusController { ); return new Result>>().ok(result); } + @GetMapping("/capabilityShareCapabilitySet") + @ApiOperation("资源图谱-能力共享方-能力集") + @LogOperation("资源图谱-能力共享方-能力集") + public Result capabilitySharePartyCapabilitySet() { + return new Result().ok(resourceService.capabilitySharePartyCapabilitySet()); + } + + @GetMapping("/selectResourceListByDept") + @ApiOperation("资源图谱-能力共享方-能力集-根据部门查能力") + @LogOperation("资源图谱-能力共享方-能力集-根据部门查能力") + public Result selectResourceListByDept(Long deptId) { + return new Result().ok(resourceService.selectResourceListByDept(deptId)); + } + + @GetMapping("/competencyApplicantCompetencySet") + @ApiOperation("资源图谱-能力申请方-能力集") + @LogOperation("资源图谱-能力申请方-能力集") + public Result competencyApplicantCompetencySet() { + return new Result().ok(resourceService.competencyApplicantCompetencySet()); + } + + @GetMapping("/selectResourceListByApplyDept") + @ApiOperation("资源图谱-能力申请方-能力集-根据部门查能力") + @LogOperation("资源图谱-能力申请方-能力集-根据部门查能力") + public Result selectResourceListByApplyDept(Long deptId) { + return new Result().ok(resourceService.selectResourceListByApplyDept(deptId)); + } @GetMapping("/applyDeptTopN") @ApiOperation("部门申请量能力topN") @@ -248,6 +275,25 @@ public class CensusController { ); return new Result>>().ok(result); } + @GetMapping("/capabilitySharingPartyCapabilityType") + @ApiOperation("资源图谱-能力共享方-能力类型") + @LogOperation("资源图谱-能力共享方-能力类型") + public Result capabilitySharingPartyCapabilityType() { + return new Result().ok(resourceService.capabilitySharingPartyCapabilityType()); + } + @GetMapping("/competencyApplicantCapabilityType") + @ApiOperation("资源图谱-能力申请方-能力类型") + @LogOperation("资源图谱-能力申请方-能力类型") + public Result competencyApplicantCapabilityType() { + return new Result().ok(resourceService.competencyApplicantCapabilityType()); + } + + @GetMapping("/capabilityTypeCapabilitySet") + @ApiOperation("资源图谱-能力类型-能力集") + @LogOperation("资源图谱-能力类型-能力集") + public Result capabilityTypeCapabilitySet() { + return new Result().ok(resourceService.capabilityTypeCapabilitySet()); + } } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index ba0af651..82c3fd5c 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -49,7 +49,6 @@ public interface ResourceDao extends BaseDao { /** * 介入部门数目 - * * @return */ Long countAllDept(); @@ -78,4 +77,26 @@ public interface ResourceDao extends BaseDao { List selectDeptProvideCount(Integer n); List selectDeptProvide(Long deptId); + + List selectMaxDeptIds(); + + List selectByDeptId(@Param("deptId") Long deptId); + + List selectDeptCountList(); + + List selectMaxApplyDeptIds(); + + List selectByApplyDeptId(Long aLong); + + List selectApplyDeptCountList(); + + List> selectDeptTypeCountList(); + + List> selectApplyDeptTypeCountList(); + + List selectMaxType(); + + List selectByType(@Param("type") String s); + + List selectTypeCountList(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index 1ef95915..beeb112e 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -55,4 +55,18 @@ public interface ResourceService extends CrudService selectDeptProvide(Long deptId); + Object capabilitySharePartyCapabilitySet(); + + Object selectResourceListByDept(Long deptId); + + Object competencyApplicantCompetencySet(); + + Object selectResourceListByApplyDept(Long deptId); + + Object capabilitySharingPartyCapabilityType(); + + Object competencyApplicantCapabilityType(); + + Object capabilityTypeCapabilitySet(); + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index f9ed4701..ffeef633 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -24,6 +24,7 @@ import io.renren.modules.resourceCollection.dao.ResourceCollectionDao; import io.renren.modules.resourceScore.dao.ResourceScoreDao; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.UserDetail; +import io.renren.modules.sys.dao.SysDeptDao; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +63,9 @@ public class ResourceServiceImpl extends CrudServiceImpl getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -427,4 +431,91 @@ public class ResourceServiceImpl extends CrudServiceImpl selectDeptProvide(Long deptId) { return baseDao.selectDeptProvide(deptId); } + + @Override + public Object capabilitySharePartyCapabilitySet() { + HashMap resultMap = new HashMap<>(); + List deptIds = resourceDao.selectMaxDeptIds(); + List resourceList = resourceDao.selectByDeptId(deptIds.get(0)); + HashMap maxdeptMap = new HashMap<>(); + maxdeptMap.put("resourceList", resourceList); + maxdeptMap.put("deptName", sysDeptDao.selectById(deptIds.get(0)).getName()); + maxdeptMap.put("deptId", deptIds.get(0)); + resultMap.put("maxDept", maxdeptMap); + List deptList = resourceDao.selectDeptCountList(); + resultMap.put("deptList", deptList); + return resultMap; + } + + @Override + public Object selectResourceListByDept(Long deptId) { + return resourceDao.selectByDeptId(deptId); + } + + @Override + public Object competencyApplicantCompetencySet() { + HashMap resultMap = new HashMap<>(); + List deptIds = resourceDao.selectMaxApplyDeptIds(); + List resourceList = resourceDao.selectByApplyDeptId(deptIds.get(0)); + HashMap maxdeptMap = new HashMap<>(); + maxdeptMap.put("resourceList", resourceList); + maxdeptMap.put("deptName", sysDeptDao.selectById(deptIds.get(0)).getName()); + maxdeptMap.put("deptId", deptIds.get(0)); + resultMap.put("maxDept", maxdeptMap); + List deptList = resourceDao.selectApplyDeptCountList(); + resultMap.put("deptList", deptList); + return resultMap; + } + + @Override + public Object selectResourceListByApplyDept(Long deptId) { + return resourceDao.selectByApplyDeptId(deptId); + } + + @Override + public Object capabilitySharingPartyCapabilityType() { + List> typeCountListByDept = resourceDao.selectDeptTypeCountList(); + Map>> typeCountListMap = typeCountListByDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); + ArrayList resultList = new ArrayList<>(); + typeCountListMap.forEach((k,v) -> { + HashMap map = new HashMap<>(); + map.put("name", k); + v.forEach(item -> { + map.put(item.get("type").toString(), item.get("count")); + }); + resultList.add(map); + }); + return resultList; + } + + @Override + public Object competencyApplicantCapabilityType() { + List> typeCountListByApplyDept = resourceDao.selectApplyDeptTypeCountList(); + Map>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); + ArrayList resultList = new ArrayList<>(); + typeCountListMap.forEach((k,v) -> { + HashMap map = new HashMap<>(); + map.put("name", k); + v.forEach(item -> { + map.put(item.get("type").toString(), item.get("count")); + }); + resultList.add(map); + }); + return resultList; + } + + @Override + public Object capabilityTypeCapabilitySet() { + HashMap resultMap = new HashMap<>(); + List types = resourceDao.selectMaxType(); + List resourceList = resourceDao.selectByType(types.get(0)); + HashMap maxdeptMap = new HashMap<>(); + maxdeptMap.put("resourceList", resourceList); + maxdeptMap.put("typeName", types.get(0)); + resultMap.put("maxDept", maxdeptMap); + List deptList = resourceDao.selectTypeCountList(); + resultMap.put("typeList", deptList); + return resultMap; + } + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/dao/ResourceBrowseDao.java b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/dao/ResourceBrowseDao.java index a70d5375..ef37bb7f 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/dao/ResourceBrowseDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/dao/ResourceBrowseDao.java @@ -17,7 +17,7 @@ import java.util.Map; @Mapper public interface ResourceBrowseDao extends BaseDao { - Integer selectDayAvg(@Param("days") Long days); + Long selectDayAvg(@Param("days") Long days); Integer selectDayMax(); diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index 38b75291..bf8d3074 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -83,4 +83,4 @@ mybatis-plus: #系统上线日期,用于统计能力浏览记录 system: - startDay: 2022-01-01 \ No newline at end of file + startDay: 2022-04-01 \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 9e5889a5..77893cee 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -554,4 +554,234 @@ tda.attr_type = '应用领域' + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml index 11eb4b88..46410412 100644 --- a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml +++ b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml @@ -16,7 +16,8 @@ - SELECT IFNULL(COUNT(id), 0) / ${days} FROM tb_resource_browse WHERE 1 = 1 @@ -46,7 +47,7 @@ WHERE 1 = 1 AND state = 0 - AND create_date BETWEEN ${startDate} AND ${endDate} + AND SUBSTR(create_date, 1, 10) BETWEEN ${startDate} AND ${endDate} GROUP BY SUBSTR(create_date, 1, 10)