完善任务存储、权限及货源查询流程

This commit is contained in:
supernijia
2026-08-14 22:49:15 +08:00
parent 91cd02eeb4
commit cf59e23f15
21 changed files with 2584 additions and 566 deletions
@@ -1,9 +1,45 @@
package com.nanri.aiimage.modules.permission.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.modules.permission.model.entity.UserColumnPermissionEntity;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface UserColumnPermissionMapper extends BaseMapper<UserColumnPermissionEntity> {
public interface UserColumnPermissionMapper {
@Insert("INSERT INTO user_column_permission (user_id, column_id) VALUES (#{userId}, #{columnId})")
int insert(UserColumnPermissionEntity entity);
@Select("SELECT user_id, column_id FROM user_column_permission WHERE user_id = #{userId}")
List<UserColumnPermissionEntity> selectByUserId(@Param("userId") Long userId);
@Select("SELECT user_id, column_id FROM user_column_permission WHERE column_id = #{columnId}")
List<UserColumnPermissionEntity> selectByColumnId(@Param("columnId") Long columnId);
@Select("SELECT COUNT(*) FROM user_column_permission WHERE user_id = #{userId} AND column_id = #{columnId}")
Long countByUserIdAndColumnId(@Param("userId") Long userId, @Param("columnId") Long columnId);
@Delete("DELETE FROM user_column_permission WHERE user_id = #{userId}")
int deleteByUserId(@Param("userId") Long userId);
@Delete("DELETE FROM user_column_permission WHERE column_id = #{columnId}")
int deleteByColumnId(@Param("columnId") Long columnId);
@Delete("""
<script>
DELETE FROM user_column_permission
WHERE user_id = #{userId}
AND column_id IN
<foreach collection="columnIds" item="columnId" open="(" separator="," close=")">
#{columnId}
</foreach>
</script>
""")
int deleteByUserIdAndColumnIds(@Param("userId") Long userId,
@Param("columnIds") List<Long> columnIds);
}
@@ -1,7 +1,6 @@
package com.nanri.aiimage.modules.permission.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
@@ -144,8 +143,7 @@ public class PermissionMenuService {
}
// Do this explicitly even when the database FK is configured, so old
// installations without the FK are cleaned up as well.
userColumnPermissionMapper.delete(new LambdaUpdateWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getColumnId, entity.getId()));
userColumnPermissionMapper.deleteByColumnId(entity.getId());
permissionMenuMapper.deleteById(entity.getId());
}
@@ -218,9 +216,7 @@ public class PermissionMenuService {
public List<ImageVideoDataPermissionUserVo> listImageVideoDataPermissionUsers(AdminUserEntity operator) {
ensureSuperAdminOperator(operator);
PermissionMenuEntity dataPermission = requireImageVideoDataPermission();
Set<Long> grantedUserIds = userColumnPermissionMapper.selectList(
new LambdaQueryWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getColumnId, dataPermission.getId()))
Set<Long> grantedUserIds = userColumnPermissionMapper.selectByColumnId(dataPermission.getId())
.stream()
.map(UserColumnPermissionEntity::getUserId)
.filter(id -> id != null && id > 0)
@@ -246,7 +242,7 @@ public class PermissionMenuService {
if (requestedIds.stream().anyMatch(id -> !grantableUsers.containsKey(id))) {
throw new BusinessException("contains unknown or non-grantable user");
}
userColumnPermissionMapper.deleteByMap(Map.of("column_id", dataPermission.getId()));
userColumnPermissionMapper.deleteByColumnId(dataPermission.getId());
for (Long userId : requestedIds) {
UserColumnPermissionEntity grant = new UserColumnPermissionEntity();
grant.setUserId(userId);
@@ -260,9 +256,7 @@ public class PermissionMenuService {
ensureSuperAdminOperator(operator, "店铺数据任务");
PermissionMenuEntity dataPermission = requireDataPermission(
SHOP_DATA_CRAWL_DATA_PERMISSION_KEY, "店铺数据任务数据");
Set<Long> grantedUserIds = userColumnPermissionMapper.selectList(
new LambdaQueryWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getColumnId, dataPermission.getId()))
Set<Long> grantedUserIds = userColumnPermissionMapper.selectByColumnId(dataPermission.getId())
.stream()
.map(UserColumnPermissionEntity::getUserId)
.filter(id -> id != null && id > 0)
@@ -289,7 +283,7 @@ public class PermissionMenuService {
if (requestedIds.stream().anyMatch(id -> !grantableUsers.containsKey(id))) {
throw new BusinessException("contains unknown or non-grantable user");
}
userColumnPermissionMapper.deleteByMap(Map.of("column_id", dataPermission.getId()));
userColumnPermissionMapper.deleteByColumnId(dataPermission.getId());
for (Long userId : requestedIds) {
UserColumnPermissionEntity grant = new UserColumnPermissionEntity();
grant.setUserId(userId);
@@ -389,10 +383,7 @@ public class PermissionMenuService {
if (!protectedIds.isEmpty()) {
for (Long protectedId : protectedIds) {
Long existingCount = userColumnPermissionMapper.selectCount(
new LambdaQueryWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getUserId, userId)
.eq(UserColumnPermissionEntity::getColumnId, protectedId));
Long existingCount = userColumnPermissionMapper.countByUserIdAndColumnId(userId, protectedId);
if (existingCount != null && existingCount > 0) {
finalGrantIds.add(protectedId);
}
@@ -405,14 +396,10 @@ public class PermissionMenuService {
.forEach(finalGrantIds::add);
}
LambdaUpdateWrapper<UserColumnPermissionEntity> delete =
new LambdaUpdateWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getUserId, userId);
if (normalizedType == null) {
userColumnPermissionMapper.delete(delete);
userColumnPermissionMapper.deleteByUserId(userId);
} else if (!scopedMenuIds.isEmpty()) {
userColumnPermissionMapper.delete(delete.in(
UserColumnPermissionEntity::getColumnId, scopedMenuIds));
userColumnPermissionMapper.deleteByUserIdAndColumnIds(userId, new ArrayList<>(scopedMenuIds));
}
for (Long columnId : finalGrantIds) {
UserColumnPermissionEntity entity = new UserColumnPermissionEntity();
@@ -439,9 +426,7 @@ public class PermissionMenuService {
}
private List<Long> loadDirectColumnIds(Long userId) {
List<UserColumnPermissionEntity> rows = userColumnPermissionMapper.selectList(
new LambdaQueryWrapper<UserColumnPermissionEntity>()
.eq(UserColumnPermissionEntity::getUserId, userId));
List<UserColumnPermissionEntity> rows = userColumnPermissionMapper.selectByUserId(userId);
if (rows == null || rows.isEmpty()) {
return List.of();
}