'优化菜单信息-修改菜单昵称和菜单信息-修改移动端菜单昵称接口，增加角色Id和菜单Id更新角色菜单表中的菜单昵称字段值逻辑'

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMobileRoleMenu.java

@@ -29,4 +29,7 @@ public class SysMobileRoleMenu implements Serializable {
     private Long menuId;
 
 
+    private String menuAliasName;
+
+
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysRoleMenu.java

@@ -16,6 +16,8 @@ public class SysRoleMenu
     /** 菜单ID */
     private Long menuId;
 
+    private String menuAliasName;
+
     public Long getRoleId()
     {
         return roleId;
@@ -36,11 +38,22 @@ public class SysRoleMenu
         this.menuId = menuId;
     }
 
+    public String getMenuAliasName()
+    {
+        return menuAliasName;
+    }
+
+    public void setMenuAliasName(String menuAliasName)
+    {
+        this.menuAliasName = menuAliasName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
             .append("roleId", getRoleId())
             .append("menuId", getMenuId())
+            .append("menuAliasName", getMenuAliasName())
             .toString();
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysMobileRoleMenuMapper.java

@@ -4,6 +4,7 @@ import com.usky.system.domain.SysMobileRoleMenu;
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysRoleMenu;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
  * @author JCB
  * @since 2023-03-02
  */
+@Repository
 public interface SysMobileRoleMenuMapper extends CrudMapper<SysMobileRoleMenu> {
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysRoleMenuService.java

@@ -0,0 +1,10 @@
+package com.usky.system.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.system.domain.SysRoleMenu;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface SysRoleMenuService extends CrudService<SysRoleMenu> {
+
+}

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMenuServiceImpl.java

@@ -1,6 +1,8 @@
 package com.usky.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.constants.Constants;
 import com.usky.common.core.util.StringUtils;
@@ -8,11 +10,9 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.mapper.SysMenuMapper;
-import com.usky.system.mapper.SysRoleMapper;
-import com.usky.system.mapper.SysRoleMenuMapper;
-import com.usky.system.mapper.SysTenantMenuMapper;
+import com.usky.system.mapper.*;
 import com.usky.system.service.ISysMenuService;
+import com.usky.system.service.SysRoleMenuService;
 import com.usky.system.service.SysTenantMenuService;
 import com.usky.system.service.vo.MetaVo;
 import com.usky.system.service.vo.RouterVo;
@@ -50,6 +50,18 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
     @Autowired
     private SysRoleMenuMapper roleMenuMapper;
 
+    @Autowired(required = false)
+    private SysRoleMenuService sysRoleMenuService;
+
+    @Autowired
+    private SysRoleMenuMapper sysRoleMenuMapper;
+
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 根据用户查询系统菜单列表
      *
@@ -412,6 +424,47 @@ public class SysMenuServiceImpl extends AbstractCrudService<SysMenuMapper, SysMe
                 .eq("tenant_id",tenantMenu.getTenantId())
                 .eq("menu_id",tenantMenu.getMenuId());
         tenantMenuService.update(updateWrapper);
+
+
+
+        LambdaQueryWrapper<SysUser> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(SysUser::getUserId)
+                .eq(SysUser::getStatus,0)
+                .eq(SysUser::getDelFlag,0)
+                .eq(SysUser::getTenantId,SecurityUtils.getTenantId());
+        List<SysUser> list = sysUserMapper.selectList(queryWrapper1);
+        List<Long> userIdList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                userIdList.add(list.get(i).getUserId());
+            }
+        }
+
+        if(userIdList.size() > 0){
+            LambdaQueryWrapper<SysUserRole> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(SysUserRole::getUserId,userIdList);
+            List<SysUserRole> userRoleList = sysUserRoleMapper.selectList(queryWrapper);
+            List<Long> roleIdList = new ArrayList<>();
+            if(userRoleList.size() > 0){
+                for (int i = 0; i < userRoleList.size(); i++) {
+                    if(roleIdList.contains(userRoleList.get(i).getRoleId())){
+
+                    }else{
+                        roleIdList.add(userRoleList.get(i).getRoleId());
+                    }
+                }
+            }
+
+            if(roleIdList.size() > 0){
+                UpdateWrapper<SysRoleMenu> updateWrapper1 = Wrappers.update();
+                updateWrapper1.set("menu_alias_name",tenantMenu.getMenuAliasName())
+                        .in("role_id",roleIdList)
+                        .eq("menu_id",tenantMenu.getMenuId());
+                sysRoleMenuMapper.update(null,updateWrapper1);
+            }
+
+        }
+
     }
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysMobileMenuServiceImpl.java

