--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java

@@ -5,7 +5,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -164,11 +163,6 @@ public class VideoLibraryController {
 		VideoLibrary entity = service.selectByPrimaryKey(oid);
 		VideoLibraryOneVO vo = new VideoLibraryOneVO();
 		BeanUtils.copyProperties(entity,vo);
-		if(StringUtils.isNotBlank(entity.getAuthorId())){
-			vo.setAuthorNameAndId(entity.getAuthor() + "," + entity.getAuthorId());
-		}else{
-			vo.setAuthorNameAndId(entity.getAuthor());
-		}
 		if(entity.getRealPrice() != null){
 			vo.setRealPrice(entity.getRealPrice().toString());
 		}
@@ -195,16 +189,4 @@ public class VideoLibraryController {
 		return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
 	}
 		
-	@ApiOperation(value = "批量修改阅读权限", notes = "批量修改阅读权限")
-	@PostMapping(value = "/batch/update/read")
-	public CallBack<Boolean> updateReadTextPower(@RequestBody BatchUpdateVideoLibraryForm form) {
-		Example example = service.createExample();
-		example.createCriteria().andIn("id", form.getIds());
-		VideoLibrary entity = new VideoLibrary();
-		entity.setReadTextPower(form.getReadTextPower());
-		if (!service.UpdateByExampleSelective(entity,example)) {
-			throw new BaseException("操作失败");
-		}
-		return CallBack.success();
-	}
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/acupointlibrary/AcupointLibrarySerivceImpl.java

@@ -160,7 +160,6 @@ public class AcupointLibrarySerivceImpl extends BaseServiceImpl<AcupointLibrary,
 		entity.setUploadTime(new Date());
 		entity.setResourceType(ResourceTypeEnum.VIDEO_LIBRARY.getCode());
 		entity.setBrowseNum(50);
-		entity.setReadTextPower(1);
 		entity.setClickNum(50);
 		entity.setSalesNum(0);
 		videoLibraryMapper.insert(entity);	

app/resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -122,7 +122,6 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 		entity.setUploadTime(new Date());
 		entity.setResourceType(ResourceTypeEnum.VIDEO_LIBRARY.getCode());
 		entity.setBrowseNum(50);
-		entity.setReadTextPower(1);
 		entity.setClickNum(50);
 		entity.setSalesNum(0);
 		videoLibraryMapper.insert(entity);	

app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -71,7 +71,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 			entity.setUploadTime(new Date());
 			entity.setResourceType(ResourceTypeEnum.VIDEO_LIBRARY.getCode());
 			entity.setBrowseNum(50);
-			entity.setReadTextPower(1);
 			entity.setClickNum(50);
 			entity.setSalesNum(0);
 			mapper.insert(entity);
@@ -133,7 +132,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 			obj.setStatus(LibraryStatusEnum.STATUS_1.getCode());
 			obj.setResourceType(AllResourceTypeEnum.VIDEO.getCode());
 			obj.setBrowseNum(50);
-			obj.setReadTextPower(1);
 			obj.setClickNum(50);
 			obj.setSalesNum(0);
 			obj.setVideoName(form.getNames().get(i));

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/articlelibrary/SaveUpdateArticleLibraryForm.java

@@ -16,6 +16,8 @@ public class SaveUpdateArticleLibraryForm {
 	private String name;
 	@ApiModelProperty("作者")
 	private String author;
+	@ApiModelProperty("封面")
+	private String cover;
 	@ApiModelProperty("文章内容")
 	private String text;
 	@ApiModelProperty("链接")

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/videolibrary/SaveUpdateVideoLibraryForm.java

@@ -15,16 +15,12 @@ public class SaveUpdateVideoLibraryForm {
 	private String id;
 	@ApiModelProperty(value = "视频名称")
 	private String name;
-	@ApiModelProperty("来源")
-	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
 	@ApiModelProperty("定价")
 	private BigDecimal price;
 	@ApiModelProperty("售价")
 	private BigDecimal realPrice;
-	@ApiModelProperty("作者id")
-	private String authorId;
 	@ApiModelProperty("作者")
 	private String author;
 	@ApiModelProperty("时长")

app/resource/src/main/java/com/zrqx/resource/commons/model/videolibrary/VideoLibrary.java

@@ -2,7 +2,6 @@ package com.zrqx.resource.commons.model.videolibrary;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -23,8 +22,6 @@ public class VideoLibrary {
 	private String id;
 	@ApiModelProperty(value = "视频名称")
 	private String name;
-	@ApiModelProperty("来源")
-	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
 	@ApiModelProperty("定价")
@@ -41,22 +38,14 @@ public class VideoLibrary {
 	private String video;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("图书id")
-	private Integer bookId;
 	@ApiModelProperty("资源类型")
 	private Integer resourceType;
-	@ApiModelProperty("图书名称")
-	private String bookName;
 	@ApiModelProperty("状态：0已录入，1已上架，2已下架")
 	private Integer status;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-	@ApiModelProperty("课程Id")
-	private Integer courseId;
 	@ApiModelProperty("播放数")
 	private Integer clickNum;
 	@ApiModelProperty(value = "销量")
@@ -65,12 +54,8 @@ public class VideoLibrary {
 	private String cover;
 	@ApiModelProperty("浏览数量")
 	private Integer browseNum;
-	@ApiModelProperty("作者id")
-	private String authorId;
 	@ApiModelProperty("作者")
 	private String author;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
 	@ApiModelProperty("格式")
 	private String formats;
 	@ApiModelProperty("售价选项 0 免费，1收费")

app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLibrarySerivceImpl.java

@@ -70,7 +70,6 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
 			entity.setUploadTime(new Date());
 			entity.setResourceType(AllResourceTypeEnum.VIDEO.getCode());
 			entity.setBrowseNum(50);
-			entity.setReadTextPower(1);
 			entity.setClickNum(50);
 			entity.setSalesNum(0);
 			mapper.insert(entity);
@@ -122,7 +121,6 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Stri
 			obj.setStatus(LibraryStatusEnum.STATUS_0.getCode());
 			obj.setResourceType(AllResourceTypeEnum.VIDEO.getCode());
 			obj.setBrowseNum(50);
-			obj.setReadTextPower(1);
 			obj.setClickNum(50);
 			obj.setSalesNum(0);
 			obj.setVideoName(form.getNames().get(i));