--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/enums/resource/EbookStatusEnum.java

@@ -19,9 +19,7 @@ public enum EbookStatusEnum {
 	/** 审核未通过*/
 	_3(3, "审核通过"),
 	/** 审核未通过 */
-	_4(4, "审核未通过"),
-	/** 删除 */
-	_6(6, "删除");
+	_4(4, "审核未通过");
 	
 	private final Integer code;
 	private final String name;

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/SaveUpdateEbookForm.java

@@ -28,7 +28,7 @@ public class SaveUpdateEbookForm {
 	@ApiModelProperty("译者")
 	private String translator;
 	@ApiModelProperty("出版单位")
-	private String publishingUnit;
+	private String publisher;
 	@ApiModelProperty("语种")
 	private String languages;
 	@ApiModelProperty("出版时间")
@@ -46,7 +46,7 @@ public class SaveUpdateEbookForm {
 	@ApiModelProperty("关键词")
 	private String keywords;
 	@ApiModelProperty("广告语")
-	private String advertisingLanguage;
+	private String advertising;
 	@ApiModelProperty("电子书封面")
 	private String bookCover;
 	@ApiModelProperty("数据类型:0 纸质版  1电子版  2纸质版+电子版  3其他")
@@ -90,9 +90,9 @@ public class SaveUpdateEbookForm {
 	@ApiModelProperty("包册")
 	private String packages;
 	@ApiModelProperty("防伪码正版提示语")
-	private String securityCodeGenuineHint;
+	private String genuineHint;
 	@ApiModelProperty("防伪码盗版提示语")
-	private String securityCodePirateHint;
+	private String pirateHint;
 	/**商品信息**/
 	@ApiModelProperty("数据来源  1:本版 2外版")
 	private Integer dataSources;
@@ -125,22 +125,12 @@ public class SaveUpdateEbookForm {
 	@ApiModelProperty("展示视频")
 	private String showVideo;
 	/**阅读文件**/
-	@ApiModelProperty("epub文件")
-	private String epubFile;
-	@ApiModelProperty("xml文件")
-	private String xmlFile;
 	@ApiModelProperty("pdf文件")
 	private String pdfFile;
 	@ApiModelProperty("视频文件")
 	private String videoFile;
 	@ApiModelProperty("音频文件")
 	private String audioFile;
-	// lz添加
-	@ApiModelProperty(value = "文件名称")
-	private String fileName;
-
-	@ApiModelProperty(value = "css路径名称")
-	private String cssPath;
 	//文本框
 	@ApiModelProperty("编辑推荐")
 	private String editorsChoice;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/Book.java

@@ -39,7 +39,7 @@ public class Book {
 	@ApiModelProperty("译者")
 	private String translator;
 	@ApiModelProperty("出版单位")
-	private String publishingUnit;
+	private String publisher;
 	@ApiModelProperty("语种")
 	private String languages;
 	@ApiModelProperty("出版时间")
@@ -57,7 +57,7 @@ public class Book {
 	@ApiModelProperty("关键词")
 	private String keywords;
 	@ApiModelProperty("广告语")
-	private String advertisingLanguage;
+	private String advertising;
 	@ApiModelProperty("电子书封面")
 	private String bookCover;
 	@ApiModelProperty("数据类型:0 纸质版  1电子版  2纸质版+电子版  3其他")
@@ -85,4 +85,8 @@ public class Book {
 	private String basicSales;
 	@ApiModelProperty("预售提示语")
 	private String presaleHint;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType=1;
+	@ApiModelProperty("是否删除 0未删除 1已删除")
+	private Integer isDelete=0;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/BookGoods.java

@@ -38,7 +38,6 @@ public class BookGoods {
 	@ApiModelProperty("售价状态 ")
 	private BigDecimal ebookSellingPrice;
 	@ApiModelProperty("价格状态  1:付费  2:免费")
-	
 	private Integer priceType;
 	@ApiModelProperty("相关合同")
 	private String relatedContracts;

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/BookIssued.java

@@ -42,9 +42,9 @@ public class BookIssued {
 	@ApiModelProperty("包册")
 	private String packages;
 	@ApiModelProperty("防伪码正版提示语")
-	private String securityCodeGenuineHint;
+	private String genuineHint;
 	@ApiModelProperty("防伪码盗版提示语")
-	private String securityCodePirateHint;
+	private String pirateHint;
 	@ApiModelProperty("创建时间")
 	private Date uploadTime;
 

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/ebook/EbookVO.java

@@ -20,43 +20,137 @@ public class EbookVO {
 
 	@ApiModelProperty("id")
 	private String id;
-	@ApiModelProperty("名称")
+	@ApiModelProperty("图书子书id")
+	private String bookId;
+	@ApiModelProperty("图书名")
 	private String name;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("isbn")
+	@ApiModelProperty("副标题")
+	private String subheading;
+	@ApiModelProperty("译名")
+	private String translatedNames;
+	@ApiModelProperty("丛书id")
+	private String seriesId;
+	@ApiModelProperty("ISBN")
 	private String isbn;
-	@ApiModelProperty("所属丛书")
-	private Integer bookSeries;
-	@ApiModelProperty("责任编辑")
-	private String executiveEditor;
+	@ApiModelProperty("译者")
+	private String translator;
 	@ApiModelProperty("出版单位")
 	private String publisher;
+	@ApiModelProperty("语种")
+	private String languages;
 	@ApiModelProperty("出版时间")
-	private Date publishTime;
+	private Date publishTime; 
+	@ApiModelProperty("主编")
+	private String editor;
+	@ApiModelProperty("策划编辑")
+	private String planningEditor;
+	@ApiModelProperty("责任编辑")
+	private String executiveEditor;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("广告语")
+	private String advertising;
+	@ApiModelProperty("电子书封面")
+	private String bookCover;
+	@ApiModelProperty("数据类型:0 纸质版  1电子版  2纸质版+电子版  3其他")
+	private Integer dataType;
+	@ApiModelProperty("所属部门")
+	private Integer department;
+	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
+	private Integer bookStatus;
+	/**纸质书信息**/
+	@ApiModelProperty("书代号")
+	private String bookCode;
+	@ApiModelProperty("SKU编号")
+	private String SKUCode;
+	@ApiModelProperty("重量")
+	private Integer weight;
+	@ApiModelProperty("商品权重")
+	private String commodityWeight;
+	@ApiModelProperty("邮费选择")
+	private int postage;
+	@ApiModelProperty("基础销量")
+	private String basicSales;
+	@ApiModelProperty("预售提示语")
+	private String presaleHint;
+	/**行业信息**/
 	@ApiModelProperty("版次")
-	private String revision;
+	private String edition;
+	@ApiModelProperty("装帧")
+	private String binding;
+	@ApiModelProperty("开本")
+	private String format;
+	@ApiModelProperty("印次")
+	private String print;
 	@ApiModelProperty("字数")
-	private String fontCount;
-	@ApiModelProperty("封面")
-	private String bookCover;
+	private String wordCount;
+	@ApiModelProperty("印章")
+	private String sela;
+	@ApiModelProperty("包册")
+	private String packages;
+	@ApiModelProperty("防伪码正版提示语")
+	private String genuineHint;
+	@ApiModelProperty("防伪码盗版提示语")
+	private String pirateHint;
+	/**商品信息**/
+	@ApiModelProperty("数据来源  1:本版 2外版")
+	private Integer dataSources;
+	@ApiModelProperty("销售状态  1:可售  2:不可售")
+	private Integer salesStatus;
+	/**纸质书价格**/
 	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("关键词")
-	private String keywords;
-	@ApiModelProperty("中图分类")
-	private String midpicid;
-	@ApiModelProperty(value = "自定义分类id")
-	private List<Integer> diyTypeIds;
+	private BigDecimal bookPrice;
+	@ApiModelProperty("售价状态 ")
+	private BigDecimal bookSellingPrice;
+	/**电子书价格**/
+	@ApiModelProperty("定价")
+	private BigDecimal ebookPrice;
+	@ApiModelProperty("售价状态 ")
+	private BigDecimal ebookSellingPrice;
+	@ApiModelProperty("价格状态  1:付费  2:免费")
+	private Integer priceType;
+	@ApiModelProperty("相关合同")
+	private String relatedContracts;
+	@ApiModelProperty("合同编号")
+	private String contractNumber;
+	@ApiModelProperty("合同名称")
+	private String contractName;
+	@ApiModelProperty("开始日期")
+	private Date startDate;
+	@ApiModelProperty("结束日期")
+	private Date endDate;
+	/**电子文件**/
+	//展示信息
+	@ApiModelProperty("展示视频")
+	private String showVideo;
+	/**阅读文件**/
+	@ApiModelProperty("xml文件")
+	private String xmlFile;
+	@ApiModelProperty("pdf文件")
+	private String pdfFile;
+	@ApiModelProperty("视频文件")
+	private String videoFile;
+	@ApiModelProperty("音频文件")
+	private String audioFile;
+	//文本框
+	@ApiModelProperty("编辑推荐")
+	private String editorsChoice;
+	@ApiModelProperty("图书简介")
+	private String bookIntro;
+	@ApiModelProperty("图书目录")
+	private String bookCatalog;
+	@ApiModelProperty("作者简介")
+	private String authorIntro;
+	@ApiModelProperty("详细介绍")
+	private String detailedIntro;
+	
 	@ApiModelProperty(value = "标签内容id")
 	private List<BookLabelContentDiyType> lcdList;
 	@ApiModelProperty("分类id")
 	private List<Integer> diyTypeId;
-	@ApiModelProperty("内容简介")
-	private String summary;
-	@ApiModelProperty("图书目录")
-	private String bookCatalog;
-	@ApiModelProperty("pdf文件")
-	private String pdfFile;
 	
 }

com.zrqx.file/src/main/java/com/zrqx/file/controller/EpubController.java

 package com.zrqx.file.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,6 +10,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import nl.siegmann.epublib.domain.TOCReference;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,19 +28,13 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ChapterLibrary;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.model.resource.ebook.Ebook;
-import com.zrqx.core.model.resource.ebook.BookDiyType;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
-import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
 import com.zrqx.core.vo.book.EpubVo;
 import com.zrqx.file.commons.Redis;
 import com.zrqx.file.service.FileService;
 import com.zrqx.file.util.EpubResolve;
 import com.zrqx.file.util.EpubUtil;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import nl.siegmann.epublib.domain.TOCReference;
-
 @RestController
 @RequestMapping(value = "/epub")
 @Api(description = "文件上传下载服务")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/coursewarelibrary/CoursewareLibraryController.java

@@ -31,8 +31,6 @@ import com.zrqx.core.form.resource.bg.coursewarelibrary.BatchUpdateCoursewareLib
 import com.zrqx.core.form.resource.bg.coursewarelibrary.QueryCoursewareLibraryForm;
 import com.zrqx.core.form.resource.bg.coursewarelibrary.SaveUpdateCoursewareLibraryForm;
 import com.zrqx.core.form.resource.bg.coursewarelibrary.UpdateCoursewareLibraryForm;
-import com.zrqx.core.form.resource.bg.imagelibrary.BatchUpdateImageLibraryForm;
-import com.zrqx.core.model.resource.animationlibrary.AnimationLibraryDiyTypeRelation;
 import com.zrqx.core.model.resource.coursewarelibrary.CoursewareGoods;
 import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibrary;
 import com.zrqx.core.model.resource.coursewarelibrary.CoursewareLibraryDiyType;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,9 +31,9 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.model.resource.ebook.BookDiyType;
 import com.zrqx.core.model.resource.ebook.BookGoods;
+import com.zrqx.core.model.resource.ebook.BookIssued;
 import com.zrqx.core.model.resource.ebook.BookLabelContentDiyType;
 import com.zrqx.core.model.resource.ebook.Ebook;
-import com.zrqx.core.model.resource.imagelibrary.ImageGoods;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
 import com.zrqx.core.util.CallBack;
@@ -49,6 +48,7 @@ import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
 import com.zrqx.resource.bg.service.articlelibrary.ChapterLibraryService;
 import com.zrqx.resource.bg.service.ebook.BookDiyTypeService;
 import com.zrqx.resource.bg.service.ebook.BookGoodsService;
+import com.zrqx.resource.bg.service.ebook.BookIssuedService;
 import com.zrqx.resource.bg.service.ebook.BookLabelContentDiyTypeService;
 import com.zrqx.resource.bg.service.ebook.BookService;
 import com.zrqx.resource.bg.service.ebook.EbookService;
@@ -71,9 +71,9 @@ public class EbookLibraryController {
 	@Autowired
 	private EbookService ebookservice;
 	@Autowired
-	private BookDiyTypeService dtservice;
+	private BookDiyTypeService bookTypeService;
 	@Autowired
-	private BookLabelContentDiyTypeService lcdtservice;
+	private BookLabelContentDiyTypeService bookLableService;
 	@Autowired
 	private Redis redis;
 	@Autowired
@@ -88,28 +88,40 @@ public class EbookLibraryController {
 	private ImageLibraryDiyTypeRelationService ildtrService;
 	@Autowired
 	private BookGoodsService bookGoodsService;
-	
+	@Autowired
+	private BookIssuedService bookIssuedService;
 	@ApiOperation("添加电子书")
 	@PostMapping(ResourceRequestPath.SAVE)
 	public CallBack<?> saveBook(@Validated(value = SaveGroup.class) @RequestBody SaveUpdateEbookForm form){
 		ebookservice.saveOrUpdate(form);
 		return CallBack.success(true);
 	}
-	
 	@ApiOperation("根据id查找电子书")
 	@GetMapping(ResourceRequestPath.OID)
-	public CallBack<EbookVO> echo(@PathVariable Integer oid) {
+	public CallBack<EbookVO> echo(@PathVariable String oid) {
+		//图书信息
 		Book book = bookservice.selectByPrimaryKey(oid);
+		//电子文件
 		Ebook ebook = ebookservice.selectByPrimaryKey(oid);
-		dtservice.createCriteria().andEqualTo("ebookId", oid);
-		List<BookDiyType> dtList = dtservice.selectByCriteria();
-		lcdtservice.createCriteria().andEqualTo("ebookId", oid);
-		List<BookLabelContentDiyType> lcdList = lcdtservice.selectByCriteria();
+		//商品信息
+		bookGoodsService.createCriteria().andEqualTo("bookId" , oid);
+		BookGoods goods=new BookGoods();
+		//行业信息
+		bookIssuedService.createCriteria().andEqualTo("bookId",oid);
+		BookIssued issued=new BookIssued();
+		//自定义分类
+		bookTypeService.createCriteria().andEqualTo("bookId", oid);
+		List<BookDiyType> dtList = bookTypeService.selectByCriteria();
+		//自定义标签
+		bookLableService.createCriteria().andEqualTo("bookId", oid);
+		List<BookLabelContentDiyType> lcdList = bookLableService.selectByCriteria();
 		EbookVO vo = new EbookVO();
 		BeanUtils.copyProperties(book, vo);
 		BeanUtils.copyProperties(ebook, vo);
-		vo.setDiyTypeId(new ArrayList<Integer>());
+		BeanUtils.copyProperties(goods, vo);
+		BeanUtils.copyProperties(issued, vo);
 		vo.setLcdList(lcdList);
+		vo.setDiyTypeId(new ArrayList<Integer>());
 		dtList.forEach(obj -> vo.getDiyTypeId().add(obj.getDiytypeId()));
 		return CallBack.success(vo);
 	}
@@ -129,7 +141,7 @@ public class EbookLibraryController {
 	@ApiOperation(value = "批量修改分类", notes = "批量修改分类")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_DIYTIPE)
 	public CallBack<Boolean> update2(@RequestBody UpdateEbookForm form) {
-		dtservice.insertListIds(form);
+		bookTypeService.insertListIds(form);
 		return CallBack.success();
 	}
 	@ApiOperation(value = "批量修改销售状态", notes = "批量修改销售状态")
@@ -173,10 +185,7 @@ public class EbookLibraryController {
 	@ApiOperation(value = "批量删除", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
 	public CallBack<Boolean> delete(@RequestBody List<String> ids) {
-		if(!list(ids,EbookStatusEnum._6,true,EbookStatusEnum._3)) {//如果状态是 3审核 不能变更为6逻辑删除
-			throw new BaseException("请先下架，再删除数据。");
-		}
-		return CallBack.success();
+		return CallBack.success(ebookservice.batchDelete(ids));
 	}
 	
 	@ApiOperation("查询电子书列表")
@@ -242,7 +251,7 @@ public class EbookLibraryController {
 		edt.setBookId(ev.getEbook().getBookId());
 		edt.setDiytypeCode(ev.getCode());
 		edt.setDiytypeId(0);
-		dtservice.insert(edt);
+		bookTypeService.insert(edt);
 		// 文章分类关联表
 		List<ArticleLibraryDiyType> aldtList = new ArrayList<ArticleLibraryDiyType>();
 		for (ArticleLibrary al : ev.getArticleSet()) {

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java

@@ -7,11 +7,8 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdffilelibrary/PdfLibraryController.java

@@ -26,14 +26,11 @@ import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
 import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
-import com.zrqx.core.form.resource.bg.imagelibrary.BatchUpdateImageLibraryForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.BatchUpdatePdfLibraryForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.QueryPdfLibraryForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.SavePdfLibraryForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.SaveUpdatePdfLibraryForm;
 import com.zrqx.core.form.resource.bg.pdffilelibrary.UpdatePdfLibraryForm;
-import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
-import com.zrqx.core.model.resource.imagelibrary.ImageResource;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfGoods;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryDiyType;
@@ -46,7 +43,6 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
 import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryListVO;
 import com.zrqx.core.vo.resource.pdffilelibrary.PdfLibraryOneVO;
 import com.zrqx.resource.bg.service.ResourceRelationService;
-import com.zrqx.resource.bg.service.imagelibrary.ImageResourceService;
 import com.zrqx.resource.bg.service.pdffilelibrary.PdfGoodsService;
 import com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryDiyTypeService;
 import com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryLableService;
@@ -162,13 +158,13 @@ public class PdfLibraryController {
 	}
 	@ApiOperation(value = "批量删除", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_DELETE)
-	public CallBack<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
+	public CallBack<Boolean> deleteByIds(@RequestBody List<String> ids) {
 		return CallBack.success(service.batchDelete(ids));
 	}
 	
 	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = ResourceRequestPath.GET_OID)
-	public CallBack<PdfLibraryOneVO> getById(@PathVariable Integer oid) {
+	public CallBack<PdfLibraryOneVO> getById(@PathVariable String oid) {
 		Criteria cr=service.createCriteria();
 		cr.andEqualTo("id", oid);
 		cr.andEqualTo("isDelete", 0);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java

@@ -36,7 +36,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 	        + " LEFT JOIN res_book_diy_type bdt ON be.id = bdt.bookid"
 	        + " LEFT JOIN res_Book_Goods g ON be.id = g.bookid"
 	        + " LEFT JOIN res_book_issued bi g ON bb.id = bi.bookid"
-	        + " WHERE 1 = 1 " 
+	        + " WHERE 1 = 1 and bb.isDelete=0" 
 			+ "<if test='option==1'>"
 			+ " AND bb.author is null "
 			+ "</if>"

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

@@ -39,7 +39,7 @@ public interface EbookService extends BaseService<Ebook, String>{
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:23
 	 */
-	boolean batchDelete(List<Integer> ids);
+	boolean batchDelete(List<String> ids);
 	/**
 	 * 后台分页查询
 	 * @param form

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.recyclebin.SaveResourceForm;
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.ebook.QueryEbookForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveEbookForm;
@@ -20,6 +21,8 @@ import com.zrqx.core.model.resource.ebook.BookGoods;
 import com.zrqx.core.model.resource.ebook.BookIssued;
 import com.zrqx.core.model.resource.ebook.BookLabelContentDiyType;
 import com.zrqx.core.model.resource.ebook.Ebook;
+import com.zrqx.core.model.resource.pdffilelibrary.PdfGoods;
+import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
@@ -164,8 +167,27 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 
 
 	@Override
-	public boolean batchDelete(List<Integer> ids) {
-		// TODO Auto-generated method stub
+	public boolean batchDelete(List<String> ids) {
+		if (ids.size() == 0) {
+			throw new BaseException("没有选中任何数据，请重新选择");
+		}
+		createCriteria().andIn("id", ids);
+		List<Book> list = bookMapper.selectByExample(example);
+		for (Book entity : list) {
+			if (entity.getBookStatus() == 1) {
+				throw new BaseException("不能删除审核通过的资源");
+			}
+			entity.setIsDelete(1);
+			bookMapper.updateByPrimaryKeySelective(entity);
+		}
+			//删除后的资源加入回收站
+			/*SaveResourceForm form =new  SaveResourceForm();
+			BeanUtils.copyProperties(entity,form);
+			pdfLibrarySerivce.createCriteria().andEqualTo("plId" , entity.getId());
+			PdfGoods goods = pdfLibrarySerivce.selectOneByCriteria();
+			form.setSellingPrice(goods.getSellingPrice());
+			form.setPriceType(goods.getPriceType());
+			binService.saveResource(form);*/
 		return false;
 	}
 

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

@@ -207,7 +207,7 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 	 * @date: 2018年11月22日 下午2:39:23
 	 */
 	@Override
-	public boolean batchDelete(List<Integer> ids) {
+	public boolean batchDelete(List<String> ids) {
 		if (ids.size() == 0) {
 			throw new BaseException("没有选中任何数据，请重新选择");
 		}
@@ -215,7 +215,7 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 		List<PdfLibrary> list = mapper.selectByExample(example);
 		for (PdfLibrary entity : list) {
 			if (entity.getStatus() == 1) {
-				throw new BaseException("不能删除已上架的资源");
+				throw new BaseException("不能删除审核通过的资源");
 			}
 			entity.setIsDelete(1);
 			mapper.updateByPrimaryKeySelective(entity);

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

@@ -38,7 +38,7 @@ public interface PdfLibraryService extends BaseService<PdfLibrary,Integer>{
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:23
 	 */
-	boolean batchDelete(List<Integer> ids);
+	boolean batchDelete(List<String> ids);
 	/**
 	 * 后台分页查询
 	 * @param form

com.zrqx.sysuser/target/classes/META-INF/build-info.properties

+#Properties
+#Tue Jan 22 15:19:57 CST 2019
+build.time=2019-01-22T15\:19\:57+0800
+build.artifact=com.zrqx.sysuser
+build.group=com.zrqx.sysuser
+build.name=com.zrqx.sysuser
+build.version=1.0.0