Explorar el Código

save: 泰康财险修改

wks hace 1 año
padre
commit
8e51065725
Se han modificado 100 ficheros con 655 adiciones y 331 borrados
  1. 73 0
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java
  2. 3 4
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/component/HuaNongCrawlerRequestComponent.java
  3. 10 3
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java
  4. 2 2
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerActualValueRequest.java
  5. 3 3
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequest.java
  6. 233 43
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java
  7. 4 4
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerSaveRequest.java
  8. 6 0
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerModelsQueryResponse.java
  9. 1 36
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.java
  10. 12 1
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerQuoteProcessService.java
  11. 43 23
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerQuoteProcessServiceImpl.java
  12. 7 5
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java
  13. 19 0
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/enums/dictionary/Risk.java
  14. 1 1
      tenant/insurance/quotation-summary/src/test/java/com/jzg/quotation/taikang/crawler/service/TKQuotationBaseServiceImplTest.java
  15. 1 1
      tenant/insurance/quotation-taikang/doc/CarModelQuery.md
  16. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/CodeUtil.java
  17. 1 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/JsonUtil.java
  18. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/AESDecryptor.java
  19. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/AESEncryption.java
  20. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/BaseRequest.java
  21. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/BaseResponse.java
  22. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/ClientProperties.java
  23. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/HttpURL.java
  24. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/OrderRequest.java
  25. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/StringResponse.java
  26. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/TKHttpClient.java
  27. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/UnknownFieldEntity.java
  28. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/TKLoginSession.java
  29. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentFuzzyParam.java
  30. 3 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentFuzzyResult.java
  31. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentQueryParam.java
  32. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentTaxParam.java
  33. 9 0
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentTaxResult.java
  34. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AreaUserParam.java
  35. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AreaUserResult.java
  36. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/BasicInfoParam.java
  37. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/BasicInfoResult.java
  38. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarCheckAttorneyListParam.java
  39. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarCheckUploadFileParam.java
  40. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoCheckVehicleTypeParam.java
  41. 8 0
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoCheckVehicleTypeResult.java
  42. 5 5
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoQueryParam.java
  43. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoQueryResult.java
  44. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarTypeParam.java
  45. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarTypeResult.java
  46. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EngageEngageQueryParam.java
  47. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EngageEngageQueryResult.java
  48. 2 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EntranceParam.java
  49. 5 5
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EntranceResult.java
  50. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/FloatNoticeGetParam.java
  51. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/FloatNoticeGetResult.java
  52. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/GroupOrderGetNewNoticeStatusParam.java
  53. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/GroupOrderGetNewNoticeStatusResult.java
  54. 1 1
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentifyTypeMapEntity.java
  55. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentityTokenParam.java
  56. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentityTokenResult.java
  57. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageDownloadPolicyParam.java
  58. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageGetInvoiceURLParam.java
  59. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageGetInvoiceURLResult.java
  60. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitBasicDataParam.java
  61. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitBasicDataResult.java
  62. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitFindRiskConfigParam.java
  63. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitFindRiskConfigResult.java
  64. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitIdentityParam.java
  65. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitIdentityResult.java
  66. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitProposalParam.java
  67. 8 8
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitProposalResult.java
  68. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuotationParam.java
  69. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuotationResult.java
  70. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuoteParam.java
  71. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuoteResult.java
  72. 2 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/LoginParam.java
  73. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/LoginResult.java
  74. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/NonCarPlanInfo.java
  75. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderCompleteAgentParam.java
  76. 3 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderCompleteAgentResult.java
  77. 10 0
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderIdParam.java
  78. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderIdResult.java
  79. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitParam.java
  80. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitResult.java
  81. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ProposalDownloadParam.java
  82. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveBasicInfoParam.java
  83. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveBasicInfoResult.java
  84. 2 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveQuoteParam.java
  85. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveQuoteResult.java
  86. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKAgentQueryResult.java
  87. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000012Param.java
  88. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000038Param.java
  89. 6 6
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000038Result.java
  90. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000086Param.java
  91. 4 4
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000086Result.java
  92. 11 0
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKPayForwardParam.java
  93. 3 3
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKPayForwardResult.java
  94. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAgent.java
  95. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAgentFuzzy.java
  96. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAllKind.java
  97. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAmount.java
  98. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAppliInfo.java
  99. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAreaInfoVo.java
  100. 2 2
      tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKBzKindVo.java

+ 73 - 0
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/build/HuaNongCrawlerQuoteResultsVoBuild.java

@@ -0,0 +1,73 @@
+package com.jzg.quote.huanong.crawler.build;
+
+import com.jzg.commons.entity.quote.vo.KindInfoVo;
+import com.jzg.commons.entity.quote.vo.RiskInfoVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerQuotedPriceResponse;
+import com.jzg.quote.huanong.enums.dictionary.Risk;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class HuaNongCrawlerQuoteResultsVoBuild {
+
+    public HuaNongCrawlerQuoteResultsVoBuild() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static QuoteResultsVo buildQuoteResultsVo(String orderNo, QuoteVo quoteVo, HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse) {
+        QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
+        quoteResultsVo.setOrdersNo(orderNo);
+
+        List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contract = huaNongCrawlerQuotedPriceResponse.getBusinessData()
+                .getContract();
+
+        Map<String, HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO> contractDTOMap = contract.stream()
+                .collect(Collectors.toMap(x -> x.getContractMain().getRiskCode(), x -> x));
+
+        boolean newEnergyMark = quoteVo.getCarInfoVo().isNewEnergyMark();
+        HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO contractDTO;
+        if (newEnergyMark) {
+            contractDTO = contractDTOMap.get(Risk.RISK_0515.getRiskCode());
+        } else {
+            contractDTO = contractDTOMap.get(Risk.RISK_0510.getRiskCode());
+        }
+        // 商业险险种信息
+        List<KindInfoVo> kindInfoVo = buildKindInfo(quoteVo.getKindInfoVo(), contractDTO.getCoverage());
+        quoteResultsVo.setKindInfoVo(kindInfoVo);
+
+        // 交强险
+        HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO ciContractDTO = contractDTOMap.get(Risk.RISK_0507.getRiskCode());
+        RiskInfoVo ciRiskInfoVo =  buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), ciContractDTO.getContractMain());
+        quoteResultsVo.setCiRiskInfoVo(ciRiskInfoVo);
+
+        // 商业险
+        RiskInfoVo biRiskInfoVo =  buildRiskInfoVo(quoteVo.getCiRiskInfoVo(), contractDTO.getContractMain());
+        quoteResultsVo.setBiRiskInfoVo(biRiskInfoVo);
+
+        return quoteResultsVo;
+    }
+
+    private static RiskInfoVo buildRiskInfoVo(RiskInfoVo riskInfoVo, HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.ContractMainDTO contractMain) {
+        riskInfoVo.setStartDate(contractMain.getValidDate());
+        riskInfoVo.setEndDate(contractMain.getExpiryDate());
+        return riskInfoVo;
+    }
+
+    private static List<KindInfoVo> buildKindInfo(List<KindInfoVo> kindInfoVo, List<HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO> coverage) {
+        if (kindInfoVo.isEmpty()) {
+            return kindInfoVo;
+        }
+        Map<String, HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO> coverageDTOMap = coverage.stream()
+                .collect(Collectors.toMap(HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO::getKindCode, x -> x));
+        kindInfoVo.forEach(kind -> {
+            HuaNongCrawlerQuotedPriceResponse.BusinessDataDTO.ContractDTO.CoverageDTO coverageDTO = coverageDTOMap.get(kind.getKindCode());
+            kind.setPremium(String.valueOf(coverageDTO.getCoveragePremium()));
+        });
+        return kindInfoVo;
+    }
+
+
+}

