update 华农财险报价修改

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerCacheComponent.java

@@ -7,8 +7,10 @@ import lombok.RequiredArgsConstructor;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -43,11 +45,11 @@ public class HuaNongCrawlerCacheComponent {
         String token = login.getHead().getToken();
         Map<String, Object> collect = login.getLoginCom()
                 .stream()
-                .collect(Collectors.toMap(HuaNongCrawlerLoginResponse.LoginComDTO::getComCode, x -> x));
+                .collect(Collectors.toMap(HuaNongCrawlerLoginResponse.LoginComDTO::getComName, HuaNongCrawlerLoginResponse.LoginComDTO::getComCode));
         collect.put(TOKEN, token);
 
         // 3.1 存入redis中
-        RMap<Object, Object> rMap = redissonClient.getMap(AUTHORIZATION + username);
+        RMap<String, Object> rMap = redissonClient.getMap(AUTHORIZATION + username);
         rMap.putAll(collect);
         rMap.expire(Duration.ofHours(AUTHORIZATION_TIME));
     }
@@ -67,8 +69,8 @@ public class HuaNongCrawlerCacheComponent {
      * @param username 用户名
      */
     public void isAccountLockout(String username) {
-        boolean o = (boolean) redissonClient.getBucket(ACCOUNT_LOCKOUT + username).get();
-        if (o) {
+        Boolean o = (Boolean) redissonClient.getBucket(ACCOUNT_LOCKOUT + username).get();
+        if (!ObjectUtils.isEmpty(o) && o) {
             throw new SystemException("账号已锁定，请重新登陆");
         }
     }
@@ -80,20 +82,17 @@ public class HuaNongCrawlerCacheComponent {
      * @return token
      */
     public String getToken(String username) {
-        RMap<String, Object> map = redissonClient.getMap(AUTHORIZATION + username);
+        RMap<String, Object> map = getAuthorization(username);
         return (String) map.get(TOKEN);
     }
 
     /**
-     * 获取请求 登录归属
-     *
+     * 获取存入认证信息
      * @param username 用户名
-     * @param comCode  归属机构编码
-     * @return token
+     * @return 认证信息
      */
-    public HuaNongCrawlerLoginResponse.LoginComDTO getLoginCom(String username, String comCode) {
-        RMap<String, Object> map = redissonClient.getMap(AUTHORIZATION + username);
-        return (HuaNongCrawlerLoginResponse.LoginComDTO) map.get(comCode);
+    public RMap<String, Object> getAuthorization(String username){
+        return redissonClient.getMap(AUTHORIZATION + username);
     }
 
 }

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/component/HuaNongCrawlerRequestComponent.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.huanong.crawler.component;
 
 import cn.hutool.core.codec.Base64;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
@@ -13,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
@@ -44,12 +46,13 @@ public class HuaNongCrawlerRequestComponent {
 
     public <Request extends HuaNongHead, Response> Response post(RequestUrl requestUrl, Request body, Class<Response> responseClass, HttpHeaders headers) {
         HuaNongCrawlerRequestBaseHead head = body.getHead();
-        head.setSource(requestUrl.getUri());
+        head.setTransCode(requestUrl.getUri());
         JSONObject json = JSONObject.from(body);
-        String requestBody = RequestEncryptor.processRequest(json);
+        // 加盐
+        RequestEncryptor.processRequest(json);
         String url = properties.getUrl() + "?" + requestUrl.getRequestSuffix();
-        ResponseEntity<Response> responseResponseEntity = requestComponent.stringPost(url, requestBody, responseClass, headers);
-        return responseResponseEntity.getBody();
+        ResponseEntity<String> responseResponseEntity = requestComponent.stringPost(url, json, String.class, headers);
+        return JSON.parseObject(responseResponseEntity.getBody(), responseClass);
     }
 
     /**

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java

@@ -21,13 +21,13 @@ public class HuaNongCrawlerConfigureParameters implements ConfigureParameters {
     /**
      * 登录机构
      */
-    private String loginComCode;
+    private String loginCom;
     /**
      * 归属机构编码
      */
     private String comCode;
     /**
-     * 渠道类型编码
+     * 渠道类型
      */
     private String producer;
     /**

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

@@ -61,10 +61,10 @@ public class HuaNongCrawlerActualValueRequest implements Serializable, HuaNongHe
         this.purchasePrice = carModelDTO.getPurchasePrice();
         this.motorUsageTypeCode = carInfoVo.getVehicleUseCode();
         this.motorTypeCode = carInfoVo.getCarKindCode();
-        this.registerDate = carInfoVo.getRegisterDate();
+        this.registerDate = TimeProcessing.dateToDateTime(carInfoVo.getRegisterDate());
         this.loginCom = loginCom;
         this.isNewEnergyFlag = false;
-        this.energyType = "";
+        this.energyType = carInfoVo.getEnergyTypeCode();
     }
 
 }

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

@@ -55,15 +55,16 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
     public HuaNongCrawlerQuotedPriceRequest(String token,
                                             String username,
                                             QuoteVo quoteVo,
+                                            String loginCom,
+                                            String comeCode,
                                             HuaNongCrawlerModelsQueryResponse.CarModelDTO carModelDTO,
-                                            HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameter,
                                             String actualValue) {
         this.head = new HuaNongCrawlerRequestBaseHead(token);
-        this.loginCom = huaNongCrawlerConfigureParameter.getLoginComCode();
+        this.loginCom = loginCom;
         this.userCode = username;
-        this.comeCode = huaNongCrawlerConfigureParameter.getComCode();
+        this.comeCode = comeCode;
         this.agentCode = "";
-        this.businessData = new BusinessDataDTO(quoteVo, carModelDTO, huaNongCrawlerConfigureParameter.getLoginComCode(), huaNongCrawlerConfigureParameter.getComCode(), actualValue);
+        this.businessData = new BusinessDataDTO(quoteVo, carModelDTO, loginCom, comeCode, actualValue);
     }
 
     @NoArgsConstructor

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerRequestBaseHead.java

@@ -27,6 +27,9 @@ public class HuaNongCrawlerRequestBaseHead {
     @JsonProperty("source")
     private String source;
 
+    @JsonProperty("sign")
+    private String sign;
+
     public HuaNongCrawlerRequestBaseHead(String token) {
         this.transType = "Req";
         this.token = token;

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerUserTypeAndProxyInfoQueryRequest.java

@@ -37,11 +37,11 @@ public class HuaNongCrawlerUserTypeAndProxyInfoQueryRequest implements Serializa
     private String userCode;
 
 
-    public HuaNongCrawlerUserTypeAndProxyInfoQueryRequest(String username, String token, HuaNongCrawlerComInfoQueryRequest huaNongCrawlerComInfoQueryRequest) {
+    public HuaNongCrawlerUserTypeAndProxyInfoQueryRequest(String username, String token, String loginCom, String comCode) {
         this.head = new HuaNongCrawlerRequestBaseHead(token);
-        this.loginCom = huaNongCrawlerComInfoQueryRequest.getComCode();
-        this.comCode = huaNongCrawlerComInfoQueryRequest.getComCode();
-        this.producerCode = huaNongCrawlerComInfoQueryRequest.getComCode();
+        this.loginCom = loginCom;
+        this.comCode = comCode;
+        this.producerCode = "";
         this.userCode = username;
     }
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/properties/HuaNongCrawlerProperties.java

@@ -32,7 +32,7 @@ public class HuaNongCrawlerProperties {
     /**
      * 非车险保单地址
      */
-    private String DocumentsPrintUrl;
+    private String documentsPrintUrl;
     /**
      * 替换的保单下载地址
      */

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerGetToken.java

@@ -1,6 +1,8 @@
 package com.jzg.quotation.huanong.crawler.service;
 
 
+import org.redisson.api.RMap;
+
 public interface HuaNongCrawlerGetToken {
 
     /**
@@ -12,4 +14,10 @@ public interface HuaNongCrawlerGetToken {
      */
     String getToken(String username, String password);
 
+
+    /**
+     * 获取登录信息
+     */
+    RMap<String, Object> getAuthorization(String username, String password);
+
 }

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/HuaNongCrawlerQuoteProcessService.java

@@ -23,13 +23,15 @@ public interface HuaNongCrawlerQuoteProcessService {
      * @param huaNongCrawlerConfigureParameters 配置信息
      * @param username                          用户名
      * @param token                             token
+     * @param loginComCode                      登录机构编码
      */
-    HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token);
+    HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token, String loginComCode);
 
     /**
      * 上传影像
+     *
      * @param imageVoList 影像列表
-     * @param token 登录 token
+     * @param token       登录 token
      */
     void uploadImage(List<InsuranceImageVo> imageVoList, String token);
 

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerGetTokenImpl.java

@@ -1,12 +1,18 @@
 package com.jzg.quotation.huanong.crawler.service.impl;
 
 
+import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerGetToken;
 import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import lombok.RequiredArgsConstructor;
+import org.redisson.api.RMap;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 @Service
 @RequiredArgsConstructor
@@ -18,13 +24,36 @@ public class HuaNongCrawlerGetTokenImpl implements HuaNongCrawlerGetToken {
 
     @Override
     public String getToken(String username, String password) {
-        String token = huaNongCrawlerCacheComponent.getToken(username);
-        if(StringUtils.hasText(token)) {
-            return token;
-        }
-        huaNongCrawlerQuoteProcessService.login(username, password, false);
-        return huaNongCrawlerCacheComponent.getToken(username);
+        return getAuthData(username, password,
+                () -> huaNongCrawlerCacheComponent.getToken(username),
+                StringUtils::hasText);
+    }
+
 
+    @Override
+    public RMap<String, Object> getAuthorization(String username, String password) {
+        return getAuthData(username, password,
+                () -> huaNongCrawlerCacheComponent.getAuthorization(username),
+                auth -> !ObjectUtils.isEmpty(auth));
     }
 
+    private <T> T getAuthData(String username, String password,
+                              Supplier<T> cacheSupplier,
+                              Predicate<T> validator) {
+        try {
+            T data = cacheSupplier.get();
+            if (validator.test(data)) {
+                return data;
+            }
+            huaNongCrawlerQuoteProcessService.login(username, password, false);
+            T newData = cacheSupplier.get();
+            if (!validator.test(newData)) {
+                throw new SystemException("登录后无法获取有效的身份验证数据");
+            }
+            return newData;
+        } catch (Exception e) {
+            throw new SystemException("身份信息验证失败:" + e.getMessage());
+        }
+
+    }
 }

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

@@ -1,8 +1,8 @@
 package com.jzg.quotation.huanong.crawler.service.impl;
 
+import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.DistributedLockUtil;
-import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.service.ExteriorUtilsRequest;
 import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerCacheComponent;
 import com.jzg.quotation.huanong.crawler.component.HuaNongCrawlerRequestComponent;
@@ -92,18 +92,18 @@ public class HuaNongCrawlerQuoteProcessServiceImpl implements HuaNongCrawlerQuot
     }
 
     @Override
-    public HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token) {
+    public HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO attributionInformation(HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters, String username, String token, String loginComCode) {
         HttpHeaders httpHeaders = new HttpHeaders();
 
         // 归属机构
-        HuaNongCrawlerComInfoQueryRequest huaNongCrawlerComInfoQueryRequest = new HuaNongCrawlerComInfoQueryRequest(huaNongCrawlerConfigureParameters.getLoginComCode(), token);
+        HuaNongCrawlerComInfoQueryRequest huaNongCrawlerComInfoQueryRequest = new HuaNongCrawlerComInfoQueryRequest(loginComCode, token);
         HuaNongCrawlerComInfoQueryResponse huaNongCrawlerComInfoQueryResponse = huaNongCrawlerRequestComponent.comInfoQuery(huaNongCrawlerComInfoQueryRequest, httpHeaders);
         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, loginComCode, huaNongCrawlerConfigureParameters.getComCode());
         HuaNongCrawlerUserTypeAndProxyInfoQueryResponse huaNongCrawlerUserTypeAndProxyInfoQueryResponse = huaNongCrawlerRequestComponent.userTypeAndProxyInfoQuery(huaNongCrawlerUserTypeAndProxyInfoQueryRequest, httpHeaders);
 
         //代理人

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

@@ -4,10 +4,10 @@ import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
+import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.annotation.QuoteCrawlerService;
 import com.jzg.quotation.commons.constant.InsuranceCode;
-import com.jzg.commons.entity.quote.vo.base.LoginBase;
 import com.jzg.quotation.commons.filter.CarModelsFilterUtils;
 import com.jzg.quotation.commons.standard.conversion.ConfigureParametersConversion;
 import com.jzg.quotation.huanong.crawler.build.HuaNongCrawlerQuoteResultsVoBuild;
@@ -24,6 +24,7 @@ import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerOrderService;
 import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerQuoteProcessService;
 import com.jzg.quotation.huanong.crawler.service.HuaNongCrawlerRequest;
 import lombok.RequiredArgsConstructor;
+import org.redisson.api.RMap;
 import org.springframework.http.HttpHeaders;
 
 import java.util.List;
@@ -52,11 +53,14 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
     public QuoteResultsVo quote(QuoteVo quoteVo) {
         HttpHeaders httpHeaders = new HttpHeaders();
         AttributionInformationVo attributionInformationVo = quoteVo.getOrder().getAttributionInformationVo();
-        HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
-        String token = huaNongCrawlerGetToken.getToken(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+        HuaNongCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
+        RMap<String, Object> authorization = huaNongCrawlerGetToken.getAuthorization(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());
+        String token = (String) authorization.get(HuaNongCrawlerCacheComponent.TOKEN);
+
+        String loginCom = parameters.getLoginCom();
+        String loginComCode = (String) authorization.get(loginCom);
         // 归属信息
-        HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO saleInfoDTO = huaNongCrawlerQuoteProcessService.attributionInformation(huaNongCrawlerConfigureParameters, attributionInformationVo.getUsername(), token);
-        String loginComCode = huaNongCrawlerConfigureParameters.getLoginComCode();
+        HuaNongCrawlerQuotedPriceRequest.BusinessDataDTO.SaleInfoDTO saleInfoDTO = huaNongCrawlerQuoteProcessService.attributionInformation(parameters, attributionInformationVo.getUsername(), token, loginComCode);
 
         // 车型查询
         CarInfoVo carInfoVo = quoteVo.getCarInfoVo();
@@ -69,7 +73,7 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
         String actualValue = huaNongCrawlerRequestComponent.actualValue(huaNongCrawlerActualValueRequest, httpHeaders);
 
         // 保费计算
-        HuaNongCrawlerQuotedPriceRequest huaNongCrawlerQuotedPriceRequest = new HuaNongCrawlerQuotedPriceRequest(token, attributionInformationVo.getUsername(), quoteVo, carModelDTO, huaNongCrawlerConfigureParameters, actualValue);
+        HuaNongCrawlerQuotedPriceRequest huaNongCrawlerQuotedPriceRequest = new HuaNongCrawlerQuotedPriceRequest(token, attributionInformationVo.getUsername(), quoteVo, loginCom, parameters.getComCode(), carModelDTO, actualValue);
         huaNongCrawlerQuotedPriceRequest.getBusinessData().setSaleInfo(saleInfoDTO);
         HuaNongCrawlerQuotedPriceResponse huaNongCrawlerQuotedPriceResponse = huaNongCrawlerRequestComponent.quotedPrice(huaNongCrawlerQuotedPriceRequest, httpHeaders);
 
@@ -105,7 +109,8 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
 
     @Override
     public PaymentLinkResultsVo getPaymentLink(PaymentLinkVo paymentLinkVo) {
-        HuaNongCrawlerOrder huaNongCrawlerOrder = huaNongCrawlerOrderService.getById(paymentLinkVo.getOrder().getOrdersNo());
+        HuaNongCrawlerOrder huaNongCrawlerOrder = huaNongCrawlerOrderService.getById(paymentLinkVo.getOrder()
+                .getOrdersNo());
         if (!huaNongCrawlerOrder.isApproved()) {
             throw new SystemException("核保未通过不支持调取支付二维码");
         }
@@ -160,7 +165,7 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
     }
 
     @Override
-    public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo){
+    public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
         AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
         HuaNongCrawlerConfigureParameters huaNongCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(HuaNongCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         String token = huaNongCrawlerGetToken.getToken(attributionInformationVo.getUsername(), attributionInformationVo.getPassword());

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/utils/RequestEncryptor.java

@@ -6,6 +6,7 @@ import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jzg.quotation.huanong.crawler.entity.request.HuaNongCrawlerRequestBaseHead;
 
 /**
  * @description: 华农财险 加盐
@@ -18,25 +19,21 @@ public class RequestEncryptor {
 
     private static final RSA rsa = new RSA(null, PUBLIC_KEY);
 
-    public static String processRequest(JSONObject request) {
+    public static void processRequest(JSONObject request) {
         // 保存并清空请求头
-        Object o = request.get("head");
-        if (o instanceof JSONObject headers) {
-            request.put("head", "");
-            // 生成JSON并处理
-            String jsonStr = JSON.toJSONString(request).trim();
-            String base64Data = Base64.encode(jsonStr);
-            // 计算MD5（带Token盐值）
-            String token = (String) headers.get("token");
-            String md5Hash = SecureUtil.md5().digestHex(base64Data + token);
-            // RSA加密签名
-            String encryptedSign = rsa.encryptBase64(md5Hash, KeyType.PublicKey);
-            // 还原请求头并添加签名
-            headers.put("sign", encryptedSign);
-            request.put("head", headers);
-            return request.toString();
-        }
-        return request.toString();
+        HuaNongCrawlerRequestBaseHead headers = (HuaNongCrawlerRequestBaseHead) request.get("head");
+        request.put("head", "");
+        // 生成JSON并处理
+        String jsonStr = JSON.toJSONString(request).trim();
+        String base64Data = Base64.encode(jsonStr);
+        // 计算MD5（带Token盐值）
+        String token = headers.getToken();
+        String md5Hash = SecureUtil.md5().digestHex(base64Data + token);
+        // RSA加密签名
+        String encryptedSign = rsa.encryptBase64(md5Hash, KeyType.PublicKey);
+        // 还原请求头并添加签名
+        headers.setSign(encryptedSign);
+        request.put("head", headers);
     }
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersTaxService.java

@@ -6,5 +6,7 @@ import com.jzg.commons.entity.orders.po.InsOrdersTax;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 
 public interface InsOrdersTaxService extends IService<InsOrdersTax> {
+
     void createTax(InsOrders insOrders, QuoteVo quoteVo);
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersTaxServiceImpl.java

@@ -10,10 +10,13 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class InsOrdersTaxServiceImpl extends ServiceImpl<InsOrdersTaxMapper, InsOrdersTax> implements InsOrdersTaxService {
-    public void createTax(InsOrders insOrders,QuoteVo quoteVo) {
+
+    @Override
+    public void createTax(InsOrders insOrders, QuoteVo quoteVo) {
         InsOrdersTax insOrdersTax = new InsOrdersTax();
         insOrdersTax.setOrderNo(insOrders.getId());
         insOrdersTax.setTaxRelifFlag(Integer.parseInt(quoteVo.getVehicleAndVesselTaxVo().getTaxRelifFlag()));
         this.save(insOrdersTax);
     }
+
 }