新需求更新 同步更新

backend-java/src/test/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuControllerTest.java

@@ -248,4 +248,32 @@ class PermissionMenuControllerTest {
         verify(service).listImageVideoDataPermissionUsers(operator);
         verify(service).updateImageVideoDataPermissionUsers(operator, List.of(20L));
     }
+
+    @Test
+    void shopDataCrawlPermissionEndpointsDelegateAuthenticatedOperator() {
+        AdminAuthSupport authSupport = mock(AdminAuthSupport.class);
+        PermissionMenuService service = mock(PermissionMenuService.class);
+        HttpServletRequest request = mock(HttpServletRequest.class);
+        PermissionMenuController controller = new PermissionMenuController(authSupport, service);
+        AdminUserEntity operator = new AdminUserEntity();
+        operator.setId(1L);
+        operator.setRole("super_admin");
+        ImageVideoDataPermissionUserVo permissionUser = new ImageVideoDataPermissionUserVo();
+        permissionUser.setId(20L);
+        ImageVideoDataPermissionUpdateRequest body = new ImageVideoDataPermissionUpdateRequest();
+        body.setUserIds(List.of(20L));
+
+        when(authSupport.requireAdmin(request)).thenReturn(operator);
+        when(service.listShopDataCrawlDataPermissionUsers(operator)).thenReturn(List.of(permissionUser));
+        when(service.updateShopDataCrawlDataPermissionUsers(operator, List.of(20L))).thenReturn(1);
+
+        var listResponse = controller.listShopDataCrawlDataPermissionUsers(request);
+        var updateResponse = controller.updateShopDataCrawlDataPermissionUsers(request, body);
+
+        assertThat(listResponse.getData()).containsExactly(permissionUser);
+        assertThat(updateResponse.getData()).isEqualTo(1);
+        verify(authSupport, times(2)).requireAdmin(request);
+        verify(service).listShopDataCrawlDataPermissionUsers(operator);
+        verify(service).updateShopDataCrawlDataPermissionUsers(operator, List.of(20L));
+    }
 }

backend-java/src/test/java/com/nanri/aiimage/modules/permission/service/PermissionMenuServiceTest.java

@@ -74,6 +74,28 @@ class PermissionMenuServiceTest {
         verify(permissionMapper, times(0)).insert(any(UserColumnPermissionEntity.class));
     }
 
+    @Test
+    void preservesBothIndependentDataPermissionsDuringGenericReplacement() {
+        PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
+        UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
+        when(userMapper.selectById(7L)).thenReturn(new AdminUserEntity());
+        when(menuMapper.selectCount(any())).thenReturn(1L);
+        when(menuMapper.selectOne(any())).thenReturn(imageVideoDataPermission(), shopDataCrawlDataPermission());
+        when(permissionMapper.selectCount(any())).thenReturn(1L);
+
+        UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
+        request.setColumnIds(List.of(2L));
+        service.updateUserColumnPermissions(7L, request);
+
+        ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
+        verify(permissionMapper, times(3)).insert(captor.capture());
+        assertThat(captor.getAllValues())
+                .extracting(UserColumnPermissionEntity::getColumnId)
+                .containsExactly(2L, 75L, 76L);
+    }
+
     @Test
     void expandsDirectParentGrantToDescendantsWithoutPersistingChildren() {
         PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
@@ -526,6 +548,55 @@ class PermissionMenuServiceTest {
         assertThat(inserted.getValue().getColumnId()).isEqualTo(75L);
     }
 
+    @Test
+    void shopDataCrawlPermissionCanOnlyBeManagedBySuperAdmin() {
+        PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
+        UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
+        AdminUserEntity explicitAdmin = user(1L, "admin", 1);
+
+        assertThatThrownBy(() -> service.listShopDataCrawlDataPermissionUsers(explicitAdmin))
+                .isInstanceOf(BusinessException.class)
+                .hasMessageContaining("超级管理员");
+        assertThatThrownBy(() -> service.updateShopDataCrawlDataPermissionUsers(explicitAdmin, List.of(2L)))
+                .isInstanceOf(BusinessException.class)
+                .hasMessageContaining("超级管理员");
+        verify(menuMapper, never()).selectOne(any());
+        verify(permissionMapper, never()).delete(any());
+    }
+
+    @Test
+    void superAdminCanListAndReplaceShopDataCrawlPermissions() {
+        PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
+        UserColumnPermissionMapper permissionMapper = mock(UserColumnPermissionMapper.class);
+        AdminUserMapper userMapper = mock(AdminUserMapper.class);
+        PermissionMenuService service = new PermissionMenuService(menuMapper, permissionMapper, userMapper);
+        AdminUserEntity operator = user(99L, "super_admin", 1);
+        AdminUserEntity admin = user(1L, "admin", 1);
+        admin.setUsername("admin");
+        AdminUserEntity normal = user(2L, "normal", 0);
+        normal.setUsername("normal");
+
+        when(menuMapper.selectOne(any())).thenReturn(shopDataCrawlDataPermission());
+        when(permissionMapper.selectList(any())).thenReturn(List.of(grant(1L, 76L)));
+        when(userMapper.selectList(any())).thenReturn(List.of(operator, admin, normal));
+
+        List<ImageVideoDataPermissionUserVo> users = service.listShopDataCrawlDataPermissionUsers(operator);
+        int grantedCount = service.updateShopDataCrawlDataPermissionUsers(operator, List.of(2L));
+
+        assertThat(users).extracting(ImageVideoDataPermissionUserVo::getId).containsExactly(1L, 2L);
+        assertThat(users.get(0).isGranted()).isTrue();
+        assertThat(users.get(1).isGranted()).isFalse();
+        assertThat(grantedCount).isEqualTo(1);
+        verify(permissionMapper).deleteByMap(Map.of("column_id", 76L));
+        ArgumentCaptor<UserColumnPermissionEntity> inserted =
+                ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
+        verify(permissionMapper).insert(inserted.capture());
+        assertThat(inserted.getValue().getUserId()).isEqualTo(2L);
+        assertThat(inserted.getValue().getColumnId()).isEqualTo(76L);
+    }
+
     private PermissionMenuCreateRequest createRequest(Long parentId, String menuType) {
         PermissionMenuCreateRequest request = new PermissionMenuCreateRequest();
         request.setName("child");
@@ -575,4 +646,11 @@ class PermissionMenuServiceTest {
         entity.setColumnKey("admin_image_video_task_data");
         return entity;
     }
+
+    private PermissionMenuEntity shopDataCrawlDataPermission() {
+        PermissionMenuEntity entity = new PermissionMenuEntity();
+        entity.setId(76L);
+        entity.setColumnKey("admin_shop_data_crawl_task_data");
+        return entity;
+    }
 }