--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java

@@ -29,10 +29,8 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
-import com.zrqx.resource.bg.service.articlelibrary.ArticleResourceService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -44,7 +44,6 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.EpubVo;
 import com.zrqx.core.vo.resource.ebook.EbookListVO;
 import com.zrqx.core.vo.resource.ebook.EbookVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
 import com.zrqx.resource.bg.service.articlelibrary.ChapterLibraryService;
@@ -53,7 +52,6 @@ import com.zrqx.resource.bg.service.ebook.EbookDiyTypeService;
 import com.zrqx.resource.bg.service.ebook.EbookService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryService;
-import com.zrqx.resource.bg.service.record.RecordService;
 import com.zrqx.resource.commons.Redis;
 
 import io.swagger.annotations.Api;
@@ -82,8 +80,6 @@ public class EbookController {
 	@Autowired
 	private ArticleLibraryService alservice; 
 	@Autowired
-	private ResourceRelationService resourceRelationService;
-	@Autowired
 	private ArticleLibraryDiyTypeService aldtservice;
 	@Autowired
 	private ChapterLibraryService clservice;

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

@@ -28,7 +28,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import tk.mybatis.mapper.entity.Example;
 @RestController
-@RequestMapping(ResourceRequestPath.BG + ResourceRequestPath.EBOOK)
+@RequestMapping(ResourceRequestPath.BG + ResourceRequestPath.EBOOKMAIABODY)
 @Api(description = "杂志主体")
 public class EbookMainBodyController {
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationService.java

@@ -8,7 +8,7 @@ import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.ResourceRelationVo;
 
-public interface ResourceRelationService extends BaseService<ResourceRelation, Integer> {
+public interface ResourceRelationService extends BaseService<ResourceRelation, String> {
 
 	List<ResourceRelationVo> queryRelationList(List<ResourceRelationVo> list);
 	

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationServiceImpl.java

@@ -23,7 +23,7 @@ import com.zrqx.resource.bg.mapper.imagelibrary.ImageLibraryMapper;
 import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper;
 
 @Service
-public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelation,Integer> implements ResourceRelationService {
+public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelation,String> implements ResourceRelationService {
 	@Autowired
 	private ResourceRelationMapper mapper;
 	@Autowired

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibraryDiyTypeSerivceImpl.java

@@ -11,7 +11,7 @@ import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryDiyTypeMapper;
  * 文章库和自定义分类
  */
 @Service
-public class ArticleLibraryDiyTypeSerivceImpl extends BaseServiceImpl<ArticleLibraryDiyType,Integer> implements ArticleLibraryDiyTypeService {
+public class ArticleLibraryDiyTypeSerivceImpl extends BaseServiceImpl<ArticleLibraryDiyType,String> implements ArticleLibraryDiyTypeService {
 
 	@Autowired
 	private ArticleLibraryDiyTypeMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibraryDiyTypeService.java

@@ -5,6 +5,6 @@ import com.zrqx.core.service.BaseService;
 /**
  * 文章库和自定义分类
  */
-public interface ArticleLibraryDiyTypeService extends BaseService<ArticleLibraryDiyType,Integer>{
+public interface ArticleLibraryDiyTypeService extends BaseService<ArticleLibraryDiyType,String>{
 	
 }

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

 package com.zrqx.resource.bg.service.articlelibrary;
 
-import java.math.BigDecimal;
 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.stereotype.Service;
 
 import com.zrqx.core.enums.AllResourceTypeEnum;
-import com.zrqx.core.enums.GoodsTypeEnum;
 import com.zrqx.core.enums.resource.LibraryStatusEnum;
-import com.zrqx.core.enums.resource.PriceOptionEnum;
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibraryDiyTypeSerivceImpl.java

@@ -11,7 +11,7 @@ import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryDiyTypeMapper;
  * PDF和自定义分类
  */
 @Service
-public class PdfLibraryDiyTypeSerivceImpl extends BaseServiceImpl<PdfLibraryDiyType,Integer> implements PdfLibraryDiyTypeService {
+public class PdfLibraryDiyTypeSerivceImpl extends BaseServiceImpl<PdfLibraryDiyType,String> implements PdfLibraryDiyTypeService {
 
 	@Autowired
 	private PdfLibraryDiyTypeMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibraryDiyTypeService.java

@@ -5,6 +5,6 @@ import com.zrqx.core.service.BaseService;
 /**
  * PDF和自定义分类
  */
-public interface PdfLibraryDiyTypeService extends BaseService<PdfLibraryDiyType,Integer>{
+public interface PdfLibraryDiyTypeService extends BaseService<PdfLibraryDiyType,String>{
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibrarySerivceImpl.java

@@ -33,7 +33,7 @@ import tk.mybatis.mapper.entity.Example;
  * PDF
  */
 @Service
-public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> implements PdfLibraryService {
+public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,String> implements PdfLibraryService {
 
 	@Autowired
 	private PdfLibraryMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibraryService.java

@@ -15,7 +15,7 @@ import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryListVO;
 /**
  * PDF
  */
-public interface PdfLibraryService extends BaseService<PdfLibrary,Integer>{
+public interface PdfLibraryService extends BaseService<PdfLibrary,String>{
 	/**
 	 * 保存或修改
 	 * @param form

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/year/YearLibrarySerivceImpl.java

@@ -32,7 +32,7 @@ import tk.mybatis.mapper.entity.Example;
  * @date 2019年9月10日上午11:42:19
  */
 @Service
-public class YearLibrarySerivceImpl extends BaseServiceImpl<YearLibrary,Integer> implements YearLibraryService {
+public class YearLibrarySerivceImpl extends BaseServiceImpl<YearLibrary,String> implements YearLibraryService {
 
 	@Autowired
 	private YearLibraryMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/year/YearLibraryService.java

@@ -13,7 +13,7 @@ import com.zrqx.core.vo.resource.year.YearLibraryListVO;
  * @author rjc
  * @date 2019年9月10日上午11:42:09
  */
-public interface YearLibraryService extends BaseService<YearLibrary,Integer>{
+public interface YearLibraryService extends BaseService<YearLibrary,String>{
 	/**
 	 * 保存或修改
 	 * @param form

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibraryDiyTypeSerivceImpl.java

@@ -20,7 +20,7 @@ import com.zrqx.resource.fg.mapper.diytype.FgDiyTypeMapper;
  * 文章库和自定义分类
  */
 @Service
-public class FgArticleLibraryDiyTypeSerivceImpl extends BaseServiceImpl<ArticleLibraryDiyType,Integer> implements FgArticleLibraryDiyTypeService {
+public class FgArticleLibraryDiyTypeSerivceImpl extends BaseServiceImpl<ArticleLibraryDiyType,String> implements FgArticleLibraryDiyTypeService {
 
 	@Autowired
 	private FgArticleLibraryDiyTypeMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibraryDiyTypeService.java

@@ -8,7 +8,7 @@ import com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo;
 /**
  * 文章库和自定义分类
  */
-public interface FgArticleLibraryDiyTypeService extends BaseService<ArticleLibraryDiyType,Integer>{
+public interface FgArticleLibraryDiyTypeService extends BaseService<ArticleLibraryDiyType,String>{
 	/**
 	 * 获取文章对应类型的全部自定义分类
 	 * @param ids