From 82fb355dafd28ad33e9e9459afee571f9fc0a910 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 25 Dec 2023 16:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxUserMember.java | 20 +- .../common/core/domain/entity/WxUserTag.java | 3 + .../core/domain/req/WxUserMemberReq.java | 191 ++++++++ .../common/core/domain/vo/WxUserMemberVo.java | 426 ++++++++++++++++++ .../resources/mapper/WxUserRemarkMapper.xml | 1 + .../controller/WxUserMemberController.java | 4 +- .../system/service/IWxUserMemberService.java | 6 +- .../service/impl/WxUserMemberServiceImpl.java | 84 +++- flossom-ui/src/api/system/member.js | 17 + flossom-ui/src/views/system/member/index.vue | 283 ++++++++---- 10 files changed, 919 insertions(+), 116 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java index 9e98086..3539560 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java @@ -78,7 +78,7 @@ public class WxUserMember extends BaseEntity { * 省id */ @Excel(name = "省id") - private String provinceId; + private Long provinceId; /** * 省 @@ -90,7 +90,7 @@ public class WxUserMember extends BaseEntity { * 市id */ @Excel(name = "市id") - private String cityId; + private Long cityId; /** * 市 @@ -102,7 +102,7 @@ public class WxUserMember extends BaseEntity { * 区id */ @Excel(name = "区id") - private String areaId; + private Long areaId; /** * 区 @@ -327,27 +327,27 @@ public class WxUserMember extends BaseEntity { return status; } - public String getProvinceId() { + public Long getProvinceId() { return provinceId; } - public void setProvinceId(String provinceId) { + public void setProvinceId(Long provinceId) { this.provinceId = provinceId; } - public String getCityId() { + public Long getCityId() { return cityId; } - public void setCityId(String cityId) { + public void setCityId(Long cityId) { this.cityId = cityId; } - public String getAreaId() { + public Long getAreaId() { return areaId; } - public void setAreaId(String areaId) { + public void setAreaId(Long areaId) { this.areaId = areaId; } @@ -370,7 +370,7 @@ public class WxUserMember extends BaseEntity { public WxUserMember() { } - public WxUserMember(Long id, String nickname, String headimg, String username, Integer credit, String openid, String unionid, Integer userType, Integer level, String mobile, String provinceId, String province, String cityId, String city, String areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, Integer isAbutment, Integer isCompleteInformation, Integer devicesNum, Date loginTime, Integer status) { + public WxUserMember(Long id, String nickname, String headimg, String username, Integer credit, String openid, String unionid, Integer userType, Integer level, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, Integer isAbutment, Integer isCompleteInformation, Integer devicesNum, Date loginTime, Integer status) { this.id = id; this.nickname = nickname; this.headimg = headimg; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserTag.java index 71f1ef8..f5c0142 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserTag.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserTag.java @@ -43,6 +43,9 @@ public class WxUserTag extends BaseEntity { */ private Long status; + public WxUserTag() { + } + public WxUserTag(Long id, Long userId, String tagName, Long tagId, Integer type, Long status) { this.id = id; this.userId = userId; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java new file mode 100644 index 0000000..e345890 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java @@ -0,0 +1,191 @@ +package com.flossom.common.core.domain.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 保存用户对象 + * + * @author flossom + * @date 2023-12-08 + */ +public class WxUserMemberReq { + + /** + * id + */ + private Long id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 手机 + */ + private String mobile; + + /** + * 省id + */ + private Long provinceId; + + /** + * 市id + */ + private Long cityId; + + /** + * 区id + */ + private Long areaId; + + /** + * 生日 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthday; + + /** + * 企微标签 + */ + List wecomTags; + + /** + * 小程序标签 + */ + List miniProgramTags; + + /** + * 打卡：1可以2不可以 + */ + private Integer clock; + + /** + * 活动：1可以2不可以 + */ + private Integer activity; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + public WxUserMemberReq() { + } + + public WxUserMemberReq(Long id, String nickname, String mobile, Long provinceId, Long cityId, Long areaId, Date birthday, List wecomTags, List miniProgramTags, Integer clock, Integer activity, Date updateTime) { + this.id = id; + this.nickname = nickname; + this.mobile = mobile; + this.provinceId = provinceId; + this.cityId = cityId; + this.areaId = areaId; + this.birthday = birthday; + this.wecomTags = wecomTags; + this.miniProgramTags = miniProgramTags; + this.clock = clock; + this.activity = activity; + this.updateTime = updateTime; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public Long getProvinceId() { + return provinceId; + } + + public void setProvinceId(Long provinceId) { + this.provinceId = provinceId; + } + + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + + public Date getBirthday() { + return birthday; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + + public List getWecomTags() { + return wecomTags; + } + + public void setWecomTags(List wecomTags) { + this.wecomTags = wecomTags; + } + + public List getMiniProgramTags() { + return miniProgramTags; + } + + public void setMiniProgramTags(List miniProgramTags) { + this.miniProgramTags = miniProgramTags; + } + + public Integer getClock() { + return clock; + } + + public void setClock(Integer clock) { + this.clock = clock; + } + + public Integer getActivity() { + return activity; + } + + public void setActivity(Integer activity) { + this.activity = activity; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java new file mode 100644 index 0000000..d3ced05 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java @@ -0,0 +1,426 @@ +package com.flossom.common.core.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.domain.entity.WxUserRemark; + +import java.util.Date; +import java.util.List; + +/** + * 用户对象 wx_user_member + * + * @author flossom + * @date 2023-12-08 + */ +public class WxUserMemberVo { + + /** + * id + */ + private Long id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 头像 + */ + private String headimg; + + /** + * 姓名 + */ + private String username; + + /** + * 积分 + */ + private Integer credit; + + /** + * openid + */ + private String openid; + + /** + * unionid + */ + private String unionid; + + /** + * 用户类型：0游客 1会员 + */ + private Integer userType; + + /** + * 会员等级：0 不是会员，1以上为会员 + */ + private Integer level; + + /** + * 手机 + */ + private String mobile; + + /** + * 省id + */ + private Long provinceId; + + /** + * 省 + */ + private String province; + + /** + * 市id + */ + private Long cityId; + + /** + * 市 + */ + private String city; + + /** + * 区id + */ + private Long areaId; + + /** + * 区 + */ + private String area; + + /** + * 生日 + */ + private Date birthday; + + /** + * 打卡：1可以2不可以 + */ + private Integer clock; + + /** + * 活动：1可以2不可以 + */ + private Integer activity; + + /** + * 微信号 + */ + private String wechat; + + + /** + * 1 未对接到中控 2已经对接 3对接失败 + */ + private Integer isAbutment; + + + /** + * 是否完善信息： ：0 未完善 1完善 + */ + private Integer isCompleteInformation; + + /** + * 绑定的仪器数量 + */ + private Integer devicesNum; + + /** + * 登陆时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date loginTime; + + /** + * 状态（0正常 1停用） + */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private Integer status; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 小程序标签 + */ + private List miniProgramTags; + + private List wxUserRemarkList; + + /** + * 企微标签 + */ + private List wecomTags; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getNickname() { + return nickname; + } + + public void setHeadimg(String headimg) { + this.headimg = headimg; + } + + public String getHeadimg() { + return headimg; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getUsername() { + return username; + } + + public void setCredit(Integer credit) { + this.credit = credit; + } + + public Integer getCredit() { + return credit; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public String getOpenid() { + return openid; + } + + public void setUnionid(String unionid) { + this.unionid = unionid; + } + + public String getUnionid() { + return unionid; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + + public Integer getUserType() { + return userType; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public Integer getLevel() { + return level; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getMobile() { + return mobile; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getProvince() { + return province; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCity() { + return city; + } + + public void setArea(String area) { + this.area = area; + } + + public String getArea() { + return area; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + + public Date getBirthday() { + return birthday; + } + + public void setClock(Integer clock) { + this.clock = clock; + } + + public Integer getClock() { + return clock; + } + + public void setActivity(Integer activity) { + this.activity = activity; + } + + public Integer getActivity() { + return activity; + } + + public void setWechat(String wechat) { + this.wechat = wechat; + } + + public String getWechat() { + return wechat; + } + + + public void setIsAbutment(Integer isAbutment) { + this.isAbutment = isAbutment; + } + + public Integer getIsAbutment() { + return isAbutment; + } + + public void setLoginTime(Date loginTime) { + this.loginTime = loginTime; + } + + public Date getLoginTime() { + return loginTime; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getStatus() { + return status; + } + + public Long getProvinceId() { + return provinceId; + } + + public void setProvinceId(Long provinceId) { + this.provinceId = provinceId; + } + + public Long getCityId() { + return cityId; + } + + public void setCityId(Long cityId) { + this.cityId = cityId; + } + + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + + public Integer getIsCompleteInformation() { + return isCompleteInformation; + } + + public void setIsCompleteInformation(Integer isCompleteInformation) { + this.isCompleteInformation = isCompleteInformation; + } + + public Integer getDevicesNum() { + return devicesNum; + } + + public void setDevicesNum(Integer devicesNum) { + this.devicesNum = devicesNum; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public List getMiniProgramTags() { + return miniProgramTags; + } + + public void setMiniProgramTags(List miniProgramTags) { + this.miniProgramTags = miniProgramTags; + } + + public List getWecomTags() { + return wecomTags; + } + + public void setWecomTags(List wecomTags) { + this.wecomTags = wecomTags; + } + + public List getWxUserRemarkList() { + return wxUserRemarkList; + } + + public void setWxUserRemarkList(List wxUserRemarkList) { + this.wxUserRemarkList = wxUserRemarkList; + } + + public WxUserMemberVo() { + } + + public WxUserMemberVo(Long id, String nickname, String headimg, String username, Integer credit, String openid, String unionid, Integer userType, Integer level, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, Integer isAbutment, Integer isCompleteInformation, Integer devicesNum, Date loginTime, Integer status) { + this.id = id; + this.nickname = nickname; + this.headimg = headimg; + this.username = username; + this.credit = credit; + this.openid = openid; + this.unionid = unionid; + this.userType = userType; + this.level = level; + this.mobile = mobile; + this.provinceId = provinceId; + this.province = province; + this.cityId = cityId; + this.city = city; + this.areaId = areaId; + this.area = area; + this.birthday = birthday; + this.clock = clock; + this.activity = activity; + this.wechat = wechat; + this.isAbutment = isAbutment; + this.isCompleteInformation = isCompleteInformation; + this.devicesNum = devicesNum; + this.loginTime = loginTime; + this.status = status; + } +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserRemarkMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserRemarkMapper.xml index 16f4728..5691839 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserRemarkMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserRemarkMapper.xml @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and content = #{content} and status = #{status} + order by create_time desc