通知公告

muyu-gateway/src/main/resources/bootstrap.yml

@@ -1,41 +0,0 @@
-# Tomcat
-server:
-  port: 8080
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: muyu-gateway
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 49.232.230.199:8848
-      config:
-        # 配置中心地址
-        server-addr: 49.232.230.199:8848
-        namespace: muyu-system
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
-      # 取消控制台懒加载
-      eager: true
-      transport:
-        # 控制台地址
-        dashboard: 49.232.230.199:8718
-      # nacos配置持久化
-      datasource:
-        ds1:
-          nacos:
-            server-addr: 49.232.230.199:8848
-            dataId: sentinel-muyu-gateway
-            groupId: DEFAULT_GROUP
-            data-type: json
-            rule-type: gw-flow

muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/MenuInfo.java

@@ -1,12 +0,0 @@
-package com.muyu.system.domain;
-
-import com.muyu.common.core.web.domain.BaseEntity;
-import lombok.Data;
-
-@Data
-public class MenuInfo extends BaseEntity {
-    private static final long serialVersionUID=1L;
-
-    private Long menuInfoId;
-    private String menuInfoName;
-}

muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java

@@ -1,142 +0,0 @@
-package com.muyu.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.system.domain.SysMenu;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 菜单表 数据层
- *
- * @author muyu
- */
-public interface SysMenuMapper extends BaseMapper<SysMenu> {
-    /**
-     * 查询系统菜单列表
-     *
-     * @param menu 菜单信息
-     *
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuList (SysMenu menu);
-
-    public List<SysMenu> selectSysMenuList(SysMenu menu);
-
-    /**
-     * 根据用户所有权限
-     *
-     * @return 权限列表
-     */
-    public List<String> selectMenuPerms ();
-
-    /**
-     * 根据用户查询系统菜单列表
-     *
-     * @param menu 菜单信息
-     *
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuListByUserId (SysMenu menu);
-
-    /**
-     * 根据角色ID查询权限
-     *
-     * @param roleId 角色ID
-     *
-     * @return 权限列表
-     */
-    public List<String> selectMenuPermsByRoleId (Long roleId);
-
-    /**
-     * 根据用户ID查询权限
-     *
-     * @param userId 用户ID
-     *
-     * @return 权限列表
-     */
-    public List<String> selectMenuPermsByUserId (Long userId);
-
-    /**
-     * 根据用户ID查询菜单
-     *
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuTreeAll ();
-
-    /**
-     * 根据用户ID查询菜单
-     *
-     * @param userId 用户ID
-     *
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuTreeByUserId (Long userId);
-
-    /**
-     * 根据角色ID查询菜单树信息
-     *
-     * @param roleId            角色ID
-     * @param menuCheckStrictly 菜单树选择项是否关联显示
-     *
-     * @return 选中菜单列表
-     */
-    public List<Long> selectMenuListByRoleId (@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
-
-    /**
-     * 根据菜单ID查询信息
-     *
-     * @param menuId 菜单ID
-     *
-     * @return 菜单信息
-     */
-    public SysMenu selectMenuById (Long menuId);
-
-    /**
-     * 是否存在菜单子节点
-     *
-     * @param menuId 菜单ID
-     *
-     * @return 结果
-     */
-    public int hasChildByMenuId (Long menuId);
-
-    /**
-     * 新增菜单信息
-     *
-     * @param menu 菜单信息
-     *
-     * @return 结果
-     */
-    public int insertMenu (SysMenu menu);
-
-    /**
-     * 修改菜单信息
-     *
-     * @param menu 菜单信息
-     *
-     * @return 结果
-     */
-    public int updateMenu (SysMenu menu);
-
-    /**
-     * 删除菜单管理信息
-     *
-     * @param menuId 菜单ID
-     *
-     * @return 结果
-     */
-    public int deleteMenuById (Long menuId);
-
-    /**
-     * 校验菜单名称是否唯一
-     *
-     * @param menuName 菜单名称
-     * @param parentId 父菜单ID
-     *
-     * @return 结果
-     */
-    public SysMenu checkMenuNameUnique (@Param("menuName") String menuName, @Param("parentId") Long parentId);
-
-    public List<SysMenu> selectSysChdMenuList(List<Long> longs);
-}

muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -1,510 +0,0 @@
-package com.muyu.system.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.common.core.constant.UserConstants;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.bean.BeanValidators;
-import com.muyu.common.datascope.annotation.DataScope;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysRole;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.system.domain.SysPost;
-import com.muyu.system.domain.SysUserPost;
-import com.muyu.system.domain.SysUserRole;
-import com.muyu.system.mapper.*;
-import com.muyu.system.service.SysUserService;
-import com.muyu.system.service.SysConfigService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import javax.validation.Validator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 用户 业务层处理
- *
- * @author muyu
- */
-@Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
-    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-    @Autowired
-    protected Validator validator;
-    @Autowired
-    private SysUserMapper userMapper;
-    @Autowired
-    private SysRoleMapper roleMapper;
-    @Autowired
-    private SysPostMapper postMapper;
-    @Autowired
-    private SysUserRoleMapper userRoleMapper;
-    @Autowired
-    private SysUserPostMapper userPostMapper;
-    @Autowired
-    private SysConfigService configService;
-
-    /**
-     * 根据条件分页查询用户列表
-     *
-     * @param user 用户信息
-     *
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUserList (SysUser user) {
-        return userMapper.selectUserList(user);
-    }
-
-    /**
-     * 根据条件分页查询已分配用户角色列表
-     *
-     * @param user 用户信息
-     *
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectAllocatedList (SysUser user) {
-        List<SysUser> sysUsers = userMapper.selectAllocatedList(user);
-        if(sysUsers.isEmpty()){
-            throw new ServiceException("登录用户密码错误");
-        }
-        return userMapper.selectAllocatedList(user);
-    }
-
-    /**
-     * 根据条件分页查询未分配用户角色列表
-     *
-     * @param user 用户信息
-     *
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUnallocatedList (SysUser user) {
-        return userMapper.selectUnallocatedList(user);
-    }
-
-
-
-    /**
-     * 通过用户名查询用户
-     *
-     * @param userName 用户名
-     *
-     * @return 用户对象信息
-     */
-    @Override
-    public SysUser selectUserByUserName (String userName) {
-        return userMapper.selectUserByUserName(userName);
-    }
-
-    /**
-     * 通过用户ID查询用户
-     *
-     * @param userId 用户ID
-     *
-     * @return 用户对象信息
-     */
-    @Override
-    public SysUser selectUserById (Long userId) {
-        return userMapper.selectUserById(userId);
-    }
-
-    /**
-     * 查询用户所属角色组
-     *
-     * @param userName 用户名
-     *
-     * @return 结果
-     */
-    @Override
-    public String selectUserRoleGroup (String userName) {
-        List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list)) {
-            return StringUtils.EMPTY;
-        }
-        return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
-    }
-
-    /**
-     * 查询用户所属岗位组
-     *
-     * @param userName 用户名
-     *
-     * @return 结果
-     */
-    @Override
-    public String selectUserPostGroup (String userName) {
-        List<SysPost> list = postMapper.selectPostsByUserName(userName);
-        if (CollectionUtils.isEmpty(list)) {
-            return StringUtils.EMPTY;
-        }
-        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
-    }
-
-    /**
-     * 校验用户名称是否唯一
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    public boolean checkUserNameUnique (SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验手机号码是否唯一
-     *
-     * @param user 用户信息
-     *
-     * @return
-     */
-    @Override
-    public boolean checkPhoneUnique (SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验email是否唯一
-     *
-     * @param user 用户信息
-     *
-     * @return
-     */
-    @Override
-    public boolean checkEmailUnique (SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验用户是否允许操作
-     *
-     * @param user 用户信息
-     */
-    @Override
-    public void checkUserAllowed (SysUser user) {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
-            throw new ServiceException("不允许操作超级管理员用户");
-        }
-    }
-
-    /**
-     * 校验用户是否有数据权限
-     *
-     * @param userId 用户id
-     */
-    @Override
-    public void checkUserDataScope (Long userId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
-            SysUser user = new SysUser();
-            user.setUserId(userId);
-            List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
-            if (StringUtils.isEmpty(users)) {
-                throw new ServiceException("没有权限访问用户数据！");
-            }
-        }
-    }
-
-    /**
-     * 新增保存用户信息
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int insertUser (SysUser user) {
-        // 新增用户信息
-        int rows = userMapper.insertUser(user);
-        // 新增用户岗位关联
-        insertUserPost(user);
-        // 新增用户与角色管理
-        insertUserRole(user);
-        return rows;
-    }
-
-    /**
-     * 注册用户信息
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    public boolean registerUser (SysUser user) {
-        return userMapper.insertUser(user) > 0;
-    }
-
-    /**
-     * 修改保存用户信息
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int updateUser (SysUser user) {
-        Long userId = user.getUserId();
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 新增用户与角色管理
-        insertUserRole(user);
-        // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
-        // 新增用户与岗位管理
-        insertUserPost(user);
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 用户授权角色
-     *
-     * @param userId  用户ID
-     * @param roleIds 角色组
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void insertUserAuth (Long userId, Long[] roleIds) {
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        insertUserRole(userId, roleIds);
-    }
-
-    /**
-     * 修改用户状态
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    public int updateUserStatus (SysUser user) {
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 修改用户基本信息
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    public int updateUserProfile (SysUser user) {
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 修改用户头像
-     *
-     * @param userName 用户名
-     * @param avatar   头像地址
-     *
-     * @return 结果
-     */
-    @Override
-    public boolean updateUserAvatar (String userName, String avatar) {
-        return userMapper.updateUserAvatar(userName, avatar) > 0;
-    }
-
-    /**
-     * 重置用户密码
-     *
-     * @param user 用户信息
-     *
-     * @return 结果
-     */
-    @Override
-    public int resetPwd (SysUser user) {
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 重置用户密码
-     *
-     * @param userName 用户名
-     * @param password 密码
-     *
-     * @return 结果
-     */
-    @Override
-    public int resetUserPwd (String userName, String password) {
-        return userMapper.resetUserPwd(userName, password);
-    }
-
-    /**
-     * 新增用户角色信息
-     *
-     * @param user 用户对象
-     */
-    public void insertUserRole (SysUser user) {
-        this.insertUserRole(user.getUserId(), user.getRoleIds());
-    }
-
-    /**
-     * 新增用户岗位信息
-     *
-     * @param user 用户对象
-     */
-    public void insertUserPost (SysUser user) {
-        Long[] posts = user.getPostIds();
-        if (StringUtils.isNotEmpty(posts)) {
-            // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts) {
-                SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
-                up.setPostId(postId);
-                list.add(up);
-            }
-            userPostMapper.batchUserPost(list);
-        }
-    }
-
-    /**
-     * 新增用户角色信息
-     *
-     * @param userId  用户ID
-     * @param roleIds 角色组
-     */
-    public void insertUserRole (Long userId, Long[] roleIds) {
-        if (StringUtils.isNotEmpty(roleIds)) {
-            // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roleIds) {
-                SysUserRole ur = new SysUserRole();
-                ur.setUserId(userId);
-                ur.setRoleId(roleId);
-                list.add(ur);
-            }
-            userRoleMapper.batchUserRole(list);
-        }
-    }
-
-    /**
-     * 通过用户ID删除用户
-     *
-     * @param userId 用户ID
-     *
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteUserById (Long userId) {
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
-    }
-
-    /**
-     * 批量删除用户信息
-     *
-     * @param userIds 需要删除的用户ID
-     *
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteUserByIds (Long[] userIds) {
-        for (Long userId : userIds) {
-            checkUserAllowed(new SysUser(userId));
-            checkUserDataScope(userId);
-        }
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRole(userIds);
-        // 删除用户与岗位关联
-        userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
-    }
-
-    /**
-     * 导入用户数据
-     *
-     * @param userList        用户数据列表
-     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName        操作用户
-     *
-     * @return 结果
-     */
-    @Override
-    public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
-            throw new ServiceException("导入用户数据不能为空！");
-        }
-        int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
-        String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList) {
-            try {
-                // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u)) {
-                    BeanValidators.validateWithException(validator, user);
-                    user.setPassword(SecurityUtils.encryptPassword(password));
-                    user.setCreateBy(operName);
-                    userMapper.insertUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                } else if (isUpdateSupport) {
-                    BeanValidators.validateWithException(validator, user);
-                    checkUserAllowed(u);
-                    checkUserDataScope(u.getUserId());
-                    user.setUserId(u.getUserId());
-                    user.setUpdateBy(operName);
-                    userMapper.updateUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                } else {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
-                }
-            } catch (Exception e) {
-                failureNum++;
-                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
-                log.error(msg, e);
-            }
-        }
-        if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new ServiceException(failureMsg.toString());
-        } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-        }
-        return successMsg.toString();
-    }
-
-}

muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.system.mapper.SysMenuMapper">
-
-    <resultMap type="com.muyu.system.domain.SysMenu" id="SysMenuResult">
-        <id property="menuId" column="menu_id"/>
-        <result property="menuName" column="menu_name"/>
-        <result property="parentName" column="parent_name"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="orderNum" column="order_num"/>
-        <result property="path" column="path"/>
-        <result property="component" column="component"/>
-        <result property="query" column="query"/>
-        <result property="isFrame" column="is_frame"/>
-        <result property="isCache" column="is_cache"/>
-        <result property="menuType" column="menu_type"/>
-        <result property="visible" column="visible"/>
-        <result property="status" column="status"/>
-        <result property="perms" column="perms"/>
-        <result property="icon" column="icon"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="remark" column="remark"/>
-    </resultMap>
-
-    <sql id="selectMenuVo">
-        select menu_id,
-               menu_name,
-               parent_id,
-               order_num,
-               path,
-               component,
-               `query`,
-               is_frame,
-               is_cache,
-               menu_type,
-               visible,
-               status,
-               ifnull(perms, '') as perms,
-               icon,
-               create_time
-        from sys_menu
-    </sql>
-
-    <select id="selectMenuList" parameterType="com.muyu.system.domain.SysMenu" resultMap="SysMenuResult">
-        <include refid="selectMenuVo"/>
-        <where>
-            <if test="menuName != null and menuName != ''">
-                AND menu_name like concat('%', #{menuName}, '%')
-            </if>
-            <if test="visible != null and visible != ''">
-                AND visible = #{visible}
-            </if>
-            <if test="status != null and status != ''">
-                AND status = #{status}
-            </if>
-        </where>
-        order by parent_id, order_num
-    </select>
-
-    <select id="selectMenuTreeAll" resultMap="SysMenuResult">
-        select distinct m.menu_id,
-                        m.parent_id,
-                        m.menu_name,
-                        m.path,
-                        m.component,
-                        m.`query`,
-                        m.visible,
-                        m.status,
-                        ifnull(m.perms, '') as perms,
-                        m.is_frame,
-                        m.is_cache,
-                        m.menu_type,
-                        m.icon,
-                        m.order_num,
-                        m.create_time
-        from sys_menu m
-        where m.menu_type in ('M', 'C')
-          and m.status = 0
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuListByUserId" parameterType="com.muyu.system.domain.SysMenu" resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
-        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-        from sys_menu m
-        left join sys_role_menu rm on m.menu_id = rm.menu_id
-        left join sys_user_role ur on rm.role_id = ur.role_id
-        left join sys_role ro on ur.role_id = ro.role_id
-        where ur.user_id = #{params.userId}
-        <if test="menuName != null and menuName != ''">
-            AND m.menu_name like concat('%', #{menuName}, '%')
-        </if>
-        <if test="visible != null and visible != ''">
-            AND m.visible = #{visible}
-        </if>
-        <if test="status != null and status != ''">
-            AND m.status = #{status}
-        </if>
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-        select distinct m.menu_id,
-                        m.parent_id,
-                        m.menu_name,
-                        m.path,
-                        m.component,
-                        m.`query`,
-                        m.visible,
-                        m.status,
-                        ifnull(m.perms, '') as perms,
-                        m.is_frame,
-                        m.is_cache,
-                        m.menu_type,
-                        m.icon,
-                        m.order_num,
-                        m.create_time
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-                 left join sys_user_role ur on rm.role_id = ur.role_id
-                 left join sys_role ro on ur.role_id = ro.role_id
-                 left join sys_user u on ur.user_id = u.user_id
-        where u.user_id = #{userId}
-          and m.menu_type in ('M', 'C')
-          and m.status = 0
-          AND ro.status = 0
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuListByRoleId" resultType="Long">
-        select m.menu_id
-        from sys_menu m
-        left join sys_role_menu rm on m.menu_id = rm.menu_id
-        where rm.role_id = #{roleId}
-        <if test="menuCheckStrictly">
-            and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
-            rm.menu_id and rm.role_id = #{roleId})
-        </if>
-        order by m.parent_id, m.order_num
-    </select>
-
-    <select id="selectMenuPerms" resultType="String">
-        select distinct m.perms
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-                 left join sys_user_role ur on rm.role_id = ur.role_id
-    </select>
-
-    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
-        select distinct m.perms
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-                 left join sys_user_role ur on rm.role_id = ur.role_id
-                 left join sys_role r on r.role_id = ur.role_id
-        where m.status = '0'
-          and r.status = '0'
-          and ur.user_id = #{userId}
-    </select>
-
-    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
-        select distinct m.perms
-        from sys_menu m
-                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-        where m.status = '0'
-          and rm.role_id = #{roleId}
-    </select>
-
-    <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
-        <include refid="selectMenuVo"/>
-        where menu_id = #{menuId}
-    </select>
-
-    <select id="hasChildByMenuId" resultType="Integer">
-        select count(1)
-        from sys_menu
-        where parent_id = #{menuId}
-    </select>
-
-    <select id="checkMenuNameUnique" parameterType="com.muyu.system.domain.SysMenu" resultMap="SysMenuResult">
-        <include refid="selectMenuVo"/>
-        where menu_name=#{menuName} and parent_id = #{parentId} limit 1
-    </select>
-    <select id="selectSysMenuList" resultType="com.muyu.system.domain.SysMenu">
-        <include refid="selectMenuVo"></include>
-        <where>
-            menu_id in(
-                    <foreach collection="longs" separator="," item="id">
-                        #{menuId}
-                    </foreach>
-            )
-        </where>
-    </select>
-  <select id="selectSysChdMenuList" resultType="com.muyu.system.domain.SysMenu">
-
-  </select>
-
-  <update id="updateMenu" parameterType="com.muyu.system.domain.SysMenu">
-        update sys_menu
-        <set>
-            <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
-            <if test="parentId != null">parent_id = #{parentId},</if>
-            <if test="orderNum != null">order_num = #{orderNum},</if>
-            <if test="path != null and path != ''">path = #{path},</if>
-            <if test="component != null">component = #{component},</if>
-            <if test="query != null">`query` = #{query},</if>
-            <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
-            <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
-            <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
-            <if test="visible != null">visible = #{visible},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="perms !=null">perms = #{perms},</if>
-            <if test="icon !=null and icon != ''">icon = #{icon},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            update_time = sysdate()
-        </set>
-        where menu_id = #{menuId}
-    </update>
-
-    <insert id="insertMenu" parameterType="com.muyu.system.domain.SysMenu">
-        insert into sys_menu(
-        <if test="menuId != null and menuId != 0">menu_id,</if>
-        <if test="parentId != null and parentId != 0">parent_id,</if>
-        <if test="menuName != null and menuName != ''">menu_name,</if>
-        <if test="orderNum != null">order_num,</if>
-        <if test="path != null and path != ''">path,</if>
-        <if test="component != null and component != ''">component,</if>
-        <if test="query != null and query != ''">`query`,</if>
-        <if test="isFrame != null and isFrame != ''">is_frame,</if>
-        <if test="isCache != null and isCache != ''">is_cache,</if>
-        <if test="menuType != null and menuType != ''">menu_type,</if>
-        <if test="visible != null">visible,</if>
-        <if test="status != null">status,</if>
-        <if test="perms !=null and perms != ''">perms,</if>
-        <if test="icon != null and icon != ''">icon,</if>
-        <if test="remark != null and remark != ''">remark,</if>
-        <if test="createBy != null and createBy != ''">create_by,</if>
-        create_time
-        )values(
-        <if test="menuId != null and menuId != 0">#{menuId},</if>
-        <if test="parentId != null and parentId != 0">#{parentId},</if>
-        <if test="menuName != null and menuName != ''">#{menuName},</if>
-        <if test="orderNum != null">#{orderNum},</if>
-        <if test="path != null and path != ''">#{path},</if>
-        <if test="component != null and component != ''">#{component},</if>
-        <if test="query != null and query != ''">#{query},</if>
-        <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
-        <if test="isCache != null and isCache != ''">#{isCache},</if>
-        <if test="menuType != null and menuType != ''">#{menuType},</if>
-        <if test="visible != null">#{visible},</if>
-        <if test="status != null">#{status},</if>
-        <if test="perms !=null and perms != ''">#{perms},</if>
-        <if test="icon != null and icon != ''">#{icon},</if>
-        <if test="remark != null and remark != ''">#{remark},</if>
-        <if test="createBy != null and createBy != ''">#{createBy},</if>
-        sysdate()
-        )
-    </insert>
-
-    <delete id="deleteMenuById" parameterType="Long">
-        delete
-        from sys_menu
-        where menu_id = #{menuId}
-    </delete>
-
-</mapper>

src/views/system/dict/index.vue

@@ -329,13 +329,14 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
+      const dictIds = row.dictId || this.ids;0
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除字//典编号为"' + dictIds + '"的数据项？').then(function () {
         return delType(dictIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
+
       });
     },
     /** 导出按钮操作 */

