剧集调整完成

playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java

@@ -2,6 +2,7 @@ package com.playlet.web.controller.system;
 
 import java.util.List;
 
+import com.playlet.common.core.domain.entity.SysUser;
 import com.playlet.system.domain.PlayletItemType;
 import com.playlet.system.service.IPlayletItemTypeService;
 import com.playlet.system.service.ISysDictDataService;
@@ -148,4 +149,13 @@ public class PlayletItemController extends BaseController {
     {
         return toAjax(playletItemService.deletePlayletItemByIds(ids));
     }
+
+    @Log(title = "短剧管理", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:item:edit")
+    @PostMapping("/changeStatus")
+    @ResponseBody
+    public AjaxResult changeStatus(PlayletItem playletItem)
+    {
+        return toAjax(playletItemService.updatePlayletItem(playletItem));
+    }
 }

playlet-admin/src/main/resources/application.yml

@@ -134,7 +134,7 @@ shiro:
     cipherKey:
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 30
+    expireTime: 720
     # 同步session到数据库的周期（默认1分钟）
     dbSyncPeriod: 1
     # 相隔多久检查一次session的有效性，默认就是10分钟

playlet-admin/src/main/resources/templates/system/playlet/item/add.html

@@ -73,6 +73,12 @@
                 <input name="producer" class="form-control" type="text" required>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">推荐标签：</label>
+            <div class="col-sm-8">
+                <input name="tags" class="form-control" type="text" required>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">对标用户：</label>
             <div class="col-sm-8">
@@ -98,7 +104,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">集数：</label>
+            <label class="col-sm-3 control-label is-required">总集数：</label>
             <div class="col-sm-8">
                 <input name="numberEpisode" class="form-control" type="text" required>
             </div>
@@ -110,16 +116,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">上映时间：</label>
+            <label class="col-sm-3 control-label is-required">上架时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="releaseTime" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">上线时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
                     <input name="upTime" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
@@ -152,16 +149,20 @@
         }
     }
 
-    $("input[name='releaseTime']").datetimepicker({
+    // $("input[name='releaseTime']").datetimepicker({
-        format: "yyyy-mm-dd hh:mm",
+    //     format: 'yyyy-mm-dd hh:ii',
-        minView: "month",
+    //     todayBtn:  true,
-        autoclose: true
+    //     dateFormat: 'yyyy-mm-dd',//日期显示格式
-    });
+    //     timeFormat: 'HH:mm:ss',//时间显示格式
+    //     autoclose: true,
+    // });
 
     $("input[name='upTime']").datetimepicker({
-        format: "yyyy-mm-dd hh:mm",
+        format: 'yyyy-mm-dd hh:ii',
-        minView: "month",
+        todayBtn:  true,
-        autoclose: true
+        dateFormat: 'yyyy-mm-dd',//日期显示格式
+        timeFormat: 'HH:mm:ss',//时间显示格式
+        autoclose: true,
     });
 
 </script>

playlet-admin/src/main/resources/templates/system/playlet/item/edit.html

@@ -15,27 +15,25 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">剧集名称：</label>
+            <label class="col-sm-3 control-label is-required">任务ID：</label>
+            <div class="col-sm-8">
+                <input name="taskId" th:field="*{taskId}" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">剧集方：</label>
+            <div class="col-sm-8">
+                <select name="producerType" class="form-control m-b" th:with="type=${@dict.getType('playlet_producer_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">剧集标题：</label>
             <div class="col-sm-8">
                 <input name="videoName" th:field="*{videoName}" class="form-control" type="text" required>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">剧场：</label>
-            <div class="col-sm-8">
-                <select id="itemType" name="itemType" class="form-control m-b" required>
-                    <option th:each="itemType:${itemTypes}" th:value="${itemType.id}" th:text="${itemType.name}" th:field="*{itemType}"></option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">来源类型：</label>
-            <div class="col-sm-8">
-                <select name="sourceType" class="form-control m-b" th:with="type=${@dict.getType('playlet_source_type')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sourceType}"></option>
-                </select>
-            </div>
-        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">短剧类型：</label>
             <div class="col-sm-8">
