diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesTypeMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesTypeMapper.java index 337495a..e021ab4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesTypeMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesTypeMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bonus.canteen.core.menu.domain.MenuDishesType; import com.bonus.canteen.core.menu.domain.MenuMaterial; import com.bonus.canteen.core.menu.dto.DrpUnitPageDTO; -import com.bonus.canteen.core.menu.po.MgrUserAuthPO; import com.bonus.canteen.core.menu.vo.DrpUnitPageVO; import com.bonus.canteen.core.menu.vo.MenuDishesTypeAllVO; import org.apache.ibatis.annotations.Param; @@ -24,6 +23,4 @@ public interface MenuDishesTypeMapper extends BaseMapper { List selectAllList(DrpUnitPageDTO dto); - - List getTenantAreaIdList(@Param("excludeMiddle") Integer excludeMiddle, @Param("authPO") MgrUserAuthPO mgrUserAuthPO); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuMaterialCategoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuMaterialCategoryMapper.java index a6c942d..7cdd645 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuMaterialCategoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuMaterialCategoryMapper.java @@ -5,7 +5,6 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bonus.canteen.core.menu.domain.MenuMaterialCategory; import com.bonus.canteen.core.menu.dto.CategoryTreeListDTO; -import com.bonus.canteen.core.menu.po.MgrUserAuthPO; import com.bonus.canteen.core.menu.vo.MenuCategoryTreeVO; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -74,7 +73,5 @@ public interface MenuMaterialCategoryMapper extends BaseMapper getTenantAreaIdList(@Param("excludeMiddle") Integer excludeMiddle, @Param("authPO") MgrUserAuthPO mgrUserAuthPO); - MenuMaterialCategory getOne(MenuMaterialCategory menuMaterialCategory); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/po/MgrUserAuthPO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/po/MgrUserAuthPO.java deleted file mode 100644 index 063665c..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/po/MgrUserAuthPO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.bonus.canteen.core.menu.po; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class MgrUserAuthPO { - @ApiModelProperty("角色类型") - private Integer roleType; - @ApiModelProperty("角色编码") - private String roleCode; - @ApiModelProperty("用户id") - private Long userId; - @ApiModelProperty("用户名称") - private String userName; - - public Integer getRoleType() { - return this.roleType; - } - - public String getRoleCode() { - return this.roleCode; - } - - public Long getUserId() { - return this.userId; - } - - public String getUserName() { - return this.userName; - } - - public void setRoleType(final Integer roleType) { - this.roleType = roleType; - } - - public void setRoleCode(final String roleCode) { - this.roleCode = roleCode; - } - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public void setUserName(final String userName) { - this.userName = userName; - } - - -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java index bc46fc9..91630ad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesTypeServiceImpl.java @@ -11,7 +11,6 @@ import com.bonus.canteen.core.menu.dto.MenuDishesTypeAddDTO; import com.bonus.canteen.core.menu.enums.MgrRoleTypeV2Enum; import com.bonus.canteen.core.menu.enums.RoleCodeV2Enum; import com.bonus.canteen.core.menu.mapper.MenuDishesTypeMapper; -import com.bonus.canteen.core.menu.po.MgrUserAuthPO; import com.bonus.canteen.core.menu.service.MenuDishesTypeService; import com.bonus.canteen.core.menu.domain.MenuDishesType; import com.bonus.canteen.core.menu.vo.DrpUnitPageVO; @@ -20,7 +19,6 @@ import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.canteen.core.utils.GlobalConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.houqin.constant.DelFlagEnum; -import com.bonus.common.houqin.constant.LeConstants; import com.bonus.common.houqin.i18n.I18n; import com.bonus.common.houqin.utils.id.Id; import com.bonus.common.security.utils.SecurityUtils; @@ -70,48 +68,4 @@ public class MenuDishesTypeServiceImpl extends ServiceImpl getTenantAreaIdList(Integer excludeMiddle) { - MgrUserAuthPO mgrUserAuthPO = this.getUserAuthPO(); - return ObjectUtil.equal(mgrUserAuthPO.getRoleType(), LeConstants.DATA_DEFAULT_INTEGER) ? CollUtil.newArrayList(new Long[0]) : this.menuDishesTypeMapper.getTenantAreaIdList(excludeMiddle, mgrUserAuthPO); - } - - public MgrUserAuthPO getUserAuthPO() { - MgrUserAuthPO userAuthPO = new MgrUserAuthPO(); - LoginUser user = SecurityUtils.getLoginUser(); - user.setUserid(SecurityUtils.getUserId()); - user.setUsername(SecurityUtils.getUsername()); - Set roleSet = user.getRoles(); - if (CollectionUtils.isEmpty(roleSet)) { - throw new ServiceException(I18n.getMessage("auth_user_no_role_code", new Object[0])); - } - Integer roleType = null; - String roleCodeResult = null; -// for (String roleCode : roleSet) { -// roleCodeResult = roleCode; -// if (roleCode.startsWith(RoleCodeV2Enum.ROLE_ADMIN.key()) || GlobalConstants.SUPER_ADMIN_ROLE_KEY.equals(roleCode)) { -// roleType = MgrRoleTypeV2Enum.ROLE_ADMIN.getKey(); -//// if (CharSequenceUtil.split(roleCode, "&&").size() > 1) { -//// roleType = MgrRoleTypeV2Enum.ROLE_ADMIN.getKey(); -//// } else { -//// roleType = LeConstants.DATA_DEFAULT_INTEGER; -//// } -// break; -// } else if (roleCode.startsWith(RoleCodeV2Enum.ROLE_ORG.key())) { -// roleType = MgrRoleTypeV2Enum.ROLE_ORG.getKey(); -// break; -// } else { -// if (!roleCode.startsWith(RoleCodeV2Enum.ROLE_MERCHANT.key())) { -// throw new ServiceException(I18n.getMessage("auth_role_type_error", new Object[0])); -// } -// roleType = MgrRoleTypeV2Enum.ROLE_MERCHANT.getKey(); -// break; -// } -// } - userAuthPO.setUserId(user.getUserid()); - userAuthPO.setRoleType(roleType); - userAuthPO.setRoleCode(roleCodeResult); - userAuthPO.setUserName(user.getUsername()); - return userAuthPO; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialCategoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialCategoryServiceImpl.java index dacdfcb..826151e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialCategoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialCategoryServiceImpl.java @@ -14,7 +14,6 @@ import com.bonus.canteen.core.menu.dto.CategoryTreeListDTO; import com.bonus.canteen.core.menu.dto.MenuMaterialCategoryAddDTO; import com.bonus.canteen.core.menu.enums.MgrRoleTypeEnum; import com.bonus.canteen.core.menu.enums.RoleCodeEnum; -import com.bonus.canteen.core.menu.po.MgrUserAuthPO; import com.bonus.canteen.core.menu.vo.MenuCategoryTreeVO; import com.bonus.canteen.core.menu.enums.LeLevelEnum; import com.bonus.canteen.core.utils.BnsConstants; @@ -324,48 +323,4 @@ public class MenuMaterialCategoryServiceImpl extends ServiceImpl getTenantAreaIdList(Integer excludeMiddle) { - MgrUserAuthPO mgrUserAuthPO = this.getUserAuthPO(); - return ObjectUtil.equal(mgrUserAuthPO.getRoleType(), LeConstants.DATA_DEFAULT_INTEGER) ? CollUtil.newArrayList(new Long[0]) : menuMaterialCategoryMapper.getTenantAreaIdList(excludeMiddle, mgrUserAuthPO); - } - - public MgrUserAuthPO getUserAuthPO() { - MgrUserAuthPO userAuthPO = new MgrUserAuthPO(); - LoginUser user = SecurityUtils.getLoginUser(); - user.setUserid(SecurityUtils.getUserId()); - user.setUsername(SecurityUtils.getUsername()); - Set roleSet = user.getRoles(); - if (CollectionUtils.isEmpty(roleSet)) { - throw new ServiceException(I18n.getMessage("auth_user_no_role_code", new Object[0])); - } - Integer roleType = null; - String roleCodeResult = null; - for (String roleCode : roleSet) { - roleCodeResult = roleCode; - if (roleCode.startsWith(RoleCodeEnum.ROLE_ADMIN.key()) || GlobalConstants.SUPER_ADMIN_ROLE_KEY.equals(roleCode)) { - roleType = MgrRoleTypeEnum.ROLE_ADMIN.getKey(); -// if (CharSequenceUtil.split(roleCode, "&&").size() > 1) { -// roleType = MgrRoleTypeV2Enum.ROLE_ADMIN.getKey(); -// } else { -// roleType = LeConstants.DATA_DEFAULT_INTEGER; -// } - break; - } else if (roleCode.startsWith(RoleCodeEnum.ROLE_ORG.key())) { - roleType = MgrRoleTypeEnum.ROLE_ORG.getKey(); - break; - } else { - if (!roleCode.startsWith(RoleCodeEnum.ROLE_MERCHANT.key())) { - throw new ServiceException(I18n.getMessage("auth_role_type_error", new Object[0])); - } - roleType = MgrRoleTypeEnum.ROLE_MERCHANT.getKey(); - break; - } - } - userAuthPO.setUserId(user.getUserid()); - userAuthPO.setRoleType(roleType); - userAuthPO.setRoleCode(roleCodeResult); - userAuthPO.setUserName(user.getUsername()); - return userAuthPO; - } - } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml index 2fcf7ff..e698d8e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesTypeMapper.xml @@ -48,14 +48,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialCategoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialCategoryMapper.xml index f4b905d..d46d830 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialCategoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialCategoryMapper.xml @@ -127,16 +127,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - -