fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java
@@ -4,14 +4,8 @@ import java.util.Date; import java.util.List; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Table; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.system.BusinessSystem; @@ -22,9 +16,7 @@ * * @date 2018年10月23日 */ @Entity @Table(name = "yeshi_ec_home_navbar") @org.yeshi.utils.mybatis.Table("yeshi_ec_home_navbar") @Table("yeshi_ec_home_navbar") public class HomeNavbar implements Serializable { private static final long serialVersionUID = 1L; @@ -45,53 +37,42 @@ } @Id @Column(name = "br_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "br_id") private Long id; // 名称 @JoinColumn(name = "br_name") @org.yeshi.utils.mybatis.Column(name = "br_name") @Column(name = "br_name") private String name; // 图片 @JoinColumn(name = "br_picture") @org.yeshi.utils.mybatis.Column(name = "br_picture") @Column(name = "br_picture") private String picture; // 分类id @JoinColumn(name = "br_class_id") @org.yeshi.utils.mybatis.Column(name = "br_class_id") @Column(name = "br_class_id") private Long classId; // 跳转链接 @JoinColumn(name = "br_url") @org.yeshi.utils.mybatis.Column(name = "br_url") @Column(name = "br_url") private String url; // 类型 @JoinColumn(name = "br_type") @org.yeshi.utils.mybatis.Column(name = "br_type") @Column(name = "br_type") private NavbarTypeEnum type; // 排序 @JoinColumn(name = "br_orderby") @org.yeshi.utils.mybatis.Column(name = "br_orderby") @Column(name = "br_orderby") private Integer orderby; // 创建时间 @JoinColumn(name = "br_createtime") @org.yeshi.utils.mybatis.Column(name = "br_createtime") @Column(name = "br_createtime") private Date createtime; // 更新时间 @JoinColumn(name = "br_updatetime") @org.yeshi.utils.mybatis.Column(name = "br_updatetime") @Column(name = "br_updatetime") private Date updatetime; @Transient // 系统关联列表 // 系统关联列表 private List<BusinessSystem> systemList; public Long getId() { fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/Label.java
@@ -1,17 +1,9 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.common.AdminUser; @@ -22,15 +14,9 @@ * * @date 2018年6月27日 */ @Entity @Table(name = "yeshi_ec_label") @org.yeshi.utils.mybatis.Table("yeshi_ec_label") public class Label implements Serializable{ @Table("yeshi_ec_label") public class Label { /** * */ private static final long serialVersionUID = 1L; // 后台录入 public final static int MODE_BACKSTAGE = 1; // excel导入 @@ -38,48 +24,35 @@ // 系统数据抓取 public final static int MODE_SYSTEM = 3; @Id @Column(name = "lab_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "lab_id") private Long id; @JoinColumn(name = "lab_title") @org.yeshi.utils.mybatis.Column(name = "lab_title") @Column(name = "lab_title") private String title;// 名称 @JoinColumn(name = "lab_picture") @org.yeshi.utils.mybatis.Column(name = "lab_picture") @Column(name = "lab_picture") private String picture; // 图片url @JoinColumn(name = "lab_ios_click") @org.yeshi.utils.mybatis.Column(name = "lab_ios_click") @Column(name = "lab_ios_click") private Long iosClick; // 点击次数 @JoinColumn(name = "lab_android_click") @org.yeshi.utils.mybatis.Column(name = "lab_android_click") @Column(name = "lab_android_click") private Long androidClick; // 点击次数 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lab_entry_aid") @org.yeshi.utils.mybatis.Column(name = "lab_entry_aid") @Column(name = "lab_entry_aid") private AdminUser createUser; // 录入人 @JoinColumn(name = "lab_entry_mode") @org.yeshi.utils.mybatis.Column(name = "lab_entry_mode") @Column(name = "lab_entry_mode") private Integer entrymode; // 录入方式 (1 人工录入、2 系统自动录入、3 搜索录入) @JoinColumn(name = "lab_remark") @org.yeshi.utils.mybatis.Column(name = "lab_remark") @Column(name = "lab_remark") private String remark; // 备注 @JoinColumn(name = "lab_createtime") @org.yeshi.utils.mybatis.Column(name = "lab_createtime") @Column(name = "lab_createtime") private Date createtime; // 创建时间 @JoinColumn(name = "lab_updatetime") @org.yeshi.utils.mybatis.Column(name = "lab_updatetime") @Column(name = "lab_updatetime") private Date updatetime; // 更新时间(修改时间) fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelClass.java
@@ -1,17 +1,9 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.bus.clazz.GoodsClass; import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass; @@ -23,40 +15,25 @@ * * @date 2018年6月27日 */ @Entity @Table(name = "yeshi_ec_label_") @org.yeshi.utils.mybatis.Table("yeshi_ec_label_class") public class LabelClass implements Serializable{ @Table("yeshi_ec_label_") public class LabelClass { /** * */ private static final long serialVersionUID = 1L; @Id @Column(name = "lc_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "lc_id") private Long id; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lc_label_id") @org.yeshi.utils.mybatis.Column(name = "lc_label_id") @Column(name = "lc_label_id") private Label label; // 标签id @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lc_class_id") @org.yeshi.utils.mybatis.Column(name = "lc_class_id") @Column(name = "lc_class_id") private GoodsClass goodClass;// 商品大类 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lc_subclass_id") @org.yeshi.utils.mybatis.Column(name = "lc_subclass_id") @Column(name = "lc_subclass_id") private GoodsSubClass goodsSubClass; // 商品子类 @JoinColumn(name = "lc_createtime") @org.yeshi.utils.mybatis.Column(name = "lc_createtime") @Column(name = "lc_createtime") private Date createtime; // 创建时间 public Long getId() { return id; fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelGoods.java
@@ -1,17 +1,9 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.common.AdminUser; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -23,49 +15,28 @@ * * @date 2018年6月27日 */ @Entity @Table(name = "yeshi_ec_label_goods") @org.yeshi.utils.mybatis.Table("yeshi_ec_label_goods") public class LabelGoods implements Serializable{ /** * */ private static final long serialVersionUID = 1L; @Table("yeshi_ec_label_goods") public class LabelGoods { @Id @Column(name = "lg_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "lg_id") private Long id; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lg_label_id") @org.yeshi.utils.mybatis.Column(name = "lg_label_id") @Column(name = "lg_label_id") private Label label; // 标签id @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lg_goods_id") @org.yeshi.utils.mybatis.Column(name = "lg_goods_id") @Column(name = "lg_goods_id") private TaoBaoGoodsBrief taoBaoGoodsBrief;// 商品id @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "lg_create_aid") @org.yeshi.utils.mybatis.Column(name = "lg_create_aid") @Column(name = "lg_create_aid") private AdminUser createUser; // 创建人 @JoinColumn(name = "lg_weight") @org.yeshi.utils.mybatis.Column(name = "lg_weight") @Column(name = "lg_weight") private Double weight; // 分类id @JoinColumn(name = "lg_createtime") @org.yeshi.utils.mybatis.Column(name = "lg_createtime") @Column(name = "lg_createtime") private Date createtime; // 创建时间 @JoinColumn(name = "lg_updatetime") @org.yeshi.utils.mybatis.Column(name = "lg_updatetime") @Column(name = "lg_updatetime") private Date updatetime; // 更新时间 fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
@@ -1,17 +1,9 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.common.AdminUser; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -23,12 +15,8 @@ * * @date 2018年7月3日 */ @Entity @Table(name = "yeshi_ec_quality_factory") @org.yeshi.utils.mybatis.Table("yeshi_ec_quality_factory") public class QualityFactory implements Serializable{ private static final long serialVersionUID = 1L; @Table("yeshi_ec_quality_factory") public class QualityFactory { // 人工筛选入库 public final static int MODE_MANUAL = 1; @@ -53,60 +41,42 @@ public final static int SOURCE_OTHER = 5; @Id @Column(name = "sg_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "sg_id") private Long id; @JoinColumn(name = "sg_class_id") @org.yeshi.utils.mybatis.Column(name = "sg_class_id") @Column(name = "sg_class_id") private Long systemCid; // 商品类目id @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sg_goods_id") @org.yeshi.utils.mybatis.Column(name = "sg_goods_id") @Column(name = "sg_goods_id") private TaoBaoGoodsBrief taoBaoGoodsBrief;// 商品id @JoinColumn(name = "sg_entry_mode") @org.yeshi.utils.mybatis.Column(name = "sg_entry_mode") @Column(name = "sg_entry_mode") private Integer entryMode; // 录入方式 @JoinColumn(name = "sg_goods_source") @org.yeshi.utils.mybatis.Column(name = "sg_goods_source") @Column(name = "sg_goods_source") private Integer goodsSource; // 商品来源 @JoinColumn(name = "sg_source_calss") @org.yeshi.utils.mybatis.Column(name = "sg_source_calss") @Column(name = "sg_source_calss") private String sourceCalss; // 来源具体类目 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sg_rule_id") @org.yeshi.utils.mybatis.Column(name = "sg_rule_id") @Column(name = "sg_rule_id") private BoutiqueAutoRule boutiqueAutoRule; // 录入方式 @JoinColumn(name = "sg_weight") @org.yeshi.utils.mybatis.Column(name = "sg_weight") @Column(name = "sg_weight") private Integer weight; // 商品权重 -- 排序 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sg_create_aid") @org.yeshi.utils.mybatis.Column(name = "sg_create_aid") @Column(name = "sg_create_aid") private AdminUser createUser; // 创建人 @JoinColumn(name = "sg_createtime") @org.yeshi.utils.mybatis.Column(name = "sg_createtime") @Column(name = "sg_createtime") private Date createtime; // 创建时间 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sg_update_aid") @org.yeshi.utils.mybatis.Column(name = "sg_update_aid") @Column(name = "sg_update_aid") private AdminUser updateUser; // 修改人 @JoinColumn(name = "sg_updatetime") @org.yeshi.utils.mybatis.Column(name = "sg_updatetime") @Column(name = "sg_updatetime") private Date updatetime; // 更新时间 public Long getId() { fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java
@@ -1,17 +1,9 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; /** * 精选库:限时抢购 @@ -20,44 +12,29 @@ * * @date 2018年9月18日 */ @Entity @Table(name = "yeshi_ec_quality_flash_sale") @org.yeshi.utils.mybatis.Table("yeshi_ec_quality_flash_sale") public class QualityFlashSale implements Serializable{ @Table("yeshi_ec_quality_flash_sale") public class QualityFlashSale { /** * */ private static final long serialVersionUID = 1L; @Id @Column(name = "fs_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "fs_id") private Long id; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "fs_qfgoods_id") @org.yeshi.utils.mybatis.Column(name = "fs_qfgoods_id") @Column(name = "fs_qfgoods_id") private QualityFactory qualityFactory; // 精选id // 取消数据区分时间段:1(00:00) 2(09:00) 3(12:00) 4(14:00) 5(16:00) 6(20:00) 7(22:00) @JoinColumn(name = "fs_type") @org.yeshi.utils.mybatis.Column(name = "fs_type") @Column(name = "fs_type") private Integer type; // 暂停用 @JoinColumn(name = "fs_weight") @org.yeshi.utils.mybatis.Column(name = "fs_weight") @Column(name = "fs_weight") private Double weight; // 商品权重 -- 排序 @JoinColumn(name = "fs_createtime") @org.yeshi.utils.mybatis.Column(name = "fs_createtime") @Column(name = "fs_createtime") private Date createtime; // 创建时间 @JoinColumn(name = "fs_updatetime") @org.yeshi.utils.mybatis.Column(name = "fs_updatetime") @Column(name = "fs_updatetime") private Date updatetime; // 更新时间 public Long getId() { fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
@@ -36,8 +36,6 @@ @Resource private LabelMapper labelMapper; @Resource private LabelService labelService; @Resource private LabelGoodsMapper labelGoodsMapper; @@ -92,7 +90,7 @@ // 上传图片 if (file != null) { labelService.uploadPicture(file, label); uploadPicture(file, label); } @@ -140,7 +138,7 @@ Label label = labelMapper.selectByPrimaryKey(id); if (label != null) { // 删除图片 labelService.deleteImg(label); deleteImg(label); // 删除数据信息 labelMapper.deleteByPrimaryKey(id); @@ -215,7 +213,7 @@ for (String title : titles) { List<Label> labels = labelService.selectByTitle(title.trim()); List<Label> labels = selectByTitle(title.trim()); // 若已存在则不存入数据库 if (labels == null || labels.size() == 0) { Label label = new Label(); @@ -226,7 +224,7 @@ label.setUpdatetime(nowTime); label.setCreateUser(admin); labelService.insertSelective(label); insertSelective(label); } } @@ -266,7 +264,7 @@ label.setPicture(uploadFilePath); label.setUpdatetime(nowTime); result = labelService.updateByPrimaryKeySelective(label); result = updateByPrimaryKeySelective(label); } } @@ -295,7 +293,7 @@ label.setPicture(null); label.setUpdatetime(nowTime); // 更新数据库 result = labelService.updateByPrimaryKey(label); result = updateByPrimaryKey(label); } } @@ -366,7 +364,7 @@ for (String title : arrtitles) { /* 遍历标签名称:查询数据库中是否已存在 */ List<Label> labels = labelService.selectByTitle(title.trim()); List<Label> labels = selectByTitle(title.trim()); if (labels != null && labels.size() > 0) { Label label = labels.get(0); listLabs.add(label); @@ -380,7 +378,7 @@ label.setCreateUser(admin); label.setIosClick(0l); label.setAndroidClick(0l); labelService.insertSelective(label); insertSelective(label); listLabs.add(label); }