zhuo
2025-03-18 d5165d2cdaeab2be112b805addf438466b59bedd
单点登录完成
已修改5个文件
30 ■■■■ 文件已修改
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceRecordDto;
import com.ruoyi.device.excel.DeviceRecordExportWord;
import com.ruoyi.device.mapper.DeviceMapper;
@@ -13,6 +14,8 @@
import com.ruoyi.device.pojo.DeviceRecord;
import com.ruoyi.device.service.DeviceRecordService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.domain.vo.SysRoleVo;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -40,12 +43,23 @@
    @Resource
    private DeviceMapper deviceMapper;
    @Resource
    private SysRoleMenuMapper sysRoleMenuMapper;
    @Override
    public IPage<DeviceRecordDto> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
        // todo:仅看自己
        Integer userId = null;
        Long userId = SecurityUtils.getUserId();
        // 获取权限判断是否是仅看我
        SysRoleVo sysRoleVo = sysRoleMenuMapper.selectRoleMenu("get:device:record", userId);
        return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, userId);
        Integer testUserId = null;
        //没有仅看我权限跳过
        if (sysRoleVo != null && sysRoleVo.getIsRersonal() != null && sysRoleVo.getIsRersonal().equals(1)) {
            testUserId = SecurityUtils.getUserId().intValue();
        }
        return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, testUserId);
    }
ruoyi-admin/src/main/resources/application.yml
@@ -90,9 +90,9 @@
#集团统一登录
sso:
  url: https://ztt-sso.asuncloud.net
  clientId: 47ded514-f447-43b4-afdf-181c10e2222d
  clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
  url: https://ztt-sso.ztt.cn
  clientId: 6ca77685-e304-4c0e-9e63-3839e166742f
  clientSecret: 496e2809629ea5beb4118b10c95d702f
  callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -59,7 +59,7 @@
            Object idToken = redisTemplate.opsForValue().get("ssoOauthToken:idToken:" + userName);
            if (idToken != null) {
                loginOutUrl = ssoBean.getUrl() + "/oauth2/sessions/logout?id_token_hint=" + idToken;
                redisTemplate.delete("ssoOauthToken:idToken:" + SecurityUtils.getUsername());
                redisTemplate.delete("ssoOauthToken:idToken:" + userName);
                AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.sso.logout.success")));
            } else {
                AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -259,7 +259,7 @@
        Authentication authentication = null;
        SysUser sysUser = sysUserService.selectUserByUserName(username);
        if (sysUser == null) {
            throw new ServiceException("单点登录验证失败");
            throw new ServiceException("当前系统没有该用户");
        }
        try
        {
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -25,7 +25,7 @@
        is_custom
        from user
        where del_flag = '0'
        and id != ) a
        and id != 1) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>