详情-会话

yd-email-api/src/main/java/com/yd/email/api/controller/ApiEmailContactImportController.java

@@ -10,6 +10,7 @@ import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
+import com.yd.email.feign.response.ApiEmailContactImportSessionResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -70,6 +71,16 @@ public class ApiEmailContactImportController implements ApiEmailContactImportFei
     }
     }
 
 
     /**
     /**
+     * 详情-会话
+     * @param sessionId 会话id
+     * @return
+     */
+    @Override
+    public Result<ApiEmailContactImportSessionResponse> detailSessionId(String sessionId) {
+        return apiEmailContactImportService.detailSessionId(sessionId);
+    }
+
+    /**
      * 删除-邮件联系人导入信息
      * 删除-邮件联系人导入信息
      * @param importBizId 导入临时表唯一业务ID
      * @param importBizId 导入临时表唯一业务ID
      * @return
      * @return

yd-email-api/src/main/java/com/yd/email/api/service/ApiEmailContactImportService.java

@@ -8,6 +8,7 @@ import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
+import com.yd.email.feign.response.ApiEmailContactImportSessionResponse;
 
 
 public interface ApiEmailContactImportService {
 public interface ApiEmailContactImportService {
     Result<IPage<ApiEmailContactImportPageResponse>> page(ApiEmailContactImportPageRequest request);
     Result<IPage<ApiEmailContactImportPageResponse>> page(ApiEmailContactImportPageRequest request);
@@ -18,5 +19,7 @@ public interface ApiEmailContactImportService {
 
 
     Result<ApiEmailContactImportResponse> detail(String importBizId);
     Result<ApiEmailContactImportResponse> detail(String importBizId);
 
 
+    Result<ApiEmailContactImportSessionResponse> detailSessionId(String sessionId);
+
     Result del(String importBizId);
     Result del(String importBizId);
 }
 }

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailContactImportServiceImpl.java

@@ -14,6 +14,7 @@ import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportPageResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
+import com.yd.email.feign.response.ApiEmailContactImportSessionResponse;
 import com.yd.email.service.dto.EmailContactImportDto;
 import com.yd.email.service.dto.EmailContactImportDto;
 import com.yd.email.service.model.EmailContactImport;
 import com.yd.email.service.model.EmailContactImport;
 import com.yd.email.service.service.IEmailContactImportService;
 import com.yd.email.service.service.IEmailContactImportService;
@@ -137,6 +138,26 @@ public class ApiEmailContactImportServiceImpl implements ApiEmailContactImportSe
         return Result.success(response);
         return Result.success(response);
     }
     }
 
 
+    /**
+     * 详情-会话
+     * @param sessionId 会话id
+     * @return
+     */
+    @Override
+    public Result<ApiEmailContactImportSessionResponse> detailSessionId(String sessionId) {
+        ApiEmailContactImportSessionResponse response = new ApiEmailContactImportSessionResponse();
+        response.setSessionId(sessionId);
+        List<EmailContactImport> list = iEmailContactImportService.queryList(EmailContactImportDto.builder().sessionId(sessionId).build());
+        if (!CollectionUtils.isEmpty(list)) {
+            //收件人列表
+            List<String> receiveEmailList = list.stream().map(EmailContactImport::getReceiveEmail).collect(Collectors.toList());
+            //抄送人邮箱列表
+            List<String> ccEmailList = list.stream().map(EmailContactImport::getCcEmail).collect(Collectors.toList());
+            response.setReceiveEmails(!CollectionUtils.isEmpty(receiveEmailList) ? String.join(",",receiveEmailList) : "");
+            response.setCcEmails(!CollectionUtils.isEmpty(ccEmailList) ? String.join(",",ccEmailList) : "");
+        }
+        return Result.success(response);
+    }
 
 
     /**
     /**
      * 删除-邮件联系人导入信息
      * 删除-邮件联系人导入信息

yd-email-feign/src/main/java/com/yd/email/feign/client/ApiEmailContactImportFeignClient.java

@@ -7,10 +7,13 @@ import com.yd.email.feign.request.ApiEmailContactImportPageRequest;
 import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
 import com.yd.email.feign.response.ApiEmailContactImportSelectAddResponse;
+import com.yd.email.feign.response.ApiEmailContactImportSessionResponse;
 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.*;
 
 
+import javax.validation.constraints.NotBlank;
+
 /**
 /**
  * 邮箱服务-邮件联系人导入临时表信息Feign客户端
  * 邮箱服务-邮件联系人导入临时表信息Feign客户端
  */
  */
@@ -47,7 +50,15 @@ public interface ApiEmailContactImportFeignClient {
      * @return
      * @return
      */
      */
     @GetMapping("/detail")
     @GetMapping("/detail")
-    Result<ApiEmailContactImportResponse> detail(@RequestParam(value = "importBizId") String importBizId);
+    Result<ApiEmailContactImportResponse> detail(@NotBlank(message = "导入临时表唯一业务ID不能为空") @RequestParam(value = "importBizId") String importBizId);
+
+    /**
+     * 详情-会话
+     * @param sessionId 会话id
+     * @return
+     */
+    @GetMapping("/detail/sessionId")
+    Result<ApiEmailContactImportSessionResponse> detailSessionId(@NotBlank(message = "会话id不能为空") @RequestParam(value = "sessionId") String sessionId);
 
 
     /**
     /**
      * 删除-邮件联系人导入信息
      * 删除-邮件联系人导入信息

yd-email-feign/src/main/java/com/yd/email/feign/fallback/ApiEmailContactImportFeignFallbackFactory.java

@@ -6,6 +6,7 @@ import com.yd.email.feign.request.ApiEmailContactImportEditRequest;
 import com.yd.email.feign.request.ApiEmailContactImportPageRequest;
 import com.yd.email.feign.request.ApiEmailContactImportPageRequest;
 import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.request.ApiEmailContactImportSelectAddRequest;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
 import com.yd.email.feign.response.ApiEmailContactImportResponse;
+import com.yd.email.feign.response.ApiEmailContactImportSessionResponse;
 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;
@@ -40,6 +41,11 @@ public class ApiEmailContactImportFeignFallbackFactory implements FallbackFactor
             }
             }
 
 
             @Override
             @Override
+            public Result<ApiEmailContactImportSessionResponse> detailSessionId(String sessionId) {
+                return null;
+            }
+
+            @Override
             public Result del(String importBizId) {
             public Result del(String importBizId) {
                 return null;
                 return null;
             }
             }

yd-email-feign/src/main/java/com/yd/email/feign/response/ApiEmailContactImportSessionResponse.java

+package com.yd.email.feign.response;
+
+import lombok.Data;
+
+@Data
+public class ApiEmailContactImportSessionResponse {
+
+    /**
+     * 当前会话id（前端使用，用于查询。存于前端缓存）
+     */
+    private String sessionId;
+
+    /**
+     * 收件人邮箱（多个逗号分隔）
+     */
+    private String receiveEmails;
+
+    /**
+     * 抄送人邮箱（多个逗号分隔）
+     */
+    private String ccEmails;
+}