+ 3 - 4
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/component/HuaNongCrawlerRequestComponent.java

@@ -40,8 +40,6 @@ public class HuaNongCrawlerRequestComponent {
 
 
     private final RequestComponent requestComponent;
     private final RequestComponent requestComponent;
 
 
-    private final WebClient webClient;
-
     public <Request extends HuaNongHead, Response> Response post(RequestUrl requestUrl, Request body, Class<Response> responseClass, HttpHeaders headers) {
     public <Request extends HuaNongHead, Response> Response post(RequestUrl requestUrl, Request body, Class<Response> responseClass, HttpHeaders headers) {
         HuaNongCrawlerRequestBaseHead head = body.getHead();
         HuaNongCrawlerRequestBaseHead head = body.getHead();
         head.setSource(requestUrl.getUri());
         head.setSource(requestUrl.getUri());
@@ -137,8 +135,9 @@ public class HuaNongCrawlerRequestComponent {
      * @param headers 请求头
      * @param headers 请求头
      * @return 保存订单信息
      * @return 保存订单信息
      */
      */
-    public HuaNongCrawlerSaveResponse save(HuaNongCrawlerSaveRequest request, HttpHeaders headers) {
-        return post(RequestUrl.SAVE, request, HuaNongCrawlerSaveResponse.class, headers);
+    public void save(HuaNongCrawlerSaveRequest request, HttpHeaders headers) {
+        HuaNongCrawlerSaveResponse response = post(RequestUrl.SAVE, request, HuaNongCrawlerSaveResponse.class, headers);
+
     }
     }
 
 
     /**
     /**

+ 10 - 3
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java

@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import java.io.Serial;
 import java.io.Serial;
-import java.io.Serializable;
 
 
 @Data
 @Data
 @Component
 @Component
@@ -15,6 +14,10 @@ public class HuaNongCrawlerConfigureParameters implements ConfigureParameters {
 
 
     @Serial
     @Serial
     private static final long serialVersionUID = 4615335555960316808L;
     private static final long serialVersionUID = 4615335555960316808L;
+    /**
+     * 团队名称
+     */
+    private String teamName;
     /**
     /**
      * 归属机构编码
      * 归属机构编码
      */
      */
@@ -23,13 +26,17 @@ public class HuaNongCrawlerConfigureParameters implements ConfigureParameters {
      * 渠道类型编码
      * 渠道类型编码
      */
      */
     private String producerCode;
     private String producerCode;
+    /**
+     * 协议号
+     */
+    private String agreementNo;
     /**
     /**
      * 代理人
      * 代理人
      */
      */
-    private String agentName;
+    private String handlerCode;
     /**
     /**
      * 维护人
      * 维护人
      */
      */
-    private String maintainers;
+    private String callerName;
 
 
 }
 }

+ 2 - 2
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerActualValueRequest.java

@@ -59,8 +59,8 @@ public class HuaNongCrawlerActualValueRequest implements Serializable, HuaNongHe
         this.approvedPassengersCapacity = Integer.valueOf(carInfoVo.getSeatCount());
         this.approvedPassengersCapacity = Integer.valueOf(carInfoVo.getSeatCount());
         this.validDate = TimeProcessing.tomorrowDateTime();
         this.validDate = TimeProcessing.tomorrowDateTime();
         this.purchasePrice = carModelDTO.getPurchasePrice();
         this.purchasePrice = carModelDTO.getPurchasePrice();
-        this.motorUsageTypeCode = "";
-        this.motorTypeCode = "";
+        this.motorUsageTypeCode = carInfoVo.getVehicleUseCode();
+        this.motorTypeCode = carInfoVo.getCarKindCode();
         this.registerDate = carInfoVo.getRegisterDate();
         this.registerDate = carInfoVo.getRegisterDate();
         this.loginCom = comCode;
         this.loginCom = comCode;
         this.isNewEnergyFlag = false;
         this.isNewEnergyFlag = false;

+ 3 - 3
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerModelsQueryRequest.java

@@ -92,10 +92,10 @@ public class HuaNongCrawlerModelsQueryRequest  implements Serializable, HuaNongH
         this.noLicenseFlag = false;
         this.noLicenseFlag = false;
         this.frameNo = "";
         this.frameNo = "";
         this.engineNo = "";
         this.engineNo = "";
-        this.motorUsageTypeCode = "";
-        this.motorTypeCode = "";
+        this.motorUsageTypeCode = carInfoVo.getVehicleUseCode();
+        this.motorTypeCode = carInfoVo.getCarKindCode();
         this.newCarFlag = "";
         this.newCarFlag = "";
-        this.ecdemicVehicleFlag = "";
+        this.ecdemicVehicleFlag = "0";
         this.windowsFlag = "0";
         this.windowsFlag = "0";
     }
     }
 }
 }

+ 233 - 43
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java

@@ -2,10 +2,13 @@ package com.jzg.quote.huanong.crawler.entity.request;
 
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.codec.Base64;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerComInfoQueryResponse;
 import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
 import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerModelsQueryResponse;
+import com.jzg.quote.huanong.crawler.entity.response.HuaNongCrawlerUserTypeAndProxyInfoQueryResponse;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -48,12 +51,12 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
     private BusinessDataDTO businessData;
     private BusinessDataDTO businessData;
 
 
     public HuaNongCrawlerQuotedPriceRequest(String token, String username, QuoteVo quoteVo, HuaNongCrawlerModelsQueryResponse.CarModelDTO carModelDTO, String actualValue) {
     public HuaNongCrawlerQuotedPriceRequest(String token, String username, QuoteVo quoteVo, HuaNongCrawlerModelsQueryResponse.CarModelDTO carModelDTO, String actualValue) {
-        this.head = new HuaNongCrawlerRequestBaseHead("token");
+        this.head = new HuaNongCrawlerRequestBaseHead(token);
         this.loginCom = loginCom;
         this.loginCom = loginCom;
         this.userCode = username;
         this.userCode = username;
         this.comeCode = comeCode;
         this.comeCode = comeCode;
         this.agentCode = "";
         this.agentCode = "";
-        this.businessData = new BusinessDataDTO(quoteVo, "", "");
+        this.businessData = new BusinessDataDTO(quoteVo, carModelDTO, "", "");
     }
     }
 
 
     @NoArgsConstructor
     @NoArgsConstructor
@@ -94,13 +97,13 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
         private List<NewEnergyAmountListDataDTO> newEnergyAmountListData;
         private List<NewEnergyAmountListDataDTO> newEnergyAmountListData;
 
 
         @JsonProperty("BListData")
         @JsonProperty("BListData")
-        private List<BListDataDTO> bListData;
+        private List<ListDataDTO> bListData;
 
 
         @JsonProperty("D3ListData")
         @JsonProperty("D3ListData")
-        private List<D3ListDataDTO> d3ListData;
+        private List<ListDataDTO> d3ListData;
 
 
         @JsonProperty("D4ListData")
         @JsonProperty("D4ListData")
-        private List<D4ListDataDTO> d4ListData;
+        private List<ListDataDTO> d4ListData;
 
 
         @JsonProperty("ocrFlag")
         @JsonProperty("ocrFlag")
         private String ocrFlag;
         private String ocrFlag;
@@ -151,18 +154,19 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
         private List<Object> glassInfo;
         private List<Object> glassInfo;
 
 
 
 
