From cd7bb43e6180ee53bb5e15f895f5b26b5d68980a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=86=E6=98=9F=E9=9C=96?= <729219176@qq.com> Date: Fri, 22 Mar 2024 12:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/PlayletTaskAppController.java | 47 ++++++++- .../system/PlayletTaskController.java | 9 +- .../service/app/PlayletTaskAppService.java | 59 ++++++++++- .../app/PlayletUserTaskAppService.java | 62 ++++++++++++ .../app/impl/PlayletTaskAppServiceImpl.java | 98 ++++++++++++++++++- .../impl/PlayletUserTaskAppServiceImpl.java | 96 ++++++++++++++++++ .../playlet/system/domain/PlayletTask.java | 6 ++ .../system/mapper/PlayletTaskMapper.java | 20 ++-- .../service/IPlayletUserTaskService.java | 1 + .../mapper/system/PlayletTaskMapper.xml | 37 +++++++ 10 files changed, 420 insertions(+), 15 deletions(-) create mode 100644 playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java create mode 100644 playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java 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 3ed43f0..8d085dd 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 @@ -1,12 +1,18 @@ package com.playlet.web.controller.app; +import com.github.pagehelper.PageInfo; import com.playlet.common.core.controller.BaseController; +import com.playlet.common.core.domain.Result; +import com.playlet.system.domain.PlayletItem; +import com.playlet.system.domain.PlayletTask; +import com.playlet.web.service.app.PlayletItemAppService; +import com.playlet.web.service.app.PlayletTaskAppService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** @@ -22,4 +28,41 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlayletTaskAppController extends BaseController { + private final PlayletTaskAppService playletTaskAppService; + + /** + * 分页查询任务列表 + */ + @ResponseBody + @PostMapping("/getItemList") + @ApiOperation(value = "分页查询任务列表") + public Result> getItemList(@RequestBody PlayletTask playletTask, + @RequestParam(value = "pageNum") Integer pageNum, + @RequestParam(value = "pageSize") Integer pageSize) { + return Result.success(playletTaskAppService.getItemPage(playletTask, pageNum, pageSize)); + } + + /** + * 分页查询任务列表 + */ + @ResponseBody + @PostMapping("/getItemList/list") + @ApiOperation(value = "分页查询用户任务列表") + public Result> getItemListByUser(@RequestBody PlayletTask playletTask, + @RequestParam(value = "pageNum") Integer pageNum, + @RequestParam(value = "pageSize") Integer pageSize) { + return Result.success(playletTaskAppService.getItemPageByUser(playletTask, pageNum, pageSize)); + } + + /** + * 任务详情 + */ + @ResponseBody + @GetMapping("/load/{taskId}") + @ApiOperation(value = "分页查询任务列表") + public Result loadByTaskId(@PathVariable("taskId") Long taskId) { + return Result.success(playletTaskAppService.selectPlayletTaskById(taskId)); + } + + } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java index caa4464..304fdc8 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletTaskController.java @@ -2,15 +2,14 @@ package com.playlet.web.controller.system; import java.util.List; +import com.github.pagehelper.PageInfo; +import com.playlet.common.core.domain.Result; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.playlet.common.annotation.Log; import com.playlet.common.enums.BusinessType; import com.playlet.system.domain.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 8de72a9..24f1888 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 @@ -1,10 +1,67 @@ package com.playlet.web.service.app; +import com.github.pagehelper.PageInfo; +import com.playlet.system.domain.PlayletTask; + +import java.util.List; + /** * @Date: 2024-03-22 00:02 * @Author: 但星霖 * @Version: v1.0 - * @Description: + * @Description: 任务app Service接口 */ public interface PlayletTaskAppService { + + PageInfo getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum); + + PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum); + + /** + * 查询任务 + * + * @param id 任务主键 + * @return 任务 + */ + PlayletTask selectPlayletTaskById(Long id); + + /** + * 查询任务列表 + * + * @param playletTask 任务 + * @return 任务集合 + */ + List selectPlayletTaskList(PlayletTask playletTask); + + /** + * 新增任务 + * + * @param playletTask 任务 + * @return 结果 + */ + int insertPlayletTask(PlayletTask playletTask); + + /** + * 修改任务 + * + * @param playletTask 任务 + * @return 结果 + */ + int updatePlayletTask(PlayletTask playletTask); + + /** + * 批量删除任务 + * + * @param ids 需要删除的任务主键集合 + * @return 结果 + */ + int deletePlayletTaskByIds(String ids); + + /** + * 删除任务信息 + * + * @param id 任务主键 + * @return 结果 + */ + int deletePlayletTaskById(Long id); } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java new file mode 100644 index 0000000..bea9437 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletUserTaskAppService.java @@ -0,0 +1,62 @@ +package com.playlet.web.service.app; + +import com.playlet.system.domain.PlayletUserTask; + +import java.util.List; + +/** + * @Date: 2024-03-22 12:13 + * @Author: 但星霖 + * @Version: v1.0 + * @Description: 任务用户app Service接口 + */ +public interface PlayletUserTaskAppService { + + /** + * 查询短剧用户任务 + * + * @param id 短剧用户任务主键 + * @return 短剧用户任务 + */ + PlayletUserTask selectPlayletUserTaskById(Long id); + + /** + * 查询短剧用户任务列表 + * + * @param playletUserTask 短剧用户任务 + * @return 短剧用户任务集合 + */ + List selectPlayletUserTaskList(PlayletUserTask playletUserTask); + + /** + * 新增短剧用户任务 + * + * @param playletUserTask 短剧用户任务 + * @return 结果 + */ + int insertPlayletUserTask(PlayletUserTask playletUserTask); + + /** + * 修改短剧用户任务 + * + * @param playletUserTask 短剧用户任务 + * @return 结果 + */ + int updatePlayletUserTask(PlayletUserTask playletUserTask); + + /** + * 批量删除短剧用户任务 + * + * @param ids 需要删除的短剧用户任务主键集合 + * @return 结果 + */ + int deletePlayletUserTaskByIds(String ids); + + /** + * 删除短剧用户任务信息 + * + * @param id 短剧用户任务主键 + * @return 结果 + */ + int deletePlayletUserTaskById(Long id); +} 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 648018e..cbbeb67 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 @@ -1,19 +1,115 @@ package com.playlet.web.service.app.impl; +import cn.hutool.core.util.ObjectUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.playlet.common.core.text.Convert; +import com.playlet.common.utils.DateUtils; +import com.playlet.system.domain.PlayletItem; +import com.playlet.system.domain.PlayletItemType; +import com.playlet.system.domain.PlayletRevenueRecord; +import com.playlet.system.domain.PlayletTask; +import com.playlet.system.mapper.PlayletTaskMapper; import com.playlet.web.service.app.PlayletTaskAppService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Date: 2024-03-22 00:02 * @Author: 但星霖 * @Version: v1.0 - * @Description: + * @Description: 任务app Service接口实现 */ @Slf4j @Service @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { + + private final PlayletTaskMapper playletTaskMapper; + + @Override + public PageInfo getItemPage(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + PageHelper.startPage(pageNum, pageSize); + List revenueRecordList = playletTaskMapper.selectPlayletTaskList(playletTask); + return PageInfo.of(revenueRecordList); + } + + @Override + public PageInfo getItemPageByUser(PlayletTask playletTask, Integer pageSize, Integer pageNum) { + PageHelper.startPage(pageNum, pageSize); + List revenueRecordList = playletTaskMapper.selectPlayletTaskListByUser(playletTask); + return PageInfo.of(revenueRecordList); + } + + /** + * 查询任务 + * + * @param id 任务主键 + * @return 任务 + */ + @Override + public PlayletTask selectPlayletTaskById(Long id) { + return playletTaskMapper.selectPlayletTaskById(id); + } + + /** + * 查询任务列表 + * + * @param playletTask 任务 + * @return 任务 + */ + @Override + public List selectPlayletTaskList(PlayletTask playletTask) { + return playletTaskMapper.selectPlayletTaskList(playletTask); + } + + /** + * 新增任务 + * + * @param playletTask 任务 + * @return 结果 + */ + @Override + public int insertPlayletTask(PlayletTask playletTask) { + playletTask.setCreateTime(DateUtils.getNowDate()); + return playletTaskMapper.insertPlayletTask(playletTask); + } + + /** + * 修改任务 + * + * @param playletTask 任务 + * @return 结果 + */ + @Override + public int updatePlayletTask(PlayletTask playletTask) { + playletTask.setUpdateTime(DateUtils.getNowDate()); + return playletTaskMapper.updatePlayletTask(playletTask); + } + + /** + * 批量删除任务 + * + * @param ids 需要删除的任务主键 + * @return 结果 + */ + @Override + public int deletePlayletTaskByIds(String ids) { + return playletTaskMapper.deletePlayletTaskByIds(Convert.toStrArray(ids)); + } + + /** + * 删除任务信息 + * + * @param id 任务主键 + * @return 结果 + */ + @Override + public int deletePlayletTaskById(Long id) { + return playletTaskMapper.deletePlayletTaskById(id); + } } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java new file mode 100644 index 0000000..5da3495 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserTaskAppServiceImpl.java @@ -0,0 +1,96 @@ +package com.playlet.web.service.app.impl; + + +import com.playlet.common.core.text.Convert; +import com.playlet.common.utils.DateUtils; +import com.playlet.system.domain.PlayletUserTask; +import com.playlet.system.mapper.PlayletUserTaskMapper; +import com.playlet.web.service.app.PlayletUserTaskAppService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Date: 2024-03-22 12:13 + * @Author: 但星霖 + * @Version: v1.0 + * @Description: 任务用户app Service接口实现 + */ +@Slf4j +@Service +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletUserTaskAppServiceImpl implements PlayletUserTaskAppService { + + private final PlayletUserTaskMapper playletUserTaskMapper; + + /** + * 查询短剧用户任务 + * + * @param id 短剧用户任务主键 + * @return 短剧用户任务 + */ + @Override + public PlayletUserTask selectPlayletUserTaskById(Long id) { + return playletUserTaskMapper.selectPlayletUserTaskById(id); + } + + /** + * 查询短剧用户任务列表 + * + * @param playletUserTask 短剧用户任务 + * @return 短剧用户任务 + */ + @Override + public List selectPlayletUserTaskList(PlayletUserTask playletUserTask) { + return playletUserTaskMapper.selectPlayletUserTaskList(playletUserTask); + } + + /** + * 新增短剧用户任务 + * + * @param playletUserTask 短剧用户任务 + * @return 结果 + */ + @Override + public int insertPlayletUserTask(PlayletUserTask playletUserTask) { + playletUserTask.setCreateTime(DateUtils.getNowDate()); + return playletUserTaskMapper.insertPlayletUserTask(playletUserTask); + } + + /** + * 修改短剧用户任务 + * + * @param playletUserTask 短剧用户任务 + * @return 结果 + */ + @Override + public int updatePlayletUserTask(PlayletUserTask playletUserTask) { + playletUserTask.setUpdateTime(DateUtils.getNowDate()); + return playletUserTaskMapper.updatePlayletUserTask(playletUserTask); + } + + /** + * 批量删除短剧用户任务 + * + * @param ids 需要删除的短剧用户任务主键 + * @return 结果 + */ + @Override + public int deletePlayletUserTaskByIds(String ids) { + return playletUserTaskMapper.deletePlayletUserTaskByIds(Convert.toStrArray(ids)); + } + + /** + * 删除短剧用户任务信息 + * + * @param id 短剧用户任务主键 + * @return 结果 + */ + @Override + public int deletePlayletUserTaskById(Long id) { + return playletUserTaskMapper.deletePlayletUserTaskById(id); + } +} diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java index c1fd9b1..40fd5cc 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletTask.java @@ -1,6 +1,7 @@ package com.playlet.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.playlet.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; @@ -111,4 +112,9 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "任务状态 0 未开始 1 已开始 2 已结束 3 已失效 4 已完成") private Long state; + @TableField(exist = false) + @Excel(name = "用户id") + @ApiModelProperty(value = "用户id") + private Long userId; + } diff --git a/playlet-system/src/main/java/com/playlet/system/mapper/PlayletTaskMapper.java b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletTaskMapper.java index e07940c..eb8a110 100644 --- a/playlet-system/src/main/java/com/playlet/system/mapper/PlayletTaskMapper.java +++ b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletTaskMapper.java @@ -18,7 +18,7 @@ public interface PlayletTaskMapper extends BaseMapper { * @param id 任务主键 * @return 任务 */ - public PlayletTask selectPlayletTaskById(Long id); + PlayletTask selectPlayletTaskById(Long id); /** * 查询任务列表 @@ -26,7 +26,15 @@ public interface PlayletTaskMapper extends BaseMapper { * @param playletTask 任务 * @return 任务集合 */ - public List selectPlayletTaskList(PlayletTask playletTask); + List selectPlayletTaskList(PlayletTask playletTask); + + /** + * 查询任务列表 根据用户查询 + * + * @param playletTask 任务 + * @return 任务集合 + */ + List selectPlayletTaskListByUser(PlayletTask playletTask); /** * 新增任务 @@ -34,7 +42,7 @@ public interface PlayletTaskMapper extends BaseMapper { * @param playletTask 任务 * @return 结果 */ - public int insertPlayletTask(PlayletTask playletTask); + int insertPlayletTask(PlayletTask playletTask); /** * 修改任务 @@ -42,7 +50,7 @@ public interface PlayletTaskMapper extends BaseMapper { * @param playletTask 任务 * @return 结果 */ - public int updatePlayletTask(PlayletTask playletTask); + int updatePlayletTask(PlayletTask playletTask); /** * 删除任务 @@ -50,7 +58,7 @@ public interface PlayletTaskMapper extends BaseMapper { * @param id 任务主键 * @return 结果 */ - public int deletePlayletTaskById(Long id); + int deletePlayletTaskById(Long id); /** * 批量删除任务 @@ -58,5 +66,5 @@ public interface PlayletTaskMapper extends BaseMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deletePlayletTaskByIds(String[] ids); + int deletePlayletTaskByIds(String[] ids); } diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java index dc82353..4a3ece9 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserTaskService.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @Description: 短剧用户任务Service接口 */ public interface IPlayletUserTaskService extends IService { + /** * 查询短剧用户任务 * diff --git a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml index 4343414..9d918b1 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml @@ -65,6 +65,43 @@ + +