--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/BaseRequestPath.java

@@ -12,6 +12,8 @@ public class BaseRequestPath {
 	public static final String BG = "/bg";
 	/** 前台根路径 */
 	public static final String FG = "/fg";
+	/** 前台根路径 */
+	public static final String FG_PC = "/fg_pc";
 	
 	public static final String OBJECTID = "oid";
 	public static final String PARENTID = "pid";

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

@@ -80,4 +80,21 @@ public class SaveUpdateEbookForm {
 	private List<EbookDiyType> diyType;
 	@ApiModelProperty("中图分类号")
 	private String clcnumber;
+	//判断资源在当前电商平台的状态
+	@ApiModelProperty("亚马逊")
+	private String amazon;
+	@ApiModelProperty("亚马逊状态：0隐藏 1显示")
+	private Integer amazon_Status;
+	@ApiModelProperty("天猫")
+	private String tmall;
+	@ApiModelProperty("天猫状态：0隐藏 1显示")
+	private Integer tmall_Status;
+	@ApiModelProperty("京东")
+	private String jd;
+	@ApiModelProperty("京东状态：0隐藏 1显示")
+	private Integer jd_Status;
+	@ApiModelProperty("当当")
+	private String dangDang;
+	@ApiModelProperty("当当状态：0隐藏 1显示")
+	private Integer dangDang_Status;
 }			

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/pc/index/FgQueryIndexEbookInfoForm.java

+package com.zrqx.core.form.resource.fg.pc.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="FgQueryEbookInfoForm",description="电子书查询")
+public class FgQueryIndexEbookInfoForm {
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("自定义分类code")
+	private String diyTypeCode;
+}

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

@@ -93,4 +93,22 @@ public class Ebook {
 	private Integer pdfResourceType;
 	@ApiModelProperty("中图分类号")
 	private String clcnumber;
+	
+	//判断资源在当前电商平台的状态
+	@ApiModelProperty("亚马逊")
+	private String amazon;
+	@ApiModelProperty("亚马逊状态：0隐藏 1显示")
+	private Integer amazon_Status;
+	@ApiModelProperty("天猫")
+	private String tmall;
+	@ApiModelProperty("天猫状态：0隐藏 1显示")
+	private Integer tmall_Status;
+	@ApiModelProperty("京东")
+	private String jd;
+	@ApiModelProperty("京东状态：0隐藏 1显示")
+	private Integer jd_Status;
+	@ApiModelProperty("当当")
+	private String dangDang;
+	@ApiModelProperty("当当状态：0隐藏 1显示")
+	private Integer dangDang_Status;
 }

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

@@ -85,4 +85,21 @@ public class EbookVO {
 	private List<EbookDiyType> diyType;
 	@ApiModelProperty("中图分类号")
 	private String clcnumber;
+	//判断资源在当前电商平台的状态
+	@ApiModelProperty("亚马逊")
+	private String amazon;
+	@ApiModelProperty("亚马逊状态：0隐藏 1显示")
+	private Integer amazon_Status;
+	@ApiModelProperty("天猫")
+	private String tmall;
+	@ApiModelProperty("天猫状态：0隐藏 1显示")
+	private Integer tmall_Status;
+	@ApiModelProperty("京东")
+	private String jd;
+	@ApiModelProperty("京东状态：0隐藏 1显示")
+	private Integer jd_Status;
+	@ApiModelProperty("当当")
+	private String dangDang;
+	@ApiModelProperty("当当状态：0隐藏 1显示")
+	private Integer dangDang_Status;
 }

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

