--no commit message

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

@@ -25,7 +25,6 @@ import com.zrqx.core.form.resource.bg.articlelibrary.UpdateArticleImgForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
 import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
-import com.zrqx.core.util.datatype.UUIDUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java

@@ -30,7 +30,6 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryOneVO;
-import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
 import com.zrqx.resource.bg.service.recommend.RecommendResourceService;
@@ -51,10 +50,6 @@ public class AudioLibraryController {
 	private AudioLibraryService service;
 	@Autowired
 	private AudioLibraryDiyTypeService vdrService;
-	//@Autowired
-	//private AudioResourceService resourceService;
-	@Autowired
-	private ResourceRelationService resourceRelationService;
 	/** 推荐位内容*/
 	@Autowired
 	private RecommendResourceService recommendResourceService;
@@ -198,6 +193,7 @@ public class AudioLibraryController {
 		Example example = vdrService.createExample();
 		example.createCriteria().andEqualTo("audioId",oid);
 		List<AudioLibraryDiyType> list = vdrService.selectByExample(example);
+		vo.setDiyType(list);
 		return CallBack.success(vo);
 	}
 	@ApiOperation(value = "分页查询" , notes ="查询列表")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -13,7 +13,6 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListStatisticsVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
-import com.zrqx.core.vo.resource.ebook.EbookListStatisticsVO;
 /**
  * 文章库
  */

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/year/YearLibraryMapper.java

@@ -8,8 +8,6 @@ import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.year.YearLibrary;
 import com.zrqx.core.vo.resource.fg.ebook.FgEbookMainBodyVO;
 import com.zrqx.core.vo.resource.year.YearLibraryListVO;
-
-import feign.Param;
 /**
  * 年份库
  * @author rjc

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

@@ -13,7 +13,6 @@ import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.ebook.Book;
-import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.model.resource.resourcerelation.ResourceRelation;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -22,7 +21,6 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.resource.bg.mapper.ResourceRelationMapper;
 import com.zrqx.resource.bg.mapper.articlelibrary.ArticleLibraryMapper;
 import com.zrqx.resource.bg.mapper.ebook.BookMapper;
-import com.zrqx.resource.bg.mapper.imagelibrary.ImageLibraryMapper;
 import com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper;
 
 @Service

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookMainBodyServiceImpl.java

 package com.zrqx.resource.bg.service.ebook;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -13,13 +12,11 @@ import com.zrqx.core.form.resource.bg.ebook.QueryEbookMainBodyForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookMainBodyForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.EbookMainBody;
-import com.zrqx.core.model.resource.ebook.EbookMainBodyRelation;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO;
 import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyMapper;
-import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper;
 
 /**
  * 杂志主体
@@ -38,7 +35,6 @@ public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, Str
 
 	@Override
 	public boolean saveOrUpdate(SaveUpdateEbookMainBodyForm form) throws ParseException {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		EbookMainBody body = new EbookMainBody();
 		BeanUtils.copyProperties(form, body);
 		if (body.getId() == null) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -33,9 +33,6 @@ import com.zrqx.core.vo.resource.videolibrary.ExcelVideoImportVo;
 import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.bg.client.order.OrderClient;
 import com.zrqx.resource.bg.mapper.ResourceRelationMapper;
-import com.zrqx.resource.bg.mapper.diytype.DiyTypeMapper;
-import com.zrqx.resource.bg.mapper.ebook.BookMapper;
-import com.zrqx.resource.bg.mapper.ebook.EbookMapper;
 import com.zrqx.resource.bg.mapper.record.RecordMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryDiyTypeMapper;
 import com.zrqx.resource.bg.mapper.videolibrary.VideoLibraryMapper;
@@ -55,10 +52,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	private VideoLibraryDiyTypeMapper vdrMapper;
 	@Autowired
 	private OrderClient orderClient;
-	@Autowired
-	private BookMapper bookMapper;
-	@Autowired
-	private EbookMapper ebookMapper;
 	
 	
 	@Autowired
@@ -67,8 +60,6 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	private ResourceRelationMapper resourceRelationMapper;
 	@Autowired
 	private Redis redis;
-	@Autowired
-	private DiyTypeMapper diyTypeMapper;
 	
 	@Override
 	public BaseMapper<VideoLibrary> getMapper() {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java

@@ -5,7 +5,6 @@ import java.util.List;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
-import com.zrqx.core.form.resource.bg.resource.SearchForm;
 import com.zrqx.core.form.resource.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.core.form.resource.bg.videolibrary.SaveUpdateVideoLibraryForm;
 import com.zrqx.core.form.resource.bg.videolibrary.SaveVideoLibraryForm;