src/views/system/notice/index.vue

@@ -165,6 +165,23 @@
               <editor v-model="form.noticeContent" :min-height="192"/>
             </el-form-item>
           </el-col>
+<!--          <el-checkbox label="深圳总公司" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="长沙分公司" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="研发部门" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="市场部门" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="测试部门" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="财务部门" name="deptId"></el-checkbox>-->
+<!--          <el-checkbox label="运维部门" name="deptId"></el-checkbox>-->
+          <el-col :span="12">
+            <el-form-item label="部门ID">
+              <el-checkbox-group v-model="form.deptId">
+                <el-checkbox  v-for="dict in dict.type.sys_notice_dept"
+                              :key="dict.value"
+                              :label="dict.value"
+                >{{ dict.label }}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -180,7 +197,7 @@ import {addNotice, delNotice, getNotice, listNotice, updateNotice} from "@/api/s
 
 export default {
   name: "Notice",
-  dicts: ['sys_notice_status', 'sys_notice_type'],
+  dicts: ['sys_notice_status', 'sys_notice_type','sys_notice_dept'],
   data() {
     return {
       // 遮罩层
@@ -197,6 +214,7 @@ export default {
       total: 0,
       // 公告表格数据
       noticeList: [],
+      deptId:['复选框 A'],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -207,7 +225,8 @@ export default {
         pageSize: 10,
         noticeTitle: undefined,
         createBy: undefined,
-        status: undefined
+        status: undefined,
+        deptId: undefined
       },
       // 表单参数
       form: {},
@@ -218,6 +237,9 @@ export default {
         ],
         noticeType: [
           {required: true, message: "公告类型不能为空", trigger: "change"}
+        ],
+        deptId: [
+          {required: true, message: "部门不能为空", trigger: "change"}
         ]
       }
     };

src/views/system/user/index.vue

@@ -374,6 +374,7 @@ import {
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {forceLogout, list} from "@/api/monitor/online";
 
 export default {
   name: "User",
@@ -628,7 +629,7 @@ export default {
       }).then(({value}) => {
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          list(this.queryParams).then(res->{
+          list(this.queryParams).then(res => {
             const userList=res.data.rows
             userList.foreach(userInfo=>{
               if(userInfo.userName==row.userName){
@@ -706,6 +707,12 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
+    },
+    foreach: (param) => {
+
+    },
+    tokenId: () => {
+
     }
   }
 };