-        public BusinessDataDTO(QuoteVo quoteVo, String loginCom, String comeCode) {
+        public BusinessDataDTO(QuoteVo quoteVo, HuaNongCrawlerModelsQueryResponse.CarModelDTO carModelDTO, String loginCom, String comeCode) {
             this.businessMain = new BusinessMainDTO(loginCom, comeCode);
             this.businessMain = new BusinessMainDTO(loginCom, comeCode);
-            this.insuredObject = new InsuredObjectDTO();
+            this.insuredObject = new InsuredObjectDTO(carModelDTO.getFullCarData(), quoteVo.getCarInfoVo());
+
             this.saleInfo = new SaleInfoDTO();
             this.saleInfo = new SaleInfoDTO();
             this.platFormMessageNvehBean = new PlatFormMessageNvehBeanDTO("");
             this.platFormMessageNvehBean = new PlatFormMessageNvehBeanDTO("");
             this.sum = 0;
             this.sum = 0;
             this.threeMountFlag = false;
             this.threeMountFlag = false;
             this.amountListData = new ArrayList<>();
             this.amountListData = new ArrayList<>();
             this.newEnergyAmountListData = new ArrayList<>();
             this.newEnergyAmountListData = new ArrayList<>();
-            this.bListData = new ArrayList<>();
-            this.d3ListData = new ArrayList<>();
-            this.d4ListData = new ArrayList<>();
+            this.bListData = ListDataDTO.getListBDataDTO();
+            this.d3ListData = ListDataDTO.getListDDataDTO();
+            this.d4ListData = ListDataDTO.getListDDataDTO();
             this.nvehInfo = new ArrayList<>();
             this.nvehInfo = new ArrayList<>();
             this.homeInfo = new ArrayList<>();
             this.homeInfo = new ArrayList<>();
             this.glassInfo = new ArrayList<>();
             this.glassInfo = new ArrayList<>();
@@ -259,11 +263,11 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             private Integer isAloneInsureNveh;
             private Integer isAloneInsureNveh;
 
 
             public BusinessMainDTO(String loginCom, String comeCode) {
             public BusinessMainDTO(String loginCom, String comeCode) {
-                this.accessSource = accessSource;
-                this.agreementNo = agreementNo;
+                this.accessSource = "";
+                this.agreementNo = "";
                 this.appointAreaCode = "";
                 this.appointAreaCode = "";
-                this.argueSolution = argueSolution;
-                this.argueSolutionCom = argueSolutionCom;
+                this.argueSolution = "";
+                this.argueSolutionCom = "";
                 this.beforeFXQStockOnline = beforeFXQStockOnline;
                 this.beforeFXQStockOnline = beforeFXQStockOnline;
                 this.billAcceptDate = billAcceptDate;
                 this.billAcceptDate = billAcceptDate;
                 this.businessType = "2";
                 this.businessType = "2";
@@ -292,8 +296,8 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
                 this.quoteMd5 = quoteMd5;
                 this.quoteMd5 = quoteMd5;
                 this.isPeerComparison = isPeerComparison;
                 this.isPeerComparison = isPeerComparison;
                 this.isRunFlag = isRunFlag;
                 this.isRunFlag = isRunFlag;
-                this.bjLogId = bjLogId;
-                this.lastPolicyNos = lastPolicyNos;
+                this.bjLogId = "";
+                this.lastPolicyNos = Collections.emptyList();
                 this.isAloneInsureNveh = isAloneInsureNveh;
                 this.isAloneInsureNveh = isAloneInsureNveh;
             }
             }
         }
         }
@@ -314,6 +318,15 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             @JsonProperty("violation")
             @JsonProperty("violation")
             private List<Object> violation;
             private List<Object> violation;
 
 
