我的对接

src/main/java/com/izouma/jmrh/dto/ConversationToAbutmentDTO.java

@@ -0,0 +1,84 @@
+package com.izouma.jmrh.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.jmrh.domain.Contact;
+import com.izouma.jmrh.domain.Conversation;
+import com.izouma.jmrh.domain.OrgInfo;
+import com.izouma.jmrh.domain.User;
+import com.izouma.jmrh.enums.ConversationType;
+import com.izouma.jmrh.enums.ResSnDType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ConversationToAbutmentDTO {
+    private Long id;
+
+    private String sessionId;
+
+    private Long userId;
+
+    private Long toUserId;
+
+    private Long orgId;
+
+    private Contact contact;
+
+    private ConversationType type;
+
+    private LocalDateTime lastUpdate;
+
+    private String lastMessage;
+
+
+
+    @ApiModelProperty("资源id")
+    private Long sndId;
+
+    @ApiModelProperty("资源供需类型")
+    @Enumerated(EnumType.STRING)
+    private ResSnDType resSndType;
+
+
+    //-----------------------------------------
+
+
+    @ApiModelProperty("资源名字")
+    private String resourceName;
+
+    @ApiModelProperty("资源图片")
+    private List<String> resourceImag;
+
+
+//企业信息------------------------------------
+
+    @ApiModelProperty("企业logo")
+    @ExcelProperty("企业logo")
+    private String logo;
+
+    private String orgName;
+
+
+    private OrgInfo orgInfo;
+
+    private String title;
+
+    private String icon;
+
+    private long unread;
+
+
+}

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

@@ -67,10 +67,13 @@ public class ConversationService {
                                            .sndId(sndId)
                                            .resSndType(snd.getType())
                                            .build();
+            conversationRepo.save(conversationFrom);
+        }else{
+            conversationFrom.setOrgId(snd.getOrgId());
+            conversationFrom.setContact(contact);
+            conversationRepo.save(conversationFrom);
         }
-        conversationFrom.setOrgId(snd.getOrgId());
-        conversationFrom.setContact(contact);
-        conversationRepo.save(conversationFrom);
+
 
         //-------------------------------
 

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

@@ -1,35 +1,45 @@
 package com.izouma.jmrh.web;
 
 import com.izouma.jmrh.domain.Conversation;
+import com.izouma.jmrh.domain.OrgInfo;
 import com.izouma.jmrh.domain.ResourceSupplyAndDemand;
 import com.izouma.jmrh.dto.ConversationDTO;
+import com.izouma.jmrh.dto.ConversationToAbutmentDTO;
 import com.izouma.jmrh.dto.PageQuery;
+import com.izouma.jmrh.dto.R;
 import com.izouma.jmrh.enums.ConversationType;
 import com.izouma.jmrh.enums.Exist;
+import com.izouma.jmrh.enums.ResSnDType;
 import com.izouma.jmrh.exception.BusinessException;
 import com.izouma.jmrh.repo.ConversationRepo;
+import com.izouma.jmrh.repo.OrgInfoRepo;
+import com.izouma.jmrh.repo.ResourceSupplyAndDemandRepo;
 import com.izouma.jmrh.service.ConversationService;
 import com.izouma.jmrh.utils.ObjUtils;
 import com.izouma.jmrh.utils.SecurityUtils;
 import com.izouma.jmrh.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 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.*;
 import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/conversation")
 @AllArgsConstructor
+@Slf4j
 public class ConversationController extends BaseController {
     private ConversationService conversationService;
-    private ConversationRepo    conversationRepo;
+    private ConversationRepo            conversationRepo;
+    private ResourceSupplyAndDemandRepo resourceSupplyAndDemandRepo;
+    private OrgInfoRepo                 orgInfoRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -50,20 +60,78 @@ public class ConversationController extends BaseController {
 
     //@PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/all")
-    public Page<Conversation> all(PageQuery pageQuery) {
+    public R all(PageQuery pageQuery) {
         //过滤已经终止并删除的对接
         ArrayList<Exist> exists = new ArrayList<>();
         exists.add(Exist.PUBLISHERS_DELETED);
         exists.add(Exist.ON_DELETED);
         pageQuery.getQuery().put("exist", exists);
+        Map<String, Object> query = pageQuery.getQuery();
+        String str = (String) query.get("typeStr");
+        log.info(str);
+        List<String> types = Arrays.asList(str.split(","));
+        boolean b = types.contains("PRODUCT_SUPPLY");
+        log.info("是否包含PRODUCT_SUPPLY{}", b);
         Page<Conversation> all = conversationRepo.findAll(toSpecification(pageQuery, Conversation.class), toPageRequest(pageQuery));
         List<Conversation> content = all.getContent();
-        List<Conversation> filteredList = content.stream()
-                                                 .filter(x -> x.getType().equals(ConversationType.DOCKING) && x.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId()))
-                                                 .collect(Collectors.toList());
-        Page<Conversation> filteredPage = new PageImpl<>(filteredList, all.getPageable(), filteredList.size());
+        if (b) {
+            List<Conversation> filteredList = content.stream()
+                                                     .filter(x -> x.getType().equals(ConversationType.DOCKING)
+                                                             && x.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId())
+                                                             && (x.getResSndType().equals(ResSnDType.PRODUCT_SUPPLY)
+                                                             || x.getResSndType().equals(ResSnDType.TECH_SUPPLY)
+                                                             || x.getResSndType().equals(ResSnDType.RES_SUPPLY)))
+                                                            .collect(Collectors.toList());
+
+            List<ConversationToAbutmentDTO> filteredListDto   =  filteredList.stream().map(conversation -> {
+                ConversationToAbutmentDTO conversationToAbutmentDTO = new ConversationToAbutmentDTO();
+                BeanUtils.copyProperties(conversation, conversationToAbutmentDTO);
+
+                ResourceSupplyAndDemand snd = resourceSupplyAndDemandRepo.findById(conversation.getSndId())
+                                                                         .orElseThrow(new BusinessException("供需不存在"));
+                conversationToAbutmentDTO.setResourceName(snd.getName());
+                conversationToAbutmentDTO.setResourceImag(snd.getImages());
+
+                OrgInfo orgInfo = orgInfoRepo.findById(conversation.getOrgId())
+                                             .orElseThrow(new BusinessException("无记录"));
+                conversationToAbutmentDTO.setOrgName(orgInfo.getOrgName());
+
+                return conversationToAbutmentDTO;
+            }).collect(Collectors.toList());
+
+            Page<ConversationToAbutmentDTO> filteredPage = new PageImpl<>(filteredListDto, all.getPageable(), filteredList.size());
+
+            return R.success(filteredPage);
+        } else {
+            List<Conversation> filteredList = content.stream()
+                                                     .filter(x -> x.getType().equals(ConversationType.DOCKING)
+                                                             && x.getUserId().equals(SecurityUtils.getAuthenticatedUser().getId())
+                                                             && (x.getResSndType().equals(ResSnDType.TECH_DEMAND)
+                                                             || x.getResSndType().equals(ResSnDType.PRODUCT_DEMAND)
+                                                             || x.getResSndType().equals(ResSnDType.FINANCING_DEMAND)))
+                                                     .collect(Collectors.toList());
+
+            List<ConversationToAbutmentDTO> filteredListDto   =  filteredList.stream().map(conversation -> {
+                ConversationToAbutmentDTO conversationToAbutmentDTO = new ConversationToAbutmentDTO();
+                BeanUtils.copyProperties(conversation, conversationToAbutmentDTO);
+
+                ResourceSupplyAndDemand snd = resourceSupplyAndDemandRepo.findById(conversation.getSndId())
+                                                                         .orElseThrow(new BusinessException("供需不存在"));
+                conversationToAbutmentDTO.setResourceName(snd.getName());
+                conversationToAbutmentDTO.setResourceImag(snd.getImages());
+
+                OrgInfo orgInfo = orgInfoRepo.findById(conversation.getOrgId())
+                                             .orElseThrow(new BusinessException("无记录"));
+                conversationToAbutmentDTO.setOrgName(orgInfo.getOrgName());
+
+                return conversationToAbutmentDTO;
+            }).collect(Collectors.toList());
+
+            Page<ConversationToAbutmentDTO> filteredPage = new PageImpl<>(filteredListDto, all.getPageable(), filteredList.size());
+
+            return R.success(filteredPage);
+        }
 
-        return filteredPage;
 
     }
 
@@ -77,12 +145,12 @@ public class ConversationController extends BaseController {
         conversationRepo.deleteById(id);
     }
 
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<Conversation> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
+//    @GetMapping("/excel")
+//    @ResponseBody
+//    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+//        List<Conversation> data = all(pageQuery).getContent();
+//        ExcelUtils.export(response, data);
+//    }
 
     @GetMapping("/my")
     @ApiOperation("我的对话")

src/main/jmrh/.prettierrc.js

@@ -2,6 +2,7 @@ module.exports = {
     printWidth: 120,
     singleQuote: true,
     tabWidth: 4,
+    endOfLine: auto,
     overrides: [
         {
             files: '*.html',