--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -274,7 +274,7 @@ public class EbookController {
 					image.setSalesNum(0);
 					image.setReadTextPower(1);
 					image.setDownloadNum(50);
-					image.setResourceType(AllResourceTypeEnum.IMAGE.getCode());
+					/*image.setResourceType(AllResourceTypeEnum.IMAGE.getCode());*/
 					ilService.insert(image);
 					ImageLibraryDiyType ildt = new ImageLibraryDiyType();
 					ildt.setIlId(image.getId());
@@ -348,7 +348,7 @@ public class EbookController {
 			image.setSalesNum(0);
 			image.setReadTextPower(1);
 			image.setDownloadNum(50);
-			image.setResourceType(AllResourceTypeEnum.IMAGE.getCode());
+		/*	image.setResourceType(AllResourceTypeEnum.IMAGE.getCode());*/
 			ilService.insert(image);
 			// 图片分类关联表
 			ImageLibraryDiyType ildt = new ImageLibraryDiyType();

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/imagelibrary/ImageLibrarySerivceImpl.java

@@ -75,7 +75,7 @@ public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,String
 			//添加
 			entity.setStatus(LibraryStatusEnum.STATUS_0.getCode());
 			entity.setUploadTime(new Date());
-			entity.setResourceType(AllResourceTypeEnum.IMAGE.getCode());
+			entity.setResourceType(4);
 			entity.setBrowseNum(50);
 			entity.setReadTextPower(1);
 			entity.setDownloadNum(50);
@@ -125,7 +125,7 @@ public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,String
 			obj.setImagesName(form.getImagesName().get(i));
 			obj.setUploadTime(new Date());
 			obj.setStatus(LibraryStatusEnum.STATUS_0.getCode());
-			obj.setResourceType(AllResourceTypeEnum.IMAGE.getCode());
+			obj.setResourceType(4);
 			obj.setBrowseNum(50);
 			obj.setReadTextPower(1);
 			obj.setDownloadNum(50);

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

@@ -121,15 +121,6 @@ public class FgRecordServiceImpl extends BaseServiceImpl<Record, Integer>
 					}
 				}
 				//图片
-				if(AllResourceTypeEnum.IMAGE.getCode().toString().equals(vo.getGoodsType())){
-					ImageLibrary imageLibrary = imageLibraryMapper.selectByPrimaryKey(vo.getGoodsId());
-					if(imageLibrary != null){
-						vo.setName(imageLibrary.getName());
-						vo.setImg(imageLibrary.getImage());
-						vo.setText(imageLibrary.getSynopsis());
-						vo.setSource(imageLibrary.getSource());
-					}
-				}
 				if(StringUtils.isNotBlank(vo.getText())){
 					vo.setText(vo.getText().replaceAll("\\<.*?>", ""));
 				}

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapBookServiceImpl.java

@@ -68,7 +68,7 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 		List<WapIndexEbookListVO> list = bookMapper.queryMainBody(oid);
 		for (WapIndexEbookListVO vo : list) {
 			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
-			vo.setName(library.getName()+"年第"+vo.getPeriods()+"期");
+			vo.setName(vo.getName()+"("+library.getName()+"年第"+vo.getPeriods()+"期)");
 		}
 		this.regEx2(list);
 		return list;