--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/articlelibrary/FgArticleLibraryOneVO.java

 package com.zrqx.core.vo.resource.fg.articlelibrary;
 
-import java.util.Date;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,101 +10,6 @@ public class FgArticleLibraryOneVO {
 	private String id;
 	@ApiModelProperty(value = "文章标题")
 	private String name;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty("资源类型")
-	private Integer resourceType;
-	@ApiModelProperty("资源名称")
-	private String resourceTypeName;
-	//ycw添加
-	@ApiModelProperty(value = "浏览数量")
-	private Integer browseNum;
-	@ApiModelProperty("上传时间")
-	private Date uploadTime;
-	
-	@ApiModelProperty("作者id")
-	private String authorId;
-	
-	@ApiModelProperty("关键词")
-	private String keywords;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("pdf")
-	private String pdf;
-	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
-	private Integer status;
-	@ApiModelProperty("图书id")
-	private String bookId;
-	@ApiModelProperty("图书名称")
-	private String bookName;
-	@ApiModelProperty("封面")
-	private String img;
-	@ApiModelProperty("音频文件")
-	private String audio;
-	@ApiModelProperty("视频文件")
-	private String video;
-	@ApiModelProperty("售价")
-	private String realPrice;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
-	
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-	@ApiModelProperty(value = "章节标识号（bookid+txt编号）", required = true)
-	private String markid;
-	@ApiModelProperty(value = "预览文章", required = true)
-	private String previewText;
-	
-	@ApiModelProperty(value = "销量")
-	private Integer salesNum;
-	@ApiModelProperty("商品类型，默认2-2")
-	private String goodsType;
-	
-	
-
-	@ApiModelProperty("0：未收藏；1：已收藏")
-	private Integer isCollection;
-	@ApiModelProperty("0:未购买；1：已购买")
-	private Integer isBuy;
-	@ApiModelProperty("0:未登录；1：已登录")
-	private Integer isLogin;
-	@ApiModelProperty("0:付费；1：免费")
-	private Integer isFree;
-	@ApiModelProperty("0:不是作者；1：是作者")
-	private Integer isAuthor;
-	@ApiModelProperty("0:阅读；1：加入购车；2：加入购物车(按钮置灰)")
-	private Integer isStatus;
-	@ApiModelProperty("提示消息code")
-	private Integer messageCode;
-	@ApiModelProperty("提示消息")
-	private String message;
-	@ApiModelProperty("图书是否是PDF 0否1是")
-	private Integer isPdf;
-	@ApiModelProperty("pdf阅读url")
-	private String pdfReadUrl;
-	
-	@ApiModelProperty("图书定价")
-	private String bookPrice;
-	@ApiModelProperty("图书售价")
-	private String bookRealPrice;
-	@ApiModelProperty("图书折扣")
-	private String bookDiscount;
-	
-	@ApiModelProperty("目录排序")
-	private Integer orderNum;
-	@ApiModelProperty("最大目录排序")
-	private Integer orderMaxNum;
-	@ApiModelProperty("最小目录排序")
-	private Integer orderMinNum;
-	
-	@ApiModelProperty("评论数量")
-	private Integer commentNum;
-	@ApiModelProperty("资源评分")
-	private Integer resourceScore;
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java

@@ -2,14 +2,18 @@ package com.zrqx.resource.fg.controller.articlelibrary;
 
 import java.util.List;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.zrqx.core.constant.resource.ResourceRequestPath;
+import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
+import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService;
 
 import io.swagger.annotations.Api;
@@ -27,9 +31,17 @@ public class FgArticleLibraryController {
 	@Autowired
 	private FgArticleLibraryService service;
 	
-	@ApiOperation(value = "查询精彩瞬间" , notes ="查询精彩瞬间")
+	@ApiOperation(value = "首页-查询精彩瞬间" , notes ="查询精彩瞬间")
 	@GetMapping(value = ResourceRequestPath.LIST)
 	public CallBack<List<FgArticleLibraryListVO>> List(){
 		return CallBack.success(service.list());
 	}
+	@ApiOperation(value = "详情" , notes ="详情")
+	@GetMapping(value = ResourceRequestPath.GET_OID)
+	public CallBack<FgArticleLibraryOneVO> getById(@PathVariable String oid) {
+		ArticleLibrary entity = service.selectByPrimaryKey(oid);
+		FgArticleLibraryOneVO vo = new FgArticleLibraryOneVO();
+		BeanUtils.copyProperties(entity, vo);
+		return CallBack.success(vo);
+	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/diytype/FgDiyTypeController.java

@@ -16,7 +16,6 @@ import com.zrqx.core.util.bean.Copy;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.diytype.DiyTypeVO;
 import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeRelationListVo;
-import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 import com.zrqx.resource.fg.service.diytype.FgDiyTypeService;
 import com.zrqx.resource.fg.service.resource.FgResourceLibraryService;