push

yd-communication-api/src/main/java/com/yd/communication/api/controller/ApiCoSessionController.java

@@ -3,21 +3,15 @@ package com.yd.communication.api.controller;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.communication.api.service.ApiCoSessionService;
 import com.yd.communication.api.service.ApiCoSessionService;
 import com.yd.communication.feign.client.ApiCoSessionFeignClient;
 import com.yd.communication.feign.client.ApiCoSessionFeignClient;
-import com.yd.communication.feign.request.CreateRequest;
-import com.yd.communication.feign.request.EndSessionRequest;
-import com.yd.communication.feign.request.JoinRequest;
-import com.yd.communication.feign.request.TransferControlRequest;
-import com.yd.communication.feign.response.CommonResponse;
-import com.yd.communication.feign.response.CreateResponse;
-import com.yd.communication.feign.response.JoinResponse;
-import com.yd.communication.feign.response.SessionDetailResponse;
+import com.yd.communication.feign.request.*;
+import com.yd.communication.feign.response.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
 
 
 /**
 /**
- * 协同会话信息
+ * 会话信息
  *
  *
  * @author zxm
  * @author zxm
  * @since 2026-07-28
  * @since 2026-07-28
@@ -31,7 +25,7 @@ public class ApiCoSessionController implements ApiCoSessionFeignClient {
     private ApiCoSessionService apiCoSessionService;
     private ApiCoSessionService apiCoSessionService;
 
 
     /**
     /**
-     * 创建协同会话
+     * 创建会话
      * @param request 创建会话请求
      * @param request 创建会话请求
      * @return
      * @return
      */
      */
@@ -41,7 +35,7 @@ public class ApiCoSessionController implements ApiCoSessionFeignClient {
     }
     }
 
 
     /**
     /**
-     * 加入协同会话
+     * 加入会话
      * @param request
      * @param request
      * @return
      * @return
      */
      */
@@ -50,6 +44,16 @@ public class ApiCoSessionController implements ApiCoSessionFeignClient {
     }
     }
 
 
     /**
     /**
+     * 获取会话状态
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<GetStatusResponse> getStatus(GetStatusRequest request) {
+        return apiCoSessionService.getStatus(request);
+    }
+
+    /**
      * 获取会话详情
      * 获取会话详情
      * @param bizId
      * @param bizId
      * @return
      * @return

yd-communication-api/src/main/java/com/yd/communication/api/service/ApiCoSessionService.java

@@ -2,14 +2,8 @@ package com.yd.communication.api.service;
 
 
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.communication.feign.dto.RoomRedisInfoDTO;
 import com.yd.communication.feign.dto.RoomRedisInfoDTO;
-import com.yd.communication.feign.request.CreateRequest;
-import com.yd.communication.feign.request.EndSessionRequest;
-import com.yd.communication.feign.request.JoinRequest;
-import com.yd.communication.feign.request.TransferControlRequest;
-import com.yd.communication.feign.response.CommonResponse;
-import com.yd.communication.feign.response.CreateResponse;
-import com.yd.communication.feign.response.JoinResponse;
-import com.yd.communication.feign.response.SessionDetailResponse;
+import com.yd.communication.feign.request.*;
+import com.yd.communication.feign.response.*;
 import com.yd.communication.service.model.CoSession;
 import com.yd.communication.service.model.CoSession;
 
 
 
 
@@ -19,6 +13,8 @@ public interface ApiCoSessionService {
 
 
     Result<JoinResponse> join(JoinRequest request);
     Result<JoinResponse> join(JoinRequest request);
 
 
+    Result<GetStatusResponse> getStatus(GetStatusRequest request);
+
     Result<SessionDetailResponse> get(String bizId);
     Result<SessionDetailResponse> get(String bizId);
 
 
     Result<CommonResponse> end(EndSessionRequest request);
     Result<CommonResponse> end(EndSessionRequest request);

yd-communication-feign/src/main/java/com/yd/communication/feign/client/ApiCoSessionFeignClient.java

@@ -2,14 +2,8 @@ package com.yd.communication.feign.client;
 
 
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.communication.feign.fallback.ApiCoSessionFeignFallbackFactory;
 import com.yd.communication.feign.fallback.ApiCoSessionFeignFallbackFactory;
-import com.yd.communication.feign.request.CreateRequest;
-import com.yd.communication.feign.request.EndSessionRequest;
-import com.yd.communication.feign.request.JoinRequest;
-import com.yd.communication.feign.request.TransferControlRequest;
-import com.yd.communication.feign.response.CommonResponse;
-import com.yd.communication.feign.response.CreateResponse;
-import com.yd.communication.feign.response.JoinResponse;
-import com.yd.communication.feign.response.SessionDetailResponse;
+import com.yd.communication.feign.request.*;
+import com.yd.communication.feign.response.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public interface ApiCoSessionFeignClient {
 public interface ApiCoSessionFeignClient {
 
 
     /**
     /**
-     * 创建协同会话
+     * 创建会话
      *
      *
      * @param request 创建会话请求
      * @param request 创建会话请求
      * @return 会话信息
      * @return 会话信息
@@ -34,7 +28,7 @@ public interface ApiCoSessionFeignClient {
     Result<CreateResponse> create(@Validated @RequestBody CreateRequest request);
     Result<CreateResponse> create(@Validated @RequestBody CreateRequest request);
 
 
     /**
     /**
-     * 顾问加入协同会话（输入共享码）
+     * 加入会话
      *
      *
      * @param request 加入会话请求
      * @param request 加入会话请求
      * @return 会话详情
      * @return 会话详情
@@ -43,6 +37,14 @@ public interface ApiCoSessionFeignClient {
     Result<JoinResponse> join(@Validated @RequestBody JoinRequest request);
     Result<JoinResponse> join(@Validated @RequestBody JoinRequest request);
 
 
     /**
     /**
+     * 获取会话状态
+     * @param request
+     * @return
+     */
+    @PostMapping("/status")
+    Result<GetStatusResponse> getStatus(@Validated @RequestBody GetStatusRequest request);
+
+    /**
      * 获取协同会话详情
      * 获取协同会话详情
      *
      *
      * @param bizId 会话业务ID
      * @param bizId 会话业务ID

yd-communication-feign/src/main/java/com/yd/communication/feign/fallback/ApiCoSessionFeignFallbackFactory.java

@@ -2,14 +2,8 @@ package com.yd.communication.feign.fallback;
 
 
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.communication.feign.client.ApiCoSessionFeignClient;
 import com.yd.communication.feign.client.ApiCoSessionFeignClient;
-import com.yd.communication.feign.request.CreateRequest;
-import com.yd.communication.feign.request.EndSessionRequest;
-import com.yd.communication.feign.request.JoinRequest;
-import com.yd.communication.feign.request.TransferControlRequest;
-import com.yd.communication.feign.response.CommonResponse;
-import com.yd.communication.feign.response.CreateResponse;
-import com.yd.communication.feign.response.JoinResponse;
-import com.yd.communication.feign.response.SessionDetailResponse;
+import com.yd.communication.feign.request.*;
+import com.yd.communication.feign.response.*;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
@@ -35,6 +29,11 @@ public class ApiCoSessionFeignFallbackFactory implements FallbackFactory<ApiCoSe
             }
             }
 
 
             @Override
             @Override
+            public Result<GetStatusResponse> getStatus(GetStatusRequest request) {
+                return null;
+            }
+
+            @Override
             public Result<SessionDetailResponse> get(String bizId) {
             public Result<SessionDetailResponse> get(String bizId) {
                 return null;
                 return null;
             }
             }

yd-communication-feign/src/main/java/com/yd/communication/feign/request/CreateRequest.java

@@ -64,10 +64,4 @@ public class CreateRequest {
     @NotBlank(message = "资源所有者的登录用户ID不能为空")
     @NotBlank(message = "资源所有者的登录用户ID不能为空")
     private String userId;
     private String userId;
 
 
-    /**
-     * 资源所有者的登录token信息
-     */
-    @NotBlank(message = "资源所有者的登录token信息不能为空")
-    private String token;
-
 }
 }
