diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index a18c9360..1d04f184 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -92,6 +92,21 @@ public class ResourceController { return new Result<>().ok(resourceService.selectTotal()); } + @GetMapping("/selectNewest") + @ApiOperation("查询最新上架能力") + @LogOperation("查询最新上架能力") + public Result selectNewest(@RequestBody JSONObject jsonObject){ + return new Result<>().ok(resourceService.selectNewest(jsonObject)); + } + + + @GetMapping("/selectMostPopular") + @ApiOperation("查询热门能力") + @LogOperation("查询热门能力") + public Result selectMostPopular(@RequestBody JSONObject jsonObject){ + return new Result<>().ok(resourceService.selectMostPopular(jsonObject)); + } + @PostMapping("/insert") @ApiOperation("保存") 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 15fc6082..7a8c8e1d 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 @@ -23,4 +23,6 @@ public interface ResourceDao extends BaseDao { List selectWithAttrs(@Param("dto") ResourceDTO resourceDTO); List selectTypeCount(Long deptId); + + List selectMostPopular(); } \ 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 8aa19d76..8e590ab3 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 @@ -34,4 +34,7 @@ public interface ResourceService extends CrudService queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByDesc("create_date") + .eq(StringUtils.isNotBlank(jsonObject.getString("type")),"type", jsonObject.getString("type")); + return resourceDao.selectList(queryWrapper); + + } + + @Override + public Object selectMostPopular(JSONObject jsonObject) { + resourceDao.selectMostPopular(); + return null; + } } \ 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 861320cf..e2e911a1 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -132,4 +132,26 @@ group by type order by type + + \ No newline at end of file