【丽水】满意度模块化：新增 ruoyi-satisfaction 独立模块

liusheng

2026-10-12 0c1f8c479065739f3c7a5126de8e667035d00b58

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -15,6 +16,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.common.core.service.IUserExtInfoService;
import com.ruoyi.common.core.service.ISatisfactionCategoryService;
import com.ruoyi.system.mapper.SysUserDeptMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,6 +75,10 @@

    @Value("${isAdmin}")
    private List<Long> isAdmin;


    @Value("${spring.profiles.active}")
    private String active;

    /**
     * 根据条件分页查询用户列表
@@ -133,6 +139,7 @@
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(sysUser.getUserId());
        sysUserDept.setDeptType(sysUser.getSearchscope());
        sysUserDept.setOrgid(sysUser.getOrgid());
        List<SysUserDept> sysUserDeptKSs = null;
        List<SysUserDept> sysUserDeptBQs = null;
        if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {
@@ -181,14 +188,16 @@
        String[] split = userName.split("&");
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
        if (Objects.isNull(sysUser)) return sysUser;
        //这里只卡用户类型为“患者”的
        if (sysUser.getUserType().equals("患者") && StringUtils.isNotEmpty(split[3]) && !split[3].equals("null") && !sysUser.getUserType().equals(split[3].trim()))
            throw new BaseException("当前用户类型与登录用户类型不一致");

        boolean isAdmin = StringUtils.isNotEmpty(split[0]) && "admin".equals(split[0]);
        IUserExtInfoService userExtInfoService = SpringUtils.getBean(IUserExtInfoService.class);
        Executor executor = SpringUtils.getBean("threadPoolTaskExecutor");

        // === 并行查询: 用户机构信息 + 部门列表 ===
        CompletableFuture<Map<String, String>> orgInfoFuture = CompletableFuture.supplyAsync(() ->
                userExtInfoService.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[2]), executor);
        CompletableFuture<Map<String, String>> orgInfoFuture = CompletableFuture.supplyAsync(() -> userExtInfoService.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[2]), executor);

        CompletableFuture<List<SysDept>> deptsFuture;
        if (isAdmin) {
@@ -306,9 +315,40 @@
            }
            sysUser.setBelongDepts(list);
            // 设置满意度分类（走缓存）
            sysUser.setSatisfactionCategories(userExtInfoService.getSatisfactionCategories(sysUser.getOrgid()));
            // 满意度模块化后：不再经由 smartor 的 IUserExtInfoService，
            // 改为按 ruoyi-common 的 ISatisfactionCategoryService 接口查找实现
            // （实现在 ruoyi-satisfaction，由常驻门面保证"模块关闭/缺失时返回空 Map"）
            sysUser.setSatisfactionCategories(loadSatisfactionCategories(sysUser.getOrgid()));
        }
        return sysUser;
    }

    /**
     * 安全地获取满意度分类。
     * <p>
     * 满意度模块可以被配置关闭（{@code sys_config} 参数 {@code satisfaction.enabled=false}），也可以整体不在依赖里；
     * 这两种情况下都必须<b>不影响登录主流程</b>，因此这里：
     * <ul>
     *   <li>容器里没有 {@code ISatisfactionCategoryService} 实现时返回空 Map；</li>
     *   <li>调用过程中抛任何异常也只记日志并返回空 Map。</li>
     * </ul>
     *
     * @param orgid 机构ID
     * @return 满意度分类；不可用时返回空 Map（不会返回 null）
     */
    private Map<String, Object> loadSatisfactionCategories(String orgid) {
        try {
            ISatisfactionCategoryService satisfactionCategoryService =
                    SpringUtils.getBean(ISatisfactionCategoryService.class);
            if (satisfactionCategoryService == null) {
                return Collections.emptyMap();
            }
            Map<String, Object> categories = satisfactionCategoryService.getSatisfactionCategories(orgid);
            return categories == null ? Collections.emptyMap() : categories;
        } catch (Exception e) {
            log.warn("获取满意度分类失败，已降级为空结果（不影响登录）。orgid={}", orgid, e);
            return Collections.emptyMap();
        }
    }

    /**
@@ -333,17 +373,15 @@
    @Override
    public SysUser selectUserByUserNameAndDeptId(String userName) {
        String[] split = userName.split("&");
        if (split[2].contains("null")) {
        //南华附一也不验证dept_id了
        if (split[2].contains("null") || active.equals("nhfy")) {
            split[2] = null;
        }
        SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);

        //获取当前登陆人的机构和院�?
        IUserExtInfoService userExtInfoService2 = SpringUtils.getBean(IUserExtInfoService.class);
        Map<String, String> userOrgInfo2 = userExtInfoService2.getUserOrgInfo(
                sysUser.getUserId().toString(),
                split[1],
                split[3]);
        Map<String, String> userOrgInfo2 = userExtInfoService2.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[3]);
        if (!userOrgInfo2.isEmpty()) {
            sysUser.setOrgid(userOrgInfo2.get("orgid"));
            sysUser.setCampusid(userOrgInfo2.get("campusid"));
@@ -709,15 +747,13 @@
//                sysUserDeptMapper.insertSysUserDept(sysUserDep);
//            }
//        }
        //删除原有关系
        SysUserDept delSysUserDept = new SysUserDept();
        delSysUserDept.setUserId(user.getUserId());
        delSysUserDept.setOrgid(user.getOrgid());
        sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

        if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
            //删除原有关系
            SysUserDept delSysUserDept = new SysUserDept();
            delSysUserDept.setUserId(user.getUserId());
            delSysUserDept.setOrgid(user.getOrgid());
            delSysUserDept.setDeptType("1");
            sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

            for (String deptCode : user.getDeptCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), deptCode);
                if (ObjectUtils.isEmpty(sysDept)) {
@@ -739,13 +775,6 @@
        }

        if (!CollectionUtils.isEmpty(user.getWardCodes())) {
            //删除原有关系
            SysUserDept delSysUserDept = new SysUserDept();
            delSysUserDept.setUserId(user.getUserId());
            delSysUserDept.setOrgid(user.getOrgid());
            delSysUserDept.setDeptType("2");
            sysUserDeptMapper.deleteSysUserDeptByUserId(delSysUserDept);

            for (String wardCode : user.getWardCodes()) {
                SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), wardCode);
                if (ObjectUtils.isEmpty(sysDept)) {