中煤上传影像修改

src/main/java/com/ydtech/components/ZhongmeiRequestApiComponents.java

@@ -48,7 +48,7 @@ public class ZhongmeiRequestApiComponents {
 
         String body = response.getBody();
         log.info("---------> 响应参数:{}", body);
-        T t = JSONObject.parseObject(body, tClass);
+        T t = JSON.parseObject(body, tClass);
 
         if (ObjectUtils.isEmpty(t)) {
             throw new SystemException("请求失败");

src/main/java/com/ydtech/modules/order/entity/api/zm/request/QuotedPriceRequest.java

@@ -16,7 +16,6 @@ import com.ydtech.modules.order.entity.api.zm.constants.enums.ContractEnum;
 import com.ydtech.modules.order.entity.api.zm.response.ModelsQueryResponse;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -100,9 +99,10 @@ public class QuotedPriceRequest extends BaseRequest {
             // 客户信息
             this.customer = new CustomerDTO().getCustomers(ownerInfo, policyHolderInfo, insuredPersonInfo);
             // 驾意险
-            if(ObjectUtil.isNotEmpty(accidentalDrivingVo)){
+            if(!StringUtils.isEmpty(accidentalDrivingVo.getRideRiskCode())){
                 this.accident = Collections.singletonList(new AccidentDTO(accidentalDrivingVo.getRideRiskCode(), accidentalDrivingVo.getQuantity()));
             }
+
         }
 
         @AllArgsConstructor

src/main/java/com/ydtech/modules/order/entity/api/zm/request/UploadImageRequest.java

@@ -76,26 +76,32 @@ public class UploadImageRequest extends BaseRequest {
         public NodeBeanlistDTO(List<InsTaskImagesBase64> insTaskImages, String id) {
             this.id = id;
             List<ImageBeanListDTO> imageBeanListDTOS = new ArrayList<>();
-            for (int i = 1; i <= insTaskImages.size(); i++) {
+            for (int i = 0; i < insTaskImages.size(); i++) {
                 ImageBeanListDTO imageBeanListDTO = new ImageBeanListDTO();
-                String fileName = insTaskImages.get(i).getFileName();
-                String suffix = fileName.substring(fileName.lastIndexOf("."));
                 InsTaskImagesBase64 insTaskImagesBase64 = insTaskImages.get(i);
 
-                if (insTaskImagesBase64.getImageType().equals("C01")) {
-                    fileName = "车辆影像" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType().equals("C02")) {
-                    fileName = "车主身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType().equals("C03")) {
-                    fileName = "投保人身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType().equals("C04")) {
-                    fileName = "被保人身份证" + i + suffix;
-                } else if (insTaskImagesBase64.getImageType().equals("C05")) {
-                    fileName = "验车照" + i + suffix;
+                String fileName = insTaskImagesBase64.getFileName();
+                String suffix = fileName.substring(fileName.lastIndexOf("."));
+                switch (insTaskImagesBase64.getImageType()) {
+                    case "C01":
+                        fileName = "车辆影像" + i + suffix;
+                        break;
+                    case "C02":
+                        fileName = "车主身份证" + i + suffix;
+                        break;
+                    case "C03":
+                        fileName = "投保人身份证" + i + suffix;
+                        break;
+                    case "C04":
+                        fileName = "被保人身份证" + i + suffix;
+                        break;
+                    case "C05":
+                        fileName = "验车照" + i + suffix;
+                        break;
                 }
 
-                imageBeanListDTO.setFileName(UUID.randomUUID() + suffix);
-                imageBeanListDTO.setImage(fileName);
+                imageBeanListDTO.setFileName(fileName);
+                imageBeanListDTO.setImage(insTaskImagesBase64.getBase64String());
                 imageBeanListDTOS.add(imageBeanListDTO);
             }
 

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

@@ -73,6 +73,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
         List<InsTaskImagesBase64> list = new ArrayList<>();
         for (InsUploadImagesDto insUploadImagesDto : insUploadImagesDtos) {
             InsTaskImagesBase64 insTaskImagesBase64 = new InsTaskImagesBase64();
+            insTaskImagesBase64.setFileName(insUploadImagesDto.getFileName());
             insTaskImagesBase64.setImageType(insUploadImagesDto.getImageType());
             insTaskImagesBase64.setQuoteNo(insUploadImagesDto.getQuoteNo());
             insTaskImagesBase64.setBase64String(map.get(insUploadImagesDto.getImageId()));