+            public InsuredObjectDTO(HuaNongCrawlerModelsQueryResponse.CarModelDTO.FullCarDataDTO fullCarDataDTO, CarInfoVo carInfoVo) {
+                this.chargingPostInfos = chargingPostInfos;
+                this.platformCar = platformCar;
+                this.policyCar = policyCar;
+                this.simpleStadarCar = new SimpleStadarCarDTO(fullCarDataDTO, carInfoVo.getSeatCount(), carInfoVo.getCompleteKerbMass(), carInfoVo.getLimitLoad());
+                this.specializedDevice = specializedDevice;
+                this.violation = violation;
+            }
+
             @NoArgsConstructor
             @NoArgsConstructor
             @Data
             @Data
             public static class PlatformCarDTO {
             public static class PlatformCarDTO {
@@ -489,22 +502,50 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             @NoArgsConstructor
             @NoArgsConstructor
             @Data
             @Data
             public static class SimpleStadarCarDTO {
             public static class SimpleStadarCarDTO {
+
+
+                @JsonProperty("absFlag")
+                private String absFlag;
+                @JsonProperty("airbagCount")
+                private String airbagCount;
+                @JsonProperty("analogyPrice")
+                private Integer analogyPrice;
+                @JsonProperty("analogyPriceTax")
+                private Integer analogyPriceTax;
                 @JsonProperty("approvedLoad")
                 @JsonProperty("approvedLoad")
-                private Double approvedLoad;
+                private Integer approvedLoad;
                 @JsonProperty("approvedPassengersCapacity")
                 @JsonProperty("approvedPassengersCapacity")
                 private Integer approvedPassengersCapacity;
                 private Integer approvedPassengersCapacity;
                 @JsonProperty("brand")
                 @JsonProperty("brand")
                 private String brand;
                 private String brand;
                 @JsonProperty("brandCode")
                 @JsonProperty("brandCode")
                 private String brandCode;
                 private String brandCode;
-                @JsonProperty("carCategory")
-                private String carCategory;
+                @JsonProperty("carAlias")
+                private String carAlias;
+                @JsonProperty("carKind")
+                private String carKind;
+                @JsonProperty("carType")
+                private String carType;
+                @JsonProperty("carYear")
+                private String carYear;
                 @JsonProperty("displacement")
                 @JsonProperty("displacement")
                 private Double displacement;
                 private Double displacement;
                 @JsonProperty("energyTypes")
                 @JsonProperty("energyTypes")
                 private String energyTypes;
                 private String energyTypes;
+                @JsonProperty("factory")
+                private String factory;
                 @JsonProperty("grossMass")
                 @JsonProperty("grossMass")
                 private Integer grossMass;
                 private Integer grossMass;
+                @JsonProperty("hfEndTime")
+                private String hfEndTime;
+                @JsonProperty("hfStartTime")
+                private String hfStartTime;
+                @JsonProperty("hfcode")
+                private String hfcode;
+                @JsonProperty("hfname")
+                private String hfname;
+                @JsonProperty("hnCarNo")
+                private String hnCarNo;
                 @JsonProperty("insCarClass")
                 @JsonProperty("insCarClass")
                 private String insCarClass;
                 private String insCarClass;
                 @JsonProperty("insCarClassName")
                 @JsonProperty("insCarClassName")
@@ -513,14 +554,32 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
                 private String localModelCode;
                 private String localModelCode;
                 @JsonProperty("modelCode")
                 @JsonProperty("modelCode")
                 private String modelCode;
                 private String modelCode;
+                @JsonProperty("modelFlag")
+                private String modelFlag;
+                @JsonProperty("modelName")
+                private String modelName;
+                @JsonProperty("oldMark")
+                private String oldMark;
                 @JsonProperty("power")
                 @JsonProperty("power")
                 private Integer power;
                 private Integer power;
-                @JsonProperty("priceEnd")
-                private Integer priceEnd;
-                @JsonProperty("priceStart")
-                private Integer priceStart;
+                @JsonProperty("productStatus")
+                private String productStatus;
                 @JsonProperty("purchasePrice")
                 @JsonProperty("purchasePrice")
-                private Integer purchasePrice;
+                private String purchasePrice;
+                @JsonProperty("purchasePriceTax")
+                private String purchasePriceTax;
+                @JsonProperty("qualityMax")
+                private Integer qualityMax;
+                @JsonProperty("qualityMin")
+                private Integer qualityMin;
+                @JsonProperty("remark")
+                private String remark;
+                @JsonProperty("riskType")
+                private String riskType;
+                @JsonProperty("seatMax")
+                private Integer seatMax;
+                @JsonProperty("seatMin")
+                private Integer seatMin;
                 @JsonProperty("series")
                 @JsonProperty("series")
                 private String series;
                 private String series;
                 @JsonProperty("seriesCode")
                 @JsonProperty("seriesCode")
@@ -529,14 +588,74 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
                 private String seriesType;
                 private String seriesType;
                 @JsonProperty("shortHandCode")
                 @JsonProperty("shortHandCode")
                 private String shortHandCode;
                 private String shortHandCode;
+                @JsonProperty("theftProof")
+                private String theftProof;
                 @JsonProperty("tractionMass")
                 @JsonProperty("tractionMass")
                 private Integer tractionMass;
                 private Integer tractionMass;
+                @JsonProperty("transmissionType")
+                private String transmissionType;
                 @JsonProperty("unladenMass")
                 @JsonProperty("unladenMass")
                 private Integer unladenMass;
                 private Integer unladenMass;
                 @JsonProperty("vehicleStyleUniqueId")
                 @JsonProperty("vehicleStyleUniqueId")
                 private String vehicleStyleUniqueId;
                 private String vehicleStyleUniqueId;
+                @JsonProperty("noticeType")
+                private String noticeType;
+                @JsonProperty("brandCopy")
+                private String brandCopy;
                 @JsonProperty("purchasePriceCopy")
                 @JsonProperty("purchasePriceCopy")
-                private Integer purchasePriceCopy;
+                private String purchasePriceCopy;
+
+                public SimpleStadarCarDTO(HuaNongCrawlerModelsQueryResponse.CarModelDTO.FullCarDataDTO fullCarDataDTO, String seatCount, String completeKerbMass, String limitLoad) {
+                    this.absFlag = fullCarDataDTO.getAbsFlag();
+                    this.airbagCount = fullCarDataDTO.getAirbagCount();
+                    this.analogyPrice = fullCarDataDTO.getAnalogyPrice();
+                    this.analogyPriceTax = fullCarDataDTO.getAnalogyPriceTax();
+                    this.approvedLoad = fullCarDataDTO.getApprovedLoad();
+                    this.approvedPassengersCapacity = Integer.valueOf(seatCount);
+                    this.brand = fullCarDataDTO.getBrand();
+                    this.brandCode = fullCarDataDTO.getBrandCode();
+                    this.carAlias = fullCarDataDTO.getCarAlias();
+                    this.carKind = fullCarDataDTO.getCarKind();
+                    this.carType = fullCarDataDTO.getCarType();
+                    this.carYear = fullCarDataDTO.getCarYear();
+                    this.displacement = fullCarDataDTO.getDisplacement();
+                    this.energyTypes = fullCarDataDTO.getEnergyTypes();
+                    this.factory = fullCarDataDTO.getFactory();
+                    this.grossMass = fullCarDataDTO.getGrossMass();
+                    this.hfEndTime = fullCarDataDTO.getHfEndTime();
+                    this.hfStartTime = fullCarDataDTO.getHfStartTime();
+                    this.hfcode = fullCarDataDTO.getHfcode();
+                    this.hfname = fullCarDataDTO.getHfname();
+                    this.hnCarNo = fullCarDataDTO.getHnCarNo();
+                    this.insCarClass = fullCarDataDTO.getInsCarClass();
+                    this.insCarClassName = fullCarDataDTO.getInsCarClassName();
+                    this.localModelCode = fullCarDataDTO.getLocalModelCode();
+                    this.modelCode = fullCarDataDTO.getModelCode();
+                    this.modelFlag = fullCarDataDTO.getModelFlag();
+                    this.modelName = fullCarDataDTO.getModelName();
+                    this.oldMark = fullCarDataDTO.getOldMark();
+                    this.power = fullCarDataDTO.getPower();
+                    this.productStatus = fullCarDataDTO.getProductStatus();
+                    this.purchasePrice = fullCarDataDTO.getPurchasePrice();
+                    this.purchasePriceTax = fullCarDataDTO.getPurchasePriceTax();
+                    this.qualityMax = fullCarDataDTO.getQualityMax();
+                    this.qualityMin = fullCarDataDTO.getQualityMin();
+                    this.remark = fullCarDataDTO.getRemark();
+                    this.riskType = fullCarDataDTO.getRiskType();
+                    this.seatMax = fullCarDataDTO.getSeatMax();
+                    this.seatMin = fullCarDataDTO.getSeatMin();
+                    this.series = fullCarDataDTO.getSeries();
+                    this.seriesCode = fullCarDataDTO.getSeriesCode();
+                    this.seriesType = fullCarDataDTO.getSeriesType();
+                    this.shortHandCode = fullCarDataDTO.getShortHandCode();
+                    this.theftProof = fullCarDataDTO.getTheftProof();
+                    this.tractionMass = fullCarDataDTO.getTractionMass();
+                    this.transmissionType = fullCarDataDTO.getTransmissionType();
+                    this.unladenMass = fullCarDataDTO.getUnladenMass();
+                    this.noticeType = fullCarDataDTO.getNoticeType();
+                    this.brandCopy = fullCarDataDTO.getBrandCopy();
+                    this.purchasePriceCopy = fullCarDataDTO.getPurchasePriceCopy();
+                }
             }
             }
         }
         }
 
 
@@ -682,27 +801,83 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             @JsonProperty("orgCode")
             @JsonProperty("orgCode")
             private String orgCode;
             private String orgCode;
 
 
+            public SaleInfoDTO(HuaNongCrawlerComInfoQueryResponse.ComListDTO comListDTO, HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO handlerListDTO, HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO agentInfoListDTO, String callerName) {
+                this.agentAddress = agentInfoListDTO.getAgentAddress();
+                this.agentCode = agentInfoListDTO.getAgentCode();
+                this.agentMobile = agentInfoListDTO.getAgentMobile();
+                this.agentName = agentInfoListDTO.getAgentName();
+                this.agentPermitNo = agentInfoListDTO.getAgentPermitNo();
+                this.agentTaxType = agentInfoListDTO.getAgentTaxType();
+                this.agentRegisteredAddress = agentInfoListDTO.getAgentRegisteredAddress();
+                this.orgCode = agentInfoListDTO.getOrgCode();
+                this.salesIdentifyNumber = agentInfoListDTO.getSalesIdentifyNumber();
+                this.salesIdentifyType = agentInfoListDTO.getSalesIdentifyType();
+
+                this.agreementNo = "";
+                this.comCode = comListDTO.getComCode();
+                this.comFlag = comListDTO.getFlag();
+                this.comName = comListDTO.getComName();
+
+                this.salesman = List.of(new SalesmanDTO(handlerListDTO, callerName));
+                this.saleSys = "";
+                this.staffCode = "";
+                this.staffName = "";
+                this.teamCode = handlerListDTO.getTeamCode();
+                this.teamName = handlerListDTO.getTeamName();
+                this.channelSource = channelSource;
+                this.channelSourceName = "";
+
+                this.producerCode = "";
+                this.producerName = "";
+
+            }
+
             @NoArgsConstructor
             @NoArgsConstructor
             @Data
             @Data
             public static class SalesmanDTO {
             public static class SalesmanDTO {
+
                 @JsonProperty("callerName")
                 @JsonProperty("callerName")
                 private String callerName;
                 private String callerName;
+
                 @JsonProperty("comCode")
                 @JsonProperty("comCode")
                 private String comCode;
                 private String comCode;
+
                 @JsonProperty("guidanceRate")
                 @JsonProperty("guidanceRate")
                 private Integer guidanceRate;
                 private Integer guidanceRate;
+
                 @JsonProperty("handleRate")
                 @JsonProperty("handleRate")
                 private Integer handleRate;
                 private Integer handleRate;
+
                 @JsonProperty("handlerCode")
                 @JsonProperty("handlerCode")
                 private String handlerCode;
                 private String handlerCode;
+
                 @JsonProperty("handlerIdentifynumber")
                 @JsonProperty("handlerIdentifynumber")
                 private String handlerIdentifynumber;
                 private String handlerIdentifynumber;
+
                 @JsonProperty("handlerMobile")
                 @JsonProperty("handlerMobile")
                 private String handlerMobile;
                 private String handlerMobile;
+
                 @JsonProperty("handlerName")
                 @JsonProperty("handlerName")
                 private String handlerName;
                 private String handlerName;
+
                 @JsonProperty("riskClassType")
                 @JsonProperty("riskClassType")
                 private String riskClassType;
                 private String riskClassType;
+
+                @JsonProperty("riskClassType")
+                private String certificateNo;
+
+                public SalesmanDTO(HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO handlerListDTO, String callerName) {
+                    this.callerName = callerName;
+                    this.certificateNo = handlerListDTO.getCertificateNo();
+                    this.comCode = "";
+                    this.guidanceRate = 100;
+                    this.handleRate = 100;
+                    this.handlerCode = handlerListDTO.getHandlerCode();
+                    this.handlerName = handlerListDTO.getHandlerName();
+                    this.handlerIdentifynumber = handlerListDTO.getHandlerCode();
+                    this.handlerMobile = handlerListDTO.getHandlerMobile();
+                    this.riskClassType = "201705";
+                }
             }
             }
         }
         }
 
 
