From ee69fdc4d6b6fb0264d6568480382030768924ec Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 12 Dec 2023 10:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/SysRegionConstants.java | 7 + .../flossom/hzMapper/domain/SysRegion.java | 81 ++++++++++ .../flossom/hzMapper/domain/WxUserMember.java | 138 ++++++++++++++---- .../hzMapper/mapper/SysRegionMapper.java | 65 +++++++++ .../mapper/hzMapper/SysRegionMapper.xml | 74 ++++++++++ .../mapper/hzMapper/WxUserMemberMapper.xml | 17 ++- .../controller/SysRegionController.java | 35 +++++ .../controller/UserMemberController.java | 17 ++- .../domain/vo/UserMemberUpdateVo.java | 41 ++++++ .../service/ISysRegionService.java | 10 ++ .../service/IWxUserMemberService.java | 3 + .../service/impl/SysRegionServiceImpl.java | 23 +++ .../service/impl/WxUserMemberServiceImpl.java | 12 +- .../controller/SysRegionController.java | 100 +++++++++++++ .../system/service/ISysRegionService.java | 62 ++++++++ .../service/impl/SysRegionServiceImpl.java | 88 +++++++++++ 16 files changed, 734 insertions(+), 39 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SysRegionConstants.java create mode 100644 flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java create mode 100644 flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java create mode 100644 flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/SysRegionController.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/UserMemberUpdateVo.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SysRegionConstants.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SysRegionConstants.java new file mode 100644 index 0000000..70f89b6 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SysRegionConstants.java @@ -0,0 +1,7 @@ +package com.flossom.common.core.constant; + +public class SysRegionConstants { + + public static final int PROVINCE_PID = 0; + +} diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java new file mode 100644 index 0000000..0028b32 --- /dev/null +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/SysRegion.java @@ -0,0 +1,81 @@ +package com.flossom.hzMapper.domain; + +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 地区列对象 sys_region + * + * @author flossom + * @date 2023-12-12 + */ +public class SysRegion extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 表id + */ + private Long id; + + /** + * 地区名称 + */ + @Excel(name = "地区名称") + private String name; + + /** + * 父id + */ + @Excel(name = "父id") + private Long parentId; + + /** + * 地区等级 + */ + @Excel(name = "地区等级") + private Integer level; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public Long getParentId() { + return parentId; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public Integer getLevel() { + return level; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("parentId", getParentId()) + .append("level", getLevel()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java index a094aec..fb4f025 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/WxUserMember.java @@ -89,18 +89,36 @@ public class WxUserMember extends BaseEntity { @Excel(name = "个人二维码") private String userQr; + /** + * 省id + */ + @Excel(name = "省id") + private String provinceId; + /** * 省 */ @Excel(name = "省") private String province; + /** + * 市id + */ + @Excel(name = "市id") + private String cityId; + /** * 市 */ @Excel(name = "市") private String city; + /** + * 区id + */ + @Excel(name = "区id") + private String areaId; + /** * 区 */ @@ -369,39 +387,95 @@ public class WxUserMember extends BaseEntity { return status; } + 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 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) { + 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.password = password; + this.userQr = userQr; + 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.code = code; + this.isAbutment = isAbutment; + this.collagenDay = collagenDay; + this.collagenMount = collagenMount; + this.loginTime = loginTime; + this.status = status; + } + @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("nickname", getNickname()) - .append("headimg", getHeadimg()) - .append("username", getUsername()) - .append("credit", getCredit()) - .append("openid", getOpenid()) - .append("unionid", getUnionid()) - .append("userType", getUserType()) - .append("level", getLevel()) - .append("mobile", getMobile()) - .append("password", getPassword()) - .append("userQr", getUserQr()) - .append("province", getProvince()) - .append("city", getCity()) - .append("area", getArea()) - .append("birthday", getBirthday()) - .append("clock", getClock()) - .append("activity", getActivity()) - .append("wechat", getWechat()) - .append("code", getCode()) - .append("isAbutment", getIsAbutment()) - .append("collagenDay", getCollagenDay()) - .append("collagenMount", getCollagenMount()) - .append("loginTime", getLoginTime()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .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-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java new file mode 100644 index 0000000..937931a --- /dev/null +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java @@ -0,0 +1,65 @@ +package com.flossom.hzMapper.mapper; + +import com.flossom.hzMapper.domain.SysRegion; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * 地区列Mapper接口 + * + * @author flossom + * @date 2023-12-12 + */ +public interface SysRegionMapper { + /** + * 查询地区列 + * + * @param id 地区列主键 + * @return 地区列 + */ + public SysRegion selectSysRegionById(Long id); + + /** + * 查询地区列列表 + * + * @param sysRegion 地区列 + * @return 地区列集合 + */ + public List selectSysRegionList(SysRegion sysRegion); + + /** + * 新增地区列 + * + * @param sysRegion 地区列 + * @return 结果 + */ + public int insertSysRegion(SysRegion sysRegion); + + /** + * 修改地区列 + * + * @param sysRegion 地区列 + * @return 结果 + */ + public int updateSysRegion(SysRegion sysRegion); + + /** + * 删除地区列 + * + * @param id 地区列主键 + * @return 结果 + */ + public int deleteSysRegionById(Long id); + + /** + * 批量删除地区列 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSysRegionByIds(Long[] ids); + + List selectSysAreaByPid(@Param("pid") Integer pid); +} diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml new file mode 100644 index 0000000..dec0a6b --- /dev/null +++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + select id, name, parent_id, level from sys_region + + + + + + + + + + insert into sys_region + + name, + parent_id, + level, + + + #{name}, + #{parentId}, + #{level}, + + + + + update sys_region + + name = #{name}, + parent_id = #{parentId}, + level = #{level}, + + where id = #{id} + + + + delete from sys_region where id = #{id} + + + + delete from sys_region where id in + + #{id} + + + \ No newline at end of file diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml index 0a26f22..702d224 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml @@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -38,7 +41,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, 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, 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