diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/entity/MgrUser.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/entity/MgrUser.java deleted file mode 100644 index 9ccfb9ff..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/entity/MgrUser.java +++ /dev/null @@ -1,301 +0,0 @@ -package com.bonus.canteen.core.auth.user.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.bonus.canteen.core.common.encrypt.SM4EncDecHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.time.LocalDateTime; - -//@TableName( -// value = "sys_user", -// autoResultMap = true -//) -@ApiModel("商家管理员用户信息") -public class MgrUser extends Model { - private static final long serialVersionUID = 1L; -// @TableId - @ApiModelProperty("主键id") - private Long id; - @ApiModelProperty("用户编号") - private Long userId; - @ApiModelProperty("用户名") - private String username; - @ApiModelProperty("密码") - private String password; - private Long custId; - private Long areaId; - @ApiModelProperty("真实姓名") -// @TableField( -// value = "real_name", -// typeHandler = SM4EncDecHandler.class -// ) - private String realName; - @ApiModelProperty("随机盐") - private String salt; - @ApiModelProperty("电话号码") -// @TableField( -// value = "phone", -// typeHandler = SM4EncDecHandler.class -// ) - private String phone; - @ApiModelProperty("电话号码后缀") -// @TableField( -// value = "phone_suffix", -// typeHandler = SM4EncDecHandler.class -// ) - private String phoneSuffix; - @ApiModelProperty("操作员头像") - private String avatar; - @ApiModelProperty("部门id") - private Long deptId; - @ApiModelProperty("用户类型(0-本地用户, 1-AD账户)") - private Integer userType; - @ApiModelProperty("激活标识") - private String lockFlag; - @ApiModelProperty("标识") - private Integer delFlag; - @ApiModelProperty("微信登录openId") - private String wxOpenid; - @ApiModelProperty("小程序openId") - private String miniOpenid; - @ApiModelProperty("QQ openId") - private String qqOpenid; - @ApiModelProperty("码云标识") - private String giteeLogin; - @ApiModelProperty("开源中国标识") - private String oscId; - @ApiModelProperty("乐观锁") - private Integer revision; - @ApiModelProperty("创建人") - private String crby; - @ApiModelProperty("创建时间") - private LocalDateTime crtime; - @ApiModelProperty("更新人") - private String upby; - @ApiModelProperty("更新时间") - private LocalDateTime uptime; - @ApiModelProperty("最新登录时间") - private LocalDateTime loginTime; - @ApiModelProperty("是否修改过密码") - private Integer editFlag; - - public Long getId() { - return this.id; - } - - public Long getUserId() { - return this.userId; - } - - public String getUsername() { - return this.username; - } - - public String getPassword() { - return this.password; - } - - public Long getCustId() { - return this.custId; - } - - public Long getAreaId() { - return this.areaId; - } - - public String getRealName() { - return this.realName; - } - - public String getSalt() { - return this.salt; - } - - public String getPhone() { - return this.phone; - } - - public String getPhoneSuffix() { - return this.phoneSuffix; - } - - public String getAvatar() { - return this.avatar; - } - - public Long getDeptId() { - return this.deptId; - } - - public Integer getUserType() { - return this.userType; - } - - public String getLockFlag() { - return this.lockFlag; - } - - public Integer getDelFlag() { - return this.delFlag; - } - - public String getWxOpenid() { - return this.wxOpenid; - } - - public String getMiniOpenid() { - return this.miniOpenid; - } - - public String getQqOpenid() { - return this.qqOpenid; - } - - public String getGiteeLogin() { - return this.giteeLogin; - } - - public String getOscId() { - return this.oscId; - } - - public Integer getRevision() { - return this.revision; - } - - public String getCrby() { - return this.crby; - } - - public LocalDateTime getCrtime() { - return this.crtime; - } - - public String getUpby() { - return this.upby; - } - - public LocalDateTime getUptime() { - return this.uptime; - } - - public LocalDateTime getLoginTime() { - return this.loginTime; - } - - public Integer getEditFlag() { - return this.editFlag; - } - - public void setId(final Long id) { - this.id = id; - } - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public void setUsername(final String username) { - this.username = username; - } - - public void setPassword(final String password) { - this.password = password; - } - - public void setCustId(final Long custId) { - this.custId = custId; - } - - public void setAreaId(final Long areaId) { - this.areaId = areaId; - } - - public void setRealName(final String realName) { - this.realName = realName; - } - - public void setSalt(final String salt) { - this.salt = salt; - } - - public void setPhone(final String phone) { - this.phone = phone; - } - - public void setPhoneSuffix(final String phoneSuffix) { - this.phoneSuffix = phoneSuffix; - } - - public void setAvatar(final String avatar) { - this.avatar = avatar; - } - - public void setDeptId(final Long deptId) { - this.deptId = deptId; - } - - public void setUserType(final Integer userType) { - this.userType = userType; - } - - public void setLockFlag(final String lockFlag) { - this.lockFlag = lockFlag; - } - - public void setDelFlag(final Integer delFlag) { - this.delFlag = delFlag; - } - - public void setWxOpenid(final String wxOpenid) { - this.wxOpenid = wxOpenid; - } - - public void setMiniOpenid(final String miniOpenid) { - this.miniOpenid = miniOpenid; - } - - public void setQqOpenid(final String qqOpenid) { - this.qqOpenid = qqOpenid; - } - - public void setGiteeLogin(final String giteeLogin) { - this.giteeLogin = giteeLogin; - } - - public void setOscId(final String oscId) { - this.oscId = oscId; - } - - public void setRevision(final Integer revision) { - this.revision = revision; - } - - public void setCrby(final String crby) { - this.crby = crby; - } - - public void setCrtime(final LocalDateTime crtime) { - this.crtime = crtime; - } - - public void setUpby(final String upby) { - this.upby = upby; - } - - public void setUptime(final LocalDateTime uptime) { - this.uptime = uptime; - } - - public void setLoginTime(final LocalDateTime loginTime) { - this.loginTime = loginTime; - } - - public void setEditFlag(final Integer editFlag) { - this.editFlag = editFlag; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java deleted file mode 100644 index 69a03467..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/user/mapper/MgrUserMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.bonus.canteen.core.auth.user.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bonus.canteen.core.auth.role.dto.MgrRoleUserDTO; -import com.bonus.canteen.core.auth.role.vo.MgrRoleUserVO; -import com.bonus.canteen.core.auth.user.entity.MgrUser; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface MgrUserMapper { -// Page selectRolePage(Page page, @Param("userPageDTO") MgrUserPageDTO userPageDTO); - -// List selectAllUserByRoleCode(MgrRoleUserDTO deliveryUserDTO); - -// MgrUserDetailVO selectUserInfoByUserId(@Param("userId") Long userId, @Param("delFlag") Integer delFlag); -// -// @Select({"select count(0) from alloc_canteen where cust_id = #{userId};"}) -// int checkCountBasicsDdiningUserId(Long userId); -// -// @Select({"select count(0) from alloc_stall where cust_id = #{userId};"}) -// int checkBasicsShopstallsUserId(Long userId); -// -// @Select({"select count(0) from drp_warehouse where user_id = #{userId};"}) -// int checkDrpWarehouse(Long userId); -// -// @Select({"select user_id, real_name from mgr_user ${ew.customSqlSegment}"}) -// MgrUserIdNameVO selectIdAndRealNameByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select dining_id as canteen_id, shopstall_id from basics_shopstalls ${ew.customSqlSegment}"}) -// List selectShopstallByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select canteen_id, shopstall_id from mkt_effective_detail ${ew.customSqlSegment}"}) -// List selectCanteenByWrapper(@Param("ew") Wrapper wrapper); -// -// @Select({"select 1 from mkt_effective ${ew.customSqlSegment}"}) -// Integer selectExistFromMktEffectiveByWrapper(@Param("ew") Wrapper wrapper); -// -// List listUserByIdAndRole(@Param("userId") Long userId, @Param("roleCode") String roleCode, @Param("delFlag") Integer delFlag); -// -// Long selectUserIdByCustId(@Param("custId") Long custId); -// -// String selectUserNameIdByCustId(@Param("custId") Long custId); -// -// Long selectCustIdByUserId(@Param("userId") Long userId); -// -// List getUserExcludeSupplier(@Param("delFlag") Integer delFlag); -// -// MgrUser getUserByRoleCode(@Param("roleCode") String roleCode); -// -// List queryByRoles(@Param("roles") List roles); -// -// List queryMgrUserIdListByCustIdList(@Param("custIdList") List custIdList); -// -// List queryCanteenManagerMgrUserList(@Param("caneenIdList") List caneenIdList); -// -// MgrUser getUserByRoleCodeExcludeUserName(@Param("roleCode") String roleCode, @Param("excludeUserName") String excludeUserName); -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml deleted file mode 100644 index 38bcff6a..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -