--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/authorLibrary/AuthorLibraryController.java

@@ -171,7 +171,7 @@ public class AuthorLibraryController {
 		UpdateRecommendResourceForm res = new UpdateRecommendResourceForm();
 		res.setResId(entity.getId());
 		res.setResType(AllResourceTypeEnum.AUTHOR.getCode());
-		res.setResImg(entity.getFaceImg());
+		res.setResImg(entity.getImg());
 		res.setResName(entity.getName());
 		recommendResourceService.updateResourceContent(res);
 		return CallBack.success();

app/resource/src/main/java/com/zrqx/resource/bg/mapper/authorLibrary/AuthorLibraryMapper.java

@@ -13,7 +13,7 @@ import com.zrqx.resource.commons.vo.bg.authorlibrary.AuthorLibraryListVO;
 
 public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	@Select("<script>"
-			+ "select a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.description,a.faceImg,a.status,a.uploadTime "
+			+ "select a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.synopsis,a.img,a.status,a.uploadTime "
 			+ "FROM res_author_library a left join res_author_library_diy_type t "
 			+ "on a.id = t.authorlibraryid where 1 = 1 "
 			
@@ -40,7 +40,7 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<AuthorLibraryListVO> queryAuthorLibraryByConditions(@Param("form")QueryAuthorLibraryForm form);
 	
 	@Select("<script>"
-			+ "select a.id,a.name,a.institutionName,a.faceImg,a.status,a.uploadTime "
+			+ "select a.id,a.name,a.institutionName,a.img,a.status,a.uploadTime "
 			+ "FROM res_author_library a left join res_author_library_diy_type t "
 			+ "on a.id = t.authorlibraryid "
 			+ " where 1 = 1 and a.status = 1 "

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/authorLibrary/SaveUpdateAuthorForm.java

@@ -30,16 +30,14 @@ public class SaveUpdateAuthorForm {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")
 	private Integer status;
-	@Transient
+	
 	@ApiModelProperty(value = "分类id")
 	private List<AuthorLibraryDiytype> diyType;
 	@ApiModelProperty(value = "标签id")
 	private List<AuthorLibraryLabelContentDiyType> label;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 }

app/resource/src/main/java/com/zrqx/resource/commons/model/authorLibrary/AuthorLibrary.java

@@ -37,9 +37,9 @@ public class AuthorLibrary {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")
 	private Integer status;
 	@ApiModelProperty("上传时间")

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/authorlibrary/AuthorLibraryListVO.java

@@ -29,9 +29,9 @@ public class AuthorLibraryListVO {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")
 	private String status;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/authorlibrary/AuthorLibraryOneVO.java

@@ -34,9 +34,9 @@ public class AuthorLibraryOneVO {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")
 	private Integer status;
 	@ApiModelProperty("创建时间")

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

@@ -34,9 +34,9 @@ public class FgAuthorLibraryListVO {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("上传时间")
 	private String uploadTime;
 	@ApiModelProperty("浏览数量")

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

@@ -29,13 +29,11 @@ public class FgAuthorLibraryOneVO {
 	@ApiModelProperty("职务")
 	private String post;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("状态 0已录入 1上架 2下架 ")
 	private Integer status;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 	@ApiModelProperty("浏览数量")
 	private Integer browseNum;
 	@ApiModelProperty("资源类型")

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

@@ -24,9 +24,9 @@ public class FgAuthorListVO {
 	@ApiModelProperty("姓名")
 	private String name;
 	@ApiModelProperty("简介")
-	private String description;
+	private String synopsis;
 	@ApiModelProperty("头像")
-	private String faceImg;
+	private String img;
 	@ApiModelProperty("作者")
 	private String author;
 	@ApiModelProperty("相关图书资源")

app/resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java

@@ -1155,7 +1155,7 @@ public class FgResourceLibraryController {
 					Map<String, Object> resultMap = new HashMap<String, Object>();
 					//查询结果的id,存入map
 					resultMap.put("id",solrDocument.get("id"));
-					resultMap.put("img",solrDocument.get("faceImg"));
+					resultMap.put("img",solrDocument.get("img"));
 					resultMap.put("status", solrDocument.get("status"));
 					resultMap.put("title",solrDocument.get("title"));
 					resultMap.put("browseNum",solrDocument.get("browseNum"));
@@ -1267,7 +1267,7 @@ public class FgResourceLibraryController {
 					resultMap.put("id",solrDocument.get("id"));
 					resultMap.put("status", solrDocument.get("status"));	
 					resultMap.put("img", solrDocument.get("cover"));
-					//resultMap.put("img", solrDocument.get("faceImg"));
+					//resultMap.put("img", solrDocument.get("img"));
 					resultMap.put("price",(String)solrDocument.get("price"));
 					resultMap.put("realPrice",(String)solrDocument.get("realPrice"));
 					resultMap.put("discount",null);

app/resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryMapper.java

@@ -16,7 +16,7 @@ import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorListVO;
 
 public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	@Select("<script>"
-			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,synopsis,img,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
@@ -29,7 +29,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryOtherRecommendAuthor(@Param("form")FgQueryRecommedAuthorForm form);
 	
 	@Select("<script>"
-			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,synopsis,img,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -42,7 +42,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryOtherRecommendAuthorByIds(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "select DISTINCT id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select DISTINCT id,name,institutionName,sex,education,department,title,post,synopsis,img,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='form.ids != null and form.ids.size > 0' >"
@@ -55,7 +55,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryRecommendAuthor(@Param("form")FgQueryRecommedAuthorForm form);
 	
 	@Select("<script>"
-			+ "select id,name,institutionName,sex,education,department,title,post,description,faceImg,uploadTime,browseNum "
+			+ "select id,name,institutionName,sex,education,department,title,post,synopsis,img,uploadTime,browseNum "
 			+ "FROM res_author_library   "
 			+ "where status = 1 "
 			+ "<if test='ids != null and ids.size > 0' >"
@@ -68,7 +68,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> queryRecommendAuthorByIds(@Param("ids")List<String> ids);
 	
 	@Select("<script>"
-			+ "select a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.description,a.faceImg,a.uploadTime,a.browseNum "
+			+ "select a.id,a.name,a.institutionName,a.sex,a.education,a.department,a.title,a.post,a.synopsis,a.img,a.uploadTime,a.browseNum "
 			+ "FROM res_author_library a "
 			+ "left join res_author_library_diy_type t "
 			+ "on a.id = t.authorlibraryid "
@@ -92,7 +92,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
 	List<FgAuthorLibraryListVO> query(@Param("form")FgQueryAuthorLibraryForm form);
 	
 	@Select("<script>"
-			+ "select DISTINCT a.id, a.name, a.description, a.faceImg, a.browseNum "
+			+ "select DISTINCT a.id, a.name, a.synopsis, a.img, a.browseNum "
 			+ "FROM res_author_library a "
 			+ "LEFT JOIN (SELECT authorId,COUNT(1) articleCount FROM res_article_library WHERE res_article_library.status = 1 GROUP BY authorId)article ON  a.id=article.authorId "
 			+ "LEFT JOIN (SELECT authorId,COUNT(1) bookCount FROM res_book,res_ebook WHERE res_book.id=res_ebook.id AND bookStatus =4 GROUP BY authorId)book ON a.id=book.authorId "

app/resource/src/main/java/com/zrqx/resource/fg/mapper/membercollection/FgMemberCollectionMapper.java

@@ -23,7 +23,7 @@ public interface FgMemberCollectionMapper extends BaseMapper<MemberCollection> {
 	
 
 	@Select("<script>"
-			+ " select a.id, a.objectId, a.objectType, b.name, b.author , eb.summary as intro, a.createTime,eb.bookCover cover "
+			+ " select a.id, a.objectId, a.objectType, b.name, b.author , eb.synopsis as intro, a.createTime,eb.bookCover cover "
 			+ " from res_member_collection a left join res_book b on a.objectId = b.id left join res_ebook eb on a.objectId = eb.id "
 			+ " where 1=1 and a.objectType=#{form.goodsType} "
 			
@@ -43,7 +43,7 @@ public interface FgMemberCollectionMapper extends BaseMapper<MemberCollection> {
 	List<FgMemberCollectionVo> queryArticlePage(@Param("form")MemberCollectionForm form);
 
 	@Select("<script>"
-			+ " select b.id, b.name, b.institutionname, b.sex, b.education, b.department, b.title, b.post, b.description, b.faceimg, b.status, b.uploadtime, b.nationstype, b.browsenum  "
+			+ " select b.id, b.name, b.institutionname, b.sex, b.education, b.department, b.title, b.post, b.synopsis, b.img, b.status, b.uploadtime, b.nationstype, b.browsenum  "
 			+ " from res_author_library b left join res_member_collection a on b.id=a.objectId "
 			+ " where 1=1 and a.objectType=#{type} "
 			+ DEFAULT_PARAM

app/resource/src/main/java/com/zrqx/resource/fg/service/authorlibrary/FgAuthorLibraryServiceImpl.java

@@ -147,7 +147,7 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
 			form.setType(AllResourceTypeEnum.AUTHOR.getCode().toString());
 			vo.setIsConcerned(fgMemberConllectionManage.checkIsCollect(form));
 		}
-		vo.setDescription(removeLabel(vo.getDescription()));
+		vo.setSynopsis(removeLabel(vo.getSynopsis()));
 		return vo;
 	}
 	
@@ -184,7 +184,7 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
 	public List<FgAuthorLibraryListVO> queryOtherAuthor(String oid){
 		List<FgAuthorLibraryListVO> list = authorLibraryMapper.queryOtherAuthor(oid);
 		list.forEach(f ->{
-			f.setDescription(removeLabel(f.getDescription()));
+			f.setSynopsis(removeLabel(f.getSynopsis()));
 		});
 		return list;
 	}
@@ -263,8 +263,8 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
 	private void regEx(List<FgAuthorListVO> list){
 		if(ArrayUtils.isNotEmpty(list)){
 			list.forEach(li -> {
-				if(StringUtils.isNotBlank(li.getDescription())){
-					li.setDescription(removeLabel(li.getDescription()));
+				if(StringUtils.isNotBlank(li.getSynopsis())){
+					li.setSynopsis(removeLabel(li.getSynopsis()));
 				}
 			});
 		}

app/resource/src/main/java/com/zrqx/resource/fg/service/record/FgRecordServiceImpl.java

@@ -139,9 +139,9 @@ public class FgRecordServiceImpl extends BaseServiceImpl<Record, Integer>
 				if(AllResourceTypeEnum.AUTHOR.getCode().toString().equals(vo.getGoodsType())){
 					AuthorLibrary article = authorLibraryMapper.selectByPrimaryKey(vo.getGoodsId());
 					if(article != null){
-						vo.setImg(article.getFaceImg());
+						vo.setImg(article.getImg());
 						vo.setName(article.getName());
-						vo.setText(article.getDescription());
+						vo.setText(article.getSynopsis());
 					}
 				}
 				//电子书2-1