serv\web- 多租户修改
This commit is contained in:
@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.xyzh.common.core.page.PageParam;
|
||||
import org.xyzh.common.dto.usercenter.TbAchievement;
|
||||
import org.xyzh.common.vo.AchievementVO;
|
||||
import org.xyzh.common.vo.UserDeptRoleVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -21,9 +23,10 @@ public interface AchievementMapper extends BaseMapper<TbAchievement> {
|
||||
/**
|
||||
* @description 查询成就列表
|
||||
* @param filter 过滤条件
|
||||
* @param userDeptRoles 用户部门角色列表
|
||||
* @return List<TbAchievement> 成就列表
|
||||
*/
|
||||
List<TbAchievement> selectAchievements(@Param("filter") TbAchievement filter);
|
||||
List<TbAchievement> selectAchievements(@Param("filter") TbAchievement filter, @Param("userDeptRoles") List<UserDeptRoleVO> userDeptRoles);
|
||||
|
||||
/**
|
||||
* @description 根据成就ID查询成就信息
|
||||
@@ -108,15 +111,30 @@ public interface AchievementMapper extends BaseMapper<TbAchievement> {
|
||||
* @description 分页查询成就
|
||||
* @param filter 过滤条件
|
||||
* @param pageParam 分页参数
|
||||
* @param userDeptRoles 用户部门角色列表
|
||||
* @return List<TbAchievement> 成就列表
|
||||
*/
|
||||
List<TbAchievement> selectAchievementsPage(@Param("filter") TbAchievement filter, @Param("pageParam") PageParam pageParam);
|
||||
List<TbAchievement> selectAchievementsPage(@Param("filter") TbAchievement filter, @Param("pageParam") PageParam pageParam, @Param("userDeptRoles") List<UserDeptRoleVO> userDeptRoles);
|
||||
|
||||
/**
|
||||
* @description 统计成就总数
|
||||
* @param filter 过滤条件
|
||||
* @param userDeptRoles 用户部门角色列表
|
||||
* @return long 总数
|
||||
*/
|
||||
long countAchievements(@Param("filter") TbAchievement filter);
|
||||
long countAchievements(@Param("filter") TbAchievement filter, @Param("userDeptRoles") List<UserDeptRoleVO> userDeptRoles);
|
||||
|
||||
/**
|
||||
* @description 联表查询用户成就列表（包含进度信息）- 带权限过滤
|
||||
* @param userId 用户ID
|
||||
* @param type 成就类型（可选）
|
||||
* @param userDeptRoles 用户部门角色列表
|
||||
* @return List<AchievementVO> 用户成就列表（包含进度）
|
||||
*/
|
||||
List<AchievementVO> selectUserAchievementsWithProgress(
|
||||
@Param("userId") String userId,
|
||||
@Param("type") Integer type,
|
||||
@Param("userDeptRoles") List<UserDeptRoleVO> userDeptRoles
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,9 @@ import org.xyzh.common.dto.usercenter.TbUserAchievementProgress;
|
||||
import org.xyzh.common.utils.IDUtils;
|
||||
import org.xyzh.common.vo.AchievementVO;
|
||||
import org.xyzh.system.utils.LoginUtil;
|
||||
import org.xyzh.api.system.permission.ResourcePermissionService;
|
||||
import org.xyzh.common.vo.UserDeptRoleVO;
|
||||
import org.xyzh.common.core.enums.ResourceType;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -51,6 +54,9 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
@Autowired
|
||||
private List<AchievementChecker> checkers;
|
||||
|
||||
@Autowired
|
||||
private ResourcePermissionService resourcePermissionService;
|
||||
|
||||
// ==================== 成就定义管理 ====================
|
||||
|
||||
@Override
|
||||
@@ -84,6 +90,21 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
// 插入数据库
|
||||
int result = achievementMapper.insertAchievement(achievement);
|
||||
if (result > 0) {
|
||||
// 创建成就资源权限
|
||||
try {
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
if (userDeptRoles != null && !userDeptRoles.isEmpty()) {
|
||||
// 使用用户的第一个部门角色创建权限
|
||||
resourcePermissionService.createResourcePermission(
|
||||
ResourceType.ACHIEVEMENT.getCode(),
|
||||
achievement.getAchievementID(),
|
||||
userDeptRoles.get(0)
|
||||
);
|
||||
logger.info("创建成就权限成功: {}", achievement.getAchievementID());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("创建成就权限异常，但不影响成就创建: {}", e.getMessage(), e);
|
||||
}
|
||||
resultDomain.success("创建成就成功", achievement);
|
||||
} else {
|
||||
resultDomain.fail("创建成就失败");
|
||||
@@ -176,7 +197,9 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
public ResultDomain<TbAchievement> getAllAchievements(TbAchievement filter) {
|
||||
ResultDomain<TbAchievement> resultDomain = new ResultDomain<>();
|
||||
try {
|
||||
List<TbAchievement> list = achievementMapper.selectAchievements(filter);
|
||||
// 获取当前用户的部门角色
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
List<TbAchievement> list = achievementMapper.selectAchievements(filter, userDeptRoles);
|
||||
|
||||
resultDomain.success("获取成就列表成功", list);
|
||||
return resultDomain;
|
||||
@@ -196,8 +219,10 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
filter.setDeleted(false);
|
||||
}
|
||||
|
||||
List<TbAchievement> list = achievementMapper.selectAchievementsPage(filter, pageParam);
|
||||
long total = achievementMapper.countAchievements(filter);
|
||||
// 获取当前用户的部门角色
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
List<TbAchievement> list = achievementMapper.selectAchievementsPage(filter, pageParam, userDeptRoles);
|
||||
long total = achievementMapper.countAchievements(filter, userDeptRoles);
|
||||
|
||||
pageParam.setTotalElements(total);
|
||||
pageParam.setTotalPages((int) Math.ceil((double) total / pageParam.getPageSize()));
|
||||
@@ -286,87 +311,13 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
|
||||
String userID = user.getID();
|
||||
|
||||
// 1. 获取所有成就列表（根据type过滤）
|
||||
List<TbAchievement> allAchievements;
|
||||
if (type != null) {
|
||||
allAchievements = achievementMapper.selectByType(type);
|
||||
} else {
|
||||
TbAchievement filter = new TbAchievement();
|
||||
filter.setDeleted(false);
|
||||
allAchievements = achievementMapper.selectAchievements(filter);
|
||||
}
|
||||
|
||||
// 2. 获取用户已获得的成就列表
|
||||
List<TbUserAchievement> userAchievements = type != null
|
||||
? userAchievementMapper.selectByUserIdAndType(userID, type)
|
||||
: userAchievementMapper.selectByUserId(userID);
|
||||
|
||||
// 转换为Map，key为achievementID
|
||||
Map<String, TbUserAchievement> userAchievementMap = userAchievements.stream()
|
||||
.collect(Collectors.toMap(TbUserAchievement::getAchievementID, ua -> ua));
|
||||
|
||||
// 3. 获取用户的成就进度列表
|
||||
List<TbUserAchievementProgress> progressList = progressMapper.selectByUserId(userID);
|
||||
|
||||
// 转换为Map，key为achievementID
|
||||
Map<String, TbUserAchievementProgress> progressMap = progressList.stream()
|
||||
.collect(Collectors.toMap(TbUserAchievementProgress::getAchievementID, p -> p));
|
||||
|
||||
// 4. 组装AchievementVO列表
|
||||
List<AchievementVO> achievementVOList = new ArrayList<>();
|
||||
for (TbAchievement achievement : allAchievements) {
|
||||
AchievementVO vo = new AchievementVO();
|
||||
|
||||
// 复制成就基本信息
|
||||
vo.setID(achievement.getID());
|
||||
vo.setAchievementID(achievement.getAchievementID());
|
||||
vo.setName(achievement.getName());
|
||||
vo.setDescription(achievement.getDescription());
|
||||
vo.setType(achievement.getType());
|
||||
vo.setLevel(achievement.getLevel());
|
||||
vo.setIcon(achievement.getIcon());
|
||||
vo.setPoints(achievement.getPoints());
|
||||
vo.setConditionType(achievement.getConditionType());
|
||||
vo.setConditionValue(achievement.getConditionValue());
|
||||
vo.setOrderNum(achievement.getOrderNum());
|
||||
vo.setCreator(achievement.getCreator());
|
||||
vo.setUpdater(achievement.getUpdater());
|
||||
vo.setCreateTime(achievement.getCreateTime());
|
||||
vo.setUpdateTime(achievement.getUpdateTime());
|
||||
vo.setDeleted(achievement.getDeleted());
|
||||
|
||||
// 设置用户ID
|
||||
vo.setUserID(userID);
|
||||
|
||||
// 填充用户成就信息（如果已获得）
|
||||
TbUserAchievement userAchievement = userAchievementMap.get(achievement.getAchievementID());
|
||||
if (userAchievement != null) {
|
||||
vo.setUserAchievementID(userAchievement.getID());
|
||||
vo.setObtainTime(userAchievement.getObtainTime());
|
||||
vo.setObtained(true);
|
||||
} else {
|
||||
vo.setObtained(false);
|
||||
}
|
||||
|
||||
// 填充进度信息
|
||||
TbUserAchievementProgress progress = progressMap.get(achievement.getAchievementID());
|
||||
if (progress != null) {
|
||||
vo.setProgressID(progress.getID());
|
||||
vo.setCurrentValue(progress.getCurrentValue());
|
||||
vo.setTargetValue(progress.getTargetValue());
|
||||
vo.setProgressPercentage(progress.getProgressPercentage());
|
||||
vo.setCompleted(progress.getCompleted());
|
||||
vo.setLastUpdateTime(progress.getLastUpdateTime());
|
||||
} else {
|
||||
// 没有进度记录，设置默认值
|
||||
vo.setCurrentValue(0);
|
||||
vo.setTargetValue(achievement.getConditionValue());
|
||||
vo.setProgressPercentage(0);
|
||||
vo.setCompleted(false);
|
||||
}
|
||||
|
||||
achievementVOList.add(vo);
|
||||
}
|
||||
// 使用联表查询一次性获取所有数据（包含成就、用户成就、进度信息及权限过滤）
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
List<AchievementVO> achievementVOList = achievementMapper.selectUserAchievementsWithProgress(
|
||||
userID,
|
||||
type,
|
||||
userDeptRoles
|
||||
);
|
||||
|
||||
resultDomain.success("获取成就列表成功", achievementVOList);
|
||||
return resultDomain;
|
||||
@@ -652,7 +603,8 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
// 获取所有成就
|
||||
TbAchievement filter = new TbAchievement();
|
||||
filter.setDeleted(false);
|
||||
List<TbAchievement> allAchievements = achievementMapper.selectAchievements(filter);
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
List<TbAchievement> allAchievements = achievementMapper.selectAchievements(filter, userDeptRoles);
|
||||
|
||||
// 获取用户进度
|
||||
List<TbUserAchievementProgress> progressList = progressMapper.selectIncompletedByUserId(userID);
|
||||
@@ -815,7 +767,8 @@ public class ACHAchievementServiceImpl implements AchievementService {
|
||||
// 获取所有成就
|
||||
TbAchievement filter = new TbAchievement();
|
||||
filter.setDeleted(false);
|
||||
List<TbAchievement> allAchievements = achievementMapper.selectAchievements(filter);
|
||||
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
|
||||
List<TbAchievement> allAchievements = achievementMapper.selectAchievements(filter, userDeptRoles);
|
||||
|
||||
// 筛选支持该事件类型的成就
|
||||
return allAchievements.stream()
|
||||
|
||||
@@ -65,13 +65,57 @@
|
||||
</where>
|
||||
</sql>
|
||||
|
||||
<!-- 查询成就列表 -->
|
||||
<!-- 权限过滤条件（基于dept_path的高效继承） -->
|
||||
<sql id="Permission_Filter">
|
||||
INNER JOIN tb_resource_permission rp ON a.achievement_id = rp.resource_id
|
||||
AND rp.resource_type = 6
|
||||
AND rp.deleted = 0
|
||||
AND rp.can_read = 1
|
||||
AND (
|
||||
(rp.dept_id IS NULL AND rp.role_id IS NULL)
|
||||
<if test="userDeptRoles != null and userDeptRoles.size() > 0">
|
||||
OR EXISTS (
|
||||
SELECT 1
|
||||
FROM (
|
||||
<foreach collection="userDeptRoles" item="udr" separator=" UNION ALL ">
|
||||
SELECT #{udr.deptID} AS dept_id, #{udr.deptPath} AS dept_path, #{udr.roleID} AS role_id
|
||||
</foreach>
|
||||
) user_roles
|
||||
LEFT JOIN tb_sys_dept perm_dept ON perm_dept.dept_id = rp.dept_id AND perm_dept.deleted = 0
|
||||
WHERE
|
||||
(rp.role_id IS NULL AND rp.dept_id IS NOT NULL
|
||||
AND user_roles.dept_path LIKE CONCAT(perm_dept.dept_path, '%'))
|
||||
OR (rp.dept_id IS NULL AND rp.role_id = user_roles.role_id)
|
||||
OR (rp.dept_id = user_roles.dept_id AND rp.role_id = user_roles.role_id)
|
||||
)
|
||||
</if>
|
||||
)
|
||||
</sql>
|
||||
|
||||
<!-- 查询成就列表 - 添加权限过滤 -->
|
||||
<select id="selectAchievements" resultMap="BaseResultMap">
|
||||
SELECT
|
||||
<include refid="Base_Column_List" />
|
||||
FROM tb_achievement
|
||||
<include refid="Base_Where_Clause" />
|
||||
ORDER BY order_num ASC, create_time DESC
|
||||
SELECT DISTINCT a.*
|
||||
FROM tb_achievement a
|
||||
<include refid="Permission_Filter" />
|
||||
WHERE 1=1
|
||||
<if test="filter != null">
|
||||
<if test="filter.achievementID != null and filter.achievementID != ''">
|
||||
AND a.achievement_id = #{filter.achievementID}
|
||||
</if>
|
||||
<if test="filter.name != null and filter.name != ''">
|
||||
AND a.name LIKE CONCAT('%', #{filter.name}, '%')
|
||||
</if>
|
||||
<if test="filter.type != null">
|
||||
AND a.type = #{filter.type}
|
||||
</if>
|
||||
<if test="filter.level != null">
|
||||
AND a.level = #{filter.level}
|
||||
</if>
|
||||
<if test="filter.deleted != null">
|
||||
AND a.deleted = #{filter.deleted}
|
||||
</if>
|
||||
</if>
|
||||
ORDER BY a.order_num ASC, a.create_time DESC
|
||||
</select>
|
||||
|
||||
<!-- 根据成就ID查询成就信息 -->
|
||||
@@ -227,20 +271,133 @@
|
||||
</delete>
|
||||
|
||||
<!-- 分页查询成就 -->
|
||||
<!-- selectAchievementsPage - 添加权限过滤 -->
|
||||
<select id="selectAchievementsPage" resultMap="BaseResultMap">
|
||||
SELECT
|
||||
<include refid="Base_Column_List" />
|
||||
FROM tb_achievement
|
||||
<include refid="Base_Where_Clause" />
|
||||
ORDER BY order_num ASC, create_time DESC
|
||||
SELECT DISTINCT a.*
|
||||
FROM tb_achievement a
|
||||
<include refid="Permission_Filter" />
|
||||
WHERE 1=1
|
||||
<if test="filter != null">
|
||||
<if test="filter.achievementID != null and filter.achievementID != ''">
|
||||
AND a.achievement_id = #{filter.achievementID}
|
||||
</if>
|
||||
<if test="filter.name != null and filter.name != ''">
|
||||
AND a.name LIKE CONCAT('%', #{filter.name}, '%')
|
||||
</if>
|
||||
<if test="filter.type != null">
|
||||
AND a.type = #{filter.type}
|
||||
</if>
|
||||
<if test="filter.level != null">
|
||||
AND a.level = #{filter.level}
|
||||
</if>
|
||||
<if test="filter.deleted != null">
|
||||
AND a.deleted = #{filter.deleted}
|
||||
</if>
|
||||
</if>
|
||||
ORDER BY a.order_num ASC, a.create_time DESC
|
||||
LIMIT #{pageParam.pageSize} OFFSET #{pageParam.offset}
|
||||
</select>
|
||||
|
||||
<!-- 统计成就总数 -->
|
||||
<!-- 统计成就总数 - 添加权限过滤 -->
|
||||
<select id="countAchievements" resultType="long">
|
||||
SELECT COUNT(1)
|
||||
FROM tb_achievement
|
||||
<include refid="Base_Where_Clause" />
|
||||
SELECT COUNT(DISTINCT a.id)
|
||||
FROM tb_achievement a
|
||||
<include refid="Permission_Filter" />
|
||||
WHERE 1=1
|
||||
<if test="filter != null">
|
||||
<if test="filter.achievementID != null and filter.achievementID != ''">
|
||||
AND a.achievement_id = #{filter.achievementID}
|
||||
</if>
|
||||
<if test="filter.name != null and filter.name != ''">
|
||||
AND a.name LIKE CONCAT('%', #{filter.name}, '%')
|
||||
</if>
|
||||
<if test="filter.type != null">
|
||||
AND a.type = #{filter.type}
|
||||
</if>
|
||||
<if test="filter.level != null">
|
||||
AND a.level = #{filter.level}
|
||||
</if>
|
||||
<if test="filter.deleted != null">
|
||||
AND a.deleted = #{filter.deleted}
|
||||
</if>
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<!-- AchievementVO 结果映射（包含用户成就和进度信息） -->
|
||||
<resultMap id="AchievementVOResultMap" type="org.xyzh.common.vo.AchievementVO">
|
||||
<!-- 成就基本信息 -->
|
||||
<id column="id" property="ID" />
|
||||
<result column="achievement_id" property="achievementID" />
|
||||
<result column="name" property="name" />
|
||||
<result column="description" property="description" />
|
||||
<result column="icon" property="icon" />
|
||||
<result column="type" property="type" />
|
||||
<result column="level" property="level" />
|
||||
<result column="condition_type" property="conditionType" />
|
||||
<result column="condition_value" property="conditionValue" />
|
||||
<result column="points" property="points" />
|
||||
<result column="order_num" property="orderNum" />
|
||||
<result column="creator" property="creator" />
|
||||
<result column="updater" property="updater" />
|
||||
<result column="create_time" property="createTime" />
|
||||
<result column="update_time" property="updateTime" />
|
||||
<result column="deleted" property="deleted" />
|
||||
|
||||
<!-- 用户信息 -->
|
||||
<result column="user_id" property="userID" />
|
||||
|
||||
<!-- 用户成就信息 -->
|
||||
<result column="user_achievement_id" property="userAchievementID" />
|
||||
<result column="obtain_time" property="obtainTime" />
|
||||
<result column="obtained" property="obtained" />
|
||||
|
||||
<!-- 进度信息 -->
|
||||
<result column="progress_id" property="progressID" />
|
||||
<result column="current_value" property="currentValue" />
|
||||
<result column="target_value" property="targetValue" />
|
||||
<result column="progress_percentage" property="progressPercentage" />
|
||||
<result column="completed" property="completed" />
|
||||
<result column="last_update_time" property="lastUpdateTime" />
|
||||
</resultMap>
|
||||
|
||||
<!-- 联表查询用户成就列表（包含进度信息）- 带权限过滤 -->
|
||||
<select id="selectUserAchievementsWithProgress" resultMap="AchievementVOResultMap">
|
||||
SELECT
|
||||
a.id,
|
||||
a.achievement_id,
|
||||
a.name,
|
||||
a.description,
|
||||
a.icon,
|
||||
a.type,
|
||||
a.level,
|
||||
a.condition_type,
|
||||
a.condition_value,
|
||||
a.points,
|
||||
a.order_num,
|
||||
a.creator,
|
||||
a.updater,
|
||||
a.create_time,
|
||||
a.update_time,
|
||||
a.deleted,
|
||||
#{userId} as user_id,
|
||||
ua.id as user_achievement_id,
|
||||
ua.obtain_time,
|
||||
CASE WHEN ua.id IS NOT NULL THEN 1 ELSE 0 END as obtained,
|
||||
p.id as progress_id,
|
||||
COALESCE(p.current_value, 0) as current_value,
|
||||
COALESCE(p.target_value, a.condition_value) as target_value,
|
||||
COALESCE(p.progress_percentage, 0) as progress_percentage,
|
||||
COALESCE(p.completed, 0) as completed,
|
||||
p.last_update_time
|
||||
FROM tb_achievement a
|
||||
<include refid="Permission_Filter"/>
|
||||
LEFT JOIN tb_user_achievement ua ON a.achievement_id = ua.achievement_id AND ua.user_id = #{userId}
|
||||
LEFT JOIN tb_user_achievement_progress p ON a.achievement_id = p.achievement_id AND p.user_id = #{userId}
|
||||
WHERE a.deleted = 0
|
||||
<if test="type != null">
|
||||
AND a.type = #{type}
|
||||
</if>
|
||||
ORDER BY a.order_num ASC, a.create_time DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user