--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/ebook/WapEbookController.java

@@ -20,11 +20,8 @@ import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookVO;
 import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService;
-import com.zrqx.resource.fg.service.ebook.FgBookService;
-import com.zrqx.resource.fg.service.ebook.FgEbookDiyTypeService;
 import com.zrqx.resource.fg.service.ebook.FgEbookService;
-import com.zrqx.resource.fg.service.year.FgYearLibraryService;
-import com.zrqx.resource.wap.controller.service.WapBookService;
+import com.zrqx.resource.wap.service.WapBookService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,7 +49,7 @@ public class WapEbookController {
 	private FgEbookService ebookservice;
 
 	@ApiOperation("查询杂志列表")
-	@GetMapping(ResourceRequestPath.PAGE)
+	@GetMapping(ResourceRequestPath.PAGE)	
 	public CallBack<List<FgEbookListVO>> getBookList(FgQueryArticleLibraryForm form) {
 		List<FgEbookListVO> list = bookservice.query(form);
 		return CallBack.success(list);

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/mapper/WapBookMapper.java → com.zrqx.resource/src/main/java/com/zrqx/resource/wap/mapper/WapBookMapper.java

-package com.zrqx.resource.wap.controller.mapper;
+package com.zrqx.resource.wap.mapper;
 
 import java.util.List;
 

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/service/WapArticleLibrarySerivceImpl.java → com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapArticleLibrarySerivceImpl.java

-package com.zrqx.resource.wap.controller.service;
+package com.zrqx.resource.wap.service;
 
 import java.util.List;
 
@@ -15,10 +15,6 @@ import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
-import com.zrqx.resource.commons.Redis;
-import com.zrqx.resource.fg.client.order.FgOrderClient;
-import com.zrqx.resource.fg.client.organ.OrganClient;
-import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryDiyTypeMapper;
 import com.zrqx.resource.fg.mapper.articlelibrary.FgArticleLibraryMapper;
 
 

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/service/WapArticleLibraryService.java → com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapArticleLibraryService.java

-package com.zrqx.resource.wap.controller.service;
+package com.zrqx.resource.wap.service;
 
 import java.util.List;
 
-import org.apache.solr.common.SolrDocument;
-
 import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
-import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRecommedArticleForm;
-import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRelatedArticleForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.service.BaseService;
-import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
-import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO;
 /**
  * 文章库
  */

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/controller/service/WapBookService.java → com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapBookService.java

-package com.zrqx.resource.wap.controller.service;
+package com.zrqx.resource.wap.service;
 
 import java.util.List;
 
 import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.service.BaseService;
-import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;

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

-package com.zrqx.resource.wap.controller.service;
+package com.zrqx.resource.wap.service;
 
 import java.util.List;
 
@@ -16,7 +16,7 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO;
 import com.zrqx.resource.fg.mapper.year.FgYearLibraryMapper;
-import com.zrqx.resource.wap.controller.mapper.WapBookMapper;
+import com.zrqx.resource.wap.mapper.WapBookMapper;
 
 /**
  *