补全交互操作

src/main/java/com/upchina/group/entity/GroupMessage.java

@@ -110,7 +110,7 @@ public class GroupMessage implements Serializable {
      * 创建人ID
      */
     @TableField("create_user_id")
-    private Integer createUserId;
+    private String createUserId;
 
     /**
      * 创建时间
@@ -271,11 +271,11 @@ public class GroupMessage implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
-    public Integer getCreateUserId() {
+    public String getCreateUserId() {
         return createUserId;
     }
 
-    public void setCreateUserId(Integer createUserId) {
+    public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
     public LocalDateTime getCreateTime() {

src/main/java/com/upchina/group/query/ListGroupAppQuery.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 public class ListGroupAppQuery {
 
     @ApiModelProperty("投顾ID")
-    @NotNull(message = "投顾ID不能为空")
+    @NotNull
     private Integer id;
 
     @ApiModelProperty("最后一条记录ID")

src/main/java/com/upchina/group/query/SaveGroupQuery.java

@@ -53,11 +53,11 @@ public class SaveGroupQuery {
     private Integer pageId;
 
     @ApiModelProperty("原价")
-    @NotNull(message = "原价不能为空")
+    @NotNull
     private BigDecimal originalPrice;
 
     @ApiModelProperty("活动价")
-    @NotNull(message = "活动价不能为空")
+    @NotNull
     private BigDecimal activityPrice;
 
     @ApiModelProperty("支付链接")

src/main/java/com/upchina/group/query/UpdateGroupQuery.java

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
 public class UpdateGroupQuery extends SaveGroupQuery {
 
     @ApiModelProperty("ID")
-    @NotNull(message = "ID不能为空")
+    @NotNull
     private Integer id;
 
     @Override

src/main/java/com/upchina/group/query/UpdateGroupStatusQuery.java

@@ -11,11 +11,11 @@ import java.time.LocalDateTime;
 public class UpdateGroupStatusQuery {
 
     @ApiModelProperty("ID")
-    @NotNull(message = "ID不能为空")
+    @NotNull
     private Integer id;
 
     @ApiModelProperty("状态 101:提交 102:撤回 103:通过 103:驳回 105:上架 106:下架 107:删除")
-    @NotNull(message = "状态不能为空")
+    @NotNull
     private Integer event;
 
     @ApiModelProperty("审核意见")

src/main/java/com/upchina/group/query/message/DeleteGroupMessageQuery.java

@@ -1,48 +0,0 @@
-package com.upchina.group.query.message;
-
-import com.upchina.common.vo.BackendUserVO;
-import com.upchina.group.constant.GroupMessageStatus;
-import com.upchina.group.entity.GroupMessage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@ApiModel("删除交易圈消息请求")
-public class DeleteGroupMessageQuery {
-
-    @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
-    private Integer groupId;
-
-    @ApiModelProperty(value = "消息ID列表", required = true)
-    @NotEmpty(message = "消息ID列表不能为空")
-    private List<Integer> ids;
-
-    public GroupMessage toPO(BackendUserVO userVO) {
-        GroupMessage message = new GroupMessage();
-        message.setStatus(GroupMessageStatus.DELETED.value);
-        message.setDeleteUserId(userVO.getUserId());
-        message.setDeleteTime(LocalDateTime.now());
-        return message;
-    }
-
-    public Integer getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Integer groupId) {
-        this.groupId = groupId;
-    }
-
-    public List<Integer> getIds() {
-        return ids;
-    }
-
-    public void setIds(List<Integer> ids) {
-        this.ids = ids;
-    }
-}

src/main/java/com/upchina/group/query/message/FollowAdvisorMessageQuery.java

@@ -1,19 +0,0 @@
-package com.upchina.group.query.message;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-@ApiModel("关注投顾消息请求")
-public class FollowAdvisorMessageQuery {
-    @NotNull(message = "交易圈ID不能为空")
-    @ApiModelProperty(value = "交易圈ID", required = true)
-    private Integer groupId;
-
-    @NotNull(message = "投顾ID不能为空")
-    @ApiModelProperty(value = "投顾ID", required = true)
-    private Integer advisorId;
-} 

src/main/java/com/upchina/group/query/message/GroupMessageProductQuery.java

@@ -1,24 +1,22 @@
 package com.upchina.group.query.message;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-@ApiModel("推荐产品消息请求")
 public class GroupMessageProductQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
+    @NotNull
     private Integer groupId;
 
     @ApiModelProperty(value = "产品ID", required = true)
-    @NotNull(message = "产品ID不能为空")
+    @NotNull
     private Integer productId;
 
     @ApiModelProperty(value = "产品名称", required = true)
-    @NotBlank(message = "产品名称不能为空")
+    @NotBlank
     private String productName;
 
     @ApiModelProperty(value = "产品描述")

src/main/java/com/upchina/group/query/message/GroupMessageStatusQuery.java

@@ -1,19 +1,18 @@
 package com.upchina.group.query.message;
 
 import com.upchina.group.entity.GroupInfo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-@ApiModel("交易圈互动状态请求")
 public class GroupMessageStatusQuery {
-    @NotNull(message = "交易圈ID不能为空")
+
+    @NotNull
     @ApiModelProperty(value = "交易圈ID", required = true)
     private Integer groupId;
 
-    @NotNull(message = "状态不能为空")
+    @NotNull
     @ApiModelProperty(value = "状态 1:开启 2:关闭", required = true)
     private Integer status;
 

src/main/java/com/upchina/group/query/message/ListGroupMessageAppQuery.java

@@ -1,15 +1,13 @@
 package com.upchina.group.query.message;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
 
-@ApiModel("APP查询交易圈消息请求")
 public class ListGroupMessageAppQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
+    @NotNull
     private Integer groupId;
 
     @ApiModelProperty("最后一条消息ID")

src/main/java/com/upchina/group/query/message/ListGroupMessageQuery.java

@@ -1,15 +1,13 @@
 package com.upchina.group.query.message;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotNull;
 
-@ApiModel("查询交易圈消息请求")
 public class ListGroupMessageQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
+    @NotNull
     private Integer groupId;
 
     @ApiModelProperty("消息状态:1初始;2已审核;3已删除")
@@ -18,6 +16,9 @@ public class ListGroupMessageQuery {
     @ApiModelProperty("查询类型:1全部;2投顾;3用户;4精选")
     private Integer type;
 
+    @ApiModelProperty("关键字")
+    private String keyword;
+
     @ApiModelProperty("最后一条消息ID")
     private Integer lastId;
 
@@ -48,6 +49,14 @@ public class ListGroupMessageQuery {
         this.type = type;
     }
 
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     public Integer getLastId() {
         return lastId;
     }

src/main/java/com/upchina/group/query/message/ListPrivateMessageQuery.java

@@ -1,58 +0,0 @@
-package com.upchina.group.query.message;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-@ApiModel("私聊消息列表查询请求")
-public class ListPrivateMessageQuery {
-
-    @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
-    private Integer groupId;
-
-    @ApiModelProperty(value = "对方用户ID", required = true)
-    @NotBlank(message = "对方用户ID不能为空")
-    private String toUserId;
-
-    @ApiModelProperty("最后一条消息ID")
-    private Integer lastId;
-
-    @ApiModelProperty("每页大小")
-    private Integer size = 20;
-
-    public Integer getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(Integer groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getToUserId() {
-        return toUserId;
-    }
-
-    public void setToUserId(String toUserId) {
-        this.toUserId = toUserId;
-    }
-
-    public Integer getLastId() {
-        return lastId;
-    }
-
-    public void setLastId(Integer lastId) {
-        this.lastId = lastId;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
-
-} 

src/main/java/com/upchina/group/query/message/MessageAuditQuery.java

@@ -1,50 +0,0 @@
-package com.upchina.group.query.message;
-
-import com.upchina.common.vo.BackendUserVO;
-import com.upchina.group.entity.GroupMessage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-@ApiModel("消息审核请求")
-public class MessageAuditQuery {
-
-    @ApiModelProperty(value = "消息ID", required = true)
-    @NotNull(message = "消息ID不能为空")
-    private Integer messageId;
-
-    @ApiModelProperty(value = "审核状态:2已审核;", required = true)
-    @NotNull(message = "审核状态不能为空")
-    @Min(2)
-    @Max(2)
-    private Integer status;
-
-    public GroupMessage toPO(BackendUserVO backendUser) {
-        GroupMessage po = new GroupMessage();
-        po.setId(messageId);
-        po.setStatus(status);
-        po.setAuditUserId(backendUser.getUserId());
-        po.setAuditTime(LocalDateTime.now());
-        return po;
-    }
-
-    public Integer getMessageId() {
-        return messageId;
-    }
-
-    public void setMessageId(Integer messageId) {
-        this.messageId = messageId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-}

src/main/java/com/upchina/group/query/message/SendGroupMessageAdminQuery.java

@@ -1,26 +1,22 @@
 package com.upchina.group.query.message;
 
 import com.upchina.common.vo.BackendUserVO;
-import com.upchina.group.constant.GroupInteractiveType;
-import com.upchina.group.constant.GroupMessageContentType;
-import com.upchina.group.constant.GroupMessageStatus;
+import com.upchina.group.constant.*;
 import com.upchina.group.entity.GroupMessage;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-@ApiModel("发送交易圈消息请求")
 public class SendGroupMessageAdminQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
+    @NotNull
     private Integer groupId;
 
     @ApiModelProperty(value = "消息内容", required = true)
-    @NotBlank(message = "消息内容不能为空")
+    @NotBlank
     private String content;
 
     @ApiModelProperty("回复消息ID")
@@ -30,23 +26,33 @@ public class SendGroupMessageAdminQuery {
     private Integer quoteId;
 
     @ApiModelProperty("消息类型:1文本;2图片;3文件;4产品;5问卷")
-    @NotNull(message = "消息类型不能为空")
+    @NotNull
     private Integer contentType = GroupMessageContentType.TEXT.value;
 
     @ApiModelProperty("交互类型:1群聊;2私聊;3会话消息")
+    @NotNull
     private Integer interactiveType;
 
     @ApiModelProperty("接收用户ID(私聊)")
     private String toUserId;
 
+    @ApiModelProperty("是否精选 1是 2否")
+    private Integer isRecommend = 2;
+
     public GroupMessage toPO(BackendUserVO userVO) {
         GroupMessage message = new GroupMessage();
         message.setGroupId(groupId);
+        message.setMsgType(GroupMessageType.NORMAL.value);
         message.setContent(content);
-        message.setUserId(userVO.getUserId().toString());
-        message.setAdvisorId(userVO.getAdvisorId());
-        message.setUserName(userVO.getUserName());
         message.setContentType(contentType);
+        if (userVO.getAdvisorId() != null) {
+            message.setUserType(GroupMessageUserType.ADVISOR.value);
+        } else {
+            message.setUserType(GroupMessageUserType.ASSISTANT.value);
+        }
+        message.setUserId(userVO.getUserId().toString());
+        message.setUserName(userVO.getUserName());
+        message.setAdvisorId(userVO.getAdvisorId());
         message.setReplyId(replyId);
         message.setQuoteId(quoteId);
         message.setInteractiveType(interactiveType);
@@ -55,7 +61,9 @@ public class SendGroupMessageAdminQuery {
             message.setPrivateUserId(toUserId);
         }
         message.setStatus(GroupMessageStatus.INITIAL.value);
+        message.setCreateUserId(userVO.getUserId().toString());
         message.setCreateTime(LocalDateTime.now());
+        message.setIsRecommend(isRecommend);
         return message;
     }
 
@@ -114,4 +122,12 @@ public class SendGroupMessageAdminQuery {
     public void setToUserId(String toUserId) {
         this.toUserId = toUserId;
     }
+
+    public Integer getIsRecommend() {
+        return isRecommend;
+    }
+
+    public void setIsRecommend(Integer isRecommend) {
+        this.isRecommend = isRecommend;
+    }
 }

src/main/java/com/upchina/group/query/message/SendGroupMessageAppQuery.java

@@ -3,8 +3,9 @@ package com.upchina.group.query.message;
 import com.upchina.common.vo.FrontUserVO;
 import com.upchina.group.constant.GroupMessageContentType;
 import com.upchina.group.constant.GroupMessageStatus;
+import com.upchina.group.constant.GroupMessageType;
+import com.upchina.group.constant.GroupMessageUserType;
 import com.upchina.group.entity.GroupMessage;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -13,18 +14,18 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-@ApiModel("发送交易圈消息请求")
 public class SendGroupMessageAppQuery {
 
     @ApiModelProperty(value = "交易圈ID", required = true)
-    @NotNull(message = "交易圈ID不能为空")
+    @NotNull
     private Integer groupId;
 
     @ApiModelProperty(value = "消息内容", required = true)
-    @NotBlank(message = "消息内容不能为空")
+    @NotBlank
     private String content;
 
     @ApiModelProperty("交互类型:1群聊;2私聊")
+    @NotNull
     @Min(1)
     @Max(2)
     private Integer interactiveType;
@@ -32,13 +33,16 @@ public class SendGroupMessageAppQuery {
     public GroupMessage toPO(FrontUserVO userVO) {
         GroupMessage message = new GroupMessage();
         message.setGroupId(groupId);
+        message.setMsgType(GroupMessageType.NORMAL.value);
         message.setContent(content);
+        message.setUserType(GroupMessageUserType.CUSTOMER.value);
         message.setUserId(userVO.getUserId());
         message.setUserName(userVO.getUserName());
         message.setContentType(GroupMessageContentType.TEXT.value);
         message.setInteractiveType(interactiveType);
         message.setPrivateUserId(userVO.getUserId());
         message.setStatus(GroupMessageStatus.INITIAL.value);
+        message.setCreateUserId(userVO.getUserId());
         message.setCreateTime(LocalDateTime.now());
         return message;
     }

src/main/java/com/upchina/group/query/message/UpdateGroupMessageStatusQuery.java

@@ -11,11 +11,11 @@ import java.time.LocalDateTime;
 public class UpdateGroupMessageStatusQuery {
 
     @ApiModelProperty(value = "消息ID", required = true)
-    @NotNull(message = "消息ID不能为空")
+    @NotNull
     private Integer id;
 
     @ApiModelProperty(value = "状态 1:初始 2:已审核 3:已删除", required = true)
-    @NotNull(message = "状态不能为空")
+    @NotNull
     private Integer status;
 
     public GroupMessage toPO(GroupMessageStatus targetStatus, BackendUserVO backendUserVO) {

src/main/java/com/upchina/group/query/message/UserOnlineStatusMessageQuery.java

@@ -1,19 +0,0 @@
-package com.upchina.group.query.message;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-@ApiModel("用户在线状态消息请求")
-public class UserOnlineStatusMessageQuery {
-    @NotNull(message = "交易圈ID不能为空")
-    @ApiModelProperty(value = "交易圈ID", required = true)
-    private Integer groupId;
-
-    @NotNull(message = "在线状态不能为空")
-    @ApiModelProperty(value = "是否在线", required = true)
-    private Boolean online;
-} 

src/main/java/com/upchina/group/service/admin/AdminGroupMessageService.java

@@ -1,5 +1,6 @@
 package com.upchina.group.service.admin;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -93,6 +94,7 @@ public class AdminGroupMessageService {
         Integer groupId = query.getGroupId();
         Integer status = query.getStatus();
         Integer type = query.getType();
+        String keyword = query.getKeyword();
         Integer lastId = query.getLastId();
         Integer size = query.getSize();
 
@@ -103,6 +105,8 @@ public class AdminGroupMessageService {
             .eq(QueryGroupMessageType.CUSTOMER.value.equals(type), GroupMessage::getUserType, GroupMessageUserType.CUSTOMER.value)
             .eq(QueryGroupMessageType.SELECTED.value.equals(type), GroupMessage::getIsRecommend, IsOrNot.IS.value)
             .eq(status != null, GroupMessage::getStatus, query.getStatus())
+            .like(StrUtil.isNotEmpty(keyword),GroupMessage::getContent, keyword)
+            .eq(StrUtil.isNotEmpty(keyword), GroupMessage::getContentType, GroupMessageContentType.TEXT.value)
             .lt(lastId != null, GroupMessage::getId, lastId)
             .orderByDesc(GroupMessage::getId)
             .last("limit " + (size + 1));
@@ -123,7 +127,7 @@ public class AdminGroupMessageService {
         message.setGroupId(query.getGroupId());
         message.setContentType(GroupMessageContentType.PRODUCT.value);
         message.setStatus(GroupMessageStatus.AUDITED.value);
-        message.setCreateUserId(backendUser.getUserId());
+        message.setCreateUserId(backendUser.getUserId().toString());
         message.setCreateTime(LocalDateTime.now());
         message.setAdvisorId(backendUser.getAdvisorId());
         

src/main/java/com/upchina/group/vo/GroupVO.java

@@ -4,14 +4,13 @@ import com.upchina.advisor.entity.AdvisorBasic;
 import com.upchina.common.vo.AuthResultVO;
 import com.upchina.course.vo.PageVO;
 import com.upchina.group.entity.GroupInfo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-@ApiModel("交易圈详情")
-public class GroupVO {
+public class GroupVO implements Serializable {
 
     @ApiModelProperty("ID")
     private Integer id;

src/main/java/com/upchina/group/vo/message/GroupMessageVO.java

@@ -2,13 +2,12 @@ package com.upchina.group.vo.message;
 
 import com.upchina.advisor.vo.AdvisorBasicVO;
 import com.upchina.group.entity.GroupMessage;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@ApiModel("交易圈消息VO")
-public class GroupMessageVO {
+public class GroupMessageVO implements Serializable {
 
     @ApiModelProperty("消息ID")
     private Integer id;

src/main/java/com/upchina/group/vo/message/GroupNotificationVO.java

@@ -1,13 +0,0 @@
-package com.upchina.group.vo.message;
-
-public class GroupNotificationVO {
-    private Integer type;
-    private String content;
-
-    public GroupNotificationVO(Integer type, String content) {
-        this.type = type;
-        this.content = content;
-    }
-
-    // getters and setters
-} 

src/main/java/com/upchina/video/query/cart/CartQuery.java

@@ -3,11 +3,9 @@ package com.upchina.video.query.cart;
 import com.upchina.common.constant.IsActive;
 import com.upchina.common.query.IProduct;
 import com.upchina.video.entity.VideoCart;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;
 
-@ApiModel("购物车")
 public class CartQuery implements IProduct {
 
     @ApiModelProperty(value = "产品id", required = true)
@@ -30,6 +28,19 @@ public class CartQuery implements IProduct {
     @ApiModelProperty(value = "产品推送封面图")
     private String coverImgUrl;
 
+    public VideoCart toPO(Integer videoId) {
+        VideoCart videoCart = new VideoCart();
+        videoCart.setVideoId(videoId);
+        videoCart.setProductId(this.productId);
+        videoCart.setProductType(this.productType);
+        videoCart.setStatus(IsActive.NO.value);
+        videoCart.setProductName(this.productName);
+        videoCart.setProductDesc(this.productDesc);
+        videoCart.setUrl(this.url);
+        videoCart.setCoverImgUrl(this.coverImgUrl);
+        return videoCart;
+    }
+
     public void setProductId(Integer productId) {
         this.productId = productId;
     }
@@ -79,17 +90,4 @@ public class CartQuery implements IProduct {
     public void setCoverImgUrl(String coverImgUrl) {
         this.coverImgUrl = coverImgUrl;
     }
-
-    public VideoCart toPO(Integer videoId) {
-        VideoCart videoCart = new VideoCart();
-        videoCart.setVideoId(videoId);
-        videoCart.setProductId(this.productId);
-        videoCart.setProductType(this.productType);
-        videoCart.setStatus(IsActive.NO.value);
-        videoCart.setProductName(this.productName);
-        videoCart.setProductDesc(this.productDesc);
-        videoCart.setUrl(this.url);
-        videoCart.setCoverImgUrl(this.coverImgUrl);
-        return videoCart;
-    }
 }

src/main/java/com/upchina/video/query/cart/UpdateVideoCartStatusQuery.java

@@ -1,7 +1,6 @@
 package com.upchina.video.query.cart;
 
 import com.upchina.common.validation.IntArrayValidator;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-09-30
  */
-@ApiModel("审核产品参数对象")
 public class UpdateVideoCartStatusQuery {
 
     @ApiModelProperty(value = "ID", required = true)

src/main/java/com/upchina/video/query/cloud/VideoPlayUrlQuery.java

@@ -1,6 +1,5 @@
 package com.upchina.video.query.cloud;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
@@ -13,7 +12,6 @@ import javax.validation.constraints.NotBlank;
  * @author fangliangbao
  * @since 2022-12-09
  */
-@ApiModel("视频播放地址查询参数对象")
 public class VideoPlayUrlQuery {
 
     /**

src/main/java/com/upchina/video/query/common/DeleteVideoQuery.java

@@ -1,7 +1,6 @@
 package com.upchina.video.query.common;
 
 import com.upchina.video.constant.VideoOperateType;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -15,7 +14,6 @@ import java.util.List;
  * @author fangliangbao
  * @since 2022-10-08
  */
-@ApiModel("删除产品参数对象")
 public class DeleteVideoQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty("主产品ID")

src/main/java/com/upchina/video/query/common/RecallVideoUpdateQuery.java

@@ -1,7 +1,6 @@
 package com.upchina.video.query.common;
 
 import com.upchina.video.constant.VideoOperateType;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-12-30
  */
-@ApiModel("撤回操作参数对象")
 public class RecallVideoUpdateQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "ID", required = true)

src/main/java/com/upchina/video/query/common/UpdateVideoOptionQuery.java

@@ -2,7 +2,6 @@ package com.upchina.video.query.common;
 
 import com.upchina.video.constant.VideoOperateType;
 import com.upchina.video.entity.VideoLiveUser;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -18,7 +17,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-10-19
  */
-@ApiModel("视频直播开启签约参数对象")
 public class UpdateVideoOptionQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "产品ID", required = true)

src/main/java/com/upchina/video/query/common/UpdateVideoRecommendQuery.java

@@ -1,7 +1,6 @@
 package com.upchina.video.query.common;
 
 import com.upchina.video.constant.VideoOperateType;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -16,7 +15,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-09-07
  */
-@ApiModel("产品推荐参数对象")
 public class UpdateVideoRecommendQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "产品ID", required = true)

