From ac2a9aa597a48058659cbadff3d0fc4e617421e2 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 19 Aug 2018 21:20:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BC=9A=E5=91=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 40 ++- .../simple/domain/dto/WxCuerBasicInfoDto.java | 80 +++++ .../simple/domain/po/WxCUserBasicInfo.java | 30 +- .../java/com/simple/domain/po/WxTags.java | 322 +++++++++--------- .../simple/mapper/WxCUserBasicInfoMapper.java | 4 +- .../service/WxCUserBasicInfoService.java | 4 +- .../impl/WxCUserBasicInfoServiceImpl.java | 10 + .../mapper/WxCUserBasicInfoMapper.xml | 32 +- 8 files changed, 329 insertions(+), 193 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index a4f4381e2..7f6465d2b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -18,10 +18,13 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.dto.WxCuerBasicInfoDto; +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxCUserTags; import com.simple.domain.po.WxTags; import com.simple.service.WxCUserBasicInfoService; +import com.simple.service.WxCUserService; import com.simple.service.WxCUserTagsService; import com.simple.service.WxTagsService; @@ -43,6 +46,9 @@ public class WxCUserBasicInfoController extends BaseController @Autowired private WxTagsService wxTagsService; + + @Autowired + private WxCUserService wxCUserService; private Logger logger = Logger.getLogger(WxCUserBasicInfoController.class); @@ -51,12 +57,36 @@ public class WxCUserBasicInfoController extends BaseController @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo,Integer pageNum, Integer pageSize) { - if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfo(); - wxCUserBasicInfo.setTenantId(getTenantId()); - final PageInfo page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); + public ResultData list(@ModelAttribute WxCuerBasicInfoDto wxCUserBasicInfo,Integer pageNum, Integer pageSize) { + if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCuerBasicInfoDto(); + String tenantId = getTenantId(); + wxCUserBasicInfo.setTenantId(tenantId); + PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); + if(page.getSize()==0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) + && wxCUserBasicInfo.getEndTime()==null && wxCUserBasicInfo.getStartTime()==null + && StringUtils.isBlank(wxCUserBasicInfo.getName()) + ) {//当只有手机号查询并且查不到数据 ,新增 + WxCUser cUser = new WxCUser(); + cUser.setTenantId(tenantId); + cUser.setPhone(wxCUserBasicInfo.getPhone()); + PageInfo cUsers = wxCUserService.listAsPage(cUser, 1, 1); + if(cUsers.getSize()>0) { + createUserBasicInfo(cUsers.getList().get(0)); + page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); + } + } return new ResultData(page); } + + + private void createUserBasicInfo(WxCUser wxCUser) { + WxCUserBasicInfo wxCUserBasicInfo =new WxCUserBasicInfo(); + wxCUserBasicInfo.setCUserId(wxCUser.getId()); + wxCUserBasicInfo.setPhone(wxCUser.getPhone()); + wxCUserBasicInfo.setTenantId(wxCUser.getTenantId()); + wxCUserBasicInfoService.saveOrUpdate(wxCUserBasicInfo); + + } // @ApiOperation("新增接口") // @PostMapping("add") @@ -73,7 +103,7 @@ public class WxCUserBasicInfoController extends BaseController wxCUserBasicInfo.setTenantId(getTenantId()); if(StringUtils.isNotBlank(wxCUserBasicInfo.getTags())) { WxCUserTags record =new WxCUserTags(); - record.setUserId(wxCUserBasicInfo.getcUserId()); + record.setUserId(wxCUserBasicInfo.getCUserId()); record.setTenantId(getTenantId()); PageInfo page = wxCUserTagsService.listAsPage(record, 1, 1); if(page.getSize()>0) { diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java new file mode 100644 index 000000000..3641cd25c --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java @@ -0,0 +1,80 @@ +package com.simple.domain.dto; + +import java.io.Serializable; +import java.util.Date; + +import javax.persistence.Transient; +/** + * 用户查询dto + * @author jinguo + * + */ +public class WxCuerBasicInfoDto implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = -1116465873573690766L; + + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startTime") + private Date startTime; + + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") + private Date endTime; + + @io.swagger.annotations.ApiModelProperty(value="手机号",name="phone") + private String phone; + + @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") + private String name; + + /*租户id**/ +// @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + @Transient + private String tenantId; + + + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java index febd9ba01..c3f5886cb 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -78,17 +78,16 @@ public class WxCUserBasicInfo implements Serializable { /*租户id**/ @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - /*商户id**/ - @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value="标签-传json",name="tags") + /*用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") + private String name; @Transient - private String tags ; - + private String tags; @Transient private List tagList; + public List getTagList() { return tagList; } @@ -97,14 +96,6 @@ public class WxCUserBasicInfo implements Serializable { this.tagList = tagList; } - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - public String getTags() { return tags; } @@ -185,11 +176,12 @@ public class WxCUserBasicInfo implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Long getMerchantId() { - return merchantId; + + public String getName() { + return name; } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; + public void setName(String _name) { + name = _name; } @@ -209,7 +201,7 @@ public class WxCUserBasicInfo implements Serializable { ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java index 0d2129d38..efd52dfc6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java @@ -1,161 +1,161 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_tags") -public class WxTags 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; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*名称**/ - @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="二级属性 性别等",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; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getType1() { - return type1; - } - public void setType1(String _type1) { - type1 = _type1; - } - public String getType2() { - return type2; - } - public void setType2(String _type2) { - type2 = _type2; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` 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(WxTags.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()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.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)); - } - } -} +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; + +@Table(name = "wx_tags") +public class WxTags 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; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*名称**/ + @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="二级属性 性别等",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; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public String getName() { + return name; + } + public void setName(String _name) { + name = _name; + } + public String getType1() { + return type1; + } + public void setType1(String _type1) { + type1 = _type1; + } + public String getType2() { + return type2; + } + public void setType2(String _type2) { + type2 = _type2; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` 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(WxTags.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()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.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/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 52df60d41..58022d24d 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -3,6 +3,8 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; import org.apache.ibatis.annotations.Param; + +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; public interface WxCUserBasicInfoMapper extends CommonMapper { @@ -11,7 +13,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper list(WxCuerBasicInfoDto record); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java index 63e1d79aa..3470f8799 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java @@ -1,7 +1,7 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; public interface WxCUserBasicInfoService { @@ -40,7 +40,7 @@ public interface WxCUserBasicInfoService { - + PageInfo list(WxCuerBasicInfoDto record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index aad9d9abc..de5fe9a9d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; import com.simple.mapper.WxCUserBasicInfoMapper; import com.simple.service.WxCUserBasicInfoService; @@ -21,8 +22,17 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(record)); } + + @Override + public PageInfo list(WxCuerBasicInfoDto record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.list(record)); + } + + + + @Override public WxCUserBasicInfo getById(Long id) { return wxCUserBasicInfoMapper.selectByPrimaryKey(id); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 41c7e25bd..37fdac803 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -15,11 +15,11 @@ - + - `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`,`create_date`,`update_date`,`tenant_id`,`merchant_id` + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`,`create_date`,`update_date`,`tenant_id`,`name` @@ -90,8 +90,9 @@ - - and `merchant_id` = #{merchantId} + + + and `name` like concat('%', #{name},'%') @@ -109,7 +110,28 @@ - +