From 197289444b5b2816c9fec42952051f137c5f73e6 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 15 Dec 2023 10:03:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxUserMember.java | 132 ++------ .../core/domain/req/WxUserMemberVm.java | 203 +++++++++++ .../core/mapper/WxUserMemberMapper.java | 3 + .../resources/mapper/WxUserMemberMapper.xml | 53 +-- .../controller/WxUserMemberController.java | 26 +- .../system/service/IWxUserMemberService.java | 9 + .../service/impl/WxUserMemberServiceImpl.java | 13 + flossom-ui/src/views/system/member/index.vue | 320 ++++++------------ 8 files changed, 404 insertions(+), 355 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.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 2a685fc..f4d6776 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 @@ -52,7 +52,7 @@ public class WxUserMember extends BaseEntity { private String openid; /** - * $column.columnComment + * unionid */ @Excel(name = "unionid") private String unionid; @@ -75,18 +75,6 @@ public class WxUserMember extends BaseEntity { @Excel(name = "手机") private String mobile; - /** - * 密码 - */ - @Excel(name = "密码") - private String password; - - /** - * 个人二维码 - */ - @Excel(name = "个人二维码") - private String userQr; - /** * 省id */ @@ -131,13 +119,13 @@ public class WxUserMember extends BaseEntity { private Date birthday; /** - * 1可以2不可以 + * 打卡：1可以2不可以 */ @Excel(name = "1可以2不可以") private Integer clock; /** - * 1可以2不可以 + * 活动：1可以2不可以 */ @Excel(name = "1可以2不可以") private Integer activity; @@ -148,11 +136,6 @@ public class WxUserMember extends BaseEntity { @Excel(name = "微信号") private String wechat; - /** - * 应该是邀请码来的 - */ - @Excel(name = "应该是邀请码来的") - private String code; /** * 1 未对接到中控 2已经对接 3对接失败 @@ -160,17 +143,16 @@ public class WxUserMember extends BaseEntity { @Excel(name = "1 未对接到中控 2已经对接 3对接失败") private Integer isAbutment; + /** - * $column.columnComment + * 是否完善信息： ：0 未完善 1完善 */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal collagenDay; + private Integer isCompleteInformation; /** - * $column.columnComment + * 绑定的仪器数量 */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal collagenMount; + private Integer devicesNum; /** * 登陆时间 @@ -265,22 +247,6 @@ public class WxUserMember extends BaseEntity { return mobile; } - public void setPassword(String password) { - this.password = password; - } - - public String getPassword() { - return password; - } - - public void setUserQr(String userQr) { - this.userQr = userQr; - } - - public String getUserQr() { - return userQr; - } - public void setProvince(String province) { this.province = province; } @@ -337,13 +303,6 @@ public class WxUserMember extends BaseEntity { return wechat; } - public void setCode(String code) { - this.code = code; - } - - public String getCode() { - return code; - } public void setIsAbutment(Integer isAbutment) { this.isAbutment = isAbutment; @@ -353,22 +312,6 @@ public class WxUserMember extends BaseEntity { return isAbutment; } - public void setCollagenDay(BigDecimal collagenDay) { - this.collagenDay = collagenDay; - } - - public BigDecimal getCollagenDay() { - return collagenDay; - } - - public void setCollagenMount(BigDecimal collagenMount) { - this.collagenMount = collagenMount; - } - - public BigDecimal getCollagenMount() { - return collagenMount; - } - public void setLoginTime(Date loginTime) { this.loginTime = loginTime; } @@ -409,10 +352,26 @@ public class WxUserMember extends BaseEntity { 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 WxUserMember() { } - public WxUserMember(Long id, String nickname, String headimg, String username, BigDecimal credit, String openid, String unionid, Integer userType, Integer level, String mobile, String password, String userQr, String provinceId, String province, String cityId, String city, String areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, String code, Integer isAbutment, BigDecimal collagenDay, BigDecimal collagenMount, Date loginTime, Integer status) { + public WxUserMember(Long id, String nickname, String headimg, String username, BigDecimal 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) { this.id = id; this.nickname = nickname; this.headimg = headimg; @@ -423,8 +382,6 @@ public class WxUserMember extends BaseEntity { this.userType = userType; this.level = level; this.mobile = mobile; - this.password = password; - this.userQr = userQr; this.provinceId = provinceId; this.province = province; this.cityId = cityId; @@ -435,45 +392,10 @@ public class WxUserMember extends BaseEntity { this.clock = clock; this.activity = activity; this.wechat = wechat; - this.code = code; this.isAbutment = isAbutment; - this.collagenDay = collagenDay; - this.collagenMount = collagenMount; + this.isCompleteInformation = isCompleteInformation; + this.devicesNum = devicesNum; this.loginTime = loginTime; this.status = status; } - - @Override - public String toString() { - return "WxUserMember{" + - "id=" + id + - ", nickname='" + nickname + '\'' + - ", headimg='" + headimg + '\'' + - ", username='" + username + '\'' + - ", credit=" + credit + - ", openid='" + openid + '\'' + - ", unionid='" + unionid + '\'' + - ", userType=" + userType + - ", level=" + level + - ", mobile='" + mobile + '\'' + - ", password='" + password + '\'' + - ", userQr='" + userQr + '\'' + - ", provinceId='" + provinceId + '\'' + - ", province='" + province + '\'' + - ", cityId='" + cityId + '\'' + - ", city='" + city + '\'' + - ", areaId='" + areaId + '\'' + - ", area='" + area + '\'' + - ", birthday=" + birthday + - ", clock=" + clock + - ", activity=" + activity + - ", wechat='" + wechat + '\'' + - ", code='" + code + '\'' + - ", isAbutment=" + isAbutment + - ", collagenDay=" + collagenDay + - ", collagenMount=" + collagenMount + - ", loginTime=" + loginTime + - ", status=" + status + - '}'; - } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java new file mode 100644 index 0000000..5f59a09 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java @@ -0,0 +1,203 @@ +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.math.BigDecimal; +import java.util.Date; + +/** + * 微信用户查询对象 + * + * @author flossom + * @date 2023-12-08 + */ +public class WxUserMemberVm { + + /** + * 用户编码 + */ + private Long id; + + /** + * 会员昵称 + */ + @Excel(name = "会员昵称") + private String nickname; + + + /** + * 积分起始 + */ + @Excel(name = "积分") + private Integer creditStart; + + /** + * 积分结束 + */ + private Integer creditEnd; + + /** + * 用户类型：0游客 1会员 + */ + @Excel(name = "用户类型：0游客 1会员") + private Integer userType; + + + /** + * 手机（多个手机号码，‘，’逗号隔开，号码数不足时，模糊匹配） + */ + @Excel(name = "手机") + private String mobile; + + /** + * 省id + */ + @Excel(name = "省id") + private String provinceId; + + + /** + * 市id + */ + @Excel(name = "市id") + private String cityId; + + + /** + * 区id + */ + @Excel(name = "区id") + private String areaId; + + /** + * 生日 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthday; + + /** + * 用户注册起始时间 + */ + private Date createTimeStart; + + /** + * 用户注册结束时间 + */ + private Date createTimeEnd; + + public WxUserMemberVm() { + } + + public WxUserMemberVm(Long id, String nickname, Integer creditStart, Integer creditEnd, Integer userType, String mobile, String provinceId, String cityId, String areaId, Date birthday, Date createTimeStart, Date createTimeEnd) { + this.id = id; + this.nickname = nickname; + this.creditStart = creditStart; + this.creditEnd = creditEnd; + this.userType = userType; + this.mobile = mobile; + this.provinceId = provinceId; + this.cityId = cityId; + this.areaId = areaId; + this.birthday = birthday; + this.createTimeStart = createTimeStart; + this.createTimeEnd = createTimeEnd; + } + + 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 Integer getCreditStart() { + return creditStart; + } + + public void setCreditStart(Integer creditStart) { + this.creditStart = creditStart; + } + + public Integer getCreditEnd() { + return creditEnd; + } + + public void setCreditEnd(Integer creditEnd) { + this.creditEnd = creditEnd; + } + + public Integer getUserType() { + return userType; + } + + public void setUserType(Integer userType) { + this.userType = userType; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public Date getBirthday() { + return birthday; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + + public Date getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(Date createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public Date getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(Date createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index 9234280..2e31f51 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -2,6 +2,7 @@ package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.req.WxUserMemberVm; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -72,4 +73,6 @@ public interface WxUserMemberMapper { WxUserMember selectWxUserMemberByOpenId(@Param("openid") String openid); void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id); + + List selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index b1ad6d2..7880fa1 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -15,8 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -27,10 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + @@ -41,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, nickname, headimg, username, credit, openid, unionid, user_type, level, mobile, password, user_qr, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, code, is_abutment, collagen_day, collagen_mount, login_time, status, create_by, create_time, update_by, update_time, remark from wx_user_member + select id, nickname, headimg, username, credit, openid, unionid, user_type, level, mobile, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, is_abutment, login_time, is_complete_information, devices_num, status, create_by, create_time, update_by, update_time, remark from wx_user_member @@ -87,6 +81,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE openid = #{openid} + + insert into wx_user_member @@ -99,8 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_type, level, mobile, - password, - user_qr, province_id, city_id, area_id, @@ -111,10 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clock, activity, wechat, - code, is_abutment, - collagen_day, - collagen_mount, + is_complete_information, + devices_num, login_time, status, create_by, @@ -133,8 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{userType}, #{level}, #{mobile}, - #{password}, - #{userQr}, #{provinceId}, #{cityId}, #{areaId}, @@ -145,10 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{clock}, #{activity}, #{wechat}, - #{code}, #{isAbutment}, - #{collagenDay}, - #{collagenMount}, + #{isCompleteInformation}, + #{devicesNum}, #{loginTime}, #{status}, #{createBy}, @@ -171,8 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_type = #{userType}, level = #{level}, mobile = #{mobile}, - password = #{password}, - user_qr = #{userQr}, province_id = #{provinceId}, city_id = #{cityId}, area_id = #{areaId}, @@ -183,11 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" clock = #{clock}, activity = #{activity}, wechat = #{wechat}, - code = #{code}, is_abutment = #{isAbutment}, - collagen_day = #{collagenDay}, - collagen_mount = #{collagenMount}, login_time = #{loginTime}, + is_complete_information = #{isCompleteInformation}, + devices_num = #{devicesNum}, status = #{status}, create_by = #{createBy}, create_time = #{createTime}, diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java index 8c231a4..42d27bb 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java @@ -3,6 +3,7 @@ package com.flossom.system.controller; import javax.servlet.http.HttpServletResponse; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.req.WxUserMemberVm; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; @@ -31,8 +32,7 @@ import java.util.List; */ @RestController @RequestMapping("/member") -public class WxUserMemberController extends BaseController -{ +public class WxUserMemberController extends BaseController { @Autowired private IWxUserMemberService wxUserMemberService; @@ -41,10 +41,9 @@ public class WxUserMemberController extends BaseController */ @RequiresPermissions("system:member:list") @GetMapping("/list") - public TableDataInfo list(WxUserMember wxUserMember) - { + public TableDataInfo list(WxUserMemberVm wxUserMemberVm) { startPage(); - List list = wxUserMemberService.selectWxUserMemberList(wxUserMember); + List list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); return getDataTable(list); } @@ -54,8 +53,7 @@ public class WxUserMemberController extends BaseController @RequiresPermissions("system:member:export") @Log(title = "用户", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, WxUserMember wxUserMember) - { + public void export(HttpServletResponse response, WxUserMember wxUserMember) { List list = wxUserMemberService.selectWxUserMemberList(wxUserMember); ExcelUtil util = new ExcelUtil(WxUserMember.class); util.exportExcel(response, list, "用户数据"); @@ -66,8 +64,7 @@ public class WxUserMemberController extends BaseController */ @RequiresPermissions("system:member:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return success(wxUserMemberService.selectWxUserMemberById(id)); } @@ -77,8 +74,7 @@ public class WxUserMemberController extends BaseController @RequiresPermissions("system:member:add") @Log(title = "用户", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody WxUserMember wxUserMember) - { + public AjaxResult add(@RequestBody WxUserMember wxUserMember) { return toAjax(wxUserMemberService.insertWxUserMember(wxUserMember)); } @@ -88,8 +84,7 @@ public class WxUserMemberController extends BaseController @RequiresPermissions("system:member:edit") @Log(title = "用户", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody WxUserMember wxUserMember) - { + public AjaxResult edit(@RequestBody WxUserMember wxUserMember) { return toAjax(wxUserMemberService.updateWxUserMember(wxUserMember)); } @@ -98,9 +93,8 @@ public class WxUserMemberController extends BaseController */ @RequiresPermissions("system:member:remove") @Log(title = "用户", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(wxUserMemberService.deleteWxUserMemberByIds(ids)); } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java index bac2020..81368d4 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java @@ -2,6 +2,7 @@ package com.flossom.system.service; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.req.WxUserMemberVm; import java.util.List; @@ -29,6 +30,14 @@ public interface IWxUserMemberService */ public List selectWxUserMemberList(WxUserMember wxUserMember); + /** + * 查询用户列表 + * + * @param wxUserMemberVm 用户 + * @return 用户集合 + */ + public List selectWxUserMemberList(WxUserMemberVm wxUserMemberVm); + /** * 新增用户 * diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index f52d92a..1be52d5 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -3,6 +3,7 @@ package com.flossom.system.service.impl; import java.util.List; import com.flossom.common.core.domain.entity.WxUserMember; +import com.flossom.common.core.domain.req.WxUserMemberVm; import com.flossom.common.core.mapper.WxUserMemberMapper; import com.flossom.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +46,18 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService return wxUserMemberMapper.selectWxUserMemberList(wxUserMember); } + /** + * 查询用户列表 + * + * @param wxUserMemberVm 用户 + * @return 用户 + */ + @Override + public List selectWxUserMemberList(WxUserMemberVm wxUserMemberVm) + { + return wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); + } + /** * 新增用户 * diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index ce8db44..d375dcc 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1,182 +1,82 @@