huyao
2022-09-29 50e0d4741b19a5071741b200ff76a4d69504fce3
修为问题
6个文件已修改
3个文件已添加
156 ■■■■ 已修改文件
cloud-server-parent.zip 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/controller/LoginController.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/controller/SysMenuController.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/controller/SysRoleController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/model/vo/AgeVo.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/model/vo/LoginUserVo.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/service/ISysRoleMenuService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-upms/src/main/java/com/dsh/upms/service/impl/SysRoleMenuServiceImpl.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
mb.zip 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-parent.zip
Binary files differ
cloud-server-upms/src/main/java/com/dsh/upms/controller/LoginController.java
@@ -4,7 +4,6 @@
import cn.mb.cloud.common.core.util.ResponseData;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsh.upms.model.vo.LoginUserVo;
import com.dsh.upms.model.vo.region.RegionVo;
import com.dsh.upms.service.SysUserService;
import com.dsh.utils.login.LoginHelper;
import io.swagger.annotations.Api;
@@ -30,10 +29,6 @@
    @Autowired
    private SysUserService sysUserService;
    @Autowired
    private IRegionMemberService regionMemberService;
    @Autowired
    private IStoresService storesService;
    /**
     * 登录
@@ -58,53 +53,6 @@
        }
    }
    /**
     * 获取当前用户信息
     *
     * @return
     */
    //@SysLog("获取当前用户信息")
    @GetMapping("/getUser")
    @ApiOperation(value = "获取当前用户信息", tags = {"后台登录控制器"}, notes = "", response = LoginUserVo.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResponseData getUser() {
        try {
            LoginUserVo user = LoginHelper.getUser();
            List<RegionMember> regionMemberList = regionMemberService
                    .list(Wrappers.<RegionMember>query().lambda()
                            .eq(RegionMember::getMemberId, user.getId())
                            .eq(RegionMember::getRegionType, 2)
                            .eq(RegionMember::getState, 0)
                            .eq(RegionMember::getDelFlag, 0));
            List<Long> regionIdList = new ArrayList<>();
            for (RegionMember regionMember : regionMemberList) {
                if (!regionIdList.contains(regionMember.getRegionId())) {
                    regionIdList.add(regionMember.getRegionId());
                }
            }
            List<RegionVo> regionVoList = new ArrayList<>();
            if (!regionIdList.isEmpty()) {
                List<Stores> storesList = storesService
                        .list(Wrappers.<Stores>query().lambda()
                                .in(Stores::getId, regionIdList)
                                .eq(Stores::getDelFlag, 0)
                                .orderByAsc(Stores::getCreateDate));
                for (Stores stores : storesList) {
                    RegionVo regionVo = new RegionVo();
                    regionVo.setRegionId(stores.getId());
                    regionVo.setRegionName(stores.getStoresName());
                    regionVoList.add(regionVo);
                }
            }
            user.setStoresId(regionVoList);
            return new ResponseData<>(user);
        } catch (Exception e) {
            e.printStackTrace();
            return ResponseData.fail(e.getMessage());
        }
    }
    /**
     * 退出登录
cloud-server-upms/src/main/java/com/dsh/upms/controller/SysMenuController.java
@@ -55,10 +55,6 @@
    @Autowired
    private ISysMenuService sysMenuService;
    @Autowired
    private ISysDoctorMenuService sysDoctorMenuService;
    @Autowired
    private IDoctorService doctorService;
    /**
     * 分页查询
@@ -206,23 +202,6 @@
    }
    /**
     * 返回角色的菜单集合
     *
     * @param sysRoleMenu
     * @return
     */
    @PostMapping("/role")
    @ApiOperation(value = "返回角色的菜单集合", tags = {"权限菜单"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResponseData getRoleResource(@RequestBody SysRoleMenu sysRoleMenu) throws BusinessException {
        List<MenuVO> list = sysMenuService.findMenuByRoleId(doctorService.updateRole(sysRoleMenu.getRoleId().intValue()));
        return ResponseData.success(list.stream().filter(item -> list.stream().noneMatch(vo -> Objects.nonNull(vo) && Objects.nonNull(vo.getParentId())
                && vo.getParentId().equals(item.getId()))).map(item -> item.getId().toString()).collect(Collectors.toList()));
    }
    /**
     * 返回当前登录用户的树形菜单集合
     *
     * @return 当前用户的树形菜单
@@ -248,24 +227,5 @@
        return ResponseData.success(TreeUtil.bulidRouter(menuTreeList));
    }
    /**
     * 返回当前登录用户的权限码
     *
     * @return
     * @throws BusinessException
     */
    @GetMapping("/user/permission")
    @ApiOperation(value = "返回当前登录用户的权限码", tags = {"权限菜单"}, notes = "", response = String.class)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResponseData getPermission() throws BusinessException {
        // 获取当前登录用户信息
        LoginUserVo loginUserVo = LoginHelper.getUser();
        if (Objects.isNull(loginUserVo)) {
            throw new BusinessException("请登录", ErrorCodeConstants.FAIL.getValue());
        }
        return ResponseData.success(sysDoctorMenuService.getPermission(loginUserVo.getId()));
    }
}
cloud-server-upms/src/main/java/com/dsh/upms/controller/SysRoleController.java
@@ -130,7 +130,6 @@
     */
    @GetMapping("/synchronousAdminMenu")
    public ResponseData synchronousAdminMenu() {
        sysRoleMenuService.synchronousAdminMenu();
        return ResponseData.success(Boolean.TRUE);
    }
cloud-server-upms/src/main/java/com/dsh/upms/model/vo/AgeVo.java
New file
@@ -0,0 +1,22 @@
package com.dsh.upms.model.vo;
import lombok.Data;
/**
 * 岁月日
 */
@Data
public class AgeVo {
    /**
     * 岁
     */
    private Integer age;
    /**
     * 月
     */
    private Integer month;
    /**
     * 天
     */
    private Integer day;
}
cloud-server-upms/src/main/java/com/dsh/upms/model/vo/LoginUserVo.java
@@ -1,7 +1,6 @@
package com.dsh.upms.model.vo;
import com.dsh.config.JsonLongSerializer;
import com.dsh.upms.model.vo.region.RegionVo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -51,8 +50,4 @@
    private String sjd;
    /**
     * 地区信息
     */
    private List<RegionVo> storesId;
}
cloud-server-upms/src/main/java/com/dsh/upms/service/ISysRoleMenuService.java
@@ -32,10 +32,6 @@
     * @return
     */
    Boolean getList(Long roleId);
    /**
     * 同步admin账号的所有权限
     */
    void synchronousAdminMenu();
cloud-server-upms/src/main/java/com/dsh/upms/service/impl/SysRoleMenuServiceImpl.java
@@ -9,7 +9,6 @@
import com.dsh.upms.entity.SysUserRole;
import com.dsh.upms.mapper.SysRoleMenuMapper;
import com.dsh.upms.mapper.SysUserRoleMapper;
import com.dsh.upms.service.ISysDoctorMenuService;
import com.dsh.upms.service.ISysMenuService;
import com.dsh.upms.service.ISysRoleMenuService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,12 +34,10 @@
@Service
public class SysRoleMenuServiceImpl extends BaseServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
    @Autowired
    @Resource
    private SysUserRoleMapper userRoleMapper;
    @Autowired
    private ISysMenuService sysMenuService;
    @Autowired
    private ISysDoctorMenuService doctorMenuService;
    /**
@@ -83,30 +81,4 @@
    }
    /**
     * 同步admin账号的所有权限
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void synchronousAdminMenu() {
        this.getBaseMapper().deleteAdminMenu(1L);
        doctorMenuService.deleteAdminMenu(1L);
        List<SysMenu> menuList = sysMenuService
                .list(Wrappers.<SysMenu>query().lambda()
                        .eq(SysMenu::getDelFlag, 0)
                        .orderByAsc(SysMenu::getSort));
        List<SysRoleMenu> sysRoleMenuList = new ArrayList<>();
        for (SysMenu sysMenu : menuList) {
            SysRoleMenu sysRoleMenu = new SysRoleMenu();
            sysRoleMenu.setRoleId(1L);
            sysRoleMenu.setMenuId(sysMenu.getId());
            sysRoleMenuList.add(sysRoleMenu);
            //维护医生和菜单表关系
            SysDoctorMenu sysDoctorMenu = new SysDoctorMenu();
            sysDoctorMenu.setDoctorId(1L);
            sysDoctorMenu.setMenuId(sysMenu.getId());
            doctorMenuService.save(sysDoctorMenu);
        }
        this.saveBatch(sysRoleMenuList);
    }
}
mb.zip
Binary files differ