@@ -10,10 +10,7 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.controller.web.SysMenuController;
 import com.usky.system.domain.*;
 import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.mapper.SysMobileMenuMapper;
-import com.usky.system.mapper.SysMobileTenantMenuMapper;
-import com.usky.system.mapper.SysRoleMapper;
-import com.usky.system.mapper.SysRoleMenuMapper;
+import com.usky.system.mapper.*;
 import com.usky.system.service.SysMobileMenuService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.system.service.SysMobileTenantMenuService;
@@ -53,6 +50,15 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
     @Autowired
     private SysRoleMapper roleMapper;
 
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysMobileRoleMenuMapper sysMobileRoleMenuMapper;
+
     /**
      * 查询系统菜单列表
      *
@@ -257,6 +263,46 @@ public class SysMobileMenuServiceImpl extends AbstractCrudService<SysMobileMenuM
                 .eq("tenant_id",mobileTenantMenu.getTenantId())
                 .eq("menu_id",mobileTenantMenu.getMenuId());
         sysMobileTenantMenuService.update(updateWrapper);
+
+
+
+        LambdaQueryWrapper<SysUser> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.select(SysUser::getUserId)
+                .eq(SysUser::getStatus,0)
+                .eq(SysUser::getDelFlag,0)
+                .eq(SysUser::getTenantId,SecurityUtils.getTenantId());
+        List<SysUser> list = sysUserMapper.selectList(queryWrapper1);
+        List<Long> userIdList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                userIdList.add(list.get(i).getUserId());
+            }
+        }
+
+        if(userIdList.size() > 0){
+            LambdaQueryWrapper<SysUserRole> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(SysUserRole::getUserId,userIdList);
+            List<SysUserRole> userRoleList = sysUserRoleMapper.selectList(queryWrapper);
+            List<Long> roleIdList = new ArrayList<>();
+            if(userRoleList.size() > 0){
+                for (int i = 0; i < userRoleList.size(); i++) {
+                    if(roleIdList.contains(userRoleList.get(i).getRoleId())){
+
+                    }else{
+                        roleIdList.add(userRoleList.get(i).getRoleId());
+                    }
+                }
+            }
+
+            if(roleIdList.size() > 0){
+                UpdateWrapper<SysMobileRoleMenu> updateWrapper1 = Wrappers.update();
+                updateWrapper1.set("menu_alias_name",mobileTenantMenu.getMenuAliasName())
+                        .in("role_id",roleIdList)
+                        .eq("menu_id",mobileTenantMenu.getMenuId());
+                sysMobileRoleMenuMapper.update(null,updateWrapper1);
+            }
+
+        }
     }
 
     /**

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -173,6 +173,7 @@
         select distinct m.menu_id,
                         m.parent_id,
                         m.menu_name,
+                        rm.menu_alias_name,
                         m.path,
                         m.component,
                         m.visible,

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysMobileMenuMapper.xml

@@ -115,6 +115,7 @@
         select distinct m.menu_id,
                         m.parent_id,
                         m.menu_name,
+                        rm.menu_alias_name,
                         m.path,
                         m.component,
                         m.visible,