删除项目

common/src/main/java/com/ccsens/common/persist/dao/RelevanceDao.java

@@ -46,5 +46,5 @@ public interface RelevanceDao {
      * @param oldUserId 废弃的
      * @param newUserId 保留的
      */
-    void mergeStatusRecord(@Param("oldUserId")Long oldUserId, @Param("oldUserId")Long newUserId);
+    void mergeStatusRecord(@Param("oldUserId")Long oldUserId, @Param("newUserId")Long newUserId);
 }

signin/src/main/java/com/ccsens/signin/bean/dto/ProjectDto.java

@@ -100,8 +100,9 @@ public class ProjectDto {
     @Data
     @ApiModel("项目id")
     public static class  ProjectId{
+        @NotNull(message = "请输入项目id")
         @ApiModelProperty("项目id")
-        private Long id;
+        private Long projectId;
     }
 
 }

signin/src/main/java/com/ccsens/signin/config/SpringConfig.java

@@ -139,6 +139,7 @@ public class SpringConfig implements WebMvcConfigurer {
                     .excludePathPatterns("/users/account")
                     .excludePathPatterns("/users/token")
                     .excludePathPatterns("/users/claims")
+                    .excludePathPatterns("/users/code")
                     .excludePathPatterns("/users/userId");
 //                .addPathPatterns("/plugins/**")
 //                .addPathPatterns("/delivers/**")

signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java

@@ -41,4 +41,10 @@ public interface ProjectDao {
      * @return
      */
     List<String> queryDomain();
+
+    /**
+     * 删除项目用户关联信息
+     * @param projectId 项目id
+     */
+    void delUserProjectByProjectId(@Param("projectId") Long projectId);
 }

signin/src/main/java/com/ccsens/signin/persist/dao/SysUserDao.java

@@ -11,9 +11,9 @@ import java.util.List;
 @Repository
 public interface SysUserDao extends SysUserMapper {
 
-    void replaceAuth(@Param("oldUserId") Long userId, @Param("newUserId") Long currentUserId);
+    void replaceAuth(@Param("oldUserId") Long oldUserId, @Param("newUserId") Long newUserId);
 
-    void replaceUserProject(@Param("oldUserId") Long userId, @Param("newUserId") Long currentUserId);
+    void replaceUserProject(@Param("oldUserId") Long oldUserId, @Param("newUserId") Long newUserId);
 
     String getUserNameByUserId(@Param("userId") Long userId);
 

signin/src/main/java/com/ccsens/signin/service/ProjectService.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ccsens.signin.bean.dto.ProjectDto;
+import com.ccsens.signin.bean.dto.UserDto;
 import com.ccsens.signin.bean.po.SysProjectList;
 import com.ccsens.signin.bean.po.SysProjectListExample;
 import com.ccsens.signin.bean.po.SysUserProject;
@@ -263,11 +264,17 @@ public class ProjectService implements IProjectService{
 
     @Override
     public void deleteProject(ProjectDto.ProjectId param, Long userId) {
-        //TODO 待补充
+        //查找项目
-        SysProjectList projectList = projectListMapper.selectByPrimaryKey(param.getId());
+        SysProjectList projectList = projectDao.selectByProjectId(param.getProjectId());
         if(ObjectUtil.isNotNull(projectList)){
             projectList.setRecStatus((byte) 2);
             projectListMapper.updateByPrimaryKeySelective(projectList);
+            //TODO 删除成员项目关联表
+            projectDao.delUserProjectByProjectId(param.getProjectId());
+            //调用业务系统删除项目
+            String url = projectList.getUrl() + "/project/tallDelProject";
+            log.info("调用业务系统的接口合并用户：{}--{}",url,param);
+            RestTemplateUtil.postBody(url, param);
         }
 
     }

signin/src/main/java/com/ccsens/signin/service/RelevanceUserService.java

@@ -38,7 +38,10 @@ public class RelevanceUserService implements IRelevanceUserService {
         //传入手机号和userId，循环调用每个域内关联成员的接口
         domainList.forEach(domain -> {
             try {
-                RestTemplateUtil.postBody(domain + "/user/memberWithPhone", new UserDto.PhoneAndUserId(phone,userId));
+                String url = domain + "/user/memberWithPhone";
+                UserDto.PhoneAndUserId phoneAndUserId = new UserDto.PhoneAndUserId(phone, userId);
+                log.info("调用业务系统的接口关联成员：{}--{}",url,phoneAndUserId);
+                RestTemplateUtil.postBody(url, phoneAndUserId);
             }catch (Exception e){
                 log.error("接口调用异常",e);
             }
@@ -56,7 +59,10 @@ public class RelevanceUserService implements IRelevanceUserService {
         //传入手机号和userId，循环调用每个域内关联成员的接口
         domainList.forEach(domain -> {
             try {
-                RestTemplateUtil.postBody(domain + "/user/mergeUser", new UserDto.MergeUser(oldUserId,newUserId));
+                String url = domain + "/user/mergeUser";
+                UserDto.MergeUser mergeUser = new UserDto.MergeUser(oldUserId, newUserId);
+                log.info("调用业务系统的接口合并用户：{}--{}",url,mergeUser);
+                RestTemplateUtil.postBody(url, mergeUser);
             }catch (Exception e){
                 log.error("接口调用异常",e);
             }

signin/src/main/java/com/ccsens/signin/service/UserService.java

@@ -1053,11 +1053,11 @@ public class UserService implements IUserService {
                     }
                 }
                 //将其他登录方式的userId替换为新userId
-                userDao.replaceAuth(userId,currentUserId);
+                userDao.replaceAuth(currentUserId,userId);
                 //将用户项目关联表里的userId替换为新的
-                userDao.replaceUserProject(userId,currentUserId);
+                userDao.replaceUserProject(currentUserId,userId);
                 //TODO 调用业务系统替换所有的userId
-                relevanceUserService.mergeUserByPhone(userId,currentUserId);
+                relevanceUserService.mergeUserByPhone(currentUserId,userId);
                 //原user改为已禁用
                 SysUser sysUser = userDao.selectByPrimaryKey(currentUserId);
                 sysUser.setRecStatus((byte) 1);

signin/src/main/resources/mapper_dao/ProjectDap.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ccsens.signin.persist.dao.ProjectDao">
+    <update id="delUserProjectByProjectId">
+        update
+            t_sys_user_project
+        set
+            rec_status = 2
+        where
+            project_id = #{projectId}
+            and rec_status = 0
+    </update>
 
     <select id="queryProjectList" resultType="com.ccsens.signin.bean.vo.ProjectVo$QueryProject">
         SELECT