修改影像问题

src/main/java/com/ydtech/modules/order/service/impl/InsTaskImagesServiceImpl.java

@@ -35,7 +35,10 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
         // 将新文件存入
         List<InsTaskImagesVo.Image> imageList = insTaskImagesVo.getImageList();
 
-        List<InsTaskImages> insTaskImagesList = imageList.stream().map(x -> new InsTaskImages(x, insTaskImagesVo.getQuoteNo(), username)).collect(Collectors.toList());
+        List<InsTaskImages> insTaskImagesList = imageList
+                .stream()
+                .map(x -> new InsTaskImages(x, insTaskImagesVo.getQuoteNo(), username))
+                .collect(Collectors.toList());
         List<InsTaskImages> list = lambdaQuery().eq(InsTaskImages::getQuoteNo, insTaskImagesVo.getQuoteNo()).list();
 
         if (!list.isEmpty()) {
@@ -51,8 +54,9 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
     public HttpResult<Map<String, InsTaskImagesDto>> findByQuoteNo(String quoteNo) {
         List<InsTaskImagesDto> insTaskImagesDtos = baseMapper.getByQuoteNoInsTaskImagesDtoList(quoteNo);
 
-        Map<String, InsTaskImagesDto> collect = insTaskImagesDtos.stream().collect(Collectors.toMap(InsTaskImagesDto::getImageType, Function.identity()));
-
+        Map<String, InsTaskImagesDto> collect = insTaskImagesDtos
+                .stream()
+                .collect(LinkedHashMap::new, (m, v) -> m.put(v.getImageType(), v), LinkedHashMap::putAll);
         // 没有数据的为空对象
         for (InsuranceImageEnum insuranceImageEnum : InsuranceImageEnum.values()) {
             String code = insuranceImageEnum.getCode();

src/main/java/com/ydtech/modules/order/service/impl/YongAnOrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.ydtech.constants.InsuranceImageEnum;
 import com.ydtech.constants.enums.InsOrderStatus;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.core.page.HttpResult;
@@ -171,7 +172,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
 
             ResponseBodyC1 responseBody = responseDataC1.getResponseBody();
             List<CarModelDTO> carModel = responseBody.getCarModel();
-            if (carModel == null || carModel.size() == 0) {
+            if (carModel == null || carModel.isEmpty()) {
                 throw new SystemException("未查询到匹配车型！");
             }
 
@@ -472,31 +473,21 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             ObjectMapper mapper = new XmlMapper();
             mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
-            for (int i = 0; i < insTaskImagesBase64s.size(); i++) {
+            for (InsTaskImagesBase64 insTaskImagesBase64 : insTaskImagesBase64s) {
                 //------------------永安影像上传----------------------
                 //1.组装RequestBody
-                InsTaskImagesBase64 insTaskImagesBase64 = insTaskImagesBase64s.get(i);
                 String image = insTaskImagesBase64.getBase64String();
                 requestBodyB25.setBussNo("yx" + insAreaCompany.getId());
                 requestBodyB25.setUserCode(yaConfigureParameters.getUserCode());
                 requestBodyB25.setComCode(yaConfigureParameters.getComCode());
                 requestBodyB25.setFile(image);
-                String fileName = "";
-                String fileName1 = insTaskImagesBase64s.get(i).getFileName();
+
+                String fileName1 = insTaskImagesBase64.getFileName();
                 String suffix = fileName1.substring(fileName1.lastIndexOf("."));
 
-                //C01车辆影像，C02车主身份证,C03投保人身份证，C04被保人身份证，C05验车照
-                if (insTaskImagesBase64.getImageType() != null && insTaskImagesBase64.getImageType().equals("C01")) {
-                    fileName = "车辆影像" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType() != null && insTaskImagesBase64.getImageType().equals("C02")) {
-                    fileName = "车主身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType() != null && insTaskImagesBase64.getImageType().equals("C03")) {
-                    fileName = "投保人身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType() != null && insTaskImagesBase64.getImageType().equals("C04")) {
-                    fileName = "被保人身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType() != null && insTaskImagesBase64.getImageType().equals("C05")) {
-                    fileName = "验车照" + i + suffix;
-                }
+                InsuranceImageEnum insuranceImageEnum = Enum.valueOf(InsuranceImageEnum.class, insTaskImagesBase64.getImageType());
+                String fileName = insuranceImageEnum.getDesc() + suffix;
+
                 requestBodyB25.setFileName(fileName);
                 //2 接口请求
                 log.info("===永安--上传影像开始请求===");