From 2ec8f44b4efe010b5c2bd61e7f6562bc47bef50b Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sat, 11 May 2024 00:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E6=95=B4=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/PlayletTaskController.java | 21 +++ .../impl/PlayletUserItemAppServiceImpl.java | 2 +- .../templates/system/playlet/item/item.html | 8 +- .../templates/system/playlet/task/add.html | 53 +++++--- .../templates/system/playlet/task/edit.html | 44 ++----- .../templates/system/playlet/task/task.html | 121 +++++++++++++++--- .../playlet/system/domain/PlayletTask.java | 15 +++ .../service/impl/PlayletTaskServiceImpl.java | 14 ++ .../mapper/system/PlayletTaskMapper.xml | 21 +++ 9 files changed, 231 insertions(+), 68 deletions(-) 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 b7521e7..3e2074c 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 @@ -4,7 +4,9 @@ import java.util.List; import com.github.pagehelper.PageInfo; import com.playlet.common.core.domain.Result; +import com.playlet.system.domain.PlayletItem; import com.playlet.system.service.IPlayletItemService; +import com.playlet.system.service.ISysDictTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -39,6 +41,8 @@ public class PlayletTaskController extends BaseController { private final IPlayletItemService playletItemService; + private final ISysDictTypeService sysDictTypeService; + @RequiresPermissions("playlet:task:view") @GetMapping() public String task() { @@ -54,6 +58,12 @@ public class PlayletTaskController extends BaseController { public TableDataInfo list(PlayletTask playletTask) { startPage(); List list = playletTaskService.selectPlayletTaskList(playletTask); + list.forEach(model->{ + PlayletItem playletItem = playletItemService.getById(model.getItemId()); + if(playletItem != null){ + model.setItemName(playletItem.getVideoName()); + } + }); return getDataTable(list); } @@ -75,6 +85,7 @@ public class PlayletTaskController extends BaseController { */ @GetMapping("/add") public String add(ModelMap modelMap) { + modelMap.put("sourceTypes", sysDictTypeService.selectDictDataByType("playlet_source_type")); modelMap.put("playletItems", playletItemService.lambdaQuery().list()); return prefix + "/add"; } @@ -145,4 +156,14 @@ public class PlayletTaskController extends BaseController { public AjaxResult removeTask(@RequestParam(value = "ids") String ids) { return toAjax(playletTaskService.deletePlayletTaskByIds(ids)); } + + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("playlet:task:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(PlayletTask playletTask) + { + return toAjax(playletTaskService.updatePlayletTask(playletTask)); + } + } diff --git a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java index 5700171..b9d686f 100644 --- a/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java +++ b/playlet-admin/src/main/java/com/playlet/web/service/app/impl/PlayletUserItemAppServiceImpl.java @@ -93,7 +93,7 @@ public class PlayletUserItemAppServiceImpl implements PlayletUserItemAppService log.info("请求入参:{}, 地址:{}, 返回:{}", body, url, result.body()); com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(result.body()); if("1".equals(json.getString("code"))){ - return json.getJSONObject("data").getString("monitor"); + return "kwai://miniapp?appId=ks715227916484291037&path=" + json.getJSONObject("data").getString("path"); }else { return null; } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html index 68a8210..d833182 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html @@ -202,7 +202,7 @@ if (row.dyStatus === '01') { return ' '; } else { - return ' '; + return ' '; } } @@ -223,7 +223,7 @@ if (row.ksStatus === '01') { return ' '; } else { - return ' '; + return ' '; } } @@ -235,7 +235,7 @@ /* 上架快手 */ function disableKs(id) { - $.modal.confirm("确认下架抖音平台吗？", function() { + $.modal.confirm("确认下架快手平台吗？", function() { $.operate.post(prefix + "/changeStatus", { "id": id, "ksStatus": "01" }); }) } @@ -244,7 +244,7 @@ if (row.dspStatus === '01') { return ' '; } else { - return ' '; + return ' '; } } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/task/add.html b/playlet-admin/src/main/resources/templates/system/playlet/task/add.html index 05a0bfc..4a5943b 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/task/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/task/add.html @@ -2,6 +2,7 @@ +
@@ -20,6 +21,14 @@
+
+ +
+ +
+
@@ -29,13 +38,19 @@
- +
+ + +
- +
+ + +
@@ -50,12 +65,6 @@
-
- -
- -
-
@@ -80,12 +89,6 @@
-
- -
- -
-
@@ -101,6 +104,7 @@
+ diff --git a/playlet-admin/src/main/resources/templates/system/playlet/task/task.html b/playlet-admin/src/main/resources/templates/system/playlet/task/task.html index 655279c..3fcfc8d 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/task/task.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/task/task.html @@ -69,13 +69,34 @@ title: '任务id' }, { - field: 'itemId', - title: '短剧id' + field: 'itemName', + title: '短剧名称' }, { field: 'name', title: '任务名称' }, + { + title: '抖音', + align: 'center', + formatter: function (value, row, index) { + return dyStatusTools(row); + } + }, + { + title: '快手', + align: 'center', + formatter: function (value, row, index) { + return ksStatusTools(row); + } + }, + { + title: '视频', + align: 'center', + formatter: function (value, row, index) { + return dspStatusTools(row); + } + }, { field: 'peopleNumber', title: '参与人数' @@ -84,17 +105,21 @@ field: 'commissionRate', title: '提成比例' }, - { - field: 'recommendLabel', - title: '推荐标签' - }, { field: 'taskUrl', - title: '任务链接' + title: '任务链接', + formatter: function(value) { + if (value != null && value !== ''){return '任务链接';} + else {return '无'} + } }, { field: 'taskDiskUrl', - title: '网盘链接' + title: '网盘链接', + formatter: function(value) { + if (value != null && value !== ''){return '网盘链接';} + else {return '无'} + } }, { field: 'startTime', @@ -104,25 +129,25 @@ field: 'endTime', title: '任务结束时间' }, - { - field: 'platformType', - title: '任务短剧平台' - }, { field: 'baseBonus', - title: '基础奖金' + title: '基础奖金', + visible: false }, { field: 'totalBonus', - title: '任务总奖金' + title: '任务总奖金', + visible: false }, { field: 'state', - title: '任务状态' + title: '任务状态', + visible: false }, { field: 'taskContent', - title: '任务介绍' + title: '任务介绍', + visible: false }, { field: 'remark', @@ -141,6 +166,70 @@ }; $.table.init(options); }); + + function dyStatusTools(row) { + if (row.dyStatus === '01') { + return ' '; + } else { + return ' '; + } + } + + function enableDy(id) { + $.modal.confirm("确认要上架抖音平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "dyStatus": "02" }); + }) + } + + /* 上架抖音 */ + function disableDy(id) { + $.modal.confirm("确认下架抖音平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "dyStatus": "01" }); + }) + } + + function ksStatusTools(row) { + if (row.ksStatus === '01') { + return ' '; + } else { + return ' '; + } + } + + function enableKs(id) { + $.modal.confirm("确认要上架快手平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "ksStatus": "02" }); + }) + } + + /* 上架快手 */ + function disableKs(id) { + $.modal.confirm("确认下架快手平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "ksStatus": "01" }); + }) + } + + function dspStatusTools(row) { + if (row.dspStatus === '01') { + return ' '; + } else { + return ' '; + } + } + + function enableDsp(id) { + $.modal.confirm("确认要上架视频平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "dspStatus": "02" }); + }) + } + + /* 上架抖音 */ + function disableDsp(id) { + $.modal.confirm("确认下架视频平台吗？", function() { + $.operate.post(prefix + "/changeStatus", { "id": id, "dspStatus": "01" }); + }) + } + \ No newline at end of file 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 d224bef..82cbf22 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 @@ -33,6 +33,9 @@ public class PlayletTask extends BaseEntity { @TableId(value = "id", type = IdType.AUTO) private Long id; + @TableField(exist = false) + private String [] sourceTypeIds; + /** * 任务id 保留字段 */ @@ -40,6 +43,15 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "抖音上架状态") + private String dyStatus; + + @ApiModelProperty(value = "快手上架状态") + private String ksStatus; + + @ApiModelProperty(value = "视频上架状态") + private String dspStatus; + /** * 任务名称 */ @@ -51,6 +63,9 @@ public class PlayletTask extends BaseEntity { @ApiModelProperty(value = "短剧ID") private Long itemId; + @TableField(exist = false) + private String itemName; + @TableField(exist = false) @ApiModelProperty(value = "短剧") private PlayletItem playletItem; diff --git a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java index 1f794ad..3f489dd 100644 --- a/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java +++ b/playlet-system/src/main/java/com/playlet/system/service/impl/PlayletTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.playlet.system.service.impl; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.playlet.common.utils.DateUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,19 @@ public class PlayletTaskServiceImpl extends ServiceImpl + + + @@ -48,6 +51,9 @@ base_bonus, total_bonus, state, + ks_status, + dy_status, + dsp_status, task_content, comment_count, star_count, @@ -67,6 +73,9 @@ and task_id = #{taskId} and name like concat('%', #{name}, '%') and state = #{state} + and ks_status = #{ksStatus} + and dy_status = #{dyStatus} + and dsp_status = #{dspStatus} @@ -76,6 +85,9 @@ playlet_task.task_id, playlet_task.name, playlet_task.item_id, + playlet_task.ks_status, + playlet_task.dy_status, + playlet_task.dsp_status, playlet_task.people_number, playlet_task.commission_rate, playlet_task.recommend_label, @@ -143,6 +155,9 @@ create_by, update_by, remark, + ks_status, + dy_status, + dsp_status, #{taskId}, @@ -165,6 +180,9 @@ #{createBy}, #{updateBy}, #{remark}, + #{ksStatus}, + #{dyStatus}, + #{dspStatus}, @@ -191,6 +209,9 @@ create_by = #{createBy}, update_by = #{updateBy}, remark = #{remark}, + ks_status = #{ksStatus}, + dy_status = #{dyStatus}, + dsp_status = #{dspStatus}, where id = #{id}