diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java index 0b71913..abe45b4 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletTaskAppController.java @@ -36,44 +36,42 @@ public class PlayletTaskAppController extends BaseController { * 分页查询任务列表 */ @ResponseBody - @PostMapping("/getItemList") + @PostMapping("/getTaskList") @ApiOperation(value = "分页查询任务列表") - public Result> getItemList(@RequestBody PlayletTask playletTask, + public Result> getTaskList(@RequestBody PlayletTask playletTask, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize) { - return Result.success(playletTaskAppService.getItemPage(playletTask, pageNum, pageSize)); + return Result.success(playletTaskAppService.getTaskPage(playletTask, pageNum, pageSize)); } /** * 分页查询任务列表 */ @ResponseBody - @PostMapping("/getItemList/list") + @PostMapping("/getTaskListByUser") @ApiOperation(value = "分页查询用户任务列表") - public Result> getItemListByUser(@RequestBody PlayletTask playletTask, + public Result> getTaskListByUser(@RequestBody PlayletTask playletTask, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize) { - return Result.success(playletTaskAppService.getItemPageByUser(playletTask, pageNum, pageSize)); + return Result.success(playletTaskAppService.getTaskPageByUser(playletTask, pageNum, pageSize)); } /** * 任务详情 */ @ResponseBody - @GetMapping("/load/{taskId}") - @ApiOperation(value = "分页查询任务列表") - public Result loadByTaskId(@PathVariable("taskId") Long taskId) { + @GetMapping("/load") + @ApiOperation(value = "查询任务详情") + public Result loadByTaskId(@RequestParam(value = "taskId") Long taskId) { return Result.success(playletTaskAppService.selectPlayletTaskById(taskId)); } /** * 新增保存任务 */ - @RequiresPermissions("system:task:add") - @Log(title = "用户任务新增", businessType = BusinessType.INSERT) - @PostMapping("/user/designate") + @PostMapping("/addDesignate") @ResponseBody - public AjaxResult addSave(PlayletTask playletTask) { + public AjaxResult addSave(@RequestBody PlayletTask playletTask) { return toAjax(playletTaskAppService.userDesignateTask(playletTask)); } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java index 7ad3d16..0a67cf9 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletTaskAppService.java @@ -13,9 +13,9 @@ import java.util.List; */ public interface PlayletTaskAppService { - PageInfo getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum); + PageInfo getTaskPage(PlayletTask playletTask, Integer pageSize, Integer pageNum); - PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum); + PageInfo getTaskPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum); /** * 用户选定任务 diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java index 3060a2a..6333c9c 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletTaskAppServiceImpl.java @@ -35,14 +35,14 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { private final IPlayletRevenueRecordService revenueRecordService; @Override - public PageInfo getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + public PageInfo getTaskPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskList(playletTask); return PageInfo.of(revenueRecordList); } @Override - public PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + public PageInfo getTaskPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) { PageHelper.startPage(pageNum, pageSize); List revenueRecordList = playletTaskService.selectPlayletTaskListByUser(playletTask); return PageInfo.of(revenueRecordList);