Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -69,7 +69,7 @@ public class RequestComponent {
     /**
      * 封装请求
      *
-     * @param url           请求路劲
+     * @param url           请求路径
      * @param param         参数
      * @param description   描述
      * @param responseClass 响应返回类

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/api/component/HuiTaiUploadImageComponent.java

@@ -1,6 +1,7 @@
 package com.jzg.quote.huatai.api.component;
 
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.text.CharsetKit;
 import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quote.huatai.api.constant.enums.ImageTypeCode;
 import com.jzg.quote.huatai.api.entity.request.HuaTaiSaveFileIdxRequest;
@@ -13,12 +14,10 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.*;
 
 /**
@@ -48,7 +47,7 @@ public class HuiTaiUploadImageComponent {
         try {
             u = new URL(url);
         } catch (MalformedURLException e) {
-            throw new SystemException("华泰文件上传路劲解析失败");
+            throw new SystemException("华泰文件上传路径解析失败");
         }
         String domain = u.getProtocol() + "://" + u.getAuthority();
         String query = u.getQuery();
@@ -64,8 +63,9 @@ public class HuiTaiUploadImageComponent {
         HuaTaiImageInitParamResponse initParamResponse = initParam(domain, token);
         List<HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO> childrenDTO = initParamResponse.getChildrenDTO();
         // 使用map 存储上传类型和图片
-        Map<String, List<InsuranceImageVo.ImageDTO>> map = new HashMap<>();
+        Map<String, List<String>> map = new HashMap<>();
         for (InsuranceImageVo insuranceImageVo : imageVoList) {
+            List<String> imageIds = new ArrayList<>();
             for (InsuranceImageVo.ImageDTO imageDTO : insuranceImageVo.getImageBase64List()) {
                 String imageType = insuranceImageVo.getImageCode();//影像类型编码
                 String fileName = imageDTO.getImageName();
@@ -78,10 +78,10 @@ public class HuiTaiUploadImageComponent {
                         try {
                             HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO childrenDTO1 =
                                     HuaTaiImageInitParamResponse.filteringTypeCode(childrenDTO, fileTypeEnum.getCode());
-                            /* 涉及业务表
-                            FileuploadResult fileupload = fileupload(domain, token, initParamResponse, imageDTO.getFilePath(), file);
+
+                            FileuploadResult fileupload = fileupload(domain, token, initParamResponse, imageDTO.getImageBase64Str(), file);
                             saveFileIdx(domain, token, initParamResponse, fileupload, fileName, childrenDTO1);
-                            map.put(insuranceImageVo.getImageCode(), imageDTO.getImageId());*/
+                            imageIds.add(imageDTO.getImageId());
                         } catch (Exception e) {
                             insImagesUploadCacheComponent.setUploadImageCache(companyId, map);
                             throw new SystemException(fileTypeEnum.getName() + "上传异常, 请重试");
@@ -90,11 +90,10 @@ public class HuiTaiUploadImageComponent {
                     }
                 }
             }
+            map.put(insuranceImageVo.getImageCode(), imageIds);
         }
 
         insImagesUploadCacheComponent.setUploadImageCache(companyId, map);
-
-
     }
 
     /**
@@ -116,14 +115,14 @@ public class HuiTaiUploadImageComponent {
     }
 
     /**
-     * 文件上传返回文件路劲
+     * 文件上传返回文件路径
      *
-     * @return 文件路劲
+     * @return 文件路径
      */
-    private FileuploadResult fileupload(String domain, String token, HuaTaiImageInitParamResponse initParamResponse, String path,
+    private FileuploadResult fileupload(String domain, String token, HuaTaiImageInitParamResponse initParamResponse, String imageBase64Str,
                                         String fileName) {
-        File file = new File(path);
-        byte[] bytes = file2byte(file);
+        Charset charset = Charset.forName(CharsetKit.UTF_8);
+        byte[] bytes = imageBase64Str.getBytes(charset);
         double v = (double) bytes.length / 1024;
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setAccept(Collections.singletonList(MediaType.MULTIPART_FORM_DATA));

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/api/component/InsImagesUploadCacheComponent.java

@@ -41,7 +41,7 @@ public class InsImagesUploadCacheComponent {
         return JSON.parseObject(value);
     }
 
-    public void setUploadImageCache(String companyId, Map<String, List<InsuranceImageVo.ImageDTO>> map) {
+    public void setUploadImageCache(String companyId, Map<String, List<String>> map) {
         try {
             JSONObject uploadImage = isUploadImage(companyId);
             if (!ObjectUtils.isEmpty(uploadImage)) {
@@ -56,14 +56,4 @@ public class InsImagesUploadCacheComponent {
         }
     }
 
-    public void setUploadImageCache(String companyId, List<InsuranceImageVo> imageVoList) {
-        try {
-            Map<String, List<InsuranceImageVo.ImageDTO>> collect = imageVoList.stream().collect(Collectors.toMap(InsuranceImageVo::getImageCode,
-                    InsuranceImageVo::getImageBase64List));
-            setUploadImageCache(companyId, collect);
-        } catch (Exception e) {
-            log.info(e.getMessage());
-        }
-    }
-
 }

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/api/service/Impl/HuaTaiApiRequestImpl.java

@@ -14,6 +14,7 @@ import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quote.huatai.api.build.HuaTaiApiQuoteResultsVoBuild;
 import com.jzg.quote.huatai.api.component.HuaTaiRequestApiComponent;
+import com.jzg.quote.huatai.api.component.HuiTaiUploadImageComponent;
 import com.jzg.quote.huatai.api.constant.enums.HuaTaiRiskCode;
 import com.jzg.quote.huatai.api.entity.HuaTaiApiOrder;
 import com.jzg.quote.huatai.api.entity.HuaTaiBaseRequestHead;
@@ -42,6 +43,8 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
     private final HuaTaiRequestApiComponent huataiRequestApiComponent;
 
     private final HuaTaiApiOrderService huaTaiApiOrderService;
+
+    private final HuiTaiUploadImageComponent huiTaiUploadImageComponent;
     /**
      * 报价
      *
@@ -255,6 +258,8 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
         //返回影像上传url
         HuaTaiUploadImageResponse huaTaiUploadImageResponse = huataiRequestApiComponent.uploadImage(uploadImageRequest, HuaTaiUploadImageResponse.class, huaTaiParameters.getInsuredCode());
 
+        //爬虫方式进行图片上传
+        huiTaiUploadImageComponent.uploadImage(orderBase.getInsuranceCompanyCode(), huaTaiUploadImageResponse.getUrl(), insuranceUploadImageVo.getImageVoList());
     }
 
     /**

tenant/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name="jzg-platform",url = "http://172.24.144.223:8083/")
+@FeignClient(name="jzg-platform",url = "http://172.24.144.223:8001/")
 public interface EsmInsCompanyClient {