@@ -983,31 +1158,47 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             }
             }
         }
         }
 
 
+        @AllArgsConstructor
         @NoArgsConstructor
         @NoArgsConstructor
         @Data
         @Data
-        public static class BListDataDTO {
-            @JsonProperty("code")
-            private String code;
-            @JsonProperty("value")
-            private String value;
-        }
+        public static class ListDataDTO {
 
 
-        @NoArgsConstructor
-        @Data
-        public static class D3ListDataDTO {
             @JsonProperty("code")
             @JsonProperty("code")
             private String code;
             private String code;
-            @JsonProperty("value")
-            private String value;
-        }
 
 
-        @NoArgsConstructor
-        @Data
-        public static class D4ListDataDTO {
-            @JsonProperty("code")
-            private String code;
             @JsonProperty("value")
             @JsonProperty("value")
             private String value;
             private String value;
+
+            public static List<ListDataDTO> getListBDataDTO() {
+                List<ListDataDTO> list = new ArrayList<>();
+                list.add(new ListDataDTO("100000", "10万元"));
+                list.add(new ListDataDTO("150000", "15万元"));
+                list.add(new ListDataDTO("200000", "20万元"));
+                list.add(new ListDataDTO("300000", "30万元"));
+                list.add(new ListDataDTO("500000", "50万元"));
+                list.add(new ListDataDTO("1000000", "100万元"));
+                list.add(new ListDataDTO("1500000", "150万元"));
+                list.add(new ListDataDTO("2000000", "200万元"));
+                list.add(new ListDataDTO("3000000", "300万元"));
+                list.add(new ListDataDTO("4000000", "400万元"));
+                list.add(new ListDataDTO("5000000", "500万元"));
+                return list;
+            }
+
+            public static List<ListDataDTO> getListDDataDTO() {
+                List<ListDataDTO> list = new ArrayList<>();
+                list.add(new ListDataDTO("5000", "0.5万元"));
+                list.add(new ListDataDTO("10000", "1万元"));
+                list.add(new ListDataDTO("20000", "2万元"));
+                list.add(new ListDataDTO("30000", "3万元"));
+                list.add(new ListDataDTO("50000", "5万元"));
+                list.add(new ListDataDTO("100000", "10万元"));
+                list.add(new ListDataDTO("150000", "15万元"));
+                list.add(new ListDataDTO("200000", "20万元"));
+                list.add(new ListDataDTO("500000", "50万元"));
+                return list;
+            }
+
         }
         }
 
 
         @NoArgsConstructor
         @NoArgsConstructor
@@ -1807,7 +1998,6 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             }
             }
 
 
 
 
