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