--no commit message

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

@@ -32,6 +32,7 @@ import com.zrqx.core.form.file.CreatreQRCodeForm;
 import com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.core.form.resource.bg.ebook.UpdateEbookForm;
+import com.zrqx.core.model.recommend.RecommendResource;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
 import com.zrqx.core.model.resource.articlelibrary.ChapterLibrary;
@@ -193,7 +194,34 @@ public class EbookController {
 			EbookMainBodyRelation relation = new EbookMainBodyRelation();
 			relation.setObjectId(entity.getId());
 			ebookMainBodyRelationService.delete(relation);
+			//删除图书关联分类
+			EbookDiyType ebookDiyType = new EbookDiyType();
+			ebookDiyType.setEbookId(entity.getId());
+			dtservice.delete(ebookDiyType);
+			//删除图书关联目录
+			ChapterLibrary chapter =new ChapterLibrary();
+			chapter.setBookid(entity.getId());
+			clservice.delete(chapter);
+			
+		}
+		Example example1 = new Example(ArticleLibrary.class);
+		example1.createCriteria().andIn("bookId", ids);
+		List<ArticleLibrary> list2 = alservice.selectByExample(example1);
+		if(list2.size()>0) {
+			for (ArticleLibrary articleLibrary : list2) {
+				//删除关联文章关联分类
+				ArticleLibraryDiyType  articleDiyType = new ArticleLibraryDiyType();
+				articleDiyType.setAlId(articleLibrary.getId());
+				aldtservice.delete(articleDiyType);
+				//删除推荐关联的文章
+				ResourceRelation relation =new ResourceRelation();
+				relation.setObjectId(articleLibrary.getId());
+				resourceRelationService.delete(relation);
+			}
+			//删除关联文章
+			alservice.deleteByExample(example1);
 		}
+		//删除图书
 		bookservice.deleteByExample(example);
 		return CallBack.success();
 	}
@@ -667,6 +695,7 @@ public class EbookController {
 				ildtrService.insertSelective(ildt);
 			}
 		}
+		
 		try {
 			redis.delete(token);
 		} catch (IOException e) {

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

@@ -6,11 +6,13 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
 import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
+import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListStatisticsVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
 /**
@@ -97,6 +99,5 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 		    + ") ss group by  createTime"
 		+ "</script>")
 	List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume(@Param("form")QueryStatisticsForm form);
-
 	
 }

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

@@ -148,7 +148,9 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
 			pageParam.setOrderBy("sort asc");
 		}
 		PageHelper.startPage(pageParam);
-		return mapper.queryByIdAndGoodsType(entity);
+		List<ResourceRelationVo> list = mapper.queryByIdAndGoodsType(entity);
+		
+		return list;
 	}
 	/**
 	 * 获取相关资源列表