-
             @NoArgsConstructor
             @NoArgsConstructor
             @Data
             @Data
             public static class CopypersonObjDTO {
             public static class CopypersonObjDTO {

+ 4 - 4
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerSaveRequest.java

@@ -36,17 +36,17 @@ public class HuaNongCrawlerSaveRequest  implements Serializable, HuaNongHead  {
         @JsonProperty("contractNveh")
         @JsonProperty("contractNveh")
         private List<ContractNvehDTO> contractNveh;
         private List<ContractNvehDTO> contractNveh;
         @JsonProperty("contractHome")
         @JsonProperty("contractHome")
-        private List<?> contractHome;
+        private List<Object> contractHome;
         @JsonProperty("contractGlass")
         @JsonProperty("contractGlass")
-        private List<?> contractGlass;
+        private List<Object> contractGlass;
         @JsonProperty("ciDemandNo")
         @JsonProperty("ciDemandNo")
         private String ciDemandNo;
         private String ciDemandNo;
         @JsonProperty("biDemandNo")
         @JsonProperty("biDemandNo")
         private String biDemandNo;
         private String biDemandNo;
         @JsonProperty("ocrCarInfoId")
         @JsonProperty("ocrCarInfoId")
-        private List<?> ocrCarInfoId;
+        private List<Object> ocrCarInfoId;
         @JsonProperty("ocrIdentityInfoId")
         @JsonProperty("ocrIdentityInfoId")
-        private List<?> ocrIdentityInfoId;
+        private List<Object> ocrIdentityInfoId;
 
 
         @NoArgsConstructor
         @NoArgsConstructor
         @Data
         @Data

+ 6 - 0
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerModelsQueryResponse.java

@@ -154,6 +154,12 @@ public class HuaNongCrawlerModelsQueryResponse {
             private String transmissionType;
             private String transmissionType;
             @JsonProperty("unladenMass")
             @JsonProperty("unladenMass")
             private Integer unladenMass;
             private Integer unladenMass;
+            @JsonProperty("noticeType")
+            private String noticeType;
+            @JsonProperty("brandCopy")
+            private String brandCopy;
+            @JsonProperty("purchasePriceCopy")
+            private String purchasePriceCopy;
         }
         }
 
 
         @NoArgsConstructor
         @NoArgsConstructor

+ 1 - 36
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/response/HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.java

@@ -18,54 +18,19 @@ public class HuaNongCrawlerUserTypeAndProxyInfoQueryResponse {
 
 
     @JsonProperty("agentInfoList")
     @JsonProperty("agentInfoList")
     private List<AgentInfoListDTO> agentInfoList;
     private List<AgentInfoListDTO> agentInfoList;
-
     @JsonProperty("agreementList")
     @JsonProperty("agreementList")
     private List<AgreementListDTO> agreementList;
     private List<AgreementListDTO> agreementList;
-
     @JsonProperty("channelSource")
     @JsonProperty("channelSource")
     private String channelSource;
     private String channelSource;
-
     @JsonProperty("handlerList")
     @JsonProperty("handlerList")
     private List<HandlerListDTO> handlerList;
     private List<HandlerListDTO> handlerList;
-
     @JsonProperty("head")
     @JsonProperty("head")
-    private HeadDTO head;
-
+    private HuaNongCrawlerBaseResponseHead head;
     @JsonProperty("producerList")
     @JsonProperty("producerList")
     private List<ProducerListDTO> producerList;
     private List<ProducerListDTO> producerList;
-
     @JsonProperty("userType")
     @JsonProperty("userType")
     private String userType;
     private String userType;
 
 
-    @NoArgsConstructor
-    @Data
-    public static class HeadDTO {
-
-        @JsonProperty("errorCode")
-        private String errorCode;
-
-        @JsonProperty("logId")
-        private String logId;
-
-        @JsonProperty("returnCode")
-        private String returnCode;
-
-        @JsonProperty("returnMessage")
-        private String returnMessage;
-
-        @JsonProperty("token")
-        private String token;
-
-        @JsonProperty("transCode")
-        private String transCode;
-
-        @JsonProperty("transType")
-        private String transType;
-
-        @JsonProperty("sign")
-        private String sign;
-    }
-
     @NoArgsConstructor
     @NoArgsConstructor
     @Data
     @Data
     public static class AgentInfoListDTO {
     public static class AgentInfoListDTO {

+ 12 - 1
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/HuaNongCrawlerQuoteProcessService.java

@@ -1,6 +1,10 @@
 package com.jzg.quote.huanong.crawler.service;
 package com.jzg.quote.huanong.crawler.service;
 
 
+import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
+import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerQuotedPriceRequest;
+
+import java.util.List;
 
 
 public interface HuaNongCrawlerQuoteProcessService {
 public interface HuaNongCrawlerQuoteProcessService {
 
 
@@ -20,6 +24,13 @@ public interface HuaNongCrawlerQuoteProcessService {
      * @param username                          用户名
      * @param username                          用户名
      * @param token                             token
      * @param token                             token
      */
      */
-    void attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token);
+    HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token);
+
+    /**
+     * 上传影像
+     * @param imageVoList 影像列表
+     * @param token 登录 token
+     */
+    void uploadImage(List<InsuranceImageVo> imageVoList, String token);
 
 
 }
 }

+ 43 - 23
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerQuoteProcessServiceImpl.java

@@ -2,15 +2,13 @@ package com.jzg.quote.huanong.crawler.service.impl;
 
 
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.DistributedLockUtil;
 import com.jzg.quotation.commons.component.DistributedLockUtil;
+import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
 import com.jzg.quote.huanong.crawler.constant.enums.ReturnCode;
 import com.jzg.quote.huanong.crawler.constant.enums.ReturnCode;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
-import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerComInfoQueryRequest;
-import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerLoginRequest;
-import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerUserTypeAndProxyInfoQueryRequest;
-import com.jzg.quote.huanong.crawler.entity.request.HuaNongCrawlerVerificationCodeRequest;
+import com.jzg.quote.huanong.crawler.entity.request.*;
 import com.jzg.quote.huanong.crawler.entity.response.*;
 import com.jzg.quote.huanong.crawler.entity.response.*;
 import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import com.jzg.quote.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -18,7 +16,9 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
@@ -90,34 +90,54 @@ public class HuaNongCrawlerQuoteProcessServiceImpl implements HuaNongCrawlerQuot
     }
     }
 
 
     @Override
     @Override
-    public void attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token) {
+    public HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token) {
         HttpHeaders httpHeaders = new HttpHeaders();
         HttpHeaders httpHeaders = new HttpHeaders();
         // 归属机构
         // 归属机构
         HuaNongCrawlerComInfoQueryRequest huaNongCrawlerComInfoQueryRequest = new HuaNongCrawlerComInfoQueryRequest(huaNongCrawlerConfigureParameters.getComCode(), token);
         HuaNongCrawlerComInfoQueryRequest huaNongCrawlerComInfoQueryRequest = new HuaNongCrawlerComInfoQueryRequest(huaNongCrawlerConfigureParameters.getComCode(), token);
         HuaNongCrawlerComInfoQueryResponse huaNongCrawlerComInfoQueryResponse = huaNongCrawlerRequestComponent.comInfoQuery(huaNongCrawlerComInfoQueryRequest, httpHeaders);
         HuaNongCrawlerComInfoQueryResponse huaNongCrawlerComInfoQueryResponse = huaNongCrawlerRequestComponent.comInfoQuery(huaNongCrawlerComInfoQueryRequest, httpHeaders);
         List<HuaNongCrawlerComInfoQueryResponse.ComListDTO> comList = huaNongCrawlerComInfoQueryResponse.getComList();
         List<HuaNongCrawlerComInfoQueryResponse.ComListDTO> comList = huaNongCrawlerComInfoQueryResponse.getComList();
+        Map<String, HuaNongCrawlerComInfoQueryResponse.ComListDTO> com = comList.stream()
+                .collect(Collectors.toMap(HuaNongCrawlerComInfoQueryResponse.ComListDTO::getComCode, x -> x));
+
         // 代理人信息
         // 代理人信息
         HuaNongCrawlerUserTypeAndProxyInfoQueryRequest huaNongCrawlerUserTypeAndProxyInfoQueryRequest = new HuaNongCrawlerUserTypeAndProxyInfoQueryRequest(username, token, huaNongCrawlerComInfoQueryRequest);
         HuaNongCrawlerUserTypeAndProxyInfoQueryRequest huaNongCrawlerUserTypeAndProxyInfoQueryRequest = new HuaNongCrawlerUserTypeAndProxyInfoQueryRequest(username, token, huaNongCrawlerComInfoQueryRequest);
         HuaNongCrawlerUserTypeAndProxyInfoQueryResponse huaNongCrawlerUserTypeAndProxyInfoQueryResponse = huaNongCrawlerRequestComponent.userTypeAndProxyInfoQuery(huaNongCrawlerUserTypeAndProxyInfoQueryRequest, httpHeaders);
         HuaNongCrawlerUserTypeAndProxyInfoQueryResponse huaNongCrawlerUserTypeAndProxyInfoQueryResponse = huaNongCrawlerRequestComponent.userTypeAndProxyInfoQuery(huaNongCrawlerUserTypeAndProxyInfoQueryRequest, httpHeaders);
 
 
-        HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO agentInfoListDTO = huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getAgentInfoList()
-                .stream()
-                .filter(x -> huaNongCrawlerConfigureParameters.getAgentName().equals(x.getAgentName()))
-                .findFirst()
-                .orElseThrow(() -> new SystemException("代理人未查询到"));
-
-        String agentCode = agentInfoListDTO.getAgentCode();
-        HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgreementListDTO agreementListDTO = huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getAgreementList()
-                .stream()
-                .filter(x -> agentCode.equals(x.getAgentCode()))
-                .findFirst()
-                .orElseThrow(() -> new SystemException("代理人未查询到"));
-
-        huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getHandlerList()
-                .stream()
-                .filter(x -> agreementListDTO.getAgreementNo().equals(x.getAgreementNo()))
-                .findFirst()
-                .orElseThrow(() -> new SystemException("代理人未查询到"));
+        //代理人
+        List<HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO> agentInfoList = huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getAgentInfoList();
+        Map<String, HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO> agentInfoListDTOMap = agentInfoList.stream()
+                .collect(Collectors.toMap(HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO::getAgentCode, x -> x));
+
+        // 协议号
+        List<HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgreementListDTO> agreementList = huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getAgreementList();
+        Map<String, String> map = agreementList.stream()
+                .collect(Collectors.toMap(HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgreementListDTO::getAgreementNo, HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgreementListDTO::getAgentCode));
+
+        // 业务员
+        List<HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO> handlerList = huaNongCrawlerUserTypeAndProxyInfoQueryResponse.getHandlerList();
+        Map<String, HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO> handler = handlerList.stream()
+                .collect(Collectors.toMap(HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO::getHandlerCode, x -> x));
+
+        HuaNongCrawlerComInfoQueryResponse.ComListDTO comListDTO = com.get(huaNongCrawlerConfigureParameters.getComCode());
+        HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO handlerListDTO = handler.get(huaNongCrawlerConfigureParameters.getHandlerCode());
+        HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO agentInfoListDTO = agentInfoListDTOMap.get(map.get(huaNongCrawlerConfigureParameters.getAgreementNo()));
+        return new HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO(comListDTO, handlerListDTO, agentInfoListDTO, huaNongCrawlerConfigureParameters.getCallerName());
+    }
+
+    @Override
+    public void uploadImage(List<InsuranceImageVo> imageVoList, String token) {
+        // 跳转上传影像页面
+        HuaNongCrawlerNewImageQueryRequest huaNongCrawlerNewImageQueryRequest = new HuaNongCrawlerNewImageQueryRequest();
+        String data = huaNongCrawlerRequestComponent.newImageQuery(huaNongCrawlerNewImageQueryRequest, new HttpHeaders());
+        // 获取accessToken
+        String accessToken = huaNongCrawlerRequestComponent.bizUpload(data, new HttpHeaders());
+        // 查询上传目录
+
+        // 上传影像
+
+        // 提交影像
+
     }
     }
 
 