+package com.zrqx.core.vo.resource.ebook;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.zrqx.core.util.excelutil.ExcelResources;
+import com.zrqx.core.util.excelutil.ExcelSheetParams;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 图书导出、导入
+ * @author rjc
+ * @date 2019年2月18日下午4:33:03
+ */
+@ExcelSheetParams(startRow = 2)
+@Data
+public class ImportExcelBookVO {
+	@ExcelResources(title="正书名")
+	private String name;
+	@ExcelResources(title="ISBN")
+	private String isbn;
+	@ExcelResources(title="译者")
+	private String translator;
+	@ExcelResources(title="第一责任者及著作方式")
+	private String author;
+	@ExcelResources(title="责任编辑")
+	private String executiveEditor;
+	@ExcelResources(title="版次")
+	private String edition;
+	@ExcelResources(title="出版时间")
+	private String publishTime;
+	@ExcelResources(title="出版单位")
+	private String publisher;
+	@ExcelResources(title="字数 千字")
+	private String fontCount;
+	@ExcelResources(title="开本")
+	private String format;
+	@ExcelResources(title="页数")
+	private String pages;
+	@ExcelResources(title="用纸")
+	private String printCount;
+	@ExcelResources(title="包装类型 0平装 1精装 2线装")
+	private Integer type;
+	@ExcelResources(title="电子书链接")
+	private String bookLinks;
+	@ExcelResources(title="条形码")
+	private String bookImg;
+	@ExcelResources(title="电子书封面")
+	private String bookCover;
+	@ExcelResources(title="编辑推荐")
+	private String editorRecommend;
+	@ExcelResources(title="内容简介")
+	private String intro;
+	@ExcelResources(title="作者简介")
+	private String authorIntro;
+	@ExcelResources(title="精彩书评")
+	private String bookReview;
+	@ExcelResources(title="图书目录")
+	private String bookCatalog;
+	@ExcelResources(title="精彩书摘")
+	private String bookExtract;
+	@ExcelResources(title="产品特色")
+	private String bookCharacteristic;
+	@ExcelResources(title="前言/序言")
+	private String foreword;
+	@ExcelResources(title="图书信息")
+	private String bookInformation;
+	@ExcelResources(title="定价")
+	private BigDecimal price;
+	@ExcelResources(title="亚马逊")
+	private String amazon;
+	@ExcelResources(title="亚马逊状态：0隐藏 1显示")
+	private Integer amazon_Status;
+	@ExcelResources(title="天猫")
+	private String tmall;
+	@ExcelResources(title="天猫状态：0隐藏 1显示")
+	private Integer tmall_Status;
+	@ExcelResources(title="京东")
+	private String jd;
+	@ExcelResources(title="京东状态：0隐藏 1显示")
+	private Integer jd_Status;
+	@ExcelResources(title="当当")
+	private String dangDang;
+	@ExcelResources(title="当当状态：0隐藏 1显示")
+	private Integer dangDang_Status;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/pc/index/FgIndexEbookListVO.java

+package com.zrqx.core.vo.resource.fg.pc.index;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+@Data
+@ApiModel(value="FgIndexEbookListVO",description="查询电子书集合返回的实体")
+public class FgIndexEbookListVO {
+	//封面、图书名称、评分、评论人数、阅读人数、作者、译者、ISBN、出版社、出版时间、版本、字数、价格（展示定价和售价，如果资源有参与打折活动需显示折扣值）；
+	@ApiModelProperty("id")
+	private String id;
+	@ApiModelProperty(value = "电子书名")
+	private String name;
+	@ApiModelProperty("封面")
+	private String bookCover;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	/*@ApiModelProperty(value = "ISBN")
+	private String isbn;
+	@ApiModelProperty("作者id")
+	private String authorId;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("译者id")
+	private String translatorId;
+	@ApiModelProperty("译者")
+	private String translator;
+	@ApiModelProperty("出版时间")
+	private String publishTime;
+	@ApiModelProperty("销售状态 0 不可售 1 可售")
+	private Integer status;
+	@ApiModelProperty("资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件")
+	private Integer resourceType;
+	
+	
+	@ApiModelProperty("封面")
+	private String bookCover;
+	@ApiModelProperty("内容简介")
+	private String summary;
+	@ApiModelProperty("电子书状态  0：录入中  1：待审核  2：审核中 3：审核不通过  4：已上架  5：已下架")
+	private String bookStatus;
+	@ApiModelProperty("定价 元")
+	private BigDecimal price;
+	@ApiModelProperty("售价选项 0 免费，1收费")
+	private Integer priceOption;
+	@ApiModelProperty("售价 元")
+	private BigDecimal realPrice;
+	@ApiModelProperty("售价 元")
+	private String realPrice_string;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
+	@ApiModelProperty("商品类型，默认2-1")
+	private String goodsType;
+	@ApiModelProperty("是否包含实体书")
+	private Integer isContainEntity;
+	@ApiModelProperty("实体书售价（元）")
+	private BigDecimal entityRealPrice;
+	@ApiModelProperty("实体书定价（元）")
+	private BigDecimal entityPrice;
+	
+	@ApiModelProperty("折扣")
+	private BigDecimal discount;
+	@ApiModelProperty("0:未购买；1：已购买")
+	private Integer isBuy;
+	@ApiModelProperty("0:未登录；1：已登录")
+	private Integer isLogin;
+	@ApiModelProperty("0:付费；1：免费")
+	private Integer isFree;
+	@ApiModelProperty("0:不是作者；1：是作者")
+	private Integer isAuthor;
+	@ApiModelProperty("0:阅读；1：加入购车；2：加入购物车(按钮置灰)")
+	private Integer isStatus;
+	@ApiModelProperty("提示消息code")
+	private Integer messageCode;
+	@ApiModelProperty("提示消息")
+	private String message;*/
+}