修改项目名

src/main/java/com/ccsens/yanyuan/service/TraineeService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
 import com.ccsens.cloudutil.feign.Tall3FeignClient;
 import com.ccsens.util.CodeError;
@@ -99,7 +100,8 @@ public class TraineeService implements ITraineeService {
             tool.setVersion(YanYuanConstant.Tool.VERSION_OLD);
             toolDao.insertSelective(tool);
             // 关联项目
-            addUserProject(userId, keyId, user.getUserName(), user.getCreatedAt());
+            addUserProject(YanYuanConstant.Project.getUserProject(keyId, userId, user.getUserName(), user.getCreatedAt()));
+
         });
 
         return YanYuanCodeError.SUCCESS;
@@ -132,13 +134,16 @@ public class TraineeService implements ITraineeService {
         userExample.createCriteria().andKeyIdIn(param.getKeyUserIds());
         List<User> users = traineeDao.selectByExample(userExample);
         if (CollectionUtil.isNotEmpty(users)) {
-            users.forEach(user -> addUserProject(userId, user.getKeyId(), user.getUserName(), user.getCreatedAt()));
+            users.forEach(user -> addUserProject(YanYuanConstant.Project.getUserProject(user.getKeyId(), userId,  user.getUserName(), user.getCreatedAt())));
         }
         return YanYuanCodeError.SUCCESS;
     }
 
-    private void addUserProject(Long userId, Long projectId, String userName, Date startTime) {
-        ProjectDto.SaveProjectDto userProject = YanYuanConstant.Project.getUserProject(projectId, userId, userName, startTime);
+    /**
+     * 通知服务端添加或修改项目信息，添加用户项目关联
+     * @param userProject 用户为空，则只添加/修改项目，否则，同步删除原有用户，重新添加用户项目关系
+     */
+    private void addUserProject(ProjectDto.SaveProjectDto userProject) {
         JsonResponse response = tall3FeignClient.saveProjectList(userProject);
         log.info("添加用户项目：{},结果：{}", userProject, response);
         // TODO 失败后，添加失败记录表，由每10分钟执行一次的定时任务重复执行
@@ -167,7 +172,7 @@ public class TraineeService implements ITraineeService {
         relation.setOperator(userId);
         userRelationDao.insertSelective(relation);
         // 绑定
-        addUserProject(userId, user.getKeyId(), user.getUserName(), new Date());
+        addUserProject(YanYuanConstant.Project.getUserProject(user.getKeyId(), userId, user.getUserName(), new Date()));
         // 添加脑力测评
         generateMentalTest(userId, user.getKeyId());
         return YanYuanCodeError.SUCCESS;
@@ -193,6 +198,10 @@ public class TraineeService implements ITraineeService {
             user.setId(uuId);
             traineeDao.updateByPrimaryKeySelective(user);
             redisUtil.del(key);
+            if (StrUtil.isNotEmpty(param.getUserName())) {
+                // 修改用户名，则更新项目名称
+                addUserProject(YanYuanConstant.Project.getUpdateProjectName(param.getProjectId(), param.getUserName()));
+            }
         }
         return CodeError.SUCCESS;
     }

src/main/java/com/ccsens/yanyuan/util/YanYuanConstant.java

@@ -303,6 +303,15 @@ public class YanYuanConstant {
             dto.setUserIdList(userIdList);
             return dto;
         }
+
+        public static ProjectDto.SaveProjectDto getUpdateProjectName(Long keyUserId, String userName){
+            ProjectDto.SaveProjectDto dto = new ProjectDto.SaveProjectDto();
+            dto.setId(keyUserId);
+            dto.setName(userName + "智能训练");
+            Set<Long> userIdList = new HashSet<>();
+            dto.setUserIdList(userIdList);
+            return dto;
+        }
     }
     public static class Task{
         /**向前翻页*/