Bläddra i källkod

华泰财险特别约定修改

wks 2 år sedan
förälder
incheckning
2a2de956a7

+ 10 - 6
src/main/java/com/ydtech/modules/order/components/huatai/HuiTaiUploadImageComponents.java

@@ -11,7 +11,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.ByteArrayOutputStream;
@@ -78,7 +77,8 @@ public class HuiTaiUploadImageComponents {
             for (ImageTypeCode fileTypeEnum : ImageTypeCode.values()) {
                 boolean contains = Arrays.asList(fileTypeEnum.getImagesType()).contains(imageType);
                 if (contains) {
-                    HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO childrenDTO1 = HuaTaiImageInitParamResponse.filteringTypeCode(childrenDTO, fileTypeEnum.getCode());
+                    HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO childrenDTO1 =
+                            HuaTaiImageInitParamResponse.filteringTypeCode(childrenDTO, fileTypeEnum.getCode());
                     FileuploadResult fileupload = fileupload(domain, token, initParamResponse, insUploadImagesDto.getFilePath(), file);
                     saveFileIdx(domain, token, initParamResponse, fileupload, fileName, childrenDTO1);
                 }
@@ -100,7 +100,8 @@ public class HuiTaiUploadImageComponents {
         httpHeaders.set("Cookie", "token=" + token);
         String initParamUrl = domain + INIT_PARAM + System.currentTimeMillis();
         HttpEntity<Object> httpEntity = new HttpEntity<>(null, httpHeaders);
-        ResponseEntity<HuaTaiImageInitParamResponse> response = restTemplate.exchange(initParamUrl, HttpMethod.GET, httpEntity, HuaTaiImageInitParamResponse.class);
+        ResponseEntity<HuaTaiImageInitParamResponse> response = restTemplate.exchange(initParamUrl, HttpMethod.GET, httpEntity,
+                HuaTaiImageInitParamResponse.class);
         return response.getBody();
     }
 
@@ -109,7 +110,8 @@ public class HuiTaiUploadImageComponents {
      *
      * @return 文件路劲
      */
-    private FileuploadResult fileupload(String domain, String token, HuaTaiImageInitParamResponse initParamResponse, String path, String fileName) {
+    private FileuploadResult fileupload(String domain, String token, HuaTaiImageInitParamResponse initParamResponse, String path,
+                                        String fileName) {
         File file = new File(path);
         byte[] bytes = file2byte(file);
         double v = (double) bytes.length / 1024;
@@ -140,9 +142,11 @@ public class HuiTaiUploadImageComponents {
      * @param fileName    文件名称
      * @param childrenDTO 上传的文件类型
      */
-    private void saveFileIdx(String domain, String token, HuaTaiImageInitParamResponse response, FileuploadResult fileupload, String fileName,
+    private void saveFileIdx(String domain, String token, HuaTaiImageInitParamResponse response, FileuploadResult fileupload,
+                             String fileName,
                              HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO childrenDTO) {
-        HuaTaiSaveFileIdxRequest huaTaiSaveFileIdxRequest = new HuaTaiSaveFileIdxRequest(token, response, fileupload, fileName, childrenDTO);
+        HuaTaiSaveFileIdxRequest huaTaiSaveFileIdxRequest = new HuaTaiSaveFileIdxRequest(token, response, fileupload, fileName,
+                childrenDTO);
         huaTaiSaveFileIdxRequest.getFileIdxVo().setImgId(System.currentTimeMillis());
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);

+ 1 - 7
src/main/java/com/ydtech/modules/order/service/impl/InsTaskImagesServiceImpl.java

@@ -98,13 +98,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
     }
     @Override
     public List<InsUploadImagesDto> findImageByOrderNo(String orderNo) {
-        List<InsUploadImagesDto> insUploadImagesDtos = baseMapper.getByOrderNoInsUploadImagesDtoList(orderNo);
-        // 使用 imagesId 去重
-        List<InsUploadImagesDto> deduplication = insUploadImagesDtos.stream().collect(
-                Collectors.collectingAndThen(
-                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(InsUploadImagesDto::getImageId))), ArrayList::new));
-
-        return deduplication;
+        return baseMapper.getByOrderNoInsUploadImagesDtoList(orderNo);
     }