diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletExpandAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletExpandAppController.java new file mode 100644 index 0000000..bbc8d89 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletExpandAppController.java @@ -0,0 +1,51 @@ +package com.playlet.web.controller.app; + +import com.github.pagehelper.PageInfo; +import com.playlet.common.core.domain.Result; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.playlet.web.service.app.PlayletExpandService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + *

短剧*扩展账号管理

+ * @author clunt + */ +@Api(tags = "短剧*扩展账号管理") +@RestController +@RequestMapping(value = "/app/expand") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletExpandAppController { + + private final PlayletExpandService playletExpandService; + + @ResponseBody + @PostMapping("/getPageList") + @ApiOperation(value = "分页查询短剧扩展账号列表") + public Result> getPageList(@RequestBody PlayletUserExpandAccount expandAccount, + @RequestParam(value = "pageNum")Integer pageNum, + @RequestParam(value = "pageSize")Integer pageSize) { + return Result.success(playletExpandService.getPageList(expandAccount, pageNum, pageSize)); + } + + @ResponseBody + @PostMapping("/getList") + @ApiOperation(value = "查询短剧扩展账号列表") + public Result> getList(@RequestBody PlayletUserExpandAccount expandAccount) { + return Result.success(playletExpandService.getList(expandAccount)); + } + + @ResponseBody + @PostMapping("/addAccount") + @ApiOperation(value = "新增扩展账号") + public Result addAccount(@RequestBody PlayletUserExpandAccount expandAccount) { + playletExpandService.addAccount(expandAccount); + return Result.success(); + } + +} diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletPlatformFlowAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletPlatformFlowAppController.java new file mode 100644 index 0000000..0a854ff --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletPlatformFlowAppController.java @@ -0,0 +1,29 @@ +package com.playlet.web.controller.app; + +import com.playlet.common.core.domain.Result; +import com.playlet.system.domain.PlayletPlatformFlow; +import com.playlet.web.service.app.PlayletFlowAppService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "短剧*挂载配置") +@RestController +@RequestMapping(value = "/app/flow") +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletPlatformFlowAppController { + + private final PlayletFlowAppService playletFlowAppService; + + @ResponseBody + @PostMapping("/getList") + @ApiOperation(value = "查询挂载配置列表") + public Result> getList(@RequestBody PlayletPlatformFlow platformFlow) { + return Result.success(playletFlowAppService.getFlowList(platformFlow)); + } + +} 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 8b867a5..bfc6844 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 @@ -7,6 +7,7 @@ import com.playlet.common.core.domain.AjaxResult; import com.playlet.common.core.domain.Result; import com.playlet.common.enums.BusinessType; import com.playlet.system.domain.PlayletTask; +import com.playlet.system.domain.PlayletUserTask; import com.playlet.web.service.app.PlayletTaskAppService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -66,14 +67,38 @@ public class PlayletTaskAppController extends BaseController { return Result.success(playletTaskAppService.selectPlayletTaskById(taskId)); } - /** - * 新增保存任务 - */ - @PostMapping("/addDesignate") + @ApiOperation(value = "接受任务") + @PostMapping("/acceptTask") @ResponseBody - public AjaxResult addSave(@RequestBody PlayletTask playletTask) { - return toAjax(playletTaskAppService.userDesignateTask(playletTask)); + public Result acceptTask(@RequestBody PlayletUserTask playletUserTask) { + try { + playletTaskAppService.userDesignateTask(playletUserTask); + return Result.success(); + }catch (Exception e){ + log.error("接任务报错:{}", e.getMessage(), e); + return Result.error(e.getMessage()); + } } + @ApiOperation(value = "推广我的任务") + @PostMapping("/promotionTask") + @ResponseBody + public Result promotionTask(@RequestBody PlayletUserTask playletUserTask) { + try { + return Result.success(playletTaskAppService.promotionTask(playletUserTask), "操作成功"); + }catch (Exception e){ + log.error("推广任务报错:{}", e.getMessage(), e); + return Result.error(e.getMessage()); + } + } + + @ApiOperation(value = "分页查询我的推广") + @PostMapping("/getPromotionTaskPage") + @ResponseBody + public Result> getPromotionTaskPage(@RequestBody PlayletUserTask playletUserTask, + @RequestParam(value = "pageNum") Integer pageNum, + @RequestParam(value = "pageSize") Integer pageSize) { + return Result.success(playletTaskAppService.getPromotionTaskPage(playletUserTask, pageNum, pageSize)); + } } diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java index 6288f39..615d269 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletUserAccountAppController.java @@ -32,7 +32,7 @@ public class PlayletUserAccountAppController { */ @ResponseBody @PostMapping("/getAccountList") - @ApiOperation(value = "分页查询短剧基础列表") + @ApiOperation(value = "分页查询基础列表") public Result> getAccountList(@RequestBody PlayletUserAccount playletUserAccount, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPlatformFlowController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPlatformFlowController.java new file mode 100644 index 0000000..9672082 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletPlatformFlowController.java @@ -0,0 +1,127 @@ +package com.playlet.web.controller.system; + +import java.util.List; +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 com.playlet.common.annotation.Log; +import com.playlet.common.enums.BusinessType; +import com.playlet.system.domain.PlayletPlatformFlow; +import com.playlet.system.service.IPlayletPlatformFlowService; +import com.playlet.common.core.controller.BaseController; +import com.playlet.common.core.domain.AjaxResult; +import com.playlet.common.utils.poi.ExcelUtil; +import com.playlet.common.core.page.TableDataInfo; + +/** + * 挂载操作流程Controller + * + * @author ruoyi + * @date 2024-04-14 + */ +@Controller +@RequestMapping("/system/playlet/flow") +public class PlayletPlatformFlowController extends BaseController +{ + private String prefix = "system/playlet/flow"; + + @Autowired + private IPlayletPlatformFlowService playletPlatformFlowService; + + @RequiresPermissions("playlet:flow:view") + @GetMapping() + public String flow() + { + return prefix + "/flow"; + } + + /** + * 查询挂载操作流程列表 + */ + @RequiresPermissions("playlet:flow:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(PlayletPlatformFlow playletPlatformFlow) + { + startPage(); + List list = playletPlatformFlowService.selectPlayletPlatformFlowList(playletPlatformFlow); + return getDataTable(list); + } + + /** + * 导出挂载操作流程列表 + */ + @RequiresPermissions("playlet:flow:export") + @Log(title = "挂载操作流程", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(PlayletPlatformFlow playletPlatformFlow) + { + List list = playletPlatformFlowService.selectPlayletPlatformFlowList(playletPlatformFlow); + ExcelUtil util = new ExcelUtil(PlayletPlatformFlow.class); + return util.exportExcel(list, "挂载操作流程数据"); + } + + /** + * 新增挂载操作流程 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存挂载操作流程 + */ + @RequiresPermissions("playlet:flow:add") + @Log(title = "挂载操作流程", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(PlayletPlatformFlow playletPlatformFlow) + { + return toAjax(playletPlatformFlowService.insertPlayletPlatformFlow(playletPlatformFlow)); + } + + /** + * 修改挂载操作流程 + */ + @RequiresPermissions("playlet:flow:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + PlayletPlatformFlow playletPlatformFlow = playletPlatformFlowService.selectPlayletPlatformFlowById(id); + mmap.put("playletPlatformFlow", playletPlatformFlow); + return prefix + "/edit"; + } + + /** + * 修改保存挂载操作流程 + */ + @RequiresPermissions("playlet:flow:edit") + @Log(title = "挂载操作流程", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(PlayletPlatformFlow playletPlatformFlow) + { + return toAjax(playletPlatformFlowService.updatePlayletPlatformFlow(playletPlatformFlow)); + } + + /** + * 删除挂载操作流程 + */ + @RequiresPermissions("playlet:flow:remove") + @Log(title = "挂载操作流程", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(playletPlatformFlowService.deletePlayletPlatformFlowByIds(ids)); + } +} diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserExpandAccountController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserExpandAccountController.java new file mode 100644 index 0000000..ae9d5b2 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletUserExpandAccountController.java @@ -0,0 +1,127 @@ +package com.playlet.web.controller.system; + +import java.util.List; +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 com.playlet.common.annotation.Log; +import com.playlet.common.enums.BusinessType; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.playlet.system.service.IPlayletUserExpandAccountService; +import com.playlet.common.core.controller.BaseController; +import com.playlet.common.core.domain.AjaxResult; +import com.playlet.common.utils.poi.ExcelUtil; +import com.playlet.common.core.page.TableDataInfo; + +/** + * 用户外部账号Controller + * + * @author ruoyi + * @date 2024-04-14 + */ +@Controller +@RequestMapping("/system/playlet/expand") +public class PlayletUserExpandAccountController extends BaseController +{ + private String prefix = "system/playlet/expand"; + + @Autowired + private IPlayletUserExpandAccountService playletUserExpandAccountService; + + @RequiresPermissions("playlet:account:view") + @GetMapping() + public String account() + { + return prefix + "/expand"; + } + + /** + * 查询用户外部账号列表 + */ + @RequiresPermissions("playlet:account:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(PlayletUserExpandAccount playletUserExpandAccount) + { + startPage(); + List list = playletUserExpandAccountService.selectPlayletUserExpandAccountList(playletUserExpandAccount); + return getDataTable(list); + } + + /** + * 导出用户外部账号列表 + */ + @RequiresPermissions("playlet:account:export") + @Log(title = "用户外部账号", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(PlayletUserExpandAccount playletUserExpandAccount) + { + List list = playletUserExpandAccountService.selectPlayletUserExpandAccountList(playletUserExpandAccount); + ExcelUtil util = new ExcelUtil(PlayletUserExpandAccount.class); + return util.exportExcel(list, "用户外部账号数据"); + } + + /** + * 新增用户外部账号 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存用户外部账号 + */ + @RequiresPermissions("playlet:account:add") + @Log(title = "用户外部账号", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(PlayletUserExpandAccount playletUserExpandAccount) + { + return toAjax(playletUserExpandAccountService.insertPlayletUserExpandAccount(playletUserExpandAccount)); + } + + /** + * 修改用户外部账号 + */ + @RequiresPermissions("playlet:account:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + PlayletUserExpandAccount playletUserExpandAccount = playletUserExpandAccountService.selectPlayletUserExpandAccountById(id); + mmap.put("playletUserExpandAccount", playletUserExpandAccount); + return prefix + "/edit"; + } + + /** + * 修改保存用户外部账号 + */ + @RequiresPermissions("playlet:account:edit") + @Log(title = "用户外部账号", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(PlayletUserExpandAccount playletUserExpandAccount) + { + return toAjax(playletUserExpandAccountService.updatePlayletUserExpandAccount(playletUserExpandAccount)); + } + + /** + * 删除用户外部账号 + */ + @RequiresPermissions("playlet:account:remove") + @Log(title = "用户外部账号", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(playletUserExpandAccountService.deletePlayletUserExpandAccountByIds(ids)); + } +} diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletExpandService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletExpandService.java new file mode 100644 index 0000000..31427ce --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletExpandService.java @@ -0,0 +1,33 @@ +package com.playlet.web.service.app; + +import com.github.pagehelper.PageInfo; +import com.playlet.system.domain.PlayletUserExpandAccount; + +import java.util.List; + +/** + * @author clunt + *

短剧*扩展账号管理service

+ */ +public interface PlayletExpandService { + + /** + * @param expandAccount 查询条件 + * @param pageNum 页码 + * @param pageSize 单页条数 + * @return 分页结果 + */ + PageInfo getPageList(PlayletUserExpandAccount expandAccount, Integer pageNum, Integer pageSize); + + /** + * @param expandAccount 查询条件 + * @return 返回list + */ + List getList(PlayletUserExpandAccount expandAccount); + + /** + * @param expandAccount 新增外部账号 + */ + void addAccount(PlayletUserExpandAccount expandAccount); + +} diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletFlowAppService.java b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletFlowAppService.java new file mode 100644 index 0000000..d98f395 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/PlayletFlowAppService.java @@ -0,0 +1,11 @@ +package com.playlet.web.service.app; + +import com.playlet.system.domain.PlayletPlatformFlow; + +import java.util.List; + +public interface PlayletFlowAppService { + + List getFlowList(PlayletPlatformFlow platformFlow); + +} 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 0a67cf9..06dcdcf 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 @@ -2,6 +2,7 @@ package com.playlet.web.service.app; import com.github.pagehelper.PageInfo; import com.playlet.system.domain.PlayletTask; +import com.playlet.system.domain.PlayletUserTask; import java.util.List; @@ -19,10 +20,10 @@ public interface PlayletTaskAppService { /** * 用户选定任务 - * @param playletTask 任务实体数据 + * @param playletUserTask 任务实体数据 * @return 是否添加成功 */ - Boolean userDesignateTask(PlayletTask playletTask); + Boolean userDesignateTask(PlayletUserTask playletUserTask); /** * 查询任务 @@ -71,4 +72,19 @@ public interface PlayletTaskAppService { * @return 结果 */ int deletePlayletTaskById(Long id); + + /** + * @param playletUserTask 推广任务 + * @return 获取推广的链接 + */ + String promotionTask(PlayletUserTask playletUserTask); + + /** + * @param playletUserTask 入参 + * @param pageNum 页数 + * @param pageSize 单页条数 + * @return 符合结果数据 + */ + PageInfo getPromotionTaskPage(PlayletUserTask playletUserTask, Integer pageNum, Integer pageSize); + } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletExpandServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletExpandServiceImpl.java new file mode 100644 index 0000000..8af11c4 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletExpandServiceImpl.java @@ -0,0 +1,40 @@ +package com.playlet.web.service.app.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.playlet.system.service.IPlayletUserExpandAccountService; +import com.playlet.web.service.app.PlayletExpandService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletExpandServiceImpl implements PlayletExpandService { + + private final IPlayletUserExpandAccountService iPlayletUserExpandAccountService; + + @Override + public PageInfo getPageList(PlayletUserExpandAccount expandAccount, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum, pageSize); + List list = iPlayletUserExpandAccountService.selectPlayletUserExpandAccountList(expandAccount); + return PageInfo.of(list); + } + + @Override + public List getList(PlayletUserExpandAccount expandAccount) { + return iPlayletUserExpandAccountService.selectPlayletUserExpandAccountList(expandAccount); + } + + @Override + public void addAccount(PlayletUserExpandAccount expandAccount) { + expandAccount.setCreateTime(new Date()); + iPlayletUserExpandAccountService.insertPlayletUserExpandAccount(expandAccount); + } +} diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletFlowAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletFlowAppServiceImpl.java new file mode 100644 index 0000000..12b1e78 --- /dev/null +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletFlowAppServiceImpl.java @@ -0,0 +1,25 @@ +package com.playlet.web.service.app.impl; + +import com.playlet.system.domain.PlayletPlatformFlow; +import com.playlet.system.service.IPlayletPlatformFlowService; +import com.playlet.web.service.app.PlayletFlowAppService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor(onConstructor = @__(@Autowired)) +public class PlayletFlowAppServiceImpl implements PlayletFlowAppService { + + private final IPlayletPlatformFlowService iPlayletPlatformFlowService; + + @Override + public List getFlowList(PlayletPlatformFlow platformFlow) { + return iPlayletPlatformFlowService.selectPlayletPlatformFlowList(platformFlow); + } + +} 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 05eff47..980f74b 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 @@ -10,6 +10,7 @@ import com.playlet.common.utils.DateUtils; import com.playlet.system.domain.*; import com.playlet.system.service.IPlayletRevenueRecordService; import com.playlet.system.service.IPlayletTaskService; +import com.playlet.system.service.IPlayletUserTaskService; import com.playlet.web.service.app.PlayletTaskAppService; import com.playlet.web.service.app.PlayletUserTaskAppService; import lombok.RequiredArgsConstructor; @@ -33,6 +34,7 @@ import java.util.List; public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { private final IPlayletTaskService playletTaskService; + private final IPlayletUserTaskService iPlayletUserTaskService; private final PlayletUserTaskAppService playletUserTaskAppService; private final IPlayletRevenueRecordService revenueRecordService; @@ -51,9 +53,9 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { } @Override - public Boolean userDesignateTask(PlayletTask playletTask) { + public Boolean userDesignateTask(PlayletUserTask playletUserTask) { // 检查任务数据。 - PlayletTask task = playletTaskService.selectPlayletTaskById(playletTask.getId()); + PlayletTask task = playletTaskService.selectPlayletTaskById(playletUserTask.getTaskId()); // 任务数据数据 if (ObjectUtils.isNull(task)) { throw new ServiceException("参与任务失败，未找到匹配任务数据。"); @@ -63,9 +65,17 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { throw new ServiceException("参与任务失败，任务还未开始或者已结束。"); } // 是否在任务时间线内 - if (DateUtil.compare(task.getStartTime(), new Date()) >=0 && DateUtil.compare(task.getEndTime(), new Date())<=0) { + if (DateUtil.compare(new Date(), task.getStartTime()) >=0 && DateUtil.compare(new Date(), task.getEndTime())<=0) { + long count = iPlayletUserTaskService.lambdaQuery().eq(PlayletUserTask::getUserId, playletUserTask.getUserId()) + .eq(PlayletUserTask::getTaskId, playletUserTask.getTaskId()) + .count(); + if(count > 0){ + throw new ServiceException("请勿重复领取任务!"); + } + PlayletUserTask model = PlayletUserTask.dataSupplement(task); + model.setUserId(playletUserTask.getUserId()); // 用户数据绑定。 - playletUserTaskAppService.insertPlayletUserTask(PlayletUserTask.dataSupplement(task)); + playletUserTaskAppService.insertPlayletUserTask(model); return Boolean.TRUE; } else { throw new ServiceException("参与任务失败，任务未开始或者已结束。"); @@ -152,4 +162,35 @@ public class PlayletTaskAppServiceImpl implements PlayletTaskAppService { public int deletePlayletTaskById(Long id) { return playletTaskService.deletePlayletTaskById(id); } + + @Override + public String promotionTask(PlayletUserTask playletUserTask) { + PlayletUserTask model = iPlayletUserTaskService.getById(playletUserTask.getId()); + if(model == null){ + throw new ServiceException("改任务不存在!"); + } + // 检查任务数据。 + PlayletTask task = playletTaskService.selectPlayletTaskById(model.getTaskId()); + // 任务数据数据 + if (ObjectUtils.isNull(task)) { + throw new ServiceException("参与任务失败，未找到匹配任务数据。"); + } + model.setUserTaskState(1); + // 将任务更新成推广中 + iPlayletUserTaskService.updateById(model); + return "https://jumpv.qinronmedia.com/web/call?key=e9848b589167b459e98178e2e5ebfdbc"; + } + + @Override + public PageInfo getPromotionTaskPage(PlayletUserTask playletUserTask, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum, pageSize); + List list = iPlayletUserTaskService.lambdaQuery() + .eq(PlayletUserTask::getUserId, playletUserTask.getUserId()) + .ne(PlayletUserTask::getUserTaskState, 0) + .list(); + list.forEach(model->{ + model.setPlayletTask(playletTaskService.getById(model.getTaskId())); + }); + return PageInfo.of(list); + } } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/expand/expand.html b/playlet-admin/src/main/resources/templates/system/playlet/expand/expand.html new file mode 100644 index 0000000..8ede6bc --- /dev/null +++ b/playlet-admin/src/main/resources/templates/system/playlet/expand/expand.html @@ -0,0 +1,106 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/flow/add.html b/playlet-admin/src/main/resources/templates/system/playlet/flow/add.html new file mode 100644 index 0000000..07dd8b2 --- /dev/null +++ b/playlet-admin/src/main/resources/templates/system/playlet/flow/add.html @@ -0,0 +1,76 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/flow/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/flow/edit.html new file mode 100644 index 0000000..3477c28 --- /dev/null +++ b/playlet-admin/src/main/resources/templates/system/playlet/flow/edit.html @@ -0,0 +1,81 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/playlet-admin/src/main/resources/templates/system/playlet/flow/flow.html b/playlet-admin/src/main/resources/templates/system/playlet/flow/flow.html new file mode 100644 index 0000000..6423425 --- /dev/null +++ b/playlet-admin/src/main/resources/templates/system/playlet/flow/flow.html @@ -0,0 +1,90 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletPlatformFlow.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPlatformFlow.java new file mode 100644 index 0000000..6fceaec --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPlatformFlow.java @@ -0,0 +1,33 @@ +package com.playlet.system.domain; + +import com.playlet.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.playlet.common.annotation.Excel; + +/** + * 挂载操作流程对象 playlet_platform_flow + * + * @author ruoyi + * @date 2024-04-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "playlet_platform_flow") +public class PlayletPlatformFlow extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 平台类型 01.抖音 02.快手 03.视频号 */ + @Excel(name = "平台类型 01.抖音 02.快手 03.视频号") + private String type; + + /** 挂载流程 */ + @Excel(name = "挂载流程") + private String content; + +} diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUser.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUser.java index e42b145..a301ae7 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUser.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUser.java @@ -61,4 +61,7 @@ public class PlayletUser extends BaseEntity @ApiModelProperty(value = "父级分销ID") private String parentId; + @ApiModelProperty(value = "用户状态 01.待审核, 02.审核通过 03.审核拒绝") + private String status; + } diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserExpandAccount.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserExpandAccount.java new file mode 100644 index 0000000..12a5a86 --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserExpandAccount.java @@ -0,0 +1,52 @@ +package com.playlet.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.playlet.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.playlet.common.annotation.Excel; + +/** + * 用户外部账号对象 playlet_user_expand_account + * + * @author ruoyi + * @date 2024-04-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "playlet_user_expand_account") +@ApiModel(value = "短剧*扩展账户管理") +public class PlayletUserExpandAccount extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键id */ + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** 昵称 */ + @Excel(name = "昵称") + @ApiModelProperty(value = "昵称") + private String name; + + /** 账号 */ + @Excel(name = "账号") + @ApiModelProperty(value = "账号") + private String account; + + /** 平台 01.抖音 02.快手 03.视频号 */ + @Excel(name = "平台 01.抖音 02.快手 03.视频号") + @ApiModelProperty(value = "平台 01.抖音 02.快手 03.视频号") + private String type; + + /** 审核状态 01.待审核 02.审核通过 03.审核拒绝 */ + @Excel(name = "审核状态 01.待审核 02.审核通过 03.审核拒绝") + @ApiModelProperty(value = "审核状态 01.待审核 02.审核通过 03.审核拒绝") + private String status; + +} diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java index caa1f5d..be15dee 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletUserTask.java @@ -1,6 +1,7 @@ package com.playlet.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.playlet.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -38,6 +39,10 @@ public class PlayletUserTask extends BaseEntity { @Excel(name = "任务id") private Long taskId; + @ApiModelProperty(value = "任务详情") + @TableField(exist = false) + private PlayletTask playletTask; + /** * 用户Id */ @@ -70,7 +75,7 @@ public class PlayletUserTask extends BaseEntity { PlayletUserTask userTask = new PlayletUserTask(); userTask.setTaskId(task.getId()); userTask.setUserId(task.getUserId()); - userTask.setUserTaskState(1); + userTask.setUserTaskState(0); userTask.setCreateBy(task.getUserId()); userTask.setUpdateBy(task.getUserId()); userTask.setTaskStartTime(task.getStartTime()); diff --git a/playlet-system/src/main/java/com/playlet/system/mapper/PlayletPlatformFlowMapper.java b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletPlatformFlowMapper.java new file mode 100644 index 0000000..5f42b39 --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletPlatformFlowMapper.java @@ -0,0 +1,62 @@ +package com.playlet.system.mapper; + +import java.util.List; +import com.playlet.system.domain.PlayletPlatformFlow; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 挂载操作流程Mapper接口 + * + * @author ruoyi + * @date 2024-04-14 + */ +public interface PlayletPlatformFlowMapper extends BaseMapper +{ + /** + * 查询挂载操作流程 + * + * @param id 挂载操作流程主键 + * @return 挂载操作流程 + */ + public PlayletPlatformFlow selectPlayletPlatformFlowById(Long id); + + /** + * 查询挂载操作流程列表 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 挂载操作流程集合 + */ + public List selectPlayletPlatformFlowList(PlayletPlatformFlow playletPlatformFlow); + + /** + * 新增挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + public int insertPlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow); + + /** + * 修改挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + public int updatePlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow); + + /** + * 删除挂载操作流程 + * + * @param id 挂载操作流程主键 + * @return 结果 + */ + public int deletePlayletPlatformFlowById(Long id); + + /** + * 批量删除挂载操作流程 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deletePlayletPlatformFlowByIds(String[] ids); +} diff --git a/playlet-system/src/main/java/com/playlet/system/mapper/PlayletUserExpandAccountMapper.java b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletUserExpandAccountMapper.java new file mode 100644 index 0000000..4f44319 --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/mapper/PlayletUserExpandAccountMapper.java @@ -0,0 +1,62 @@ +package com.playlet.system.mapper; + +import java.util.List; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 用户外部账号Mapper接口 + * + * @author ruoyi + * @date 2024-04-14 + */ +public interface PlayletUserExpandAccountMapper extends BaseMapper +{ + /** + * 查询用户外部账号 + * + * @param id 用户外部账号主键 + * @return 用户外部账号 + */ + public PlayletUserExpandAccount selectPlayletUserExpandAccountById(Long id); + + /** + * 查询用户外部账号列表 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 用户外部账号集合 + */ + public List selectPlayletUserExpandAccountList(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 新增用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + public int insertPlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 修改用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + public int updatePlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 删除用户外部账号 + * + * @param id 用户外部账号主键 + * @return 结果 + */ + public int deletePlayletUserExpandAccountById(Long id); + + /** + * 批量删除用户外部账号 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deletePlayletUserExpandAccountByIds(String[] ids); +} diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletPlatformFlowService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletPlatformFlowService.java new file mode 100644 index 0000000..0a0609d --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletPlatformFlowService.java @@ -0,0 +1,62 @@ +package com.playlet.system.service; + +import java.util.List; +import com.playlet.system.domain.PlayletPlatformFlow; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 挂载操作流程Service接口 + * + * @author ruoyi + * @date 2024-04-14 + */ +public interface IPlayletPlatformFlowService extends IService +{ + /** + * 查询挂载操作流程 + * + * @param id 挂载操作流程主键 + * @return 挂载操作流程 + */ + public PlayletPlatformFlow selectPlayletPlatformFlowById(Long id); + + /** + * 查询挂载操作流程列表 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 挂载操作流程集合 + */ + public List selectPlayletPlatformFlowList(PlayletPlatformFlow playletPlatformFlow); + + /** + * 新增挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + public int insertPlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow); + + /** + * 修改挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + public int updatePlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow); + + /** + * 批量删除挂载操作流程 + * + * @param ids 需要删除的挂载操作流程主键集合 + * @return 结果 + */ + public int deletePlayletPlatformFlowByIds(String ids); + + /** + * 删除挂载操作流程信息 + * + * @param id 挂载操作流程主键 + * @return 结果 + */ + public int deletePlayletPlatformFlowById(Long id); +} diff --git a/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserExpandAccountService.java b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserExpandAccountService.java new file mode 100644 index 0000000..543ebb9 --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/service/IPlayletUserExpandAccountService.java @@ -0,0 +1,62 @@ +package com.playlet.system.service; + +import java.util.List; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 用户外部账号Service接口 + * + * @author ruoyi + * @date 2024-04-14 + */ +public interface IPlayletUserExpandAccountService extends IService +{ + /** + * 查询用户外部账号 + * + * @param id 用户外部账号主键 + * @return 用户外部账号 + */ + public PlayletUserExpandAccount selectPlayletUserExpandAccountById(Long id); + + /** + * 查询用户外部账号列表 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 用户外部账号集合 + */ + public List selectPlayletUserExpandAccountList(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 新增用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + public int insertPlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 修改用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + public int updatePlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount); + + /** + * 批量删除用户外部账号 + * + * @param ids 需要删除的用户外部账号主键集合 + * @return 结果 + */ + public int deletePlayletUserExpandAccountByIds(String ids); + + /** + * 删除用户外部账号信息 + * + * @param id 用户外部账号主键 + * @return 结果 + */ + public int deletePlayletUserExpandAccountById(Long id); +} diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletPlatformFlowServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletPlatformFlowServiceImpl.java new file mode 100644 index 0000000..5c123a1 --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletPlatformFlowServiceImpl.java @@ -0,0 +1,98 @@ +package com.playlet.system.service.impl; + +import java.util.List; +import com.playlet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.playlet.system.mapper.PlayletPlatformFlowMapper; +import com.playlet.system.domain.PlayletPlatformFlow; +import com.playlet.system.service.IPlayletPlatformFlowService; +import com.playlet.common.core.text.Convert; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 挂载操作流程Service业务层处理 + * + * @author ruoyi + * @date 2024-04-14 + */ +@Service +public class PlayletPlatformFlowServiceImpl extends ServiceImpl implements IPlayletPlatformFlowService +{ + @Autowired + private PlayletPlatformFlowMapper playletPlatformFlowMapper; + + /** + * 查询挂载操作流程 + * + * @param id 挂载操作流程主键 + * @return 挂载操作流程 + */ + @Override + public PlayletPlatformFlow selectPlayletPlatformFlowById(Long id) + { + return playletPlatformFlowMapper.selectPlayletPlatformFlowById(id); + } + + /** + * 查询挂载操作流程列表 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 挂载操作流程 + */ + @Override + public List selectPlayletPlatformFlowList(PlayletPlatformFlow playletPlatformFlow) + { + return playletPlatformFlowMapper.selectPlayletPlatformFlowList(playletPlatformFlow); + } + + /** + * 新增挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + @Override + public int insertPlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow) + { + playletPlatformFlow.setCreateTime(DateUtils.getNowDate()); + return playletPlatformFlowMapper.insertPlayletPlatformFlow(playletPlatformFlow); + } + + /** + * 修改挂载操作流程 + * + * @param playletPlatformFlow 挂载操作流程 + * @return 结果 + */ + @Override + public int updatePlayletPlatformFlow(PlayletPlatformFlow playletPlatformFlow) + { + playletPlatformFlow.setUpdateTime(DateUtils.getNowDate()); + return playletPlatformFlowMapper.updatePlayletPlatformFlow(playletPlatformFlow); + } + + /** + * 批量删除挂载操作流程 + * + * @param ids 需要删除的挂载操作流程主键 + * @return 结果 + */ + @Override + public int deletePlayletPlatformFlowByIds(String ids) + { + return playletPlatformFlowMapper.deletePlayletPlatformFlowByIds(Convert.toStrArray(ids)); + } + + /** + * 删除挂载操作流程信息 + * + * @param id 挂载操作流程主键 + * @return 结果 + */ + @Override + public int deletePlayletPlatformFlowById(Long id) + { + return playletPlatformFlowMapper.deletePlayletPlatformFlowById(id); + } +} diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserExpandAccountServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserExpandAccountServiceImpl.java new file mode 100644 index 0000000..3f76dfb --- /dev/null +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletUserExpandAccountServiceImpl.java @@ -0,0 +1,98 @@ +package com.playlet.system.service.impl; + +import java.util.List; +import com.playlet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.playlet.system.mapper.PlayletUserExpandAccountMapper; +import com.playlet.system.domain.PlayletUserExpandAccount; +import com.playlet.system.service.IPlayletUserExpandAccountService; +import com.playlet.common.core.text.Convert; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 用户外部账号Service业务层处理 + * + * @author ruoyi + * @date 2024-04-14 + */ +@Service +public class PlayletUserExpandAccountServiceImpl extends ServiceImpl implements IPlayletUserExpandAccountService +{ + @Autowired + private PlayletUserExpandAccountMapper playletUserExpandAccountMapper; + + /** + * 查询用户外部账号 + * + * @param id 用户外部账号主键 + * @return 用户外部账号 + */ + @Override + public PlayletUserExpandAccount selectPlayletUserExpandAccountById(Long id) + { + return playletUserExpandAccountMapper.selectPlayletUserExpandAccountById(id); + } + + /** + * 查询用户外部账号列表 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 用户外部账号 + */ + @Override + public List selectPlayletUserExpandAccountList(PlayletUserExpandAccount playletUserExpandAccount) + { + return playletUserExpandAccountMapper.selectPlayletUserExpandAccountList(playletUserExpandAccount); + } + + /** + * 新增用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + @Override + public int insertPlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount) + { + playletUserExpandAccount.setCreateTime(DateUtils.getNowDate()); + return playletUserExpandAccountMapper.insertPlayletUserExpandAccount(playletUserExpandAccount); + } + + /** + * 修改用户外部账号 + * + * @param playletUserExpandAccount 用户外部账号 + * @return 结果 + */ + @Override + public int updatePlayletUserExpandAccount(PlayletUserExpandAccount playletUserExpandAccount) + { + playletUserExpandAccount.setUpdateTime(DateUtils.getNowDate()); + return playletUserExpandAccountMapper.updatePlayletUserExpandAccount(playletUserExpandAccount); + } + + /** + * 批量删除用户外部账号 + * + * @param ids 需要删除的用户外部账号主键 + * @return 结果 + */ + @Override + public int deletePlayletUserExpandAccountByIds(String ids) + { + return playletUserExpandAccountMapper.deletePlayletUserExpandAccountByIds(Convert.toStrArray(ids)); + } + + /** + * 删除用户外部账号信息 + * + * @param id 用户外部账号主键 + * @return 结果 + */ + @Override + public int deletePlayletUserExpandAccountById(Long id) + { + return playletUserExpandAccountMapper.deletePlayletUserExpandAccountById(id); + } +} diff --git a/playlet-system/src/main/resources/mapper/system/PlayletPlatformFlowMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletPlatformFlowMapper.xml new file mode 100644 index 0000000..a8f683d --- /dev/null +++ b/playlet-system/src/main/resources/mapper/system/PlayletPlatformFlowMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + select id, type, content, create_by, create_time, update_by, update_time, remark from playlet_platform_flow + + + + + + + + insert into playlet_platform_flow + + type, + content, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{type}, + #{content}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update playlet_platform_flow + + type = #{type}, + content = #{content}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from playlet_platform_flow where id = #{id} + + + + delete from playlet_platform_flow where id in + + #{id} + + + + \ No newline at end of file diff --git a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml index 0f35b66..440d4c7 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletTaskMapper.xml @@ -83,6 +83,7 @@ select playlet_task.`id`, playlet_task.`task_id`, + playlet_task.`name`, playlet_task.`start_time`, playlet_task.`end_time`, playlet_task.`platform_type`, diff --git a/playlet-system/src/main/resources/mapper/system/PlayletUserExpandAccountMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletUserExpandAccountMapper.xml new file mode 100644 index 0000000..b09e7f3 --- /dev/null +++ b/playlet-system/src/main/resources/mapper/system/PlayletUserExpandAccountMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select id, name, account, type, status, create_by, create_time, update_by, update_time, remark from playlet_user_expand_account + + + + + + + + insert into playlet_user_expand_account + + name, + account, + type, + status, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{name}, + #{account}, + #{type}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update playlet_user_expand_account + + name = #{name}, + account = #{account}, + type = #{type}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from playlet_user_expand_account where id = #{id} + + + + delete from playlet_user_expand_account where id in + + #{id} + + + + \ No newline at end of file diff --git a/playlet-system/src/main/resources/mapper/system/PlayletUserMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletUserMapper.xml index 1cf38f7..eb00372 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletUserMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletUserMapper.xml @@ -12,6 +12,7 @@ + @@ -20,7 +21,7 @@ - select ID, PHONE, NICK_NAME, PASSWORD, ICON, AGENCY_ID, PARENT_ID, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from playlet_user + select ID, PHONE, NICK_NAME, PASSWORD, ICON, AGENCY_ID, PARENT_ID, status, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from playlet_user