修改 影像重复上传到核心 问题

src/main/java/com/ydtech/modules/order/components/InsImagesUploadCacheComponents.java

@@ -35,6 +35,10 @@ public class InsImagesUploadCacheComponents {
     public JSONObject isUploadImage(String companyId) {
         String key = IMAGE + companyId;
         String value = redisTemplate.opsForValue().get(key);
+        JSONObject jsonObject = JSON.parseObject(value);
+        if (ObjectUtils.isEmpty(jsonObject)) {
+            return new JSONObject();
+        }
         return JSON.parseObject(value);
     }
 

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

@@ -83,7 +83,7 @@ public class HuiTaiUploadImageComponents {
                                 HuaTaiImageInitParamResponse.filteringTypeCode(childrenDTO, fileTypeEnum.getCode());
                         FileuploadResult fileupload = fileupload(domain, token, initParamResponse, insUploadImagesDto.getFilePath(), file);
                         saveFileIdx(domain, token, initParamResponse, fileupload, fileName, childrenDTO1);
-                        map.put(insUploadImagesDto.getImageType(), insUploadImagesDto.getImageType());
+                        map.put(insUploadImagesDto.getImageType(), insUploadImagesDto.getImageId());
                     } catch (Exception e) {
                         insImagesUploadCacheComponents.setUploadImageCache(companyId, map);
                         throw new SystemException(fileTypeEnum.getName() + "上传异常, 请重试");

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

@@ -351,7 +351,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
 
         List<QuoteKindRespVo> kindList = new ArrayList<>();
         //  报价险种放入保费
-        List<QuoteRiskRespVo> riskList = new ArrayList<QuoteRiskRespVo>();
+        List<QuoteRiskRespVo> riskList = new ArrayList<>();
         // risk列表
         if (odr1009Response.getResult().getBasePart().getJqProposalNo() != null) {
             QuoteRiskRespVo jqRisk = new QuoteRiskRespVo();

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

@@ -44,7 +44,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -144,7 +143,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         HuaTaiQuotedPriceResponse quotedPriceResponse = huaTaiQuotationProcessorComponent.handler(quotedPriceRequest,
                 warnMessageList);
 
-        if(!"0".equals(quotedPriceResponse.getHead().getReturnCode())){
+        if (!"0".equals(quotedPriceResponse.getHead().getReturnCode())) {
             throw new SystemException(quotedPriceResponse.getHead().getReturnMessage());
         }
 
@@ -316,7 +315,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         List<InsUploadImagesDto> insUploadImagesDtoList =
                 insTaskImagesService.findImageByOrderNo(insOrders.getOrderno(), insAreaCompany.getId());
         if (insUploadImagesDtoList.isEmpty()) {
-            throw new SystemException("请检查影像是否上传了");
+            return HttpResult.ok("上传文件成功");
         }
         HuaTaiUploadImageRequest request = new HuaTaiUploadImageRequest(insAreaCompany, huaTaiConfigureParameters);
         request.setHead(new HuaTaiBaseRequestHead(huaTaiConfigureParameters));
@@ -491,7 +490,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         return huaTaiRequestApiComponents.submit(submitRequest, HuaTaiSubmitResponse.class);
     }
 
-    private QuoteRespVo getQuoteRespVo(HuaTaiQuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo,  List<String> warnMessageList) {
+    private QuoteRespVo getQuoteRespVo(HuaTaiQuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo,
+                                       List<String> warnMessageList) {
         double jqPremium = 0;
         double syPremium = 0;
         double jqDiscount = 0;
@@ -559,7 +559,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         quoteRespVo.setSyApplyNo(syApplyNo);
         quoteRespVo.setJqAdjustRate(String.valueOf(jqDiscount));
         quoteRespVo.setSyAdjustRate(String.valueOf(syDiscount));
-        quoteRespVo.setWarnMessageList(  warnMessageList);
+        quoteRespVo.setWarnMessageList(warnMessageList);
         double sumPayTax = 0;
         if (!ObjectUtils.isEmpty(taxDto)) {
             sumPayTax = taxDto.getSumTax();

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

@@ -103,7 +103,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
 
         return insUploadImagesDtos.stream()
                 // 过滤缓存中 存在的 imageId
-                .filter(x -> x.getImageId().equals(uploadImage.get(x.getImageType())))
+                .filter(x -> !x.getImageId().equals(uploadImage.get(x.getImageType())))
                 .map(x -> new InsTaskImagesBase64(x, map))
                 .collect(Collectors.toList());
     }
@@ -117,7 +117,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
         }
 
         return insUploadImagesDtos.stream()
-                .filter(x -> x.getImageId().equals(uploadImage.get(x.getImageType())))
+                .filter(x -> !x.getImageId().equals(uploadImage.get(x.getImageType())))
                 .collect(Collectors.toList());
     }
 

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

@@ -1019,7 +1019,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
         List<EsmInsAttachInsureDetails> esmInsAttachInsureDetails = new ArrayList<>();
         if (arCode.getHead().getResponseCompleteMessageStatus().getMessageStatusCode().equals("E0000")) {
             List<ResponseYwCvrg.CvrgList> cListDetails = arCode.getResponseYwCvrg().getCvrgList();
-            cListDetails.stream().forEach(d -> {
+            cListDetails.forEach(d -> {
 
                 EsmInsAttachInsureDetails atiDetails = new EsmInsAttachInsureDetails();
                 atiDetails.setName(d.getCInsuranceLiability());