视频功能测试

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.xlk.dto.VideoDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
 import com.yunzhi.marketing.xlk.service.IVideoService;
@@ -14,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -55,7 +58,7 @@ public class VideoController extends BaseController {
     @RequestMapping(value="/admin/video",method= RequestMethod.GET)
     public ResponseBean videoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                  @RequestParam(value ="name") String name,
+                                  @RequestParam(value ="name",required = false) String name,
                                   @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -78,14 +81,18 @@ public class VideoController extends BaseController {
 
     /**
      * 保存对象
-     * @param video 实体对象
+     * @param videoDTO 实体对象
      * @return
      */
     @ApiOperation(value = "添加视频", notes = "添加视频")
-    @RequestMapping(value="/video",method= RequestMethod.POST)
-    public ResponseBean videoAdd(@RequestBody Video video,@RequestHeader("authorization") String token, HttpServletRequest request){
+    @RequestMapping(value="/admin/video",method= RequestMethod.POST)
+    public ResponseBean videoAdd(@RequestBody VideoDTO videoDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Video video = new Video();
+            BeanUtils.copyProperties(videoDTO,video);
+            video.setCreatedTime(LocalDateTime.now());
+            video.setCreatedBy(getUserId(request));
             video.setOrgId(getOrgId(request));
             if (iVideoService.save(video)){
                 responseBean.addSuccess(video);
@@ -106,8 +113,8 @@ public class VideoController extends BaseController {
      */
     @ApiOperation(value = "根据id删除视频", notes = "根据id删除视频")
     @ResponseBody
-    @RequestMapping(value="/video/{id}", method= RequestMethod.DELETE)
-    public ResponseBean videoDelete(@PathVariable Integer id){
+    @RequestMapping(value="/admin/video/{id}", method= RequestMethod.DELETE)
+    public ResponseBean videoDelete(@PathVariable String id,@RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(iVideoService.removeById(id)){
@@ -126,15 +133,18 @@ public class VideoController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param video 实体对象
+     * @param videoDTO 实体对象
      * @return
      */
     @ApiOperation(value = "根据id修改视频", notes = "根据id修改视频")
-    @RequestMapping(value="/video/{id}",method= RequestMethod.PUT)
-    public ResponseBean videoUpdate(@PathVariable Integer id,
-                                        @RequestBody Video video){
+    @RequestMapping(value="/admin/video/{id}",method= RequestMethod.PUT)
+    public ResponseBean videoUpdate(@PathVariable String id,
+                                        @RequestBody VideoDTO videoDTO,@RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Video video = new Video();
+            BeanUtils.copyProperties(videoDTO,video);
+            video.setVideoId(id);
             if (iVideoService.updateById(video)){
                 responseBean.addSuccess(video);
             }else {
@@ -153,8 +163,8 @@ public class VideoController extends BaseController {
      * @param id  实体ID
      */
     @ApiOperation(value = "根据id查询详情", notes = "根据id查询详情")
-    @RequestMapping(value="/video/{id}",method= RequestMethod.GET)
-    public ResponseBean videoGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/video/{id}",method= RequestMethod.GET)
+    public ResponseBean videoGet(@PathVariable String id,@RequestHeader("authorization") String token){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iVideoService.getById(id));

src/main/java/com/yunzhi/marketing/xlk/dto/VideoDTO.java

@@ -0,0 +1,63 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 视频表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_video")
+public class VideoDTO implements Serializable {
+    /**
+     * 所属城市
+     */
+    @TableField("CITY_ID")
+    private Integer cityId;
+
+    /**
+     * 所属楼盘
+     */
+    @TableField("BUILDING_ID")
+    private String buildingId;
+
+    /**
+     * 主图
+     */
+    private String videImg;
+
+    /**
+     * 视频标题
+     */
+    private String name;
+
+    /**
+     * 视频简介
+     */
+    private String remark;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 权重
+     */
+    @TableField("WEIGHT")
+    private Integer weight;
+
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.time.LocalDateTime;
@@ -27,6 +29,7 @@ public class Curriculum implements java.io.Serializable {
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private Integer curriculumId;
 
     /**

src/main/java/com/yunzhi/marketing/xlk/entity/SearchHouse.java

@@ -1,6 +1,8 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +27,12 @@ public class SearchHouse implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private Integer id;
+
     /**
      * 创建人小程序人员
      */

src/main/java/com/yunzhi/marketing/xlk/entity/Video.java

@@ -1,7 +1,10 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,13 +31,14 @@ public class Video implements Serializable {
     /**
      * 主键
      */
-    private Integer videoId;
+    @TableId(type = IdType.UUID)
+    private String videoId;
 
     /**
      * 创建人
      */
     @TableField("CREATED_BY")
-    private String createdBy;
+    private Integer createdBy;
 
     /**
      * 创建时间

src/main/resources/db/marketing.pdman.json

@@ -19303,7 +19303,7 @@
           "fields": [
             {
               "name": "video_id",
-              "type": "Integer",
+              "type": "IdOrKey",
               "remark": "",
               "chnname": "主键",
               "pk": true,
@@ -19311,7 +19311,7 @@
             },
             {
               "name": "CREATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "创建人"
             },
@@ -19323,7 +19323,7 @@
             },
             {
               "name": "UPDATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "更新人"
             },
@@ -19461,7 +19461,7 @@
           "fields": [
             {
               "name": "curriculum_id",
-              "type": "Integer",
+              "type": "IdOrKey",
               "remark": "",
               "chnname": "主键",
               "pk": true,
@@ -19469,7 +19469,7 @@
             },
             {
               "name": "CREATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "创建人"
             },
@@ -19481,7 +19481,7 @@
             },
             {
               "name": "UPDATED_BY",
-              "type": "IdOrKey",
+              "type": "Integer",
               "remark": "",
               "chnname": "更新人"
             },
@@ -19617,7 +19617,7 @@
           "fields": [
             {
               "name": "id",
-              "type": "Integer",
+              "type": "IdOrKey",
               "remark": "",
               "chnname": "主键",
               "pk": true,
@@ -20504,7 +20504,7 @@
     "defaultFields": [
       {
         "name": "id",
-        "type": "Integer",
+        "type": "IdOrKey",
         "remark": "",
         "chnname": "主键",
         "pk": true,
@@ -20512,7 +20512,7 @@
       },
       {
         "name": "CREATED_BY",
-        "type": "IdOrKey",
+        "type": "Integer",
         "remark": "",
         "chnname": "创建人"
       },
@@ -20524,7 +20524,7 @@
       },
       {
         "name": "UPDATED_BY",
-        "type": "IdOrKey",
+        "type": "Integer",
         "remark": "",
         "chnname": "更新人"
       },