@@ -74,6 +72,12 @@
                 <input name="actorName" th:field="*{actorName}" class="form-control" type="text" required>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">推荐标签：</label>
+            <div class="col-sm-8">
+                <input name="tags" th:field="*{tags}" class="form-control" type="text" required>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">出品方：</label>
             <div class="col-sm-8">
@@ -93,25 +97,16 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">是否删除 1 正常 0 删除：</label>
+            <label class="col-sm-3 control-label is-required">前端集数：</label>
             <div class="col-sm-8">
-                <input name="isDelete" th:field="*{isDelete}" class="form-control" type="text" required>
+                <input name="numberCost" th:field="*{numberCost}" class="form-control" type="text" required>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">上架时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="upTime" th:value="${#dates.format(playletItem.upTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    <input name="upTime" th:value="${#dates.format(playletItem.upTime, 'yyyy-MM-dd hh:mm')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">上映时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="releaseTime" th:value="${#dates.format(playletItem.releaseTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -138,16 +133,18 @@
         }
     }
 
-    $("input[name='releaseTime']").datetimepicker({
+    // $("input[name='releaseTime']").datetimepicker({
-        format: "yyyy-mm-dd hh:mm",
+    //     format: "yyyy-mm-dd hh:mm",
-        minView: "month",
+    //     minView: "month",
-        autoclose: true
+    //     autoclose: true
-    });
+    // });
 
     $("input[name='upTime']").datetimepicker({
-        format: "yyyy-mm-dd hh:mm",
+        format: 'yyyy-mm-dd hh:ii',
-        minView: "month",
+        todayBtn:  true,
-        autoclose: true
+        dateFormat: 'yyyy-mm-dd',//日期显示格式
+        timeFormat: 'HH:mm:ss',//时间显示格式
+        autoclose: true,
     });
 </script>
 </body>

playlet-admin/src/main/resources/templates/system/playlet/item/item.html

@@ -77,15 +77,37 @@
                     title: '任务ID'
                 },
                 {
+                    visible: false,
                     field: 'itemTypeName',
                     title: '剧场'
                 },
                 {
-                    field: 'sourceType',
+                    field: 'producer',
-                    title: '来源类型',
+                    title: '出品方'
+                },
+                {
+                    field: 'tags',
+                    title: '推荐标签'
+                },
+                {
+                    title: '抖音',
                     align: 'center',
                     formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(typeDict, value);
+                        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);
                     }
                 },
                 {
@@ -96,10 +118,6 @@
                     field: 'actorName',
                     title: '主角名'
                 },
-                {
-                    field: 'producer',
-                    title: '出品方'
-                },
                 {
                     field: 'completeNot',
                     title: '视频是否完结',
@@ -146,7 +164,7 @@
                 },
                 {
                     field: 'numberEpisode',
-                    title: '前端剧集'
+                    title: '总剧集'
                 },
                 {
                     field: 'numberCost',
@@ -158,8 +176,8 @@
                     visible: false
                 },
                 {
-                    field: 'releaseTime',
+                    field: 'createTime',
-                    title: '上映时间'
+                    title: '创建时间'
                 },
                 {
                     field: 'remark',
@@ -179,6 +197,70 @@
         };
         $.table.init(options);
     });
+
+    function dyStatusTools(row) {
+        if (row.dyStatus === '01') {
+            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enableDy(\'' + row.id + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disableDy(\'' + row.userId + '\')"></i> ';
+        }
+    }
+
+    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 '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enableKs(\'' + row.id + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disableKs(\'' + row.userId + '\')"></i> ';
+        }
+    }
+
+    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 '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enableDsp(\'' + row.id + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disableDsp(\'' + row.userId + '\')"></i> ';
+        }
+    }
+
+    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" });
+        })
+    }
+
 </script>
 </body>
 </html>

playlet-system/src/main/java/com/playlet/system/domain/PlayletItem.java

@@ -41,6 +41,15 @@ public class PlayletItem extends BaseEntity{
     @ApiModelProperty(value = "来源类型 1.抖音 2.快手 3.视频号")
     private Long sourceType;
 
+    @ApiModelProperty(value = "抖音上架状态")
+    private String dyStatus;
+
+    @ApiModelProperty(value = "快手上架状态")
+    private String ksStatus;
+
+    @ApiModelProperty(value = "视频上架状态")
+    private String dspStatus;
+
     @TableField(exist = false)
     private String [] sourceTypeIds;
 
@@ -70,14 +79,18 @@ public class PlayletItem extends BaseEntity{
     @ApiModelProperty(value = "出品方")
     private String producer;
 
+    @Excel(name = "推荐标签")
+    @ApiModelProperty(value = "推荐标签")
+    private String tags;
+
     /** 上映时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出品时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "出品时间")
     private Date releaseTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm")
-    @Excel(name = "上线时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "上线时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm")
     @ApiModelProperty(value = "上线日期")
     private Date upTime;
 

playlet-system/src/main/java/com/playlet/system/service/impl/PlayletItemServiceImpl.java

@@ -63,23 +63,21 @@ public class PlayletItemServiceImpl extends ServiceImpl<PlayletItemMapper, Playl
      */
     @Override
     public int insertPlayletItem(PlayletItem playletItem) {
-        int index = 0;
         if(ArrayUtils.isNotEmpty(playletItem.getSourceTypeIds())){
             for (String sourceTypeId : playletItem.getSourceTypeIds()) {
-                PlayletItemType itemType = playletItemTypeService.lambdaQuery()
+                if("1".equals(sourceTypeId)){
-                        .eq(PlayletItemType::getProducerType, playletItem.getProducerType())
+                    playletItem.setDyStatus("02");
-                        .eq(PlayletItemType::getSourceType, sourceTypeId)
+                }
-                        .one();
+                if("2".equals(sourceTypeId)){
-                if(itemType != null){
+                    playletItem.setKsStatus("02");
-                    playletItem.setItemType(Integer.parseInt(itemType.getId().toString()));
+                }
+                if("3".equals(sourceTypeId)){
+                    playletItem.setDspStatus("02");
+                }
+            }
+        }
         playletItem.setCreateTime(DateUtils.getNowDate());
-                    playletItem.setSourceType(Long.valueOf(sourceTypeId));
+        return playletItemMapper.insertPlayletItem(playletItem);
-                    playletItemMapper.insertPlayletItem(playletItem);
-                    index = index + 1;
-                }
-            }
-        }
-        return index;
     }
 
     /**

playlet-system/src/main/resources/mapper/system/PlayletItemMapper.xml

@@ -22,18 +22,22 @@
         <result property="actorName"    column="actor_name"    />
         <result property="videoType"    column="video_type"    />
         <result property="producer"    column="producer"    />
+        <result property="tags"    column="tags"    />
         <result property="labelType"    column="label_type"    />
         <result property="specialItem"    column="special_item"    />
         <result property="forUser"    column="for_user"    />
         <result property="numberEpisode"    column="number_episode"    />
         <result property="numberCost"    column="number_cost"    />
         <result property="isDelete"    column="is_delete"    />
+        <result property="dyStatus" column="dy_status"  />
+        <result property="ksStatus" column="ks_status"  />
+        <result property="dspStatus" column="dsp_status"  />
         <result property="releaseTime"    column="release_time"    />
         <result property="itemType" column="item_type" />
     </resultMap>
 
     <sql id="selectPlayletItemVo">
-        select id, item_id,task_id, number_cost, source_type, video_name, complete_not, cover_pic, actor_name, producer, connect_site, release_time, video_type, label_type, item_type, number_episode, up_time, is_delete, special_item, for_user, remark, create_by, update_by, create_time, update_time from playlet_item
+        select id, item_id,task_id, number_cost, source_type, dy_status, ks_status, dsp_status, video_name, complete_not, cover_pic, actor_name, producer, tags, connect_site, release_time, video_type, label_type, item_type, number_episode, up_time, is_delete, special_item, for_user, remark, create_by, update_by, create_time, update_time from playlet_item
     </sql>
 
     <select id="selectPlayletItemList" parameterType="PlayletItem" resultMap="PlayletItemResult">
@@ -49,6 +53,9 @@
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="releaseTime != null "> and release_time = #{releaseTime}</if>
             <if test="itemType != null "> and item_type = #{itemType}</if>
+            <if test="ksStatus != null "> and ks_status = #{ksStatus}</if>
+            <if test="dyStatus != null "> and dy_status = #{dyStatus}</if>
+            <if test="dspStatus != null "> and dsp_status = #{dspStatus}</if>
             <if test="createBeginTime != null">
                 and date_format(create_time,'%y%m%d') &gt;= date_format(#{createBeginTime},'%y%m%d')
             </if>
@@ -56,6 +63,7 @@
                 and date_format(create_time,'%y%m%d') &lt;= date_format(#{createEndTime},'%y%m%d')
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPlayletItemById" parameterType="Long" resultMap="PlayletItemResult">
@@ -77,6 +85,7 @@
             <if test="coverPic != null">cover_pic,</if>
             <if test="connectSite != null and connectSite != ''">connect_site,</if>
             <if test="producer != null and producer != ''">producer,</if>
+            <if test="tags != null and tags != ''">tags,</if>
             <if test="actorName!= null and actorName != ''">actor_name,</if>
             <if test="videoType != null">video_type,</if>
             <if test="numberEpisode != null">number_episode,</if>
@@ -90,6 +99,9 @@
             <if test="forUser != null">for_user,</if>
             <if test="upTime != null">up_time,</if>
             <if test="specialItem != null">special_item,</if>
+            <if test="ksStatus != null">ks_status,</if>
+            <if test="dyStatus != null">dy_status,</if>
+            <if test="dspStatus != null">dsp_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createBy != null">#{createBy},</if>
@@ -103,6 +115,7 @@
             <if test="coverPic != null">#{coverPic},</if>
             <if test="connectSite != null and connectSite != ''">#{connectSite},</if>
             <if test="producer != null and producer != ''">#{producer},</if>
+            <if test="tags != null and tags != ''">#{tags},</if>
             <if test="actorName!= null and actorName != ''">#{actorName},</if>
             <if test="videoType != null">#{videoType},</if>
             <if test="numberEpisode != null">#{numberEpisode},</if>
@@ -116,6 +129,9 @@
             <if test="forUser != null">#{forUser},</if>
             <if test="upTime != null">#{upTime},</if>
             <if test="specialItem != null">#{specialItem},</if>
+            <if test="ksStatus != null">#{ksStatus},</if>
+            <if test="dyStatus != null">#{dyStatus},</if>
+            <if test="dspStatus != null">#{dspStatus},</if>
         </trim>
     </insert>
 
@@ -139,6 +155,7 @@
             <if test="releaseTime != null">release_time = #{releaseTime},</if>
             <if test="itemType != null ">item_type = #{itemType},</if>
             <if test="producer != null and producer != ''">producer = #{producer},</if>
+            <if test="tags != null and tags != ''">tags = #{tags},</if>
             <if test="actorName!= null and actorName != ''">actor_name = #{actorName},</if>
             <if test="itemId != null">item_id = #{itemId},</if>
             <if test="taskId != null">task_id = #{taskId},</if>
@@ -146,6 +163,9 @@
             <if test="forUser != null">for_user = #{forUser},</if>
             <if test="upTime != null">up_time = #{upTime},</if>
             <if test="specialItem != null">special_item = #{specialItem},</if>
+            <if test="ksStatus != null">ks_status = #{ksStatus},</if>
+            <if test="dyStatus != null">dy_status = #{dyStatus},</if>
+            <if test="dspStatus != null">dsp_status = #{dspStatus},</if>
         </trim>
         where id = #{id}
     </update>