Bläddra i källkod

测试上传影像件

jinshihui 10 månader sedan
förälder
incheckning
2018917f02
17 ändrade filer med 81 tillägg och 47 borttagningar
  1. 0 4
      commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/InsuranceUploadImageVo.java
  2. 3 3
      commons/src/main/java/com/jzg/commons/entity/quote/vo/image/InsuranceImageVo.java
  3. 1 1
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java
  4. 1 1
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/config/WebClientConfig.java
  5. 10 14
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java
  6. 19 4
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java
  7. 1 1
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/state/listener/OrderStateListener.java
  8. 4 1
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/component/ZiJinCrawlerRequestComponent.java
  9. 5 0
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerImageUploadRequest.java
  10. 9 0
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerUnderwritingRequest.java
  11. 5 0
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/repository/ZiJinCrawlerOrderRepository.java
  12. 6 1
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/ZiJinCrawlerOrderService.java
  13. 4 4
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerOrderServiceImpl.java
  14. 12 12
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerRequestImpl.java
  15. 0 0
      tenant/insurance/quotation-zijin/src/main/resources/js/auto.js
  16. 1 1
      tenant/insurance/quotation-zijin/src/main/resources/js/content.js
  17. 0 0
      tenant/insurance/quotation-zijin/src/main/resources/js/tsssss.js

+ 0 - 4
commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/InsuranceUploadImageVo.java

