From 648049d81a01b13e1c5f4f81f026410e24425aa7 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Thu, 9 Sep 2021 15:04:02 +0800
Subject: [PATCH] bug

---
 .../ccsens/carbasics/api/OrganizationController.java |  2 +-
 .../com/ccsens/carbasics/api/ProjectController.java  |  8 +++++++-
 .../com/ccsens/carbasics/bean/dto/ProjectDto.java    |  2 ++
 .../ccsens/carbasics/service/IQcpProjectService.java |  2 +-
 .../ccsens/carbasics/service/QcpProjectService.java  | 12 ++++++------
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
index 4dc8c89..291e52b 100644
--- a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
+++ b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /**
  * @description:
- * @author: whj
+ * @author: whjswitchProject
  * @time: 2021/9/3 16:38
  */
 @Api(tags = "机构（质控，医院）相关")
diff --git a/src/main/java/com/ccsens/carbasics/api/ProjectController.java b/src/main/java/com/ccsens/carbasics/api/ProjectController.java
index 365c5e7..428f7bc 100644
--- a/src/main/java/com/ccsens/carbasics/api/ProjectController.java
+++ b/src/main/java/com/ccsens/carbasics/api/ProjectController.java
@@ -9,6 +9,7 @@ import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.message.SwitchoverProjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author 逗
@@ -58,7 +61,10 @@ public class ProjectController {
     @RequestMapping(value = "/switchProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse switchProject(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.SwitchProject> params) throws Exception {
         log.info("切换项目：{}", params);
-        qcpProjectService.switchProject(params.getParam(), params.getUserId());
+        Set<String> userIds = new HashSet<>();
+        userIds.add(params.getUserId().toString());
+        ProjectDto.SwitchProject param = params.getParam();
+        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId(), param.getUrl());
         log.info("切换项目");
         return JsonResponse.newInstance().ok();
     }
diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/ProjectDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/ProjectDto.java
index 69bd61c..353ac8a 100644
--- a/src/main/java/com/ccsens/carbasics/bean/dto/ProjectDto.java
+++ b/src/main/java/com/ccsens/carbasics/bean/dto/ProjectDto.java
@@ -61,6 +61,8 @@ public class ProjectDto {
     public static class SwitchProject {
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("项目访问域")
+        private String url;
     }
 
     @Data
diff --git a/src/main/java/com/ccsens/carbasics/service/IQcpProjectService.java b/src/main/java/com/ccsens/carbasics/service/IQcpProjectService.java
index 3a157fc..96ec1d2 100644
--- a/src/main/java/com/ccsens/carbasics/service/IQcpProjectService.java
+++ b/src/main/java/com/ccsens/carbasics/service/IQcpProjectService.java
@@ -23,5 +23,5 @@ public interface IQcpProjectService {
      * @param param 项目id
      * @param userId 当前用户id
      */
-    void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception;
+//    void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception;
 }
diff --git a/src/main/java/com/ccsens/carbasics/service/QcpProjectService.java b/src/main/java/com/ccsens/carbasics/service/QcpProjectService.java
index b4205f4..003e7aa 100644
--- a/src/main/java/com/ccsens/carbasics/service/QcpProjectService.java
+++ b/src/main/java/com/ccsens/carbasics/service/QcpProjectService.java
@@ -192,11 +192,11 @@ public class QcpProjectService implements IQcpProjectService {
 //        return createCaseV;
 //    }
 
-    @Override
-    public void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception {
-        Set<String> userIds = new HashSet<>();
-        userIds.add(userId.toString());
-        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId());
-    }
+//    @Override
+//    public void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception {
+//        Set<String> userIds = new HashSet<>();
+//        userIds.add(userId.toString());
+//        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId());
+//    }
 
 }