修复计划任务绑定人员。视图权限

2025-11-28 18:43:27 +08:00
parent ba0aabdac3
commit fc960265f4
6 changed files with 100 additions and 54 deletions
--- a/schoolNewsServ/.bin/mysql/sql/initMenuData.sql
+++ b/schoolNewsServ/.bin/mysql/sql/initMenuData.sql
@@ -318,8 +318,8 @@ INSERT INTO `tb_sys_menu` VALUES
 ('3000', 'menu_admin_resource_manage', '资源管理', NULL, '', '', 'admin/resource.svg', 3, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:52:40', NULL, 0),
 ('3001', 'menu_admin_resource', '数据采集', 'menu_admin_resource_manage', '/admin/manage/resource/resource', 'admin/manage/resource/ResourceManagementView', NULL, 1, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
 ('3002', 'menu_admin_article', '文章管理', 'menu_admin_resource_manage', '/admin/manage/resource/article', 'admin/manage/resource/ArticleManagementView', NULL, 2, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
-('3010', 'menu_article_add', '文章添加', 'menu_admin_article', '/article/add', 'public/article/ArticleAddView', NULL, 1, 3, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
-('3011', 'menu_article_show', '文章展示', 'menu_admin_article', '/article/show', 'public/article/ArticleShowView', NULL, 2, 3, 'NavigationLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
+('3010', 'menu_article_add', '文章添加', NULL, '/article/add', 'public/article/ArticleAddView', NULL, 1, 3, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
+('3011', 'menu_article_show', '文章展示', NULL, '/article/show', 'public/article/ArticleShowView', NULL, 2, 3, 'NavigationLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:48:39', NULL, 0),
 ('4000', 'menu_admin_content_manage', '运营管理', NULL, '', '', 'admin/maintain.svg', 4, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:52:42', NULL, 0),
 ('4001', 'menu_admin_banner', 'Banner管理', 'menu_admin_content_manage', '/admin/manage/content/banner', 'admin/manage/content/BannerManagementView', NULL, 1, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:49:56', NULL, 0),
 ('4002', 'menu_admin_tag', '标签管理', 'menu_admin_content_manage', '/admin/manage/content/tag', 'admin/manage/content/TagManagementView', NULL, 2, 0, 'SidebarLayout', '1', NULL, '2025-10-27 17:26:06', '2025-10-29 11:49:56', NULL, 0),
--- a/schoolNewsServ/api/api-study/src/main/java/org/xyzh/api/study/task/LearningTaskService.java
+++ b/schoolNewsServ/api/api-study/src/main/java/org/xyzh/api/study/task/LearningTaskService.java
@@ -116,6 +116,8 @@ public interface LearningTaskService {
     */
    ResultDomain<TbTaskUser> addTaskUser(String taskID, List<String> userIDs);

+    ResultDomain<TbTaskUser> updateTaskUser(String taskID, List<String> userIDs);
+
    /**
     * @description 批量添加任务用户
     * @param taskID 任务ID
--- a/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningTaskController.java
+++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningTaskController.java
@@ -117,30 +117,21 @@ public class LearningTaskController {
        return learningTaskService.addTaskUser(taskID, userIDs);
    }

+    /**
+     * 批量更新任务用户
+     */
+    @PutMapping("/{taskID}/users")
+    public ResultDomain<TbTaskUser> updateTaskUser(@PathVariable("taskID") String taskID, @RequestBody Map<String, List<String>> map) {
+        List<String> userIDs = map.get("userIDs");
+        return learningTaskService.updateTaskUser(taskID, userIDs);
+    }
+
    @DeleteMapping("/{taskID}/users")
    public ResultDomain<Boolean> removeTaskUser(@PathVariable("taskID") String taskID, @RequestBody Map<String, List<String>> map) {
        List<String> userIDs = map.get("userIDs");
        return learningTaskService.removeTaskUser(taskID, userIDs);
    }

-    /**
-     * 分配任务给用户
-     */
-    @PostMapping("/{taskID}/assign")
-    public ResultDomain<TbTaskUser> assignTaskToUser(@PathVariable("taskID") String taskID, @RequestParam String userID) {
-        return null;
-        // return learningTaskService.assignTaskToUser(taskID, userID);
-    }
-
-    /**
-     * 从用户移除任务
-     */
-    @DeleteMapping("/{taskID}/user/{userID}")
-    public ResultDomain<Boolean> removeTaskFromUser(@PathVariable("taskID") String taskID, @PathVariable("userID") String userID) {
-        return null;
-        // return learningTaskService.removeTaskFromUser(taskID, userID);
-    }
-
    /**
     * 用户获取个人任务列表（用户视角）
     */
--- a/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
+++ b/schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
@@ -111,6 +111,65 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
        }
    }

+    @Override
+    public ResultDomain<TbTaskUser> updateTaskUser(String taskID, List<String> userIDs){
+        ResultDomain<TbTaskUser> resultDomain = new ResultDomain<>();
+        TbSysUser user = LoginUtil.getCurrentUser();
+        if (user == null) {
+            resultDomain.fail("请先登录");
+            return resultDomain;
+        }
+        
+        // 先查询已有人员
+        List<String> taskUsers = taskUserMapper.selectByTaskId(taskID).stream().map(TbTaskUser::getUserID).toList();
+        
+        // newList: userIDs中有但taskUsers中没有的（需要新增的用户）
+        List<String> newList = userIDs.stream()
+                .filter(userId -> !taskUsers.contains(userId))
+                .toList();
+        
+        // oldList: userIDs和taskUsers都有的（保留的用户）
+        List<String> oldList = userIDs.stream()
+                .filter(taskUsers::contains)
+                .toList();
+        
+        // deleteList: taskUsers中有但userIDs中没有的（需要删除的用户）
+        List<String> deleteList = taskUsers.stream()
+                .filter(userId -> !userIDs.contains(userId))
+                .toList();
+
+        // 批量插入新用户
+        List<TbTaskUser> insertUsers = new ArrayList<>();
+        for (String userID : newList) {
+            TbTaskUser taskUser = new TbTaskUser();
+            taskUser.setId(IDUtils.generateID());
+            taskUser.setTaskID(taskID);
+            taskUser.setUserID(userID);
+            taskUser.setCreator(user.getId());
+            taskUser.setCreateTime(new Date());
+            insertUsers.add(taskUser);
+        }
+
+        // 执行批量操作
+        if (!insertUsers.isEmpty()) {
+            int insertResult = taskUserMapper.batchInsertTaskUsers(insertUsers);
+            logger.debug("批量插入任务用户: {}条", insertResult);
+        }
+        
+        if (!deleteList.isEmpty()) {
+            int deleteResult = taskUserMapper.batchDeleteTaskUsers(taskID, deleteList);
+            logger.debug("批量删除任务用户: {}条", deleteResult);
+        }
+        
+        // 更新学习人数：新人数 = 保留的 + 新增的
+        int newUserCount = oldList.size() + newList.size();
+        courseMapper.incrementLearnCount(taskID, newUserCount - taskUsers.size());
+        
+        resultDomain.success("更新任务用户成功", insertUsers);
+        logger.info("任务{}更新用户成功: 新增{}人, 删除{}人, 保留{}人", taskID, newList.size(), deleteList.size(), oldList.size());
+        return resultDomain;
+    }
+
    @Override
    public ResultDomain<TbTaskUser> batchAddTaskUsers(String taskID, List<String> userIDs, String deptID) {
        // TODO Auto-generated method stub