我的对接

src/main/java/com/izouma/jmrh/domain/Contact.java

@@ -18,4 +18,6 @@ public class Contact {
     private String contactPhone;
 
     private String email;
+
+    private String description;
 }

src/main/java/com/izouma/jmrh/service/ConversationService.java

@@ -26,14 +26,14 @@ public class ConversationService {
     private OrgInfoRepo                 orgInfoRepo;
 
     public void create(Long userId, Long sndId, String orgName, String contactName, String contactPhone,
-                       String email, String content) {
+                       String email, String content , String description) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
         ResourceSupplyAndDemand snd = resourceSupplyAndDemandRepo.findById(sndId)
                 .orElseThrow(new BusinessException("供需不存在"));
         if (userId.equals(snd.getPublishersId())) {
             throw new BusinessException("不能和自己对接");
         }
-        Contact contact = new Contact(orgName, contactName, contactPhone, email);
+        Contact contact = new Contact(orgName, contactName, contactPhone, email , description);
         String sessionId = snd.getPublishersId() > userId ?
                 (userId + "-" + snd.getPublishersId()) : (snd.getPublishersId() + "-" + userId);
 

src/main/java/com/izouma/jmrh/web/ConversationController.java

@@ -14,12 +14,14 @@ import com.izouma.jmrh.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/conversation")
@@ -40,9 +42,9 @@ public class ConversationController extends BaseController {
     @PostMapping("/create")
     public void create(@RequestParam Long sndId, @RequestParam String orgName,
                        @RequestParam String contactName, @RequestParam String contactPhone,
-                       @RequestParam(required = false) String email, @RequestParam String content) {
+                       @RequestParam(required = false) String email, @RequestParam String content, @RequestParam String description) {
         conversationService.create(SecurityUtils.getAuthenticatedUser().getId(),
-                sndId, orgName, contactName, contactPhone, email, content);
+                sndId, orgName, contactName, contactPhone, email, content, description);
     }
 
     //@PreAuthorize("hasRole('ADMIN')")
@@ -53,7 +55,13 @@ public class ConversationController extends BaseController {
         exists.add(Exist.PUBLISHERS_DELETED);
         exists.add(Exist.ON_DELETED);
         pageQuery.getQuery().put("exist", exists);
-        return conversationRepo.findAll(toSpecification(pageQuery, Conversation.class), toPageRequest(pageQuery));
+        Page<Conversation> all = conversationRepo.findAll(toSpecification(pageQuery, Conversation.class), toPageRequest(pageQuery));
+        List<Conversation> content = all.getContent();
+        List<Conversation> filteredList = content.stream().filter(x -> x.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId())).collect(Collectors.toList());
+        Page<Conversation> filteredPage = new PageImpl<>(filteredList, all.getPageable(), filteredList.size());
+
+        return filteredPage;
+
     }
 
     @GetMapping("/get/{id}")