@@ -37,10 +37,6 @@ public class InsuranceUploadImageVo implements Serializable {
      */
      */
     private List<InsuranceImageVo> imageVoList;
     private List<InsuranceImageVo> imageVoList;
 
 
-     /**
-     * 上传的影像文件
-     */
-    //private MultipartFile[] file;
 
 
     /**
     /**
      * 车辆信息
      * 车辆信息

+ 3 - 3
commons/src/main/java/com/jzg/commons/entity/quote/vo/image/InsuranceImageVo.java

@@ -21,7 +21,7 @@ import java.util.List;
 public class InsuranceImageVo {
 public class InsuranceImageVo {
 
 
     /**
     /**
-     * 影像类型
+     * 影像编码
      */
      */
     private String imageCode;
     private String imageCode;
     /**
     /**
@@ -29,11 +29,11 @@ public class InsuranceImageVo {
      */
      */
     private String imageType;
     private String imageType;
     /**
     /**
-     * 保司影像类型
+     * 保司影像编码
      */
      */
     private String insuranceImageCode;
     private String insuranceImageCode;
     /**
     /**
-     * 保司影像名称
+     * 保司影像类型
      */
      */
     private String insuranceImageType;
     private String insuranceImageType;
 
 

+ 1 - 1
tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/component/RequestComponent.java

@@ -303,7 +303,7 @@ public class RequestComponent {
      */
      */
     public <Response> ResponseEntity<Response> post(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
     public <Response> ResponseEntity<Response> post(String url, String body, Class<Response> responseClass, HttpHeaders headers) {
         body = Optional.ofNullable(body).orElse("");
         body = Optional.ofNullable(body).orElse("");
-        log.info("URL的值:{},body的值:{}", url, body);
+        //log.info("URL的值:{},body的值:{}", url, body);
         WebClient webClient = selectNoSSLWebClient();
         WebClient webClient = selectNoSSLWebClient();
         try {
         try {
             // 创建一个不带Accept-Encoding的请求头,避免服务器返回压缩数据
             // 创建一个不带Accept-Encoding的请求头,避免服务器返回压缩数据

+ 1 - 1
tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/config/WebClientConfig.java

@@ -78,7 +78,7 @@ public class WebClientConfig {
         DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory();
         DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory();
         factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY);
         factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.VALUES_ONLY);
         return WebClient.builder().exchangeStrategies(ExchangeStrategies.builder().codecs(clientCodecConfigurer -> clientCodecConfigurer.defaultCodecs().maxInMemorySize(MAX_IN_MEMORY_SIZE)).build()).uriBuilderFactory(factory).clientConnector(new ReactorClientHttpConnector(httpClient)).defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).filter(ExchangeFilterFunction.ofRequestProcessor(clientRequest -> {
         return WebClient.builder().exchangeStrategies(ExchangeStrategies.builder().codecs(clientCodecConfigurer -> clientCodecConfigurer.defaultCodecs().maxInMemorySize(MAX_IN_MEMORY_SIZE)).build()).uriBuilderFactory(factory).clientConnector(new ReactorClientHttpConnector(httpClient)).defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).filter(ExchangeFilterFunction.ofRequestProcessor(clientRequest -> {
-            log.info("Client request: {}", clientRequest.url());
+            //log.info("Client request: {}", clientRequest.url());
             // 打印请求头信息
             // 打印请求头信息
             clientRequest.headers().forEach((key, values) -> {
             clientRequest.headers().forEach((key, values) -> {
                 //log.info("请求头: {}: {}", key, values);
                 //log.info("请求头: {}: {}", key, values);

+ 10 - 14
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -190,7 +190,7 @@ public class UnifyOrderManager {
      * 本地影像上传
      * 本地影像上传
      *
      *
      * @param insuranceUploadImageVo
      * @param insuranceUploadImageVo
-     * @return
+     * @return HttpResult
      */
      */
     @PostMapping("imageSave")
     @PostMapping("imageSave")
     @Operation(summary = "本地影像存储")
     @Operation(summary = "本地影像存储")
@@ -297,7 +297,7 @@ public class UnifyOrderManager {
         QuotationBaseService quoteService = companyFactory.getUnderwritingService(insOrders, esmInsCompanyHttpResult.getData()
         QuotationBaseService quoteService = companyFactory.getUnderwritingService(insOrders, esmInsCompanyHttpResult.getData()
                 .getCompanyCode(), baseController, underwritingVo);
                 .getCompanyCode(), baseController, underwritingVo);
 
 
-        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
+        /*InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
         List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.getByOrderId(insOrders.getId());
         List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.getByOrderId(insOrders.getId());
         List<InsOrdersRisk> riskList = insOrdersRiskService.list(new LambdaQueryWrapper<InsOrdersRisk>().eq(InsOrdersRisk::getOrderNo, insOrders.getId()));
         List<InsOrdersRisk> riskList = insOrdersRiskService.list(new LambdaQueryWrapper<InsOrdersRisk>().eq(InsOrdersRisk::getOrderNo, insOrders.getId()));
 
 
@@ -318,10 +318,10 @@ public class UnifyOrderManager {
         underwritingVo.setInsOrdersRiskList(riskList);
         underwritingVo.setInsOrdersRiskList(riskList);
         underwritingVo.setInsOrdersCosts(insOrdersCosts);
         underwritingVo.setInsOrdersCosts(insOrdersCosts);
         underwritingVo.setPolicy(insOrdersPolicy);
         underwritingVo.setPolicy(insOrdersPolicy);
-        underwritingVo.getOrder().setCompanyOrderNo(insOrders.getCompanyOrderNo());
+        underwritingVo.getOrder().setCompanyOrderNo(insOrders.getCompanyOrderNo());*/
 
 
         // 特约查询
         // 特约查询
-        List<InsOrdersClause> insOrdersClauseList = insOrdersClauseService
+        /*List<InsOrdersClause> insOrdersClauseList = insOrdersClauseService
                 .list(new LambdaQueryWrapper<InsOrdersClause>().eq(InsOrdersClause::getOrderNo, insOrders.getId()));
                 .list(new LambdaQueryWrapper<InsOrdersClause>().eq(InsOrdersClause::getOrderNo, insOrders.getId()));
         List<SpecialAppointmentsVo> specialAppointmentsVos = new ArrayList<>();
         List<SpecialAppointmentsVo> specialAppointmentsVos = new ArrayList<>();
         for (InsOrdersClause insOrdersClause : insOrdersClauseList) {
         for (InsOrdersClause insOrdersClause : insOrdersClauseList) {
@@ -335,7 +335,7 @@ public class UnifyOrderManager {
             specialAppointmentsVo.setRiskName(insuranceRisk.getShortName());
             specialAppointmentsVo.setRiskName(insuranceRisk.getShortName());
             specialAppointmentsVos.add(specialAppointmentsVo);
             specialAppointmentsVos.add(specialAppointmentsVo);
         }
         }
-        underwritingVo.setSpecialAppointmentsVos(specialAppointmentsVos);
+        underwritingVo.setSpecialAppointmentsVos(specialAppointmentsVos);*/
 
 
         UnderwritingResultsVo underwritingResultsVo = quoteService.underwriting(underwritingVo);
         UnderwritingResultsVo underwritingResultsVo = quoteService.underwriting(underwritingVo);
         underwritingResultsVo.setOrdersNo(insOrders.getId());
         underwritingResultsVo.setOrdersNo(insOrders.getId());
@@ -344,9 +344,7 @@ public class UnifyOrderManager {
 
 
         if (underwritingResultsVo.getUnderwritingStatus().equals(InsOrderStatusEnum.PAY_PENDING)) {
         if (underwritingResultsVo.getUnderwritingStatus().equals(InsOrderStatusEnum.PAY_PENDING)) {
             // 发送订单状态变更消息
             // 发送订单状态变更消息
-            insOrdersService.orderStatusMessage(insOrders,
-                    insOrdersCarInfo, insOrdersCosts,
-                    baseController.getToken(), MessageCodeEnum.TEMPLATE_5);
+            //insOrdersService.orderStatusMessage(insOrders, insOrdersCarInfo, insOrdersCosts, baseController.getToken(), MessageCodeEnum.TEMPLATE_5);
             return HttpResult.ok("核保成功");
             return HttpResult.ok("核保成功");
         } else {
         } else {
             if (underwritingResultsVo.getUnderwritingStatus().equals(InsOrderStatusEnum.AUDIT_FAIL)) {
             if (underwritingResultsVo.getUnderwritingStatus().equals(InsOrderStatusEnum.AUDIT_FAIL)) {
@@ -355,9 +353,9 @@ public class UnifyOrderManager {
                 insOrders.setOrderStatus(String.valueOf(stateFailResult.getCurrentState()));
                 insOrders.setOrderStatus(String.valueOf(stateFailResult.getCurrentState()));
                 insOrdersService.updateById(insOrders);
                 insOrdersService.updateById(insOrders);
                 // 发送订单状态变更消息
                 // 发送订单状态变更消息
-                insOrdersService.orderStatusMessage(insOrders,
+                /*insOrdersService.orderStatusMessage(insOrders,
                         insOrdersCarInfo, insOrdersCosts,
                         insOrdersCarInfo, insOrdersCosts,
-                        baseController.getToken(), MessageCodeEnum.TEMPLATE_4);
+                        baseController.getToken(), MessageCodeEnum.TEMPLATE_4);*/
             }
             }
             throw new SystemException(underwritingResultsVo.getUnderwritingResult());
             throw new SystemException(underwritingResultsVo.getUnderwritingResult());
         }
         }
@@ -438,19 +436,17 @@ public class UnifyOrderManager {
         insuranceUploadImageVo.getOrder().setAgreementId(byCompanyId.getData().get(0).getId());
         insuranceUploadImageVo.getOrder().setAgreementId(byCompanyId.getData().get(0).getId());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
         insuranceUploadImageVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
-
         insuranceUploadImageVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));
         insuranceUploadImageVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));
 
 
         // 获取影像上传服务并直接调用第三方接口上传影像文件
         // 获取影像上传服务并直接调用第三方接口上传影像文件
         QuotationBaseService quoteService = companyFactory.getImageUploadService(insuranceUploadImageVo, baseController);
         QuotationBaseService quoteService = companyFactory.getImageUploadService(insuranceUploadImageVo, baseController);
-
         try {
         try {
             // 直接调用影像上传方法,上传影像文件到第三方接口
             // 直接调用影像上传方法,上传影像文件到第三方接口
             quoteService.uploadImage(insuranceUploadImageVo);
             quoteService.uploadImage(insuranceUploadImageVo);
-            log.info("影像上传成功,订单号:{}", insuranceUploadImageVo.getOrder().getOrdersNo());
+            log.info("影像上传成功,系统订单ID:{}", insuranceUploadImageVo.getOrder().getOrdersNo());
             return HttpResult.ok("影像上传成功");
             return HttpResult.ok("影像上传成功");
         } catch (Exception e) {
         } catch (Exception e) {
-            log.error("影像上传失败,订单号:{},错误信息:{}", insuranceUploadImageVo.getOrder().getOrdersNo(), e.getMessage(), e);
+            log.error("影像上传失败,系统订单ID:{},错误信息:{}", insuranceUploadImageVo.getOrder().getOrdersNo(), e.getMessage(), e);
             return HttpResult.error("影像上传失败:" + e.getMessage());
             return HttpResult.error("影像上传失败:" + e.getMessage());
         }
         }
     }
     }

+ 19 - 4
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -95,6 +95,7 @@ public class CompanyFactory {
     }
     }
 
 
     /**
     /**
+     * 根据请求类型和保司编码获取报价请求基类
      * @param apiType       请求类型
      * @param apiType       请求类型
      * @param insuranceCode 保险公司编码
      * @param insuranceCode 保险公司编码
      * @return QuotationBaseService 报价请求基类
      * @return QuotationBaseService 报价请求基类
@@ -138,6 +139,14 @@ public class CompanyFactory {
         return service;
         return service;
     }
     }
 
 
+    /**
+     * 根据保司编码获取核保请求基类
+     * @param insOrders
+     * @param companyCode
+     * @param baseController
+     * @param underwritingVo
+     * @return QuotationBaseService
+     */
     public QuotationBaseService getUnderwritingService(InsOrders insOrders, String companyCode, BaseController baseController, UnderwritingVo underwritingVo) {
     public QuotationBaseService getUnderwritingService(InsOrders insOrders, String companyCode, BaseController baseController, UnderwritingVo underwritingVo) {
         //设置归属信息
         //设置归属信息
         String token = baseController.getToken();
         String token = baseController.getToken();
@@ -195,6 +204,12 @@ public class CompanyFactory {
         return getQuotationBase(Integer.parseInt(insOrders.getApiType()), companyCode);
         return getQuotationBase(Integer.parseInt(insOrders.getApiType()), companyCode);
     }
     }
 
 
+    /**
+     *
+     * @param insuranceUploadImageVo
+     * @param baseController
+     * @return QuotationBaseService
+     */
     public QuotationBaseService getImageUploadService(InsuranceUploadImageVo insuranceUploadImageVo, BaseController baseController) {
     public QuotationBaseService getImageUploadService(InsuranceUploadImageVo insuranceUploadImageVo, BaseController baseController) {
         //设置归属信息
         //设置归属信息
         String token = baseController.getToken();
         String token = baseController.getToken();
@@ -215,10 +230,10 @@ public class CompanyFactory {
         attributionInformationVo.setPassword(agreementAttribution.getData().getPassword());
         attributionInformationVo.setPassword(agreementAttribution.getData().getPassword());
         insuranceUploadImageVo.getOrder().setAttributionInformationVo(attributionInformationVo);
         insuranceUploadImageVo.getOrder().setAttributionInformationVo(attributionInformationVo);
 
 
-        InsOrdersVo insOrdersVo = insOrdersService.selectById(Long.parseLong(insuranceUploadImageVo.getOrder().getOrdersNo()));
-        insuranceUploadImageVo.setCarInfo(insOrdersVo.getCarInfoVo());
-        QuotationBaseService service = getQuotationBase(insuranceUploadImageVo.getOrder()
-                .getApiType(), insuranceUploadImageVo.getOrder().getInsuranceCompanyCode());
+        /*InsOrdersVo insOrdersVo = insOrdersService.selectById(Long.parseLong(insuranceUploadImageVo.getOrder().getOrdersNo()));
+        insuranceUploadImageVo.setCarInfo(insOrdersVo.getCarInfoVo());*/
+
+        QuotationBaseService service = getQuotationBase(insuranceUploadImageVo.getOrder().getApiType(), insuranceUploadImageVo.getOrder().getInsuranceCompanyCode());
         ImageParamHandlerDecorator imageParamHandlerDecorator = new ImageParamHandlerDecorator(service, minioClient, bucketName, insTaskImagesService, quoteImageRuleMappingService);
         ImageParamHandlerDecorator imageParamHandlerDecorator = new ImageParamHandlerDecorator(service, minioClient, bucketName, insTaskImagesService, quoteImageRuleMappingService);
         service = ImageProxyFactory.createProxy(service, imageParamHandlerDecorator);
         service = ImageProxyFactory.createProxy(service, imageParamHandlerDecorator);
         return service;
         return service;

+ 1 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/state/listener/OrderStateListener.java

@@ -55,7 +55,7 @@ public class OrderStateListener {
 
 
             Flux<StateMachineEventResult<OrderState.OrderStateEnum, OrderState.OrderStateEvent>> stateMachineEventResultFlux = costStateMachine.sendEvent(message);
             Flux<StateMachineEventResult<OrderState.OrderStateEnum, OrderState.OrderStateEvent>> stateMachineEventResultFlux = costStateMachine.sendEvent(message);
             StateMachineEventResult<OrderState.OrderStateEnum, OrderState.OrderStateEvent> eventResult = stateMachineEventResultFlux.blockFirst();
             StateMachineEventResult<OrderState.OrderStateEnum, OrderState.OrderStateEvent> eventResult = stateMachineEventResultFlux.blockFirst();
-            log.info("eventResult对象的值:{}", JSON.toJSONString(eventResult));
+            //log.info("eventResult对象的值:{}", JSON.toJSONString(eventResult));
             if (eventResult != null && eventResult.getResultType() == StateMachineEventResult.ResultType.ACCEPTED) {
             if (eventResult != null && eventResult.getResultType() == StateMachineEventResult.ResultType.ACCEPTED) {
                 result.set(true);
                 result.set(true);
             }
             }

+ 4 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/component/ZiJinCrawlerRequestComponent.java

@@ -273,7 +273,6 @@ public class ZiJinCrawlerRequestComponent {
     }
     }
 
 
 
 
-
     /**
     /**
      * 核保
      * 核保
      *
      *
@@ -284,7 +283,9 @@ public class ZiJinCrawlerRequestComponent {
     public ZiJinCrawlerUnderwritingResponse underwriting(ZiJinCrawlerUnderwritingRequest ziJinCrawlerUnderwritingRequest, HttpHeaders headers) throws Exception {
     public ZiJinCrawlerUnderwritingResponse underwriting(ZiJinCrawlerUnderwritingRequest ziJinCrawlerUnderwritingRequest, HttpHeaders headers) throws Exception {
         //设置headers
         //设置headers
         HttpHeaders httpHeaders = setHttpHeaders();
         HttpHeaders httpHeaders = setHttpHeaders();
+
         String jsonString = JSON.toJSONString(ziJinCrawlerUnderwritingRequest);
         String jsonString = JSON.toJSONString(ziJinCrawlerUnderwritingRequest);
+        log.info("ziJinCrawlerUnderwritingRequest请求参数的值:{}", jsonString);
         ResponseEntity<ZiJinCrawlerUnderwritingResponse> responseEntity = requestComponent.post(RequestUrl.UNDERWRITING.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerUnderwritingResponse.class, httpHeaders);
         ResponseEntity<ZiJinCrawlerUnderwritingResponse> responseEntity = requestComponent.post(RequestUrl.UNDERWRITING.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerUnderwritingResponse.class, httpHeaders);
         return responseEntity.getBody();
         return responseEntity.getBody();
     }
     }
@@ -300,7 +301,9 @@ public class ZiJinCrawlerRequestComponent {
     public ZiJinCrawlerImageUploadResponse uploadImage(ZiJinCrawlerImageUploadRequest ziJinCrawlerImageUploadRequest, HttpHeaders headers) throws Exception {
     public ZiJinCrawlerImageUploadResponse uploadImage(ZiJinCrawlerImageUploadRequest ziJinCrawlerImageUploadRequest, HttpHeaders headers) throws Exception {
         //设置headers
         //设置headers
         HttpHeaders httpHeaders = setHttpHeaders();
         HttpHeaders httpHeaders = setHttpHeaders();
+
         String jsonString = JSON.toJSONString(ziJinCrawlerImageUploadRequest);
         String jsonString = JSON.toJSONString(ziJinCrawlerImageUploadRequest);
+        log.info("ziJinCrawlerImageUploadRequest请求参数的值:{}", jsonString);
         ResponseEntity<ZiJinCrawlerImageUploadResponse> responseEntity = requestComponent.post(RequestUrl.UPLOAD_IMAGE.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerImageUploadResponse.class, httpHeaders);
         ResponseEntity<ZiJinCrawlerImageUploadResponse> responseEntity = requestComponent.post(RequestUrl.UPLOAD_IMAGE.getRequestUrl(ziJinCrawlerProperties.getBaseUrl()), jsonString, ZiJinCrawlerImageUploadResponse.class, httpHeaders);
         return responseEntity.getBody();
         return responseEntity.getBody();
     }
     }

+ 5 - 0
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerImageUploadRequest.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.zijin.crawler.entity.request;
 package com.jzg.quotation.zijin.crawler.entity.request;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,23 +21,27 @@ public class ZiJinCrawlerImageUploadRequest implements Serializable {
      * 影像base64编码
      * 影像base64编码
      */
      */
      @JsonProperty("fileBase64")
      @JsonProperty("fileBase64")
+     @JSONField(ordinal = 1)
     private String fileBase64;
     private String fileBase64;
 
 
     /**
     /**
      * 文件名
      * 文件名
      */
      */
      @JsonProperty("fileName")
      @JsonProperty("fileName")
+     @JSONField(ordinal = 2)
     private String fileName;
     private String fileName;
 
 
     /**
     /**
      * 影像类型
      * 影像类型
      */
      */
      @JsonProperty("fileType")
      @JsonProperty("fileType")
+     @JSONField(ordinal = 3)
     private String fileType;
     private String fileType;
 
 
     /**
     /**
      * 订单号
      * 订单号
      */
      */
      @JsonProperty("orderNo")
      @JsonProperty("orderNo")
+     @JSONField(ordinal = 4)
     private String orderNo;
     private String orderNo;
 }
 }

+ 9 - 0
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/entity/request/ZiJinCrawlerUnderwritingRequest.java

@@ -1,10 +1,15 @@
 package com.jzg.quotation.zijin.crawler.entity.request;
 package com.jzg.quotation.zijin.crawler.entity.request;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serial;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
+/**
+ * 紫金财险核保请求参数实体类
+ */
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
@@ -17,10 +22,14 @@ public class ZiJinCrawlerUnderwritingRequest implements Serializable {
     /**
     /**
      * 渠道代码
      * 渠道代码
      */
      */
+    @JsonProperty("channelCode")
+    @JSONField(ordinal = 1)
     private String channelCode;
     private String channelCode;
 
 
     /**
     /**
      * 订单号
      * 订单号
      */
      */
+    @JsonProperty("orderNo")
+    @JSONField(ordinal = 2)
     private String orderNo;
     private String orderNo;
 }
 }

+ 5 - 0
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/repository/ZiJinCrawlerOrderRepository.java

@@ -10,6 +10,11 @@ import org.springframework.data.mongodb.repository.MongoRepository;
  **/
  **/
 public interface ZiJinCrawlerOrderRepository extends MongoRepository<ZiJinCrawlerOrder, String> {
 public interface ZiJinCrawlerOrderRepository extends MongoRepository<ZiJinCrawlerOrder, String> {
 
 
+    /**
+     * 根据系统内部订单号查询紫金财险爬虫订单
+     * @param ordersNo
+     * @return ZiJinCrawlerOrder
+     */
     ZiJinCrawlerOrder findByOrdersNo(String ordersNo);
     ZiJinCrawlerOrder findByOrdersNo(String ordersNo);
 
 
 }
 }

+ 6 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/ZiJinCrawlerOrderService.java

@@ -19,6 +19,11 @@ public interface ZiJinCrawlerOrderService {
      */
      */
     void save(QuoteVo quoteVo, ZiJinCrawlerQuotationResponse ziJinCrawlerQuotationResponse, boolean success);
     void save(QuoteVo quoteVo, ZiJinCrawlerQuotationResponse ziJinCrawlerQuotationResponse, boolean success);
 
 
-    ZiJinCrawlerOrder getById(String ordersNo);
+    /**
+     * 根据系统内部订单号查询紫金财险爬虫订单
+     * @param ordersNo
+     * @return ZiJinCrawlerOrder
+     */
+    ZiJinCrawlerOrder getByOrdersNo(String ordersNo);
 
 
 }
 }

+ 4 - 4
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerOrderServiceImpl.java

@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class ZiJinCrawlerOrderServiceImpl implements ZiJinCrawlerOrderService {
 public class ZiJinCrawlerOrderServiceImpl implements ZiJinCrawlerOrderService {
 
 
-    private final ZiJinCrawlerOrderRepository boHaiCrawlerOrderRepository;
+    private final ZiJinCrawlerOrderRepository ziJinCrawlerOrderRepository;
 
 
     /**
     /**
      * 保存紫金财险爬虫订单
      * 保存紫金财险爬虫订单
@@ -52,11 +52,11 @@ public class ZiJinCrawlerOrderServiceImpl implements ZiJinCrawlerOrderService {
             order.setTotalPremium("0");
             order.setTotalPremium("0");
             order.setErrorMsg(ziJinCrawlerQuotationResponse.getRtnMsg());
             order.setErrorMsg(ziJinCrawlerQuotationResponse.getRtnMsg());
         }
         }
-        boHaiCrawlerOrderRepository.save(order);
+        ziJinCrawlerOrderRepository.save(order);
     }
     }
 
 
     @Override
     @Override
-    public ZiJinCrawlerOrder getById(String ordersNo) {
-        return boHaiCrawlerOrderRepository.findByOrdersNo(ordersNo);
+    public ZiJinCrawlerOrder getByOrdersNo(String ordersNo) {
+        return ziJinCrawlerOrderRepository.findByOrdersNo(ordersNo);
     }
     }
 }
 }

+ 12 - 12
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerRequestImpl.java

@@ -205,15 +205,15 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
     public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) {
     public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) {
         AttributionInformationVo attributionInformationVo = underwritingVo.getOrder().getAttributionInformationVo();
         AttributionInformationVo attributionInformationVo = underwritingVo.getOrder().getAttributionInformationVo();
         HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-        ZiJinCrawlerOrder boHaiCrawlerOrder = ziJinCrawlerOrderService.getById(underwritingVo.getOrder().getOrdersNo());
-
-        //UnderwritingRequest underwritingRequest = new UnderwritingRequest(attributionInformationVo.getConfigInfo(), boHaiCrawlerOrder.getOrderNo());
+        ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(underwritingVo.getOrder().getOrdersNo());
+        //log.info("ziJinCrawlerOrder参数的值:{}", JSON.toJSONString(ziJinCrawlerOrder));
 
 
         ZiJinCrawlerUnderwritingResponse ziJinCrawlerUnderwritingResponse = null;
         ZiJinCrawlerUnderwritingResponse ziJinCrawlerUnderwritingResponse = null;
         try {
         try {
-            ZiJinCrawlerUnderwritingRequest ziJinCrawlerUnderwritingRequest = new ZiJinCrawlerUnderwritingRequest("KSCD_PROD", "");
+            ZiJinCrawlerUnderwritingRequest ziJinCrawlerUnderwritingRequest = new ZiJinCrawlerUnderwritingRequest("KSCD_PROD", ziJinCrawlerOrder.getOrdersNo());
             // 核保
             // 核保
             ziJinCrawlerUnderwritingResponse = ziJinCrawlerRequestComponent.underwriting(ziJinCrawlerUnderwritingRequest, headers);
             ziJinCrawlerUnderwritingResponse = ziJinCrawlerRequestComponent.underwriting(ziJinCrawlerUnderwritingRequest, headers);
+            log.info("ziJinCrawlerUnderwritingResponse参数的值:{}", JSON.toJSONString(ziJinCrawlerUnderwritingResponse));
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             throw new RuntimeException(e);
             throw new RuntimeException(e);
@@ -229,7 +229,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
             StringBuilder sb = new StringBuilder();
             StringBuilder sb = new StringBuilder();
             if (null != ziJinCrawlerUnderwritingResponse.getRtnMsg()) {
             if (null != ziJinCrawlerUnderwritingResponse.getRtnMsg()) {
-                sb.append(String.format("错误信息:s%", ziJinCrawlerUnderwritingResponse.getRtnMsg()));
+                sb.append(String.format("错误信息:%s", ziJinCrawlerUnderwritingResponse.getRtnMsg()));
             }
             }
             underwritingResultsVo.setUnderwritingResult(sb.toString());
             underwritingResultsVo.setUnderwritingResult(sb.toString());
         }
         }
@@ -250,7 +250,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             AttributionInformationVo attributionInformationVo = paymentLinkVo.getOrder().getAttributionInformationVo();
             AttributionInformationVo attributionInformationVo = paymentLinkVo.getOrder().getAttributionInformationVo();
             log.info("attributionInformationVo对象的值:{}", JSONObject.toJSONString(attributionInformationVo));
             log.info("attributionInformationVo对象的值:{}", JSONObject.toJSONString(attributionInformationVo));
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getById(paymentLinkVo.getOrder().getOrdersNo());
+            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(paymentLinkVo.getOrder().getOrdersNo());
 
 
             log.info("获取支付链接,订单号:{}", ziJinCrawlerOrder.getOrderNo());
             log.info("获取支付链接,订单号:{}", ziJinCrawlerOrder.getOrderNo());
 
 
@@ -290,13 +290,13 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             //获取归属信息
             //获取归属信息
             AttributionInformationVo attributionInformationVo = insuranceUploadImageVo.getOrder().getAttributionInformationVo();
             AttributionInformationVo attributionInformationVo = insuranceUploadImageVo.getOrder().getAttributionInformationVo();
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getById(insuranceUploadImageVo.getOrder().getOrdersNo());
+            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(insuranceUploadImageVo.getOrder().getOrdersNo());
 
 
             // 上传影像文件请求参数
             // 上传影像文件请求参数
             ZiJinCrawlerImageUploadRequest ziJinCrawlerImageUploadRequest = new ZiJinCrawlerImageUploadRequest();
             ZiJinCrawlerImageUploadRequest ziJinCrawlerImageUploadRequest = new ZiJinCrawlerImageUploadRequest();
-            ziJinCrawlerImageUploadRequest.setFileBase64("");
-            ziJinCrawlerImageUploadRequest.setFileName("");
-            ziJinCrawlerImageUploadRequest.setFileType("");
+            ziJinCrawlerImageUploadRequest.setFileBase64(insuranceUploadImageVo.getImageVoList().get(0).getImageBase64List().get(0).getImageBase64Str());
+            ziJinCrawlerImageUploadRequest.setFileName(insuranceUploadImageVo.getImageVoList().get(0).getImageBase64List().get(0).getImageName());
+            ziJinCrawlerImageUploadRequest.setFileType(insuranceUploadImageVo.getImageVoList().get(0).getImageType());
             ziJinCrawlerImageUploadRequest.setOrderNo(ziJinCrawlerOrder.getOrderNo());
             ziJinCrawlerImageUploadRequest.setOrderNo(ziJinCrawlerOrder.getOrderNo());
 
 
             ZiJinCrawlerImageUploadResponse ziJinCrawlerImageUploadResponse = ziJinCrawlerRequestComponent.uploadImage(ziJinCrawlerImageUploadRequest, headers);
             ZiJinCrawlerImageUploadResponse ziJinCrawlerImageUploadResponse = ziJinCrawlerRequestComponent.uploadImage(ziJinCrawlerImageUploadRequest, headers);
@@ -326,7 +326,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             //获取归属信息
             //获取归属信息
             AttributionInformationVo attributionInformationVo = downloadPolicyVo.getOrder().getAttributionInformationVo();
             AttributionInformationVo attributionInformationVo = downloadPolicyVo.getOrder().getAttributionInformationVo();
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getById(downloadPolicyVo.getOrder().getOrdersNo());
+            ZiJinCrawlerOrder ziJinCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(downloadPolicyVo.getOrder().getOrdersNo());
 
 
             //1、查询车辆保单列表(下载保单的前一步操作)
             //1、查询车辆保单列表(下载保单的前一步操作)
             ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest = setQueryCarPolicyListRequest(downloadPolicyVo.getBeginDate(), downloadPolicyVo.getEndDate(), "");
             ZiJinCrawlerQueryCarPolicyListRequest ziJinCrawlerQueryCarPolicyListRequest = setQueryCarPolicyListRequest(downloadPolicyVo.getBeginDate(), downloadPolicyVo.getEndDate(), "");
@@ -385,7 +385,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
         try {
         try {
             AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
             AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
             HttpHeaders headers = ziJinCrawlerQuoteProcessService.getHeaders(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
-            ZiJinCrawlerOrder boHaiCrawlerOrder = ziJinCrawlerOrderService.getById(orderStatusVo.getOrder().getOrdersNo());
+            ZiJinCrawlerOrder boHaiCrawlerOrder = ziJinCrawlerOrderService.getByOrdersNo(orderStatusVo.getOrder().getOrdersNo());
 
 
             ZiJinCrawlerQueryOrderStatusRequest ziJinCrawlerQueryOrderStatusRequest = new ZiJinCrawlerQueryOrderStatusRequest();
             ZiJinCrawlerQueryOrderStatusRequest ziJinCrawlerQueryOrderStatusRequest = new ZiJinCrawlerQueryOrderStatusRequest();
             // 设置请求参数
             // 设置请求参数

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
tenant/insurance/quotation-zijin/src/main/resources/js/auto.js


+ 1 - 1
tenant/insurance/quotation-zijin/src/main/resources/js/content.js

@@ -1 +1 @@
-___content ="ZjC40HORs9423fHsB4GMEYDsk5rT3XRt1eQs4r79Wxp6PVKUZOGk_m584GOaJkHYMdUJ1vcgOLCrkgjKtX8pC_0NYjnFnm0b.FK6Ds0ZrI2SvQ0qbN7HGKQukV3uLt6hYqHCA1CdJLRWDioyEQVgKPlYHV.tPWVtVZ5j4y.6wQFyxOnDdOCgajLi0V7X3wu433r5nj_.7UQ";
+___content ="kXaQJL2IxqG7x4gqGyZvTszzpIoUrUk4yYovyxOOtyrDU5SABVT3WLpll0y.qV5gyeqr0u.X7W.RJ9T8B62vFNVHi4UwcT2dUh8j2BcL9G1PU6lTkks08lOTZyWGT6kne5sNHJ5lWdEh475DMo8YBDMbtZWDRbBORG45fywExI0amC1oZNAtNrcDxTAjwDDlAdIyVt5MDjq";

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
tenant/insurance/quotation-zijin/src/main/resources/js/tsssss.js


Vissa filer visades inte eftersom för många filer har ändrats