+
 }
 }

+ 7 - 5
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

@@ -12,6 +12,7 @@ import com.jzg.quotation.commons.entity.vo.base.LoginBase;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
+import com.jzg.quote.huanong.crawler.build.HuaNongCrawlerQuoteResultsVoBuild;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
 import com.jzg.quote.huanong.crawler.component.HuaNongCrawlerRequestComponent;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
 import com.jzg.quote.huanong.crawler.entity.HuaNongCrawlerConfigureParameters;
@@ -58,7 +59,7 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
         HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         String token = huaNongCrawlerGetToken.getToken(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         String token = huaNongCrawlerGetToken.getToken(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
         // 归属信息
         // 归属信息
-        huaNongCrawlerQuoteProcessService.attributionInformation(huaNongCrawlerConfigureParameters, attributionInformationVo.getUsername(), token);
+        HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO saleInfoDTO = huaNongCrawlerQuoteProcessService.attributionInformation(huaNongCrawlerConfigureParameters, attributionInformationVo.getUsername(), token);
 
 
         // 车型查询
         // 车型查询
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
@@ -72,13 +73,15 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
 
 
         // 保费计算
         // 保费计算
         HuaNongCrawlerQuotedPriceRequest huaNongCrawlerQuotedPriceRequest = new HuaNongCrawlerQuotedPriceRequest(token, attributionInformationVo.getUsername(), quoteVo, carModelDTO, actualValue);
         HuaNongCrawlerQuotedPriceRequest huaNongCrawlerQuotedPriceRequest = new HuaNongCrawlerQuotedPriceRequest(token, attributionInformationVo.getUsername(), quoteVo, carModelDTO, actualValue);
+        huaNongCrawlerQuotedPriceRequest.getBusinessData().setSaleInfo(saleInfoDTO);
         HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse = huaNongCrawlerRequestComponent.quotedPrice(huaNongCrawlerQuotedPriceRequest, httpHeaders);
         HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse = huaNongCrawlerRequestComponent.quotedPrice(huaNongCrawlerQuotedPriceRequest, httpHeaders);
 
 
         // 保存
         // 保存
         HuaNongCrawlerSaveRequest huaNongCrawlerSaveRequest = new HuaNongCrawlerSaveRequest();
         HuaNongCrawlerSaveRequest huaNongCrawlerSaveRequest = new HuaNongCrawlerSaveRequest();
-        HuaNongCrawlerSaveResponse save = huaNongCrawlerRequestComponent.save(huaNongCrawlerSaveRequest, httpHeaders);
+        huaNongCrawlerRequestComponent.save(huaNongCrawlerSaveRequest, httpHeaders);
 
 
-        return null;
+        return HuaNongCrawlerQuoteResultsVoBuild.buildQuoteResultsVo(quoteVo.getOrder()
+                .getOrdersNo(), quoteVo, huaNongCrawlerQuotedPriceResponse);
     }
     }
 
 
     @Override
     @Override
@@ -116,6 +119,7 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
         HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         String token = huaNongCrawlerCacheComponent.getToken(attributionInformationVo.getUsername());
         String token = huaNongCrawlerCacheComponent.getToken(attributionInformationVo.getUsername());
 
 
+
     }
     }
 
 
     @Override
     @Override
@@ -162,8 +166,6 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
         huaNongCrawlerRequestComponent.findBusinesses(huaNongCrawlerFindBusinessesRequest, httpHeaders);
         huaNongCrawlerRequestComponent.findBusinesses(huaNongCrawlerFindBusinessesRequest, httpHeaders);
 
 
 
 
-
-
     }
     }
 
 
 
 

+ 19 - 0
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/enums/dictionary/Risk.java

@@ -0,0 +1,19 @@
+package com.jzg.quote.huanong.enums.dictionary;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum Risk {
+
+    RISK_0507("0507", "机动车交强险"),
+    RISK_0510("0510", "机动车商业险(2020版)"),
+    RISK_0515("0515", "新能源汽车商业保险专属条款(2021版)");
+
+    private final String riskCode;
+
+    private final String riskName;
+
+}

+ 1 - 1
tenant/insurance/quotation-summary/src/test/java/com/jzg/quotation/taikang/service/TKQuotationBaseServiceImplTest.java → tenant/insurance/quotation-summary/src/test/java/com/jzg/quotation/taikang/crawler/service/TKQuotationBaseServiceImplTest.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.service;
+package com.jzg.quotation.taikang.crawler.service;
 
 
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;

+ 1 - 1
tenant/insurance/quotation-taikang/doc/CarModelQuery.md

@@ -3,7 +3,7 @@
 
 
 大概有4到6种方式的查询,其中还有上海的特殊处理。
 大概有4到6种方式的查询,其中还有上海的特殊处理。
 
 
-少部分在 [CarModelinfoQueryParam.java](../src/main/java/com/jzg/quotation/taikang/model/api/CarModelinfoQueryParam.java) 上, 大部分参数在 [KTCarInfoVo.java](src/main/java/com/jzg/quotation/taikang/model/entity/KTCarInfoVo.java) 上传值。
+少部分在 [CarModelinfoQueryParam.java](../src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoQueryParam.java) 上, 大部分参数在 [KTCarInfoVo.java](src/main/java/com/jzg/quotation/taikang/model/entity/KTCarInfoVo.java) 上传值。
 
 
 `CarModelinfoQueryParam` 传参说明
 `CarModelinfoQueryParam` 传参说明
 ---------------------------------------
 ---------------------------------------

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/CodeUtil.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/CodeUtil.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang;
+package com.jzg.quotation.taikang.crawler;
 
 
 import java.util.function.Consumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.function.Supplier;

+ 1 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/JsonUtil.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/JsonUtil.java