src/main/java/com/upchina/video/query/info/AbstractListAdminQuery.java

@@ -1,7 +1,6 @@
 package com.upchina.video.query.info;
 
 import com.upchina.common.query.PageQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -16,7 +15,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-09-30
  */
-@ApiModel("后台公共查询参数对象")
 public abstract class AbstractListAdminQuery extends PageQuery {
 
     @ApiModelProperty("产品名称")

src/main/java/com/upchina/video/query/info/ControlVideoLiveQuery.java

@@ -2,7 +2,6 @@ package com.upchina.video.query.info;
 
 import com.upchina.video.constant.VideoOperateType;
 import com.upchina.video.query.common.IVideoUserOperateQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -16,7 +15,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-10-07
  */
-@ApiModel("控制视频直播参数对象")
 public class ControlVideoLiveQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "视频直播ID", required = true)

src/main/java/com/upchina/video/query/info/ListVideoInfoQuery.java

@@ -1,6 +1,5 @@
 package com.upchina.video.query.info;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -17,7 +16,6 @@ import java.util.List;
  * @author fangliangbao
  * @since 2022-09-07
  */
-@ApiModel("查询视频直播列表参数对象")
 public class ListVideoInfoQuery extends AbstractListAdminQuery {
 
     @ApiModelProperty("是否是专栏直播 1是 2否")

src/main/java/com/upchina/video/query/info/SaveVideoInfoQuery.java

@@ -11,7 +11,6 @@ import com.upchina.video.query.cart.CartQuery;
 import com.upchina.video.query.common.IVideoUserOperateQuery;
 import com.upchina.video.query.mix.LiveMixQuery;
 import com.upchina.video.query.push.LivePushQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -30,7 +29,6 @@ import java.util.stream.Collectors;
  * @author fangliangbao
  * @since 2022-09-07
  */
-@ApiModel("创建视频直播参数对象")
 public class SaveVideoInfoQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty("视频专栏ID")

src/main/java/com/upchina/video/query/info/SubmitVideoInfoQuery.java

@@ -3,7 +3,6 @@ package com.upchina.video.query.info;
 import com.upchina.video.constant.VideoOperateType;
 import com.upchina.video.entity.VideoLive;
 import com.upchina.video.query.common.IVideoUserOperateQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -17,7 +16,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-10-11
  */
-@ApiModel("视频直播申请上架参数对象")
 public class SubmitVideoInfoQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty("视频直播id")

src/main/java/com/upchina/video/query/info/UpdateVideoInfoQuery.java

@@ -6,7 +6,6 @@ import com.upchina.video.constant.VideoOperateType;
 import com.upchina.video.constant.VideoPlayType;
 import com.upchina.video.constant.VideoStatus;
 import com.upchina.video.entity.VideoLive;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -21,7 +20,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-09-07
  */
-@ApiModel("更新视频直播参数对象")
 public class UpdateVideoInfoQuery extends SaveVideoInfoQuery {
 
     @ApiModelProperty("视频直播id")

src/main/java/com/upchina/video/query/info/UpdateVideoStatusQuery.java

@@ -4,7 +4,6 @@ import com.upchina.common.validation.IntArrayValidator;
 import com.upchina.video.constant.VideoStatus;
 import com.upchina.video.entity.VideoLive;
 import com.upchina.video.query.common.IVideoUserOperateQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -18,7 +17,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-09-30
  */
-@ApiModel("审核产品参数对象")
 public class UpdateVideoStatusQuery implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "ID", required = true)

src/main/java/com/upchina/video/query/info/VideoListAppQuery.java

@@ -1,6 +1,5 @@
 package com.upchina.video.query.info;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Max;
@@ -17,7 +16,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-09-30
  */
-@ApiModel("App列表查询参数")
 public class VideoListAppQuery {
 
     @ApiModelProperty(value = "1 直播计划 2 直播列表 3 投顾直播列表 4 我的关注 5 营业部视频列表", required = true)

src/main/java/com/upchina/video/query/message/ListVideoAppQuery.java

@@ -1,6 +1,5 @@
 package com.upchina.video.query.message;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -14,7 +13,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-09-30
  */
-@ApiModel("APP查询产品类别参数对象")
 public class ListVideoAppQuery {
 
     @ApiModelProperty("视频直播id")

src/main/java/com/upchina/video/query/message/ListVideoMessageQuery.java

@@ -2,7 +2,6 @@ package com.upchina.video.query.message;
 
 import com.upchina.common.validation.IntArrayValidator;
 import com.upchina.video.query.info.AbstractListAdminQuery;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -16,7 +15,6 @@ import javax.validation.constraints.NotNull;
  * @author fangliangbao
  * @since 2022-09-28
  */
-@ApiModel("查询视频互动列表参数对象")
 public class ListVideoMessageQuery extends AbstractListAdminQuery {
 
     @ApiModelProperty("消息内容")

src/main/java/com/upchina/video/query/message/SendLiveMessageQuery.java

@@ -8,7 +8,6 @@ import com.upchina.video.constant.VideoOperateType;
 import com.upchina.video.entity.VideoLiveMessage;
 import com.upchina.video.query.common.IVideoUserOperateQuery;
 import com.upchina.video.vo.message.AbstractMessageBasic;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
@@ -24,7 +23,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-09-28
  */
-@ApiModel("发送消息参数对象")
 public class SendLiveMessageQuery extends AbstractMessageBasic implements IVideoUserOperateQuery {
 
     @ApiModelProperty(value = "发送用户，投顾端为投顾ID，APP端用户手机号，助教userId", required = true)

src/main/java/com/upchina/video/query/message/VideoMessageProductQuery.java

@@ -1,6 +1,5 @@
 package com.upchina.video.query.message;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -11,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
  * @author fangliangbao
  * @since 2022-11-01
  */
-@ApiModel("投顾推荐产品消息")
 public class VideoMessageProductQuery {
 
     @ApiModelProperty("视频直播ID")

src/main/java/com/upchina/video/vo/cloud/VideoPlayerSignVO.java

@@ -1,6 +1,5 @@
 package com.upchina.video.vo.cloud;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -13,7 +12,6 @@ import java.io.Serializable;
  * @author fangliangbao
  * @since 2022-12-22
  */
-@ApiModel("视频播放器签名查询参数对象")
 public class VideoPlayerSignVO implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/upchina/video/vo/message/VideoMessageBasicVO.java

@@ -3,7 +3,6 @@ package com.upchina.video.vo.message;
 import cn.hutool.core.util.StrUtil;
 import com.upchina.video.entity.VideoLiveMessage;
 import com.upchina.video.helper.VideoHelper;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -17,7 +16,6 @@ import java.time.LocalDateTime;
  * @author fangliangbao
  * @since 2022-11-01
  */
-@ApiModel("互动消息基本信息")
 public class VideoMessageBasicVO implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/upchina/video/vo/message/VideoNotificationVO.java

@@ -4,7 +4,6 @@ import com.upchina.video.entity.OnlineUser;
 import com.upchina.video.entity.VideoCart;
 import com.upchina.video.vo.cart.CouponVO;
 import com.upchina.video.vo.question.NotifyQuestionVO;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -17,7 +16,6 @@ import java.io.Serializable;
  * @author fangliangbao
  * @since 2022-11-03
  */
-@ApiModel("视频直播通知响应对象")
 public class VideoNotificationVO implements Serializable {
 
     private static final long serialVersionUID = 1L;