From a846531e9125df92e446eceda07f3934e466ba2e Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 9 Oct 2018 23:17:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E4=B8=89=E5=B1=82=E6=A0=87=E7=AD=BE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxTagsController.java | 107 ++++++++------ .../java/com/iformall/domain/po/WxTags.java | 77 +++++----- .../com/iformall/domain/po/WxTagsGroup.java | 113 ++++++++++++++ .../com/iformall/domain/po/WxTagsType.java | 138 ++++++++++++++++++ .../com/iformall/domain/vo/WxTagsGroupVo.java | 22 +++ .../com/iformall/domain/vo/WxTagsTypeVo.java | 21 +++ .../java/com/iformall/domain/vo/WxTagsVo.java | 43 ------ .../iformall/mapper/WxTagsGroupMapper.java | 12 ++ .../com/iformall/mapper/WxTagsMapper.java | 5 - .../com/iformall/mapper/WxTagsTypeMapper.java | 12 ++ .../iformall/service/WxTagsGroupService.java | 44 ++++++ .../com/iformall/service/WxTagsService.java | 17 +-- .../iformall/service/WxTagsTypeService.java | 43 ++++++ .../service/impl/WxTagsGroupServiceImpl.java | 55 +++++++ .../service/impl/WxTagsServiceImpl.java | 22 +-- .../service/impl/WxTagsTypeServiceImpl.java | 55 +++++++ .../resources/mapper/WxTagsGroupMapper.xml | 41 ++++++ .../main/resources/mapper/WxTagsMapper.xml | 39 ++--- .../resources/mapper/WxTagsTypeMapper.xml | 51 +++++++ 19 files changed, 730 insertions(+), 187 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java delete mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxTagsVo.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxTagsGroupMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxTagsTypeMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxTagsGroupService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxTagsTypeService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/WxTagsGroupMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java index 09bd843fd..cc9689d17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java @@ -4,6 +4,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.iformall.domain.po.WxTagsGroup; +import com.iformall.domain.po.WxTagsType; +import com.iformall.domain.vo.WxTagsGroupVo; +import com.iformall.domain.vo.WxTagsTypeVo; +import com.iformall.service.WxTagsGroupService; +import com.iformall.service.WxTagsTypeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +21,6 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxTags; -import com.iformall.domain.vo.WxTagsVo; import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxTagsService; @@ -30,64 +35,78 @@ public class WxTagsController extends BaseController { @Autowired private WxTagsService wxTagsService; - + + @Autowired + private WxTagsGroupService wxTagsGroupService; + + @Autowired + private WxTagsTypeService wxTagsTypeService; + @Autowired private WxCUserTagsService wxCUserTagsService; @GetMapping("getAllList") @ApiOperation("标签弹窗接口") public ResultData getAllList() { - List type1List = new ArrayList<>(); - List tags = wxTagsService.findType1Value(); - for(WxTags t:tags) { - WxTagsVo vo =new WxTagsVo(); - vo.setValue(t.getType1()); - List type2List =new ArrayList<>(); - List type2s = wxTagsService.findType2Value(t.getType1()); - for(WxTags wt:type2s) { - WxTagsVo v = new WxTagsVo(); - v.setValue(wt.getType2()); - List list = new ArrayList<>(); - WxTags tag = new WxTags(); - tag.setType2(wt.getType2()); - PageInfo page = wxTagsService.listAsPage(tag, 1, 1000); - for(WxTags wxT : page.getList()) { - WxTagsVo wxVo = new WxTagsVo(); - wxVo.setId(wxT.getId()); - wxVo.setValue(wxT.getName()); - list.add(wxVo); - } - v.setSubTags(list); - type2List.add(v); - vo.setSubTags(type2List); + List groupVos = new ArrayList<>(); + List groups = wxTagsGroupService.findList(null); + for(WxTagsGroup tg:groups) { + WxTagsGroupVo tgvo =new WxTagsGroupVo(); + tgvo.setId(tg.getId()); + tgvo.setName(tg.getName()); + + WxTagsType type = new WxTagsType(); + type.setGroupId(tg.getId()); + List typeVos =new ArrayList<>(); + List types = wxTagsTypeService.findList(type); + for(WxTagsType tt:types) { + WxTagsTypeVo ttvo = new WxTagsTypeVo(); + ttvo.setId(tt.getId()); + ttvo.setName(tt.getName()); + ttvo.setGroupId(tg.getId()); + ttvo.setGroupName(tg.getName()); + + WxTags t = new WxTags(); + t.setTypeId(tt.getId()); + ttvo.setTags(wxTagsService.findList(t)); + typeVos.add(ttvo); } - type1List.add(vo); + tgvo.setTypes(typeVos); + groupVos.add(tgvo); } - return new ResultData(Result.SUCCESS,"查询成功",type1List); + return new ResultData(groupVos); } @GetMapping("getPeopleTagList") @ApiOperation("用户人群tag接口") public ResultData getPeopleTagList() { - List type2List =new ArrayList<>(); - List type2s = wxTagsService.findType2Value(null); - for(WxTags wt:type2s) { - WxTagsVo v = new WxTagsVo(); - v.setValue(wt.getType2()); - List list = new ArrayList<>(); - WxTags tag = new WxTags(); - tag.setType2(wt.getType2()); - PageInfo page = wxTagsService.listAsPage(tag, 1, 1000); - for(WxTags wxT : page.getList()) { - WxTagsVo wxVo = new WxTagsVo(); - wxVo.setValue(wxT.getName()); - wxVo.setId(wxT.getId()); - list.add(wxVo); + List groupVos = new ArrayList<>(); + List groups = wxTagsGroupService.findList(null); + for(WxTagsGroup tg:groups) { + WxTagsGroupVo tgvo =new WxTagsGroupVo(); + tgvo.setId(tg.getId()); + tgvo.setName(tg.getName()); + + WxTagsType type = new WxTagsType(); + type.setGroupId(tg.getId()); + List typeVos =new ArrayList<>(); + List types = wxTagsTypeService.findList(type); + for(WxTagsType tt:types) { + WxTagsTypeVo ttvo = new WxTagsTypeVo(); + ttvo.setId(tt.getId()); + ttvo.setName(tt.getName()); + ttvo.setGroupId(tg.getId()); + ttvo.setGroupName(tg.getName()); + + WxTags t = new WxTags(); + t.setTypeId(tt.getId()); + ttvo.setTags(wxTagsService.findList(t)); + typeVos.add(ttvo); } - v.setSubTags(list); - type2List.add(v); + tgvo.setTypes(typeVos); + groupVos.add(tgvo); } - return new ResultData(Result.SUCCESS,"查询成功",type2List); + return new ResultData(groupVos); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java index 7ebb17c8f..4ec2209fe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTags.java @@ -22,80 +22,85 @@ public class WxTags implements Serializable { public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public String getSortColumns() { return sortColumns; } - public List getIds() { return ids; } public void setIds(List ids) { this.ids = ids; } - - + /**名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; /**1基础2生活属性3消费偏好4行为偏好**/ - @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="type1") - private String type1; + @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") + private Long groupId; + /**二级属性 性别等**/ + @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeId") + private Long typeId; + /**1基础2生活属性3消费偏好4行为偏好**/ + @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") + private String groupName; /**二级属性 性别等**/ - @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="type2") - private String type2; - /**创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; - /**更新时间**/ - @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") - private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeName") + private String typeName; + public String getName() { return name; } public void setName(String _name) { name = _name; } - public String getType1() { - return type1; + + public Long getGroupId() { + return groupId; } - public void setType1(String _type1) { - type1 = _type1; + + public void setGroupId(Long groupId) { + this.groupId = groupId; } - public String getType2() { - return type2; + + public Long getTypeId() { + return typeId; } - public void setType2(String _type2) { - type2 = _type2; + + public void setTypeId(Long typeId) { + this.typeId = typeId; } - public Date getCreateDate() { - return createDate; + + public String getGroupName() { + return groupName; } - public void setCreateDate(Date _createDate) { - createDate = _createDate; + + public void setGroupName(String groupName) { + this.groupName = groupName; } - public Date getUpdateDate() { - return updateDate; + + public String getTypeName() { + return typeName; } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; + + public void setTypeName(String typeName) { + this.typeName = typeName; } - public static enum Field + public enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Type1_ASC("`type1` ASC"),Type1_DESC("`type1` DESC") - ,Type2_ASC("`type2` ASC"),Type2_DESC("`type2` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,GroupId_ASC("`group_id` ASC"),GroupId_DESC("`group_id` DESC") + ,GroupName_ASC("`group_name` ASC"),GroupName_DESC("`group_name` DESC") + ,TypeId_ASC("`type_id` ASC"),TypeId_DESC("`type_id` DESC") + ,TypeName_ASC("`type_name` ASC"),TypeName_DESC("`type_name` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java new file mode 100644 index 000000000..d905a6b69 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsGroup.java @@ -0,0 +1,113 @@ +package com.iformall.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_tags_group") +public class WxTagsGroup implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + /**名称**/ + + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + private String name; + + + public enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxTagsGroup.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + this.sortColumns = sb.toString(); + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java new file mode 100644 index 000000000..bd5247b15 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java @@ -0,0 +1,138 @@ +package com.iformall.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Table(name = "wx_tags_type") +public class WxTagsType implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + /**名称**/ + @io.swagger.annotations.ApiModelProperty(value="名称",name="name") + private String name; + /**1基础2生活属性3消费偏好4行为偏好**/ + @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") + private Long groupId; + + + /**1基础2生活属性3消费偏好4行为偏好**/ + @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") + private String groupName; + + public Long getGroupId() { + return groupId; + } + + public void setGroupId(Long groupId) { + this.groupId = groupId; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,GroupId_ASC("`group_id` ASC"),GroupId_DESC("`group_id` DESC") + ,GroupName_ASC("`group_name` ASC"),GroupName_DESC("`group_name` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxTagsType.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + this.sortColumns = sb.toString(); + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java new file mode 100644 index 000000000..2a8610513 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java @@ -0,0 +1,22 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxTagsGroup; + +import java.io.Serializable; +import java.util.List; + +public class WxTagsGroupVo extends WxTagsGroup implements Serializable{ + + private static final long serialVersionUID = 1786459967532225067L; + + private List types; + + public List getTypes() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java new file mode 100644 index 000000000..86505d201 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java @@ -0,0 +1,21 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxTags; +import com.iformall.domain.po.WxTagsType; + +import java.io.Serializable; +import java.util.List; + +public class WxTagsTypeVo extends WxTagsType implements Serializable{ + + private List tags; + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsVo.java deleted file mode 100644 index b0605b729..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.iformall.domain.vo; - -import java.io.Serializable; -import java.util.List; - -public class WxTagsVo implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = 1786459967532225067L; - private Long id; - - private String value; - - private List subTags; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public List getSubTags() { - return subTags; - } - - public void setSubTags(List subTags) { - this.subTags = subTags; - } - - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsGroupMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsGroupMapper.java new file mode 100644 index 000000000..5acd027d1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsGroupMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxTagsGroup; + +import java.util.List; + +public interface WxTagsGroupMapper extends CommonMapper { + + List findList(WxTagsGroup wxTagsGroup); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java index 0722db80a..6528078f4 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java @@ -8,10 +8,5 @@ import com.iformall.domain.po.WxTags; public interface WxTagsMapper extends CommonMapper { List findList(WxTags wxTags); - - List findType1Value(); - - List findType2Value(String type1); - WxTags getByName(String name); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsTypeMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsTypeMapper.java new file mode 100644 index 000000000..fe51e3ccf --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsTypeMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxTagsType; + +import java.util.List; + +public interface WxTagsTypeMapper extends CommonMapper { + + List findList(WxTagsType wxTagsType); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxTagsGroupService.java b/mallinkService/src/main/java/com/iformall/service/WxTagsGroupService.java new file mode 100644 index 000000000..4220a7363 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxTagsGroupService.java @@ -0,0 +1,44 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxTagsGroup; + +import java.util.List; + +public interface WxTagsGroupService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxTagsGroup record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxTagsGroup getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxTagsGroup record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + List findList(WxTagsGroup wxTagsGroup); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxTagsService.java index 0737b1925..1e7d14c2b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxTagsService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxTagsService.java @@ -37,22 +37,7 @@ public interface WxTagsService { * @param id */ void deleteById(Long id); - - /** - * 查询第一个属性 - * @return - */ - List findType1Value(); - - /** - * 根据第一个属性获取第二个属性 - * @param type1 - * @return - */ - List findType2Value(String type1); - - - + List findList(WxTags wxTags); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxTagsTypeService.java b/mallinkService/src/main/java/com/iformall/service/WxTagsTypeService.java new file mode 100644 index 000000000..b510a1e2a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxTagsTypeService.java @@ -0,0 +1,43 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxTagsType; + +import java.util.List; + +public interface WxTagsTypeService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxTagsType record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxTagsType getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxTagsType record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + List findList(WxTagsType wxTagsType); +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java new file mode 100644 index 000000000..3d9cd61e3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsGroupServiceImpl.java @@ -0,0 +1,55 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.WxTagsGroup; +import com.iformall.mapper.WxTagsGroupMapper; +import com.iformall.service.WxTagsGroupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WxTagsGroupServiceImpl implements WxTagsGroupService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxTagsGroupMapper wxTagsGroupMapper; + + @Override + public PageInfo listAsPage(WxTagsGroup record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxTagsGroupMapper.findList(record)); + } + + @Override + public WxTagsGroup getById(Long id) { + return wxTagsGroupMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxTagsGroup record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + wxTagsGroupMapper.insertSelective(record); + } else { + wxTagsGroupMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxTagsGroupMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(WxTagsGroup wxTagsGroup) { + return wxTagsGroupMapper.findList(wxTagsGroup); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java index 4f5d04cd9..68b3189a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java @@ -47,22 +47,8 @@ public class WxTagsServiceImpl implements WxTagsService { wxTagsMapper.deleteByPrimaryKey(id); } - @Override - public List findType1Value() { - return wxTagsMapper.findType1Value(); - } - - @Override - public List findType2Value(String type1) { - - return wxTagsMapper.findType2Value(type1); - } - - - - - - - - + @Override + public List findList(WxTags wxTags) { + return wxTagsMapper.findList(wxTags); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java new file mode 100644 index 000000000..586b67ad4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsTypeServiceImpl.java @@ -0,0 +1,55 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.WxTagsType; +import com.iformall.mapper.WxTagsTypeMapper; +import com.iformall.service.WxTagsTypeService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WxTagsTypeServiceImpl implements WxTagsTypeService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxTagsTypeMapper wxTagsTypeMapper; + + + @Override + public PageInfo listAsPage(WxTagsType record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxTagsTypeMapper.findList(record)); + } + + @Override + public WxTagsType getById(Long id) { + return wxTagsTypeMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxTagsType record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + wxTagsTypeMapper.insertSelective(record); + } else { + wxTagsTypeMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxTagsTypeMapper.deleteByPrimaryKey(id); + } + @Override + public List findList(WxTagsType wxTagsType) { + return wxTagsTypeMapper.findList(wxTagsType); + } + +} diff --git a/mallinkService/src/main/resources/mapper/WxTagsGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsGroupMapper.xml new file mode 100644 index 000000000..d22eb68b0 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxTagsGroupMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + `id`,`name` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `name` = #{name} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index 483c1d246..a920fdc2a 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -4,14 +4,14 @@ - - - - + + + + - `id`,`name`,`type1`,`type2`,`create_date`,`update_date` + `id`,`name`,`group_id`,`group_name`,`type_id`,`type_name` @@ -25,21 +25,22 @@ and `name` = #{name} - - and `type1` = #{type1} + + and `group_id` = #{groupId} - - and `type2` = #{type2} + + and `group_name` = #{groupName} - - and `create_date` = #{createDate} + + and `type_id` = #{typeId} - - and `update_date` = #{updateDate} + + and `type_name` = #{typeName} + and id in @@ -56,17 +57,6 @@ - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml new file mode 100644 index 000000000..0760afa58 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + `id`,`name`,`group_id`,`group_name` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `name` = #{name} + + + + and `group_id` = #{groupId} + + + + and `group_name` = #{groupName} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + +