fix 试听配置

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -111,5 +111,11 @@ public class GoodsAddBo {
     private List<GoodsCourseAddBo> courseList;
     @ApiModelProperty("试听配置列表")
     private List<GoodsAuditionConfigAddBo> auditionList;
+    /** 播放设置 */
+    @ApiModelProperty("播放设置")
+    private GoodsPlayConfigAddBo playConfig;
+    /** 拍照设置 */
+    @ApiModelProperty("拍照设置")
+    private GoodsPhotographConfigAddBo photographConfig;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -137,5 +137,13 @@ public class GoodsEditBo {
     @ApiModelProperty("试听列表")
     private List<GoodsAuditionConfigEditBo> auditionList;
 
+    /** 播放设置 */
+    @ApiModelProperty("播放设置")
+    private GoodsPlayConfigAddBo playConfig;
+
+    /** 拍照设置 */
+    @ApiModelProperty("拍照设置")
+    private GoodsPhotographConfigAddBo photographConfig;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsPhotographConfigAddBo.java

@@ -0,0 +1,26 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商品试听配置添加对象 goods_audition_config
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("商品拍照间隔配置添加对象")
+public class GoodsPhotographConfigAddBo {
+
+
+    /** 开启拍照 */
+    @ApiModelProperty("开启拍照 1开启 0关闭")
+    private Integer photograph;
+    /** 播放间隔 */
+    @ApiModelProperty("拍照间隔")
+    private String intervalTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsPlayConfigAddBo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商品试听配置添加对象 goods_audition_config
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("商品播放配置添加对象")
+public class GoodsPlayConfigAddBo {
+
+
+    /** 自动播放 */
+    @ApiModelProperty("自动播放 1开启 0关闭")
+    private Integer autoPlay;
+    /** 是否拖拉 */
+    @ApiModelProperty("是否拖拉 1开启 0关闭")
+    private Integer drag;
+    /** 倍速播放 */
+    @ApiModelProperty("倍速播放 1开启 0关闭")
+    private Integer speed;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -19,6 +19,8 @@ import com.zhongzheng.modules.goods.service.IGoodsAuditionConfigService;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsAuditionConfigVo;
+import com.zhongzheng.modules.goods.vo.GoodsPhotographConfigVo;
+import com.zhongzheng.modules.goods.vo.GoodsPlayConfigVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,9 +58,18 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
         GoodsVo goodsVo = BeanUtil.toBean(db, GoodsVo.class);
+        //试听配置
         if(db.getGoodsAuditionConfig()!=null){
             goodsVo.setAuditionList(JSON.parseArray(db.getGoodsAuditionConfig(), GoodsAuditionConfigVo.class));
         }
+        //播放设置
+        if(db.getGoodsPlayConfig()!=null){
+            goodsVo.setGoodsPlayConfigVo(JSON.parseObject(db.getGoodsPlayConfig(), GoodsPlayConfigVo.class));
+        }
+        //拍照设置
+        if(db.getGoodsPhotographConfig()!=null){
+            goodsVo.setGoodsPhotographConfigVo(JSON.parseObject(db.getGoodsPhotographConfig(), GoodsPhotographConfigVo.class));
+        }
         return goodsVo;
     }
 
@@ -126,10 +137,18 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        //试听列表
+        //试听设置列表
         if(bo.getAuditionList()!=null){
             add.setGoodsAuditionConfig(JSON.toJSONString(bo.getAuditionList()));
         }
+        //播放设置
+        if(bo.getPlayConfig()!=null){
+            add.setGoodsPlayConfig(JSON.toJSONString(bo.getPlayConfig()));
+        }
+        //拍照设置
+        if(bo.getPhotographConfig()!=null){
+            add.setGoodsPhotographConfig(JSON.toJSONString(bo.getPhotographConfig()));
+        }
         boolean result = this.save(add);
         //课程列表
         if(bo.getCourseList()!=null){
@@ -196,6 +215,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(bo.getAuditionList()!=null&&bo.getAuditionList().size()>0){
             update.setGoodsAuditionConfig(JSON.toJSONString(bo.getAuditionList()));
         }
+        //播放设置
+        if(bo.getPlayConfig()!=null){
+            update.setGoodsPlayConfig(JSON.toJSONString(bo.getPlayConfig()));
+        }
+        //拍照设置
+        if(bo.getPhotographConfig()!=null){
+            update.setGoodsPhotographConfig(JSON.toJSONString(bo.getPhotographConfig()));
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPhotographConfigVo.java

@@ -0,0 +1,26 @@
+package com.zhongzheng.modules.goods.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商品试听配置添加对象 goods_audition_config
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("商品拍照间隔配置添加对象")
+public class GoodsPhotographConfigVo {
+
+
+    /** 开启拍照 */
+    @ApiModelProperty("开启拍照 1开启 0关闭")
+    private Integer photograph;
+    /** 播放间隔 */
+    @ApiModelProperty("拍照间隔")
+    private String intervalTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPlayConfigVo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.goods.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商品试听配置添加对象 goods_audition_config
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("商品播放配置添加对象")
+public class GoodsPlayConfigVo {
+
+
+    /** 自动播放 */
+    @ApiModelProperty("自动播放 1开启 0关闭")
+    private Integer autoPlay;
+    /** 是否拖拉 */
+    @ApiModelProperty("是否拖拉 1开启 0关闭")
+    private Integer drag;
+    /** 倍速播放 */
+    @ApiModelProperty("倍速播放 1开启 0关闭")
+    private Integer speed;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -155,18 +155,24 @@ public class GoodsVo {
 	private String categoryName;
 
 	/** 试听设置 */
-	@Excel(name = "试听设置")
+/*	@Excel(name = "试听设置")
 	@ApiModelProperty("试听设置")
-	private String goodsAuditionConfig;
+	private String goodsAuditionConfig;*/
 	/** 拍照设置 */
-	@Excel(name = "拍照设置")
+	/*@Excel(name = "拍照设置")
 	@ApiModelProperty("拍照设置")
-	private String goodsPhotographConfig;
+	private String goodsPhotographConfig;*/
 	/** 播放设置 */
-	@Excel(name = "播放设置")
+	/*@Excel(name = "播放设置")
 	@ApiModelProperty("播放设置")
-	private String goodsPlayConfig;
+	private String goodsPlayConfig;*/
 
 	@ApiModelProperty("试听配置列表")
 	private List<GoodsAuditionConfigVo> auditionList;
+
+	@ApiModelProperty("播放设置")
+	private GoodsPlayConfigVo goodsPlayConfigVo;
+
+	@ApiModelProperty("拍照设置")
+	private GoodsPhotographConfigVo goodsPhotographConfigVo;
 }