1.删除无用代码

2.影像上传修改

src/main/java/com/ydtech/constants/InsuranceImageEnum.java

@@ -23,14 +23,14 @@ public enum InsuranceImageEnum {
     D03("D03", "投保人身份证反面"),
 
     C04("C04", "被保人身份证正面"),
-    D04("D04", "被保人身份证反面"),
-
-    C0500("C0500", "验车照（车架）"),
-    C0501("C0501", "验车照（后左）"),
-    C0502("C0502", "验车照（后右）"),
-    C0503("C0503", "验车照（前右）"),
-    C0504("C0504", "验车照（前左）"),
-    C0505("C0505", "验车照（人车合影）");
+    D04("D04", "被保人身份证反面");
+
+//    C0500("C0500", "验车照（车架）"),
+//    C0501("C0501", "验车照（后左）"),
+//    C0502("C0502", "验车照（后右）"),
+//    C0503("C0503", "验车照（前右）"),
+//    C0504("C0504", "验车照（前左）"),
+//    C0505("C0505", "验车照（人车合影）");
 
 
     private final String code;

src/main/java/com/ydtech/modules/order/controller/OrderTaskImageController.java

@@ -104,7 +104,7 @@ public class OrderTaskImageController extends BaseController {
 
     @GetMapping(value = "/findByQuoteNo")
     @ApiOperation(value = "根据报价号查询")
-    public HttpResult<Map<String, List<InsTaskImagesDto>>> findByQuoteNo(@RequestParam @NotBlank(message = "报价号ID不能为空") String quoteNo) {
+    public HttpResult<Map<String,InsTaskImagesDto>> findByQuoteNo(@RequestParam @NotBlank(message = "报价号ID不能为空") String quoteNo) {
         return this.insTaskImagesService.findByQuoteNo(quoteNo);
     }
 

src/main/java/com/ydtech/modules/order/entity/vo/as/AsAuditResponse.java

@@ -1,31 +0,0 @@
-package com.ydtech.modules.order.entity.vo.as;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.request.BaseResponse;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Data
-public class AsAuditResponse extends BaseResponse {
-    private static final long serialVersionUID = 3358122450495367977L;
-    @JsonProperty("pay_photo")
-    private String payPhoto;
-    @JsonProperty("policyNo_list")
-    private List<PolicyNoListDTO> policynoList;
-
-    @NoArgsConstructor
-    @Data
-    public static class PolicyNoListDTO {
-        @JsonProperty("applyPolicyNo")
-        private String applyPolicyNo;
-        @JsonProperty("planCodeName")
-        private Integer planCodeName;
-        @JsonProperty("policyNo")
-        private String policyNo;
-    }
-}

src/main/java/com/ydtech/modules/order/entity/vo/as/AsLoginInfoCache.java

@@ -1,46 +0,0 @@
-package com.ydtech.modules.order.entity.vo.as;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AsLoginInfoCache implements Serializable {
-
-    private static final long serialVersionUID = 6225293954405814477L;
-    @JsonProperty("carInsureMain")
-    private Double carInsureMain;
-    @JsonProperty("policyBase")
-    private List<Object> policyBase;
-    @JsonProperty("policyCoverages")
-    private List<List<Object>> policyCoverages;
-    @JsonProperty("policyPersons")
-    private List<Object> policyPersons;
-    @JsonProperty("policyRatios")
-    private List<List<Object>> policyRatios;
-    @JsonProperty("targetList")
-    private List<Object> targetList;
-    @JsonProperty("token")
-    private String token;
-
-    @JsonProperty(value = "pho_message")
-    private List<Object> phoMessage;
-
-    public AsLoginInfoCache(AsQuoteResponse asQuoteResponse) {
-        this.carInsureMain = asQuoteResponse.getCarInsureMain();
-        this.policyBase = asQuoteResponse.getPolicyBase();
-        this.policyCoverages = asQuoteResponse.getPolicyCoverages();
-        this.policyPersons = asQuoteResponse.getPolicyPersons();
-        this.policyRatios = asQuoteResponse.getPolicyRatios();
-        this.targetList = asQuoteResponse.getTargetList();
-        this.token = asQuoteResponse.getToken();
-
-    }
-}

src/main/java/com/ydtech/modules/order/entity/vo/as/AsQuoteResponse.java

@@ -1,43 +0,0 @@
-package com.ydtech.modules.order.entity.vo.as;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.request.BaseResponse;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-import java.util.Map;
-
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Data
-public class AsQuoteResponse extends BaseResponse {
-
-    private static final long serialVersionUID = 6130687804219102202L;
-
-    @JsonProperty("INSURANCE_TYPE")
-    private Map<String, Double> insuranceType;
-    @JsonProperty("busiTotalPremium")
-    private Double busiTotalPremium;
-    @JsonProperty("carInsureMain")
-    private Double carInsureMain;
-    @JsonProperty("carInsureShiptax")
-    private Double carInsureShiptax;
-    @JsonProperty("forceCarInsureRisk")
-    private Integer forceCarInsureRisk;
-    @JsonProperty("policyBase")
-    private List<Object> policyBase;
-    @JsonProperty("policyCoverages")
-    private List<List<Object>> policyCoverages;
-    @JsonProperty("policyPersons")
-    private List<Object> policyPersons;
-    @JsonProperty("policyRatios")
-    private List<List<Object>> policyRatios;
-    @JsonProperty("targetList")
-    private List<Object> targetList;
-    @JsonProperty("token")
-    private String token;
-
-
-}

src/main/java/com/ydtech/modules/order/entity/vo/as/AsSubmitImageResponse.java

@@ -1,18 +0,0 @@
-package com.ydtech.modules.order.entity.vo.as;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.request.BaseResponse;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class AsSubmitImageResponse extends BaseResponse {
-    private static final long serialVersionUID = 6911815538622504886L;
-
-    @JsonProperty(value = "pho_message")
-    private List<Object> phoMessage;
-
-}

src/main/java/com/ydtech/modules/order/entity/vo/as/AsUploadImageVo.java

@@ -1,21 +0,0 @@
-package com.ydtech.modules.order.entity.vo.as;
-
-import com.ydtech.modules.esm.model.InsTaskImage;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AsUploadImageVo implements Serializable {
-
-    private static final long serialVersionUID = 8783709603084645808L;
-
-    private String token;
-
-    private List<InsTaskImage> b64pho_list;
-}

src/main/java/com/ydtech/modules/order/service/InsTaskImagesService.java

@@ -33,7 +33,7 @@ public interface InsTaskImagesService extends IService<InsTaskImages> {
      * @param quoteNo
      * @return
      */
-    HttpResult<Map<String, List<InsTaskImagesDto>>> findByQuoteNo(String quoteNo);
+    HttpResult<Map<String, InsTaskImagesDto>> findByQuoteNo(String quoteNo);
 
     /**
      * 获取文件的 文件的Base64 编码

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

@@ -2,8 +2,8 @@ package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.constants.InsuranceImageEnum;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.dao.InsTaskImagesMapper;
 import com.ydtech.modules.order.entity.dto.InsTaskImagesDto;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
@@ -14,8 +14,10 @@ import com.ydtech.modules.order.service.InsTaskImagesService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -46,9 +48,20 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
     }
 
     @Override
-    public HttpResult<Map<String, List<InsTaskImagesDto>>> findByQuoteNo(String quoteNo) {
+    public HttpResult<Map<String, InsTaskImagesDto>> findByQuoteNo(String quoteNo) {
         List<InsTaskImagesDto> insTaskImagesDtos = baseMapper.getByQuoteNoInsTaskImagesDtoList(quoteNo);
-        Map<String, List<InsTaskImagesDto>> collect = insTaskImagesDtos.stream().collect(Collectors.groupingBy(InsTaskImagesDto::getImageType));
+
+        Map<String, InsTaskImagesDto> collect = insTaskImagesDtos.stream().collect(Collectors.toMap(InsTaskImagesDto::getImageType, Function.identity()));
+
+        // 没有数据的为空对象
+        for (InsuranceImageEnum insuranceImageEnum : InsuranceImageEnum.values()) {
+            String code = insuranceImageEnum.getCode();
+            InsTaskImagesDto insTaskImagesDto = collect.get(insuranceImageEnum.getCode());
+            if (ObjectUtils.isEmpty(insTaskImagesDto)) {
+                collect.put(code, new InsTaskImagesDto());
+            }
+        }
+
         return HttpResult.ok(collect);
     }