\ No newline at end of file

yd-communication-feign/src/main/java/com/yd/communication/feign/request/GetStatusRequest.java

+package com.yd.communication.feign.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class GetStatusRequest {
+
+    /**
+     * 会话唯一业务ID
+     */
+    @NotBlank(message = "会话唯一业务ID不能为空")
+    private String sessionBizId;
+}

yd-communication-feign/src/main/java/com/yd/communication/feign/request/http/GenerateTokenRequest.java

+package com.yd.communication.feign.request.http;
+
+import lombok.Data;
+
+@Data
+public class GenerateTokenRequest {
+
+    /**
+     * 商城用户ID
+     */
+    private Long sfpUserId;
+
+    /**
+     * 分销用户ID
+     */
+    private Long cffpUserId;
+
+}

yd-communication-feign/src/main/java/com/yd/communication/feign/response/CreateResponse.java

 package com.yd.communication.feign.response;
 package com.yd.communication.feign.response;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 /**
 /**
  * 创建协同会话响应对象
  * 创建协同会话响应对象
  */
  */
@@ -37,4 +40,10 @@ public class CreateResponse {
      * 协同房间链接（访问链接进入房间）
      * 协同房间链接（访问链接进入房间）
      */
      */
     private String roomLink;
     private String roomLink;
+
+    /**
+     * 链接失效时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date expirationTime;
 }
 }
\ No newline at end of file

yd-communication-feign/src/main/java/com/yd/communication/feign/response/GetStatusResponse.java

+package com.yd.communication.feign.response;
+
+import lombok.Data;
+
+@Data
+public class GetStatusResponse {
+
+    /**
+     * 1-未失效 2-已失效
+     */
+    private Integer status;
+}

yd-communication-feign/src/main/java/com/yd/communication/feign/response/http/GenerateTokenResponse.java

+package com.yd.communication.feign.response.http;
+
+import lombok.Data;
+
+@Data
+public class GenerateTokenResponse {
+
+    /**
+     * token
+     */
+    private String token;
+
+    /**
+     * 商城用户ID
+     */
+    private Long sfpUserId;
+
+    /**
+     * 分销用户ID
+     */
+    private Long cffpUserId;
+}