--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ArticleLibrary.java

@@ -58,4 +58,6 @@ public class ArticleLibrary {
 	private Integer status;
 	@ApiModelProperty("版权单位")
 	private String publisher;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/articlelibrary/FgArticleLibraryVO.java

@@ -51,5 +51,4 @@ public class FgArticleLibraryVO {
 	private Integer messageCode;
 	@ApiModelProperty("提示消息")
 	private String message;
-
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/resource/FgAboutListVo.java

 package com.zrqx.resource.commons.vo.fg.resource;
 
+import java.util.Date;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
@@ -34,4 +36,6 @@ public class FgAboutListVo  {
 	private Integer clickNum;
 	@ApiModelProperty("时长")
 	private String timeLength;
+	@ApiModelProperty("发布时间")
+	private Date uploadTime;
 }

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

@@ -30,6 +30,12 @@ public class FgArticleLibraryController {
 	@GetMapping(value = "/get/{oid}")
 	public CallBack<FgArticleLibraryVO> getById(@PathVariable String oid) {
 		ArticleLibrary entity = service.selectByPrimaryKey(oid);
+		if(entity.getBrowseNum() == null) {
+			entity.setBrowseNum(1);
+		}else {
+			entity.setBrowseNum(entity.getBrowseNum() + 1);
+		}
+		service.updateByPrimaryKeySelective(entity);
 		FgArticleLibraryVO vo = new FgArticleLibraryVO();
 		BeanUtils.copyProperties(entity,vo);
 		return CallBack.success(vo);

app/resource/src/main/java/com/zrqx/resource/fg/mapper/FgResourceRelationMapper.java

@@ -35,7 +35,7 @@ public interface FgResourceRelationMapper  extends BaseMapper<ResourceRelation>
 	 * @return
 	 */
 	@Select("<script>"
-			+ "select vi.id ,vi.name, vi.resourceType, vi.cover,vi.text as synopsis,vi.video "
+			+ "select vi.id ,vi.name, vi.resourceType, vi.cover,vi.text as synopsis,vi.video,vi.uploadTime,vi.browseNum "
 			+ "from res_resource_relation ar "
 			+ "left join res_article_library vi on ar.resourceId = vi.id "
 			+ "where 1 = 1 "