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 decd1bbe7..0737ceb4a 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 @@ -152,7 +152,32 @@ public class AchievementsController extends BaseController { @ApiOperation("七日新增") @GetMapping("/get7DayAdd") - public AjaxResult getA(@RequestBody AchQueryVo achQueryVo) { + public AjaxResult get7DayAdd(@RequestBody AchQueryVo achQueryVo) { return success(achievementsService.get7DayAdd(achQueryVo)); } + + + @ApiOperation("首页项目统计") + @GetMapping("/indexProjectStatistic") + public AjaxResult indexProjectStatistic() { + return success(achievementsService.indexProjectStatistic()); + } + + @ApiOperation("首页task统计") + @GetMapping("/indexTaskStatistic") + public AjaxResult indexTaskStatistic() { + return success(achievementsService.indexTaskStatistic()); + } + + @ApiOperation("首页Competition统计") + @GetMapping("/indexCompetitionStatistic") + public AjaxResult indexCompetitionStatistic() { + return success(achievementsService.indexCompetitionStatistic()); + } + + @ApiOperation("首页SchoolEnterprise统计") + @GetMapping("/indexSchoolEnterpriseStatistic") + public AjaxResult indexSchoolEnterpriseStatistic() { + return success(achievementsService.indexSchoolEnterpriseStatistic()); + } } 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 dfd4f891a..8abd0dbcc 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 @@ -93,4 +93,12 @@ public interface AchievementsMapper { List> getAchievement(@Param("s") Date s, @Param("e") Date e, @Param("t") String source); List getHotAchievement(); + + Map indexProjectStatistic(); + + Map indexTaskStatistic(); + + Map indexCompetitionStatistic(); + + Long indexSchoolEnterpriseStatistic(@Param("s") String s, @Param("t") String tags); } 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 8c7395426..0cc1f1704 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 @@ -80,4 +80,12 @@ public interface IAchievementsService { List getHotAchievement(); List> get7DayAdd(AchQueryVo achQueryVo); + + Map indexProjectStatistic(); + + Map indexTaskStatistic(); + + Map indexCompetitionStatistic(); + + Map indexSchoolEnterpriseStatistic(); } 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 b186e76aa..cec9a5524 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 @@ -10,6 +10,8 @@ import com.microservices.common.core.utils.StringUtils; import com.microservices.common.security.utils.SecurityUtils; import com.microservices.dms.achievementLibrary.domain.AchQueryVo; import com.microservices.dms.achievementLibrary.domain.KeyValueVo; +import com.microservices.dms.achievementLibrary.service.ISchoolEnterpriseAchievementsService; +import com.microservices.dms.resourceLibrary.domain.Clicker; import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo; import com.microservices.dms.resourceLibrary.mapper.TaskResourceLibraryMapper; import com.microservices.dms.utils.DateUtil; @@ -35,6 +37,9 @@ public class AchievementsServiceImpl implements IAchievementsService { @Autowired private TaskResourceLibraryMapper taskResourceLibraryMapper; + private ISchoolEnterpriseAchievementsService schoolEnterpriseAchievementsService; + + /** * 查询成果 * @@ -122,18 +127,18 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public void buildFileInfoByIdents(String img, String att, Map map) { - Set imgs = Arrays.stream(Optional.ofNullable(img).orElse("").split(",")).collect(Collectors.toSet()); - imgs = imgs.stream().filter(StringUtils::isNotEmpty).collect(Collectors.toSet()); - HashMap imgMap = new HashMap<>(); - if (!CollectionUtils.isEmpty(imgs)) { - Optional.ofNullable(achievementsMapper.getFileInfoByIdents(imgs)).orElse(new ArrayList<>()).forEach(s -> { - imgMap.put(s.get("k"), s.get("v")); - }); - } - map.put("img", imgMap); - String a = Optional.ofNullable(img).orElse("[]"); - JSONArray ao = JSONArray.parseArray(a); - map.put("att", ao); +// Set imgs = Arrays.stream(Optional.ofNullable(img).orElse("").split(",")).collect(Collectors.toSet()); +// imgs = imgs.stream().filter(StringUtils::isNotEmpty).collect(Collectors.toSet()); +// HashMap imgMap = new HashMap<>(); +// if (!CollectionUtils.isEmpty(imgs)) { +// Optional.ofNullable(achievementsMapper.getFileInfoByIdents(imgs)).orElse(new ArrayList<>()).forEach(s -> { +// imgMap.put(s.get("k"), s.get("v")); +// }); +// } +// map.put("img", imgMap); +// String a = Optional.ofNullable(img).orElse("[]"); +// JSONArray ao = JSONArray.parseArray(a); +// map.put("att", ao); } @@ -203,7 +208,7 @@ public class AchievementsServiceImpl implements IAchievementsService { @Override public List> get7DayAdd(AchQueryVo achQueryVo) { Date[] days = DateUtil.getDays(1, 7); - Map w = achievementsMapper.getaWatcher(days[0], days[1], achQueryVo.getSource()) + Map w = achievementsMapper.getAchievement(days[0], days[1], achQueryVo.getSource()) .stream().collect(Collectors.toMap(KeyValVo::getK, KeyValVo::getV)); List dateStr = DateUtil.getDateStr(days[0], days[1]); @@ -218,4 +223,40 @@ public class AchievementsServiceImpl implements IAchievementsService { } return res; } + + @Override + public Map indexProjectStatistic() { + Map res = achievementsMapper.indexProjectStatistic(); + return res; + } + + @Override + public Map indexTaskStatistic() { + Map res = achievementsMapper.indexTaskStatistic(); + double convertedTaskAmount = taskResourceLibraryMapper.getConvertedTaskAmount(); + res.put("convertedTaskAmount", convertedTaskAmount); + return res; + } + + @Override + public Map indexCompetitionStatistic() { + Map res = achievementsMapper.indexCompetitionStatistic(); + return res; + } + + @Override + public Map indexSchoolEnterpriseStatistic() { + Map res = new HashMap<>(); + Long schoolEnterpriseCount = achievementsMapper.indexSchoolEnterpriseStatistic("4", ""); + res.put("schoolEnterpriseCount", schoolEnterpriseCount); + Long schoolCount = achievementsMapper.indexSchoolEnterpriseStatistic("4", "1"); + res.put("schoolCount", schoolCount); + Long enterpriseCount = achievementsMapper.indexSchoolEnterpriseStatistic("4", "2"); + res.put("enterpriseCount", enterpriseCount); + Clicker clicker = new Clicker(); + clicker.setClickType("schoolEnterprise"); + long clickCount = taskResourceLibraryMapper.countClicker(clicker); + res.put("clickCount", clickCount); + return res; + } } 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 06277a5e4..70c808736 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 @@ -61,7 +61,7 @@ public class CollectUserActDataController { @ApiOperation(value = "记录搜索次数") @ApiImplicitParams({ @ApiImplicitParam(name = "searchType", value = "搜索类型(任务：makerSpaceTask、项目：Project、竞赛：CompetitionInfo)", paramType = "query", dataTypeClass = String.class), - @ApiImplicitParam(name = "searchIds", value = "搜索对象ID", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "searchIds", 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) }) @@ -70,7 +70,7 @@ public class CollectUserActDataController { } @PostMapping("/addFavorite") - @ApiOperation(value = "记录搜索次数") + @ApiOperation(value = "记录收藏次数") @ApiImplicitParams({ @ApiImplicitParam(name = "favoriteType", value = "收藏类型(成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "favoriteId", value = "对象ID", paramType = "query", dataTypeClass = Integer.class), @@ -82,7 +82,7 @@ public class CollectUserActDataController { } @PostMapping("/addWatcher") - @ApiOperation(value = "记录搜索次数") + @ApiOperation(value = "记录关注次数") @ApiImplicitParams({ @ApiImplicitParam(name = "favoriteType", value = "关注类型(成果：Achievements、专家：Experts)", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "favoriteId", value = "对象ID", paramType = "query", dataTypeClass = Integer.class), 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 7e3af6666..aa75ecb93 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 @@ -290,4 +290,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by DATE_FORMAT(create_time, '%Y-%m-%d') order by DATE_FORMAT(create_time, '%Y-%m-%d') + + + + + + + + \ No newline at end of file diff --git a/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java b/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java index de51925f3..243e6cc39 100644 --- a/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java +++ b/microservices-modules/microservices-modules-file/src/main/java/com/microservices/file/service/impl/SysFileInfoServiceImpl.java @@ -402,6 +402,13 @@ public class SysFileInfoServiceImpl implements ISysFileInfoService { isCommonFileType = false; break; } + case "dms": { + // 项目管理下需生成唯一标识，防止用户通过id递增访问 + sysFileInfo.setFileIdentifier(genFileIdentifier()); + baseFilePath += "/" + fileType + "/"; + isCommonFileType = false; + break; + } case "resource": { baseFilePath += "/" + fileType + "/"; isCommonFileType = false;