@@ -1,8 +1,7 @@
-package com.jzg.quotation.taikang;
+package com.jzg.quotation.taikang.crawler;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
 

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/AESDecryptor.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/AESDecryptor.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/AESEncryption.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/AESEncryption.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import javax.crypto.Cipher;
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.spec.SecretKeySpec;

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/BaseRequest.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/BaseRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/BaseResponse.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/BaseResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/ClientProperties.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/ClientProperties.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/HttpURL.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/HttpURL.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 public interface HttpURL {
 public interface HttpURL {
     String host = "http://car.tk.cn";
     String host = "http://car.tk.cn";

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/OrderRequest.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/OrderRequest.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 public class OrderRequest extends BaseRequest {
 public class OrderRequest extends BaseRequest {
     /**
     /**

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/StringResponse.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/StringResponse.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 public class StringResponse extends BaseResponse<String> {
 public class StringResponse extends BaseResponse<String> {
 }
 }

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/TKHttpClient.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/TKHttpClient.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.component.RequestComponent;
-import com.jzg.quotation.taikang.JsonUtil;
+import com.jzg.quotation.taikang.crawler.JsonUtil;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.Setter;

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/client/UnknownFieldEntity.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/client/UnknownFieldEntity.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.client;
+package com.jzg.quotation.taikang.crawler.client;
 
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/TKLoginSession.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/TKLoginSession.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model;
+package com.jzg.quotation.taikang.crawler.model;
 
 
-import com.jzg.quotation.taikang.model.api.LoginResult;
+import com.jzg.quotation.taikang.crawler.model.api.LoginResult;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AgentFuzzyParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentFuzzyParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AgentFuzzyResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentFuzzyResult.java

@@ -1,8 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.TKAgentFuzzy;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.model.entity.TKAgentFuzzy;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AgentQueryParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentQueryParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AgentTaxParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentTaxParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 9 - 0
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AgentTaxResult.java

@@ -0,0 +1,9 @@
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+
+public class AgentTaxResult extends UnknownFieldEntity {
+    public static class Response extends BaseResponse<AgentTaxResult> {
+    }
+}

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AreaUserParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AreaUserParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/AreaUserResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/AreaUserResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/BasicInfoParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/BasicInfoParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/BasicInfoResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/BasicInfoResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarCheckAttorneyListParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarCheckAttorneyListParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarCheckUploadFileParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarCheckUploadFileParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarModelinfoCheckVehicleTypeParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoCheckVehicleTypeParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 8 - 0
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoCheckVehicleTypeResult.java

@@ -0,0 +1,8 @@
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+
+public class CarModelinfoCheckVehicleTypeResult extends UnknownFieldEntity {
+    public static class Response extends BaseResponse<CarModelinfoCheckVehicleTypeResult> {}
+}

+ 5 - 5
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarModelinfoQueryParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoQueryParam.java

@@ -1,9 +1,9 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.model.entity.TKAreaInfoVo;
-import com.jzg.quotation.taikang.model.entity.TKCarInfoVo;
-import com.jzg.quotation.taikang.model.entity.TKCarOwnerVo;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.model.entity.TKAreaInfoVo;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarInfoVo;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarOwnerVo;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarModelinfoQueryResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarModelinfoQueryResult.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.TKCarModel;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarModel;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarTypeParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarTypeParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/CarTypeResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/CarTypeResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/EngageEngageQueryParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EngageEngageQueryParam.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/EngageEngageQueryResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EngageEngageQueryResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/EntranceParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EntranceParam.java

@@ -1,7 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 5 - 5
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/EntranceResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/EntranceResult.java

@@ -1,9 +1,9 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.TKCarAccident;
-import com.jzg.quotation.taikang.model.entity.TKOrderData;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarAccident;
+import com.jzg.quotation.taikang.crawler.model.entity.TKOrderData;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/FloatNoticeGetParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/FloatNoticeGetParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/FloatNoticeGetResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/FloatNoticeGetResult.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/GroupOrderGetNewNoticeStatusParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/GroupOrderGetNewNoticeStatusParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/GroupOrderGetNewNoticeStatusResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/GroupOrderGetNewNoticeStatusResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 1 - 1
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/IdentifyTypeMapEntity.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentifyTypeMapEntity.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/IdentityTokenParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentityTokenParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/IdentityTokenResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/IdentityTokenResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/ImageDownloadPolicyParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageDownloadPolicyParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/ImageGetInvoiceURLParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageGetInvoiceURLParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/ImageGetInvoiceURLResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ImageGetInvoiceURLResult.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitBasicDataParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitBasicDataParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitBasicDataResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitBasicDataResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitFindRiskConfigParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitFindRiskConfigParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitFindRiskConfigResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitFindRiskConfigResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitIdentityParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitIdentityParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitIdentityResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitIdentityResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitProposalParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitProposalParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 8 - 8
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitProposalResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitProposalResult.java

@@ -1,11 +1,11 @@
-package com.jzg.quotation.taikang.model.api;
-
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.TKCarOwnerVo;
-import com.jzg.quotation.taikang.model.entity.TKCity;
-import com.jzg.quotation.taikang.model.entity.TKIdentifyTypeMap;
-import com.jzg.quotation.taikang.model.entity.TKProvince;
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarOwnerVo;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCity;
+import com.jzg.quotation.taikang.crawler.model.entity.TKIdentifyTypeMap;
+import com.jzg.quotation.taikang.crawler.model.entity.TKProvince;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitQuotationParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuotationParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitQuotationResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuotationResult.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitQuoteParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuoteParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitQuoteResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/InitQuoteResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/LoginParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/LoginParam.java

@@ -1,7 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/LoginResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/LoginResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/NonCarPlanInfo.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/NonCarPlanInfo.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/OrderCompleteAgentParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderCompleteAgentParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseRequest;
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/OrderCompleteAgentResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderCompleteAgentResult.java

@@ -1,13 +1,12 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**

+ 10 - 0
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderIdParam.java

@@ -0,0 +1,10 @@
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.jzg.quotation.taikang.crawler.client.BaseRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class OrderIdParam extends BaseRequest {
+}

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/OrderIdResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/OrderIdResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/PreciseInitParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitParam.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/PreciseInitResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/PreciseInitResult.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Id;

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/ProposalDownloadParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/ProposalDownloadParam.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/SaveBasicInfoParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveBasicInfoParam.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/SaveBasicInfoResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveBasicInfoResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/SaveQuoteParam.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveQuoteParam.java

@@ -1,7 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/SaveQuoteResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/SaveQuoteResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKAgentQueryResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKAgentQueryResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.model.entity.TKAgent;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.model.entity.TKAgent;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000012Param.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000012Param.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
-import com.jzg.quotation.taikang.model.entity.TKInsureInfo;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.model.entity.TKInsureInfo;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000038Param.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000038Param.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 6 - 6
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000038Result.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000038Result.java

@@ -1,10 +1,10 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.TKCarAccident;
-import com.jzg.quotation.taikang.model.entity.TKOrderCheckCarSpecification;
-import com.jzg.quotation.taikang.model.entity.TKOrderData;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.TKCarAccident;
+import com.jzg.quotation.taikang.crawler.model.entity.TKOrderCheckCarSpecification;
+import com.jzg.quotation.taikang.crawler.model.entity.TKOrderData;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000086Param.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000086Param.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.OrderRequest;
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 4 - 4
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000086Result.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKEntranceFor000086Result.java

@@ -1,8 +1,8 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
-import com.jzg.quotation.taikang.model.entity.*;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.model.entity.*;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 11 - 0
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKPayForwardParam.java

@@ -0,0 +1,11 @@
+package com.jzg.quotation.taikang.crawler.model.api;
+
+import com.jzg.quotation.taikang.crawler.client.OrderRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class TKPayForwardParam extends OrderRequest {
+    private String proposalNo;
+}

+ 3 - 3
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKPayForwardResult.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/api/TKPayForwardResult.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.api;
+package com.jzg.quotation.taikang.crawler.model.api;
 
 
-import com.jzg.quotation.taikang.client.BaseResponse;
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.BaseResponse;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAgent.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAgent.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAgentFuzzy.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAgentFuzzy.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAllKind.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAllKind.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAmount.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAmount.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAppliInfo.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAppliInfo.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKAreaInfoVo.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKAreaInfoVo.java

@@ -1,6 +1,6 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

+ 2 - 2
tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKBzKindVo.java → tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/model/entity/TKBzKindVo.java

@@ -1,7 +1,7 @@
-package com.jzg.quotation.taikang.model.entity;
+package com.jzg.quotation.taikang.crawler.model.entity;
 
 
 
 
-import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import com.jzg.quotation.taikang.crawler.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio