用户上传视频

api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/contentplatform/ext/ContentPlatformPlanMapperExt.java

@@ -113,4 +113,15 @@ public interface ContentPlatformPlanMapperExt {
     List<PlanIllegalVideoDTO> getGzhPlanIllegalVideoList(@Param("videoId") Long videoId);
 
     List<PlanIllegalVideoDTO> getQwPlanIllegalVideoList(@Param("videoId") Long videoId);
+
+    int getUploadVideoCount(@Param("param") VideoContentListParam param, @Param("createAccountId") Long createAccountId);
+
+    List<ContentPlatformVideo> getUploadVideoList(@Param("param") VideoContentListParam param,
+                                                  @Param("createAccountId") Long createAccountId,
+                                                  @Param("datastatDt") String datastatDt,
+                                                  @Param("type") String type,
+                                                  @Param("channel") String channel,
+                                                  @Param("offset") int offset,
+                                                  @Param("pageSize") Integer pageSize,
+                                                  @Param("sort") String sort);
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformPqAccountRel.java

@@ -5,7 +5,7 @@ public class ContentPlatformPqAccountRel {
 
     private Long accountId;
 
-    private String pqUid;
+    private Long pqUid;
 
     private String pqName;
 
@@ -33,11 +33,11 @@ public class ContentPlatformPqAccountRel {
         this.accountId = accountId;
     }
 
-    public String getPqUid() {
+    public Long getPqUid() {
         return pqUid;
     }
 
-    public void setPqUid(String pqUid) {
+    public void setPqUid(Long pqUid) {
         this.pqUid = pqUid;
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformPqAccountRelExample.java

@@ -245,62 +245,52 @@ public class ContentPlatformPqAccountRelExample {
             return (Criteria) this;
         }
 
-        public Criteria andPqUidEqualTo(String value) {
+        public Criteria andPqUidEqualTo(Long value) {
             addCriterion("pq_uid =", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidNotEqualTo(String value) {
+        public Criteria andPqUidNotEqualTo(Long value) {
             addCriterion("pq_uid <>", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidGreaterThan(String value) {
+        public Criteria andPqUidGreaterThan(Long value) {
             addCriterion("pq_uid >", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidGreaterThanOrEqualTo(String value) {
+        public Criteria andPqUidGreaterThanOrEqualTo(Long value) {
             addCriterion("pq_uid >=", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidLessThan(String value) {
+        public Criteria andPqUidLessThan(Long value) {
             addCriterion("pq_uid <", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidLessThanOrEqualTo(String value) {
+        public Criteria andPqUidLessThanOrEqualTo(Long value) {
             addCriterion("pq_uid <=", value, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidLike(String value) {
-            addCriterion("pq_uid like", value, "pqUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPqUidNotLike(String value) {
-            addCriterion("pq_uid not like", value, "pqUid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPqUidIn(List<String> values) {
+        public Criteria andPqUidIn(List<Long> values) {
             addCriterion("pq_uid in", values, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidNotIn(List<String> values) {
+        public Criteria andPqUidNotIn(List<Long> values) {
             addCriterion("pq_uid not in", values, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidBetween(String value1, String value2) {
+        public Criteria andPqUidBetween(Long value1, Long value2) {
             addCriterion("pq_uid between", value1, value2, "pqUid");
             return (Criteria) this;
         }
 
-        public Criteria andPqUidNotBetween(String value1, String value2) {
+        public Criteria andPqUidNotBetween(Long value1, Long value2) {
             addCriterion("pq_uid not between", value1, value2, "pqUid");
             return (Criteria) this;
         }

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformUploadVideo.java

@@ -15,6 +15,10 @@ public class ContentPlatformUploadVideo {
 
     private String auditReason;
 
+    private Integer isDelete;
+
+    private Long createAccountId;
+
     private Long createTimestamp;
 
     private Long updateTimestamp;
@@ -75,6 +79,22 @@ public class ContentPlatformUploadVideo {
         this.auditReason = auditReason;
     }
 
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public Long getCreateAccountId() {
+        return createAccountId;
+    }
+
+    public void setCreateAccountId(Long createAccountId) {
+        this.createAccountId = createAccountId;
+    }
+
     public Long getCreateTimestamp() {
         return createTimestamp;
     }
@@ -104,6 +124,8 @@ public class ContentPlatformUploadVideo {
         sb.append(", video=").append(video);
         sb.append(", auditStatus=").append(auditStatus);
         sb.append(", auditReason=").append(auditReason);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", createAccountId=").append(createAccountId);
         sb.append(", createTimestamp=").append(createTimestamp);
         sb.append(", updateTimestamp=").append(updateTimestamp);
         sb.append("]");

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformUploadVideoExample.java

@@ -575,6 +575,126 @@ public class ContentPlatformUploadVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsDeleteIsNull() {
+            addCriterion("is_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIsNotNull() {
+            addCriterion("is_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteEqualTo(Integer value) {
+            addCriterion("is_delete =", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotEqualTo(Integer value) {
+            addCriterion("is_delete <>", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThan(Integer value) {
+            addCriterion("is_delete >", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_delete >=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThan(Integer value) {
+            addCriterion("is_delete <", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteLessThanOrEqualTo(Integer value) {
+            addCriterion("is_delete <=", value, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteIn(List<Integer> values) {
+            addCriterion("is_delete in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotIn(List<Integer> values) {
+            addCriterion("is_delete not in", values, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteBetween(Integer value1, Integer value2) {
+            addCriterion("is_delete between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeleteNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_delete not between", value1, value2, "isDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdIsNull() {
+            addCriterion("create_account_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdIsNotNull() {
+            addCriterion("create_account_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdEqualTo(Long value) {
+            addCriterion("create_account_id =", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdNotEqualTo(Long value) {
+            addCriterion("create_account_id <>", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdGreaterThan(Long value) {
+            addCriterion("create_account_id >", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_account_id >=", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdLessThan(Long value) {
+            addCriterion("create_account_id <", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdLessThanOrEqualTo(Long value) {
+            addCriterion("create_account_id <=", value, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdIn(List<Long> values) {
+            addCriterion("create_account_id in", values, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdNotIn(List<Long> values) {
+            addCriterion("create_account_id not in", values, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdBetween(Long value1, Long value2) {
+            addCriterion("create_account_id between", value1, value2, "createAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateAccountIdNotBetween(Long value1, Long value2) {
+            addCriterion("create_account_id not between", value1, value2, "createAccountId");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimestampIsNull() {
             addCriterion("create_timestamp is null");
             return (Criteria) this;

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/UploadVideoItemVO.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.api.model.vo.contentplatform;
 
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,9 +17,25 @@ public class UploadVideoItemVO {
     @ApiModelProperty(value = "视频url")
     private String videoUrl;
     @ApiModelProperty(value = "创建时间")
-    private String createTime;
+    private Long createTimeStamp;
     @ApiModelProperty(value = "审核状态 0-待审核 1-审核中 2-审核通过 3-审核不通过")
     private Integer auditStatus;
     @ApiModelProperty(value = "审核不通过原因")
     private String auditReason;
+
+    public static UploadVideoItemVO convert(ContentPlatformUploadVideo uploadVideo) {
+        if (uploadVideo == null) {
+            return null;
+        }
+        UploadVideoItemVO uploadVideoItemVO = new UploadVideoItemVO();
+        uploadVideoItemVO.setId(uploadVideo.getId());
+        uploadVideoItemVO.setVideoId(uploadVideo.getVideoId());
+        uploadVideoItemVO.setTitle(uploadVideo.getTitle());
+        uploadVideoItemVO.setCoverUrl(uploadVideo.getCover());
+        uploadVideoItemVO.setVideoUrl(uploadVideo.getVideo());
+        uploadVideoItemVO.setCreateTimeStamp(uploadVideo.getCreateTimestamp());
+        uploadVideoItemVO.setAuditStatus(uploadVideo.getAuditStatus());
+        uploadVideoItemVO.setAuditReason(uploadVideo.getAuditReason());
+        return uploadVideoItemVO;
+    }
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/WxBaseUserInfoVO.java

@@ -18,7 +18,7 @@ public class WxBaseUserInfoVO {
 	//private String country;
 	//private String province;
 	//private String city;
-	//private String phoneNumber;
+	private String phoneNumber;
 	//private String userCode;
 	//private String openId;
 	//

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/ContentPlatformUploadContentService.java

@@ -9,13 +9,13 @@ import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 public interface ContentPlatformUploadContentService {
 
-    Page<UploadVideoItemVO> uploadVideoList(UploadVideoListParam param);
-
     UploadVideoItemVO publishVideo(PublishVideoParam param);
 
     UploadVideoItemVO updateVideo(PublishVideoParam param);
 
     void deleteVideo(DeleteVideoParam param);
 
-    UploadVideoItemVO videoAuditCallBack(VideoAuditCallBackParam param);
+    void videoAuditCallBack(VideoAuditCallBackParam param);
+
+    Page<UploadVideoItemVO> uploadVideoList(UploadVideoListParam param);
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -580,6 +580,21 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         ContentPlatformAccount user = LoginUserContext.getUser();
         Page<VideoContentItemVO> result = new Page<>(param.getPageNum(), param.getPageSize());
         int offset = (param.getPageNum() - 1) * param.getPageSize();
+        String datastatDt = planMapperExt.getVideoDatastatMaxDt();
+        int count = planMapperExt.getUploadVideoCount(param, user.getId());
+        result.setTotalSize(count);
+        if (count == 0) {
+            result.setObjs(new ArrayList<>());
+            return result;
+        }
+        // todo video.score
+        String sort = getVideoContentListSort(param.getSort());
+        String type = getVideoContentListType(param.getType());
+        String channel = getVideoContentListChannel(param.getSort(), user.getChannel());
+        List<ContentPlatformVideo> videoList = planMapperExt.getUploadVideoList(param, user.getId(), datastatDt,
+                type, channel, offset, param.getPageSize(), sort);
+        List<VideoContentItemVO> list = buildVideoContentItemVOList(videoList, type, channel, user.getChannel(), datastatDt);
+        result.setObjs(list);
         return result;
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformSettingServiceImpl.java

@@ -1,23 +1,80 @@
 package com.tzld.piaoquan.api.service.contentplatform.impl;
 
+import com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformPqAccountRelMapper;
+import com.tzld.piaoquan.api.model.config.LoginUserContext;
 import com.tzld.piaoquan.api.model.param.contentplatform.WxWebLoginParam;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccount;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRelExample;
 import com.tzld.piaoquan.api.model.vo.contentplatform.WxBaseUserInfoVO;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformSettingService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+
 @Slf4j
 @Service
 public class ContentPlatformSettingServiceImpl implements ContentPlatformSettingService {
 
+    @Autowired
+    private ContentPlatformPqAccountRelMapper pqAccountRelMapper;
+
     @Override
     public WxBaseUserInfoVO wxLoginByWeb(WxWebLoginParam param) {
-        return null;
+        ContentPlatformAccount user = LoginUserContext.getUser();
+        // todo 调用webLogin接口 登录/注册 票圈用户
+        WxBaseUserInfoVO wxBaseUserInfoVO = new WxBaseUserInfoVO();
+        ContentPlatformPqAccountRel pqAccountRel = getPqAccountRel(user.getId());
+        if (Objects.nonNull(pqAccountRel)) {
+            wxBaseUserInfoVO = new WxBaseUserInfoVO();
+            wxBaseUserInfoVO.setUid(pqAccountRel.getPqUid());
+            wxBaseUserInfoVO.setNickName(pqAccountRel.getPqName());
+            return wxBaseUserInfoVO;
+        }
+        pqAccountRel = new ContentPlatformPqAccountRel();
+        pqAccountRel.setAccountId(user.getId());
+        pqAccountRel.setPqUid(wxBaseUserInfoVO.getUid());
+        pqAccountRel.setPqName(wxBaseUserInfoVO.getNickName());
+        pqAccountRel.setPqTelNum(StringUtils.isBlank(wxBaseUserInfoVO.getPhoneNumber()) ? user.getTelNum() : wxBaseUserInfoVO.getPhoneNumber());
+        pqAccountRelMapper.insertSelective(pqAccountRel);
+        // 修改手机号
+        if (StringUtils.isBlank(wxBaseUserInfoVO.getPhoneNumber())) {
+            asyncUpdatePqAccountTelNum(wxBaseUserInfoVO.getUid(), user.getTelNum());
+        }
+
+        return wxBaseUserInfoVO;
+    }
+
+    private void asyncUpdatePqAccountTelNum(Long uid, String telNum) {
+        // todo 修改票圈用户手机号
+    }
+
+    private ContentPlatformPqAccountRel getPqAccountRel(Long accountId) {
+        ContentPlatformPqAccountRelExample example = new ContentPlatformPqAccountRelExample();
+        example.createCriteria().andAccountIdEqualTo(accountId);
+        List<ContentPlatformPqAccountRel> pqAccountRels = pqAccountRelMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(pqAccountRels)) {
+            return null;
+        }
+        return pqAccountRels.get(0);
     }
 
     @Override
     public WxBaseUserInfoVO getBindPQUserInfo() {
-        return null;
+        ContentPlatformAccount user = LoginUserContext.getUser();
+        ContentPlatformPqAccountRel pqAccountRel = getPqAccountRel(user.getId());
+        if (Objects.isNull(pqAccountRel)) {
+            return null;
+        }
+        WxBaseUserInfoVO wxBaseUserInfoVO = new WxBaseUserInfoVO();
+        wxBaseUserInfoVO.setUid(pqAccountRel.getPqUid());
+        wxBaseUserInfoVO.setNickName(pqAccountRel.getPqName());
+        return wxBaseUserInfoVO;
     }
 
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformUploadContentServiceImpl.java

@@ -1,44 +1,156 @@
 package com.tzld.piaoquan.api.service.contentplatform.impl;
 
+import com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformUploadVideoMapper;
+import com.tzld.piaoquan.api.model.config.LoginUserContext;
 import com.tzld.piaoquan.api.model.param.contentplatform.DeleteVideoParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.PublishVideoParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.UploadVideoListParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.VideoAuditCallBackParam;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccount;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideo;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideoExample;
 import com.tzld.piaoquan.api.model.vo.contentplatform.UploadVideoItemVO;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformUploadContentService;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Slf4j
 @Service
 public class ContentPlatformUploadContentServiceImpl implements ContentPlatformUploadContentService {
 
-
-    @Override
-    public Page<UploadVideoItemVO> uploadVideoList(UploadVideoListParam param) {
-        return null;
-    }
+    @Autowired
+    ContentPlatformUploadVideoMapper uploadVideoMapper;
 
     @Override
     public UploadVideoItemVO publishVideo(PublishVideoParam param) {
-        return null;
+        ContentPlatformAccount user = LoginUserContext.getUser();
+        // todo 调用视频发布 获取videoId
+        Long videoId = null;
+        ContentPlatformUploadVideo uploadVideo = new ContentPlatformUploadVideo();
+        uploadVideo.setVideoId(videoId);
+        uploadVideo.setTitle(param.getTitle());
+        uploadVideo.setCover(param.getCoverUrl());
+        uploadVideo.setVideo(param.getVideoUrl());
+        uploadVideo.setAuditStatus(0);
+        uploadVideo.setCreateAccountId(user.getId());
+        uploadVideo.setCreateTimestamp(System.currentTimeMillis());
+        uploadVideo.setUpdateTimestamp(System.currentTimeMillis());
+        uploadVideoMapper.insertSelective(uploadVideo);
+        return UploadVideoItemVO.convert(uploadVideo);
     }
 
     @Override
     public UploadVideoItemVO updateVideo(PublishVideoParam param) {
-        return null;
+        ContentPlatformUploadVideo uploadVideo = getUploadVideo(param.getVideoId());
+        if (uploadVideo == null) {
+            return null;
+        }
+        uploadVideo.setTitle(param.getTitle());
+        uploadVideo.setCover(param.getCoverUrl());
+        uploadVideo.setVideo(param.getVideoUrl());
+        uploadVideo.setAuditStatus(1);
+        uploadVideo.setUpdateTimestamp(System.currentTimeMillis());
+        uploadVideoMapper.updateByPrimaryKeySelective(uploadVideo);
+        // todo 调用修改视频接口
+        return UploadVideoItemVO.convert(uploadVideo);
+    }
+
+    private ContentPlatformUploadVideo getUploadVideo(Long videoId) {
+        ContentPlatformUploadVideoExample example = new ContentPlatformUploadVideoExample();
+        example.createCriteria().andVideoIdEqualTo(videoId);
+        List<ContentPlatformUploadVideo> uploadVideos = uploadVideoMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(uploadVideos)) {
+            return null;
+        }
+        return uploadVideos.get(0);
     }
 
     @Override
     public void deleteVideo(DeleteVideoParam param) {
+        ContentPlatformUploadVideo uploadVideo = getUploadVideo(param.getVideoId());
+        if (uploadVideo == null) {
+            return;
+        }
+        uploadVideo.setIsDelete(1);
+        uploadVideo.setUpdateTimestamp(System.currentTimeMillis());
+        uploadVideoMapper.updateByPrimaryKeySelective(uploadVideo);
+        // todo 调用删除视频接口
+    }
 
+    @Override
+    public void videoAuditCallBack(VideoAuditCallBackParam param) {
+        ContentPlatformUploadVideo uploadVideo = getUploadVideo(param.getVideoId());
+        if (uploadVideo == null) {
+            return;
+        }
+        // todo 转化审核状态
+        uploadVideo.setAuditStatus(param.getAuditStatus());
+        // todo 更改审核失败原因
+        uploadVideo.setAuditReason(param.getAuditReason());
+        uploadVideo.setUpdateTimestamp(System.currentTimeMillis());
+        uploadVideoMapper.updateByPrimaryKeySelective(uploadVideo);
     }
 
     @Override
-    public UploadVideoItemVO videoAuditCallBack(VideoAuditCallBackParam param) {
-        return null;
+    public Page<UploadVideoItemVO> uploadVideoList(UploadVideoListParam param) {
+        ContentPlatformAccount user = LoginUserContext.getUser();
+        Page<UploadVideoItemVO> result = new Page<>(param.getPageNum(), param.getPageSize());
+        int offset = (param.getPageNum() - 1) * param.getPageSize();
+        Long count = getUploadVideoCount(param, user.getId());
+        result.setTotalSize(count.intValue());
+        if (count == 0) {
+            result.setObjs(new ArrayList<>());
+            return result;
+        }
+        List<ContentPlatformUploadVideo> videoList = getUploadVideoList(param, user.getId(), offset, param.getPageSize());
+        List<UploadVideoItemVO> list = buildUploadVideoItemVOList(videoList);
+        result.setObjs(list);
+        return result;
+    }
+
+    private Long getUploadVideoCount(UploadVideoListParam param, Long accountId) {
+        ContentPlatformUploadVideoExample example = new ContentPlatformUploadVideoExample();
+        ContentPlatformUploadVideoExample.Criteria criteria = example.createCriteria();
+        if (param.getAuditStatus() != null) {
+            criteria.andAuditStatusEqualTo(param.getAuditStatus());
+        }
+        if (StringUtils.isNotBlank(param.getTitle())) {
+            criteria.andTitleLike("%" + param.getTitle() + "%");
+        }
+        criteria.andCreateAccountIdEqualTo(accountId);
+        criteria.andIsDeleteEqualTo(0);
+        return uploadVideoMapper.countByExample(example);
     }
 
+    private List<ContentPlatformUploadVideo> getUploadVideoList(UploadVideoListParam param, Long id, int offset, Integer pageSize) {
+        ContentPlatformUploadVideoExample example = new ContentPlatformUploadVideoExample();
+        ContentPlatformUploadVideoExample.Criteria criteria = example.createCriteria();
+        if (param.getAuditStatus() != null) {
+            criteria.andAuditStatusEqualTo(param.getAuditStatus());
+        }
+        if (StringUtils.isNotBlank(param.getTitle())) {
+            criteria.andTitleLike("%" + param.getTitle() + "%");
+        }
+        criteria.andCreateAccountIdEqualTo(id);
+        criteria.andIsDeleteEqualTo(0);
+        example.setOrderByClause("create_timestamp desc");
+        example.setPage(new Page<>(param.getPageNum(), param.getPageSize()));
+        return uploadVideoMapper.selectByExample(example);
+    }
+
+    private List<UploadVideoItemVO> buildUploadVideoItemVOList(List<ContentPlatformUploadVideo> videoList) {
+        if (CollectionUtils.isEmpty(videoList)) {
+            return new ArrayList<>();
+        }
+        return videoList.stream().map(UploadVideoItemVO::convert).collect(Collectors.toList());
+    }
 
 }

api-module/src/main/resources/mapper/contentplatform/ContentPlatformPqAccountRelMapper.xml

@@ -4,7 +4,7 @@
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="account_id" jdbcType="BIGINT" property="accountId" />
-    <result column="pq_uid" jdbcType="VARCHAR" property="pqUid" />
+    <result column="pq_uid" jdbcType="BIGINT" property="pqUid" />
     <result column="pq_name" jdbcType="VARCHAR" property="pqName" />
     <result column="pq_tel_num" jdbcType="VARCHAR" property="pqTelNum" />
     <result column="status" jdbcType="INTEGER" property="status" />
@@ -105,15 +105,17 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel">
+  <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel"
+          useGeneratedKeys="true" keyProperty="id">
     insert into content_platform_pq_account_rel (id, account_id, pq_uid, 
       pq_name, pq_tel_num, `status`, 
       create_timestamp, update_timestamp)
-    values (#{id,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{pqUid,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{pqUid,jdbcType=BIGINT}, 
       #{pqName,jdbcType=VARCHAR}, #{pqTelNum,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT})
   </insert>
-  <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel">
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel"
+          useGeneratedKeys="true" keyProperty="id">
     insert into content_platform_pq_account_rel
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -149,7 +151,7 @@
         #{accountId,jdbcType=BIGINT},
       </if>
       <if test="pqUid != null">
-        #{pqUid,jdbcType=VARCHAR},
+        #{pqUid,jdbcType=BIGINT},
       </if>
       <if test="pqName != null">
         #{pqName,jdbcType=VARCHAR},
@@ -184,7 +186,7 @@
         account_id = #{record.accountId,jdbcType=BIGINT},
       </if>
       <if test="record.pqUid != null">
-        pq_uid = #{record.pqUid,jdbcType=VARCHAR},
+        pq_uid = #{record.pqUid,jdbcType=BIGINT},
       </if>
       <if test="record.pqName != null">
         pq_name = #{record.pqName,jdbcType=VARCHAR},
@@ -210,7 +212,7 @@
     update content_platform_pq_account_rel
     set id = #{record.id,jdbcType=BIGINT},
       account_id = #{record.accountId,jdbcType=BIGINT},
-      pq_uid = #{record.pqUid,jdbcType=VARCHAR},
+      pq_uid = #{record.pqUid,jdbcType=BIGINT},
       pq_name = #{record.pqName,jdbcType=VARCHAR},
       pq_tel_num = #{record.pqTelNum,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
@@ -227,7 +229,7 @@
         account_id = #{accountId,jdbcType=BIGINT},
       </if>
       <if test="pqUid != null">
-        pq_uid = #{pqUid,jdbcType=VARCHAR},
+        pq_uid = #{pqUid,jdbcType=BIGINT},
       </if>
       <if test="pqName != null">
         pq_name = #{pqName,jdbcType=VARCHAR},
@@ -250,7 +252,7 @@
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformPqAccountRel">
     update content_platform_pq_account_rel
     set account_id = #{accountId,jdbcType=BIGINT},
-      pq_uid = #{pqUid,jdbcType=VARCHAR},
+      pq_uid = #{pqUid,jdbcType=BIGINT},
       pq_name = #{pqName,jdbcType=VARCHAR},
       pq_tel_num = #{pqTelNum,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},

api-module/src/main/resources/mapper/contentplatform/ContentPlatformUploadVideoMapper.xml

@@ -9,6 +9,8 @@
     <result column="video" jdbcType="VARCHAR" property="video" />
     <result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
     <result column="audit_reason" jdbcType="VARCHAR" property="auditReason" />
+    <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
+    <result column="create_account_id" jdbcType="BIGINT" property="createAccountId" />
     <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
     <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
   </resultMap>
@@ -71,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, video_id, title, cover, video, audit_status, audit_reason, create_timestamp, 
-    update_timestamp
+    id, video_id, title, cover, video, audit_status, audit_reason, is_delete, create_account_id, 
+    create_timestamp, update_timestamp
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideoExample" resultMap="BaseResultMap">
     select
@@ -110,12 +112,12 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideo">
     insert into content_platform_upload_video (id, video_id, title, 
       cover, video, audit_status, 
-      audit_reason, create_timestamp, update_timestamp
-      )
+      audit_reason, is_delete, create_account_id, 
+      create_timestamp, update_timestamp)
     values (#{id,jdbcType=BIGINT}, #{videoId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, 
       #{cover,jdbcType=VARCHAR}, #{video,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, 
-      #{auditReason,jdbcType=VARCHAR}, #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT}
-      )
+      #{auditReason,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, #{createAccountId,jdbcType=BIGINT}, 
+      #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformUploadVideo">
     insert into content_platform_upload_video
@@ -141,6 +143,12 @@
       <if test="auditReason != null">
         audit_reason,
       </if>
+      <if test="isDelete != null">
+        is_delete,
+      </if>
+      <if test="createAccountId != null">
+        create_account_id,
+      </if>
       <if test="createTimestamp != null">
         create_timestamp,
       </if>
@@ -170,6 +178,12 @@
       <if test="auditReason != null">
         #{auditReason,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="createAccountId != null">
+        #{createAccountId,jdbcType=BIGINT},
+      </if>
       <if test="createTimestamp != null">
         #{createTimestamp,jdbcType=BIGINT},
       </if>
@@ -208,6 +222,12 @@
       <if test="record.auditReason != null">
         audit_reason = #{record.auditReason,jdbcType=VARCHAR},
       </if>
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="record.createAccountId != null">
+        create_account_id = #{record.createAccountId,jdbcType=BIGINT},
+      </if>
       <if test="record.createTimestamp != null">
         create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
       </if>
@@ -228,6 +248,8 @@
       video = #{record.video,jdbcType=VARCHAR},
       audit_status = #{record.auditStatus,jdbcType=INTEGER},
       audit_reason = #{record.auditReason,jdbcType=VARCHAR},
+      is_delete = #{record.isDelete,jdbcType=INTEGER},
+      create_account_id = #{record.createAccountId,jdbcType=BIGINT},
       create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
       update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT}
     <if test="_parameter != null">
@@ -255,6 +277,12 @@
       <if test="auditReason != null">
         audit_reason = #{auditReason,jdbcType=VARCHAR},
       </if>
+      <if test="isDelete != null">
+        is_delete = #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="createAccountId != null">
+        create_account_id = #{createAccountId,jdbcType=BIGINT},
+      </if>
       <if test="createTimestamp != null">
         create_timestamp = #{createTimestamp,jdbcType=BIGINT},
       </if>
@@ -272,6 +300,8 @@
       video = #{video,jdbcType=VARCHAR},
       audit_status = #{auditStatus,jdbcType=INTEGER},
       audit_reason = #{auditReason,jdbcType=VARCHAR},
+      is_delete = #{isDelete,jdbcType=INTEGER},
+      create_account_id = #{createAccountId,jdbcType=BIGINT},
       create_timestamp = #{createTimestamp,jdbcType=BIGINT},
       update_timestamp = #{updateTimestamp,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformPlanMapperExt.xml

@@ -370,5 +370,28 @@
         where video.video_id = #{videoId} and plan.`status` = 1
     </select>
 
+    <select id="getUploadVideoCount" resultType="java.lang.Integer">
+        select count(1)
+        from content_platform_upload_video
+        where audit_status = 2 and create_account_id = #{createAccountId}
+        <if test="param.title!= null and param.title!= ''">
+            and title like concat('%', #{param.title}, '%')
+        </if>
+    </select>
+
+    <select id="getUploadVideoList"
+            resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo">
+        select video.*
+        from content_platform_upload_video video
+        left join content_platform_video_datastat_agg datastat
+        on datastat.dt = #{datastatDt} and datastat.type = #{type} and datastat.channel = #{channel} and datastat.video_id = video.video_id
+        where audit_status = 2 and create_account_id = #{createAccountId}
+        <if test="param.title!= null and param.title!= ''">
+            and video.title like concat('%', #{param.title}, '%')
+        </if>
+        order by ${sort}
+        limit #{offset}, #{pageSize}
+    </select>
+
 
 </mapper>

api-module/src/main/resources/mybatis-api-contentPlatform-generator-config.xml

@@ -75,7 +75,7 @@
 <!--        <table tableName="content_platform_video_datastat_agg" domainObjectName="ContentPlatformVideoDataStatAgg" alias=""/>-->
 <!--        <table tableName="content_platform_illegal_video" domainObjectName="ContentPlatformIllegalVideo" alias=""/>-->
 <!--        <table tableName="content_platform_illegal_msg" domainObjectName="ContentPlatformIllegalMsg" alias=""/>-->
-        <table tableName="content_platform_pq_account_rel" domainObjectName="ContentPlatformPqAccountRel" alias=""/>
+<!--        <table tableName="content_platform_pq_account_rel" domainObjectName="ContentPlatformPqAccountRel" alias=""/>-->
         <table tableName="content_platform_upload_video" domainObjectName="ContentPlatformUploadVideo" alias=""/>
     </context>