From 63b9752eff576c1b6b69450bb4e168dc44ccf9e4 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 25 Mar 2025 15:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4mgrrole=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/auth/role/entity/MgrRole.java | 222 ------------------ .../auth/role/mapper/MgrRoleAreaMapper.java | 4 - .../role/mapper/MgrRoleCanteenMapper.java | 3 +- .../auth/role/mapper/MgrRoleOrgMapper.java | 3 +- .../mapper/auth/MgrRoleCanteenMapper.xml | 11 - .../mapper/role/MgrRoleAreaMapper.xml | 17 -- .../mapper/role/MgrRoleOrgMapper.xml | 59 ----- 7 files changed, 2 insertions(+), 317 deletions(-) delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java deleted file mode 100644 index 882e8620..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRole.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.bonus.canteen.core.auth.role.entity; - -import com.baomidou.mybatisplus.annotation.FieldFill; -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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDateTime; - -@TableName("sys_role") -@ApiModel("系统角色表") -@Data -public class MgrRole extends Model { - private static final long serialVersionUID = 1L; - @TableId - @ApiModelProperty("主键id") - private Long id; - @ApiModelProperty("角色id") - private Long roleId; - @ApiModelProperty("角色名称") - private String roleName; - @ApiModelProperty("角色标识") - private String roleCode; - @ApiModelProperty("描述") - private String roleDesc; - @ApiModelProperty("类型") - private Integer dsType; - @ApiModelProperty("ds_scope") - private String dsScope; - @ApiModelProperty("食堂类范围id") - private Long canteenEffId; - @ApiModelProperty("人员类范围id") - private Long custEffId; - @ApiModelProperty("菜品类范围id") - private Long dishesEffId; - @ApiModelProperty("仓库类范围Id") - private Long warehouseEffId; - @ApiModelProperty("标识") - private Integer delFlag; - @ApiModelProperty("乐观锁") - private Integer revision; - @TableField( - value = "crby", - fill = FieldFill.INSERT - ) - @ApiModelProperty("创建人") - private String crby; - @ApiModelProperty("创建时间") - private LocalDateTime crtime; - @ApiModelProperty("更新人") - @TableField( - value = "upby", - fill = FieldFill.UPDATE - ) - private String upby; - @ApiModelProperty("更新时间") - private LocalDateTime uptime; - @ApiModelProperty("角色类型") - private Integer roleType; - @ApiModelProperty("归属区域") - private Long areaId; - - public Long getId() { - return this.id; - } - - public Long getRoleId() { - return this.roleId; - } - - public String getRoleName() { - return this.roleName; - } - - public String getRoleCode() { - return this.roleCode; - } - - public String getRoleDesc() { - return this.roleDesc; - } - - public Integer getDsType() { - return this.dsType; - } - - public String getDsScope() { - return this.dsScope; - } - - public Long getCanteenEffId() { - return this.canteenEffId; - } - - public Long getCustEffId() { - return this.custEffId; - } - - public Long getDishesEffId() { - return this.dishesEffId; - } - - public Long getWarehouseEffId() { - return this.warehouseEffId; - } - - public Integer getDelFlag() { - return this.delFlag; - } - - 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 Integer getRoleType() { - return this.roleType; - } - - public Long getAreaId() { - return this.areaId; - } - - public void setId(final Long id) { - this.id = id; - } - - public void setRoleId(final Long roleId) { - this.roleId = roleId; - } - - public void setRoleName(final String roleName) { - this.roleName = roleName; - } - - public void setRoleCode(final String roleCode) { - this.roleCode = roleCode; - } - - public void setRoleDesc(final String roleDesc) { - this.roleDesc = roleDesc; - } - - public void setDsType(final Integer dsType) { - this.dsType = dsType; - } - - public void setDsScope(final String dsScope) { - this.dsScope = dsScope; - } - - public void setCanteenEffId(final Long canteenEffId) { - this.canteenEffId = canteenEffId; - } - - public void setCustEffId(final Long custEffId) { - this.custEffId = custEffId; - } - - public void setDishesEffId(final Long dishesEffId) { - this.dishesEffId = dishesEffId; - } - - public void setWarehouseEffId(final Long warehouseEffId) { - this.warehouseEffId = warehouseEffId; - } - - public void setDelFlag(final Integer delFlag) { - this.delFlag = delFlag; - } - - 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 setRoleType(final Integer roleType) { - this.roleType = roleType; - } - - public void setAreaId(final Long areaId) { - this.areaId = areaId; - } - - - - -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleAreaMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleAreaMapper.java index e746ebdd..964ccf16 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleAreaMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleAreaMapper.java @@ -11,8 +11,4 @@ import java.util.List; @Mapper public interface MgrRoleAreaMapper extends BaseMapper { List getTenantAreaIdList(@Param("excludeMiddle") Integer excludeMiddle, @Param("authPO") MgrUserAuthPO mgrUserAuthPO); -// -// void insertBatch(@Param("roleId") Long roleId, @Param("areaList") List areaList); -// -// List getRoleListByDataId(@Param("dataId") Long dataId, @Param("roleIdList") List roleIdList, @Param("excludeMiddle") Integer excludeMiddle); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleCanteenMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleCanteenMapper.java index 06ae5916..adadb51d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleCanteenMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleCanteenMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bonus.canteen.core.allocation.canteen.vo.AllocCanteenTreeVO; import com.bonus.canteen.core.auth.po.MgrUserAuthPO; import com.bonus.canteen.core.auth.role.dto.MgrRoleCanteenDTO; -import com.bonus.canteen.core.auth.role.entity.MgrRole; import com.bonus.canteen.core.auth.role.entity.MgrRoleCanteen; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,5 +16,5 @@ public interface MgrRoleCanteenMapper extends BaseMapper { List getTenantCanteen(@Param("excludeMiddle") Integer excludeMiddle, @Param("merchantId") Long merchantId, @Param("authPO") MgrUserAuthPO mgrUserAuthPO, @Param("delFlag") Integer delFlag); - List getRoleListByDataId(@Param("dataId") Long dataId, @Param("roleId") Long roleId, @Param("excludeMiddle") Integer excludeMiddle); +// List getRoleListByDataId(@Param("dataId") Long dataId, @Param("roleId") Long roleId, @Param("excludeMiddle") Integer excludeMiddle); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java index 310ae883..f3c1ddaa 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java @@ -3,7 +3,6 @@ package com.bonus.canteen.core.auth.role.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bonus.canteen.core.auth.po.MgrUserAuthPO; import com.bonus.canteen.core.auth.role.dto.MgrRoleOrgDTO; -import com.bonus.canteen.core.auth.role.entity.MgrRole; import com.bonus.canteen.core.auth.role.entity.MgrRoleOrg; import com.bonus.canteen.core.customer.dto.CustOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -17,5 +16,5 @@ public interface MgrRoleOrgMapper extends BaseMapper { List getTenantOrg(@Param("excludeMiddle") Integer excludeMiddle, @Param("authPO") MgrUserAuthPO mgrUserAuthPO, @Param("delFlag") Integer delFlag); - List getRoleListByOrgId(@Param("orgId") Long orgId, @Param("roleId") Long roleId, @Param("excludeMiddle") Integer excludeMiddle); +// List getRoleListByOrgId(@Param("orgId") Long orgId, @Param("roleId") Long roleId, @Param("excludeMiddle") Integer excludeMiddle); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml index 0769c124..7ef6a561 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml @@ -105,15 +105,4 @@ - - diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml index 7b75955e..6fbf99f3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml @@ -11,9 +11,6 @@ WHERE u.user_id = #{authPO.userId} AND o.role_key = #{authPO.roleCode} AND o.del_flag = 0 - - - @@ -23,18 +20,4 @@ (#{roleId}, #{area.dataId}) - - \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml index 0a526c78..b7663ae6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml @@ -45,63 +45,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -