修改华泰财险影像上传

src/main/java/com/ydtech/modules/order/components/huatai/HuiTaiUploadImageComponents.java

@@ -12,6 +12,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.ByteArrayOutputStream;
@@ -36,8 +38,8 @@ public class HuiTaiUploadImageComponents {
 
     private final RestTemplate restTemplate;
     private static final String INIT_PARAM = "/h5img/app/ImgManager/initParam.cdo?t=";
-    private static final String FILE_UPLOAD = "/h5img/fileupload";
-    private static final String SAVE_FILE_IDX = "/h5img/app/ImgManager/saveFileIdx.cmd";
+    private static final String FILE_UPLOAD = "/h5img/app/ImgFileUpload/upload.do";
+    private static final String SAVE_FILE_IDX = "/h5img/app/ImgManager/saveFileIdx.cdo";
 
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
@@ -106,11 +108,9 @@ public class HuiTaiUploadImageComponents {
      * @return
      */
     private HuaTaiImageInitParamResponse initParam(String domain, String token) {
-        HttpHeaders httpHeaders = new HttpHeaders();
         // token
-        httpHeaders.set("Cookie", "token=" + token);
         String initParamUrl = domain + INIT_PARAM + System.currentTimeMillis() + "&token" + token;
-        HttpEntity<Object> httpEntity = new HttpEntity<>(null, httpHeaders);
+        HttpEntity<Object> httpEntity = new HttpEntity<>(null, HttpHeaders.EMPTY);
         ResponseEntity<HuaTaiImageInitParamResponse> response = restTemplate.exchange(initParamUrl, HttpMethod.GET, httpEntity,
                 HuaTaiImageInitParamResponse.class);
         return response.getBody();
@@ -128,17 +128,20 @@ public class HuiTaiUploadImageComponents {
         double v = (double) bytes.length / 1024;
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setAccept(Collections.singletonList(MediaType.MULTIPART_FORM_DATA));
-        httpHeaders.set("Bucket", initParamResponse.getStorageType());
-        httpHeaders.set("Bussmodule", initParamResponse.getBussType());
-        httpHeaders.set("Bussno", initParamResponse.getBussNo());
-
+        httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.set("file", bytes);
+        body.set("token", token);
+        body.set("bussModule", initParamResponse.getBussType());
+        body.set("bussNo", initParamResponse.getBussNo());
+        body.set("fileName", fileName);
+        body.set("saveFileName", fileName);
+        body.set("bucket", initParamResponse.getBucket());
+        body.set("storageType", initParamResponse.getStorageType());
         // token
-        httpHeaders.set("Token", token);
         // 文件名称
-        httpHeaders.set("Filename", fileName);
-        httpHeaders.setContentType(MediaType.IMAGE_JPEG);
-        HttpEntity<byte[]> httpEntity = new HttpEntity<>(bytes, httpHeaders);
-
+        HttpEntity<MultiValueMap<String, Object> > httpEntity = new HttpEntity<>(body, httpHeaders);
         String fileuploadUrl = domain + FILE_UPLOAD;
         ResponseEntity<String> response = restTemplate.postForEntity(fileuploadUrl, httpEntity, String.class);
         return new FileuploadResult(response.getBody(), v);
@@ -161,7 +164,6 @@ public class HuiTaiUploadImageComponents {
         huaTaiSaveFileIdxRequest.getFileIdxVo().setImgId(System.currentTimeMillis());
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        httpHeaders.set("Cookie", "token=" + token);
         HttpEntity<HuaTaiSaveFileIdxRequest> httpEntity = new HttpEntity<>(huaTaiSaveFileIdxRequest, httpHeaders);
         String saveFileIdxUrl = domain + SAVE_FILE_IDX;
         restTemplate.postForEntity(saveFileIdxUrl, httpEntity, String.class);

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiSaveFileIdxRequest.java

@@ -14,10 +14,15 @@ public class HuaTaiSaveFileIdxRequest {
     @JsonProperty("fileIdxVo")
     private FileIdxVoDTO fileIdxVo;
 
+    @JsonProperty("validFlag")
+    private String validFlag;
+
+
     public HuaTaiSaveFileIdxRequest(String token, HuaTaiImageInitParamResponse response, HuiTaiUploadImageComponents.FileuploadResult fileupload, String fileName,
                                     HuaTaiImageInitParamResponse.TypeSelectVosDTO.ChildrenDTO childrenDTO) {
         this.token = token;
         this.fileIdxVo = new FileIdxVoDTO(response, fileupload, fileName, childrenDTO);
+        this.validFlag = "1";
     }
 
     @Data