1. 紫金驾意险修改

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

@@ -44,6 +44,7 @@ public class ZhongmeiRequestApiComponents {
 
     /**
      * 加密请求
+     *
      * @param q      请求参数
      * @param url    请求url
      * @param tClass 响应类型
@@ -65,7 +66,7 @@ public class ZhongmeiRequestApiComponents {
         ResponseEntity<String> response = restTemplate.postForEntity(url, httpEntity, String.class);
         String body = response.getBody();
 
-        S t  = AESUtilsWithDataBase.decryptMessage(body, tClass, "响应参数", sessionKey);
+        S t = AESUtilsWithDataBase.decryptMessage(body, tClass, "响应参数", sessionKey);
         if (ObjectUtils.isEmpty(t)) {
             throw new SystemException("请求失败");
         }

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

@@ -8,10 +8,10 @@ import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
 import com.ydtech.modules.order.entity.api.zj.request.PaymentCallbacksRequest;
-import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
+import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 import com.ydtech.modules.order.service.ZijinOrderApiService;
 import io.swagger.annotations.Api;
@@ -39,8 +39,8 @@ public class ZijinOrderApiController {
 
     @PostMapping("/queryVehicleProducts")
     @ApiOperation(value = "查询“车+意”中意外险方案信息")
-    public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(@RequestBody ZjVehicleProductsVo zjVehicleProductsVo) {
-        return this.zijinOrderApiService.queryVehicleProducts(zjVehicleProductsVo);
+    public HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(@RequestBody ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
+        return this.zijinOrderApiService.queryVehicleProducts(zjVehicleProductsQueryVo);
     }
 
     @QuoteVerification("报价授权")

src/main/java/com/ydtech/modules/order/dao/InsTaskImagesMapper.java

@@ -20,7 +20,7 @@ public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
 
     List<InsUploadImagesDto> getByOrderNoInsUploadImagesDtoList(String orderNo);
 
-    int delByImageTypeQuoteNo(@Param("imageType") String imageType, @Param("quoteNo") String quoteNo );
+    int delByImageTypeQuoteNo(@Param("imageType") String imageType, @Param("quoteNo") String quoteNo);
 }
 
 

src/main/java/com/ydtech/modules/order/entity/api/zj/constants/enums/FileTypeEnum.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @version
  * @description: 紫金财险  文件类型
  * @author: wenks
  * @date: 2023/9/1 17:30

src/main/java/com/ydtech/modules/order/entity/api/zj/constants/enums/MotorVehicleInsuranceEnum.java

@@ -4,9 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @version 
  * @description: 紫金财险 机动车险别代码
- * @author: wenks 
+ * @author: wenks
  * @date: 2023/9/1 17:30
  **/
 @AllArgsConstructor

src/main/java/com/ydtech/modules/order/entity/api/zj/request/CalculatePremiumRequest.java

@@ -19,6 +19,8 @@ import com.ydtech.modules.order.entity.api.zm.constants.TimeConstants;
 import com.ydtech.modules.order.entity.config.ZjConfigureParameters;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.utils.InsuranceTimeProcessing;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -710,7 +712,7 @@ public class CalculatePremiumRequest implements Serializable {
                 return CarKindDetailIdEnum.KC.getCode();
             } else if (seatCount < 36) {
                 return CarKindDetailIdEnum.KD.getCode();
-            } else{
+            } else {
                 return CarKindDetailIdEnum.KE.getCode();
             }
         }
@@ -897,46 +899,35 @@ public class CalculatePremiumRequest implements Serializable {
     @NoArgsConstructor
     @AllArgsConstructor
     @Data
+    @ApiModel("车险附加险种信息")
     public static class CarPolicySubInfoListDTO implements Serializable {
 
         private static final long serialVersionUID = 7726772202596894005L;
-        /**
-         * 险种代码
-         */
+
+        @ApiModelProperty("险种代码")
         @JsonProperty("riskCode")
         private String riskCode;
 
-        /**
-         * 险种名称
-         */
+        @ApiModelProperty("险种名称")
         @JsonProperty("riskName")
         private String riskName;
 
-        /**
-         * 附加险种投保方案号
-         */
+        @ApiModelProperty("附加险种投保方案号")
         @JsonProperty("insureGradeNo")
         private String insureGradeNo;
 
-        /**
-         * 购买份数
-         */
+        @ApiModelProperty("购买份数")
         @JsonProperty("quantity")
         private String quantity;
 
-        /**
-         * 总保额
-         */
+        @ApiModelProperty("总保额")
         @JsonProperty("sumAmount")
         private String sumAmount;
 
-        /**
-         * 总保费
-         */
+        @ApiModelProperty("总保费")
         @JsonProperty("sumPremium")
         private String sumPremium;
 
-
     }
 
 

src/main/java/com/ydtech/modules/order/entity/api/zj/request/SubmitVerifyRequest.java

@@ -39,9 +39,9 @@ public class SubmitVerifyRequest implements Serializable {
         this.engageList = Collections.emptyList();
         String code;
         if (productId.equals(ProductsType.PT_034002.getCode())) {
-             code = CarCheckReasonEnum.CCR_3.getCode();
-        }else {
-             code = CarCheckReasonEnum.CCR_2.getCode();
+            code = CarCheckReasonEnum.CCR_3.getCode();
+        } else {
+            code = CarCheckReasonEnum.CCR_2.getCode();
         }
         this.underWritingRequestVehicleDto = new UnderWritingRequestVehicleDTO(code);
     }
@@ -67,12 +67,12 @@ public class SubmitVerifyRequest implements Serializable {
 
     @NoArgsConstructor
     @Data
-    public static class UnderWritingRequestVehicleDTO implements Serializable{
+    public static class UnderWritingRequestVehicleDTO implements Serializable {
 
         private static final long serialVersionUID = 5446089370940891817L;
 
         @JsonProperty("carCheckStatus")
-        private String carCheckStatus ;
+        private String carCheckStatus;
 
         @JsonProperty("carCheckReason")
         private String carCheckReason;

src/main/java/com/ydtech/modules/order/entity/api/zj/response/GetAccessTokenResponse.java

@@ -7,9 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 
-
 /**
- * @version
  * @description: 紫金财险 为接入方提供获取token服务 出参实体
  * @author: wenks
  * @date: 2023/8/19 9:29
@@ -17,7 +15,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class GetAccessTokenResponse extends BaseResponse{
+public class GetAccessTokenResponse extends BaseResponse {
 
     private static final long serialVersionUID = -3883464091055560963L;
 

src/main/java/com/ydtech/modules/order/entity/api/zj/response/QueryClauseDataResponse.java

@@ -21,7 +21,7 @@ public class QueryClauseDataResponse extends BaseResponse implements Serializabl
 
     @NoArgsConstructor
     @Data
-    public static class ClauseInfoDtoListDTO  implements Serializable{
+    public static class ClauseInfoDtoListDTO implements Serializable {
 
         private static final long serialVersionUID = 2486640047109521788L;
 

src/main/java/com/ydtech/modules/order/entity/api/zj/response/QueryOrderDetailResponse.java

@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 @NoArgsConstructor
 @Data
@@ -37,7 +36,7 @@ public class QueryOrderDetailResponse extends BaseResponse implements Serializab
 
     @NoArgsConstructor
     @Data
-    public static class ResultObjDTO  implements Serializable {
+    public static class ResultObjDTO implements Serializable {
 
         private static final long serialVersionUID = -1129709080882223541L;
 

src/main/java/com/ydtech/modules/order/entity/api/zj/response/QueryTokenResponse.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryTokenResponse extends BaseResponse{
+public class QueryTokenResponse extends BaseResponse {
 
     private static final long serialVersionUID = 3583709566525597016L;
 

src/main/java/com/ydtech/modules/order/entity/api/zm/request/ModelsQueryRequest.java

@@ -6,8 +6,6 @@ import com.ydtech.modules.order.entity.api.zm.constants.TransCode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.regex.Pattern;
-
 /**
  * @author wenks
  * @version 0.0.2

src/main/java/com/ydtech/modules/order/entity/api/zm/response/ModelsQueryResponse.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity.api.zm.response;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
 import com.ydtech.modules.order.entity.api.zm.BaseResponse;

src/main/java/com/ydtech/modules/order/entity/api/zm/response/SubmitResponse.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.zm.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.ydtech.modules.order.entity.api.zm.BaseResponse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/config/ZjConfigureParameters.java

@@ -16,7 +16,7 @@ public class ZjConfigureParameters implements ConfigureParameters {
     /**
      * 应用Key
      */
-    private String  appKey;
+    private String appKey;
 
     /**
      * 应用Secret
@@ -34,11 +34,11 @@ public class ZjConfigureParameters implements ConfigureParameters {
     private String proposalCityCode;
 
 
-    public String getAccessToken(){
+    public String getAccessToken() {
         return OrderCacheConstant.ZJ_ACCESS_TOKEN + ":" + this.getAppKey();
     }
 
-    public String getAccessLock(){
+    public String getAccessLock() {
         return OrderCacheConstant.ZJ_ACCESS_LOCK + ":" + this.getAppKey();
     }
 

src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerDrivingInsuranceResponse.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CrawlerDrivingInsuranceResponse extends CrawlerBaseResponse{
+public class CrawlerDrivingInsuranceResponse extends CrawlerBaseResponse {
 
     private static final long serialVersionUID = 2606173551494411313L;
 

src/main/java/com/ydtech/modules/order/entity/vo/zj/ZjVehicleProductsQueryVo.java

@@ -0,0 +1,26 @@
+package com.ydtech.modules.order.entity.vo.zj;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * @description: 紫金财险驾意险请求
+ * @author: wenks
+ * @date: 2023/8/23 11:04
+ **/
+@Data
+public class ZjVehicleProductsQueryVo implements Serializable {
+
+    private static final long serialVersionUID = -626267913196798850L;
+
+    @ApiModelProperty("协议id")
+    private String agreementId;
+
+    @ApiModelProperty("座位数限制")
+    private int seatCount;
+
+
+}

src/main/java/com/ydtech/modules/order/entity/vo/zj/ZjVehicleProductsVo.java

@@ -1,27 +1,41 @@
 package com.ydtech.modules.order.entity.vo.zj;
 
+
+import com.ydtech.modules.order.entity.api.zj.constants.enums.EHealthTypeCodeEnum;
+import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
-/**
- * @version
- * @description: 紫金财险驾意险请求
- * @author: wenks
- * @date: 2023/8/23 11:04
- **/
 @Data
-public class ZjVehicleProductsVo implements Serializable {
-
-    private static final long serialVersionUID = -626267913196798850L;
-
-    @ApiModelProperty("协议id")
-    private String agreementId;
-
-    @ApiModelProperty("座位数限制")
-    private int seatCount;
+public class ZjVehicleProductsVo {
+
+    @ApiModelProperty("险种名称")
+    private String riskCode;
+
+    @ApiModelProperty("险种名称")
+    private String riskName;
+
+    @ApiModelProperty("车险附加险种信息")
+    private List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoListDTOS;
+
+    public ZjVehicleProductsVo(String riskCode, String riskName, List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoListDTOS) {
+        this.riskCode = riskCode;
+        this.riskName = riskName;
+        this.productDtoListDTOS = productDtoListDTOS;
+    }
+
+    public static List<ZjVehicleProductsVo> toZjVehicleProductsVoList(List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoList) {
+        EHealthTypeCodeEnum[] values = EHealthTypeCodeEnum.values();
+        return Arrays.stream(values).map(x -> {
+            List<QueryVehicProductsResponse.ProductDtoListDTO> collect = productDtoList.stream().filter(e -> x.getCode().equals(e.getRiskCode())).collect(Collectors.toList());
+            return new ZjVehicleProductsVo(x.getCode(), x.getName(), collect);
+        }).collect(Collectors.toList());
+    }
 
 
 }

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

@@ -16,14 +16,14 @@ public interface BaseOrderService<T> {
      * @param quoteInfoVo 报价实体
      * @return
      */
-    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfoVo, BaseQuoteVo<T> t) ;
+    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfoVo, BaseQuoteVo<T> t);
 
     /**
      * 核保
      *
      * @param companyId 子订单号
      */
-    HttpResult<Object> audit(String companyId) ;
+    HttpResult<Object> audit(String companyId);
 
     /**
      * 提交影像信息

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

@@ -3,8 +3,8 @@ package com.ydtech.modules.order.service;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
 import com.ydtech.modules.order.entity.api.zj.request.PaymentCallbacksRequest;
-import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
+import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 
 import java.util.List;
@@ -17,10 +17,11 @@ public interface ZijinOrderApiService extends BaseOrderService<List<CalculatePre
      *
      * @return 查询“车+意”中意外险方案信息
      */
-    HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsVo zjVehicleProductsVo);
+    HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsVo);
 
     /**
      * 订单状态查询
+     *
      * @param companyId 子订单号
      */
     HttpResult<Object> getOrderDetail(String companyId);
@@ -28,6 +29,7 @@ public interface ZijinOrderApiService extends BaseOrderService<List<CalculatePre
 
     /**
      * 未缴费保单撤单
+     *
      * @param companyId 子订单号
      */
     HttpResult<Object> cancel(String companyId);

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.io.FileUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -90,7 +89,6 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
     }
 
 
-
 }
 
 

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

@@ -42,7 +42,6 @@ import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.CalculateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -68,7 +67,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
 
     private final ConfigureParametersComponents configureParametersComponents;
 
-    public ZhongMeiOrderApiServiceImpl(InsOrdersService insOrdersService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, ZhongmeiRequestApiComponents zhongmeiRequestApiComponents, ZhongmeiRequestComponents zhongmeiRequestComponents,  ConfigureParametersComponents configureParametersComponents, PtlAgreementAttributionService ptlAgreementAttributionService) {
+    public ZhongMeiOrderApiServiceImpl(InsOrdersService insOrdersService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService, ZhongmeiRequestApiComponents zhongmeiRequestApiComponents, ZhongmeiRequestComponents zhongmeiRequestComponents, ConfigureParametersComponents configureParametersComponents, PtlAgreementAttributionService ptlAgreementAttributionService) {
         this.insOrdersService = insOrdersService;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insTaskImagesService = insTaskImagesService;

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

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.ydtech.components.ZhongmeiRequestComponents;
-import com.ydtech.components.queue.ZmQuoteConsumer;
 import com.ydtech.constants.enums.InsOrderStatus;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -15,7 +14,6 @@ import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.esm.service.EsmInsAttributionService;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.esm.service.InsTaskImageService;
-import com.ydtech.modules.ins.convert.ZhongmeiCarModelConvert;
 import com.ydtech.modules.ins.model.request.Response;
 import com.ydtech.modules.ins.model.request.ZhongmeiQuoteResponse;
 import com.ydtech.modules.ins.model.vo.*;
@@ -40,7 +38,6 @@ import com.ydtech.modules.order.service.ZhongMeiOrderService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

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

@@ -26,6 +26,7 @@ import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
+import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -72,14 +73,15 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
 
     @Override
-    public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsVo zjVehicleProductsVo) {
+    public HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
         // 1 通过 协议id获取配置实体
-        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, zjVehicleProductsVo.getAgreementId());
-        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjVehicleProductsVo.getAgreementId());
+        ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, zjVehicleProductsQueryVo.getAgreementId());
+        HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjVehicleProductsQueryVo.getAgreementId());
         // 2. 请求驾意险
-        QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsVo.getSeatCount(), zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
+        QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsQueryVo.getSeatCount(), zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
         QueryVehicProductsResponse queryVehicProductsResponse = zijinRequestApiComponents.queryVehicleProducts(queryVehicProductsRequest, httpHeaders);
-        return HttpResult.ok(queryVehicProductsResponse.getProductDtoList());
+        return HttpResult.ok(ZjVehicleProductsVo.toZjVehicleProductsVoList(queryVehicProductsResponse.getProductDtoList()));
+
     }
 
 

src/main/java/com/ydtech/modules/order/utils/AESUtilsWithDataBase.java

@@ -1,8 +1,6 @@
 package com.ydtech.modules.order.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.ydtech.modules.order.entity.api.zm.response.ModelsQueryResponse;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.crypto.Cipher;
@@ -23,13 +21,12 @@ public class AESUtilsWithDataBase {
 //    private static final String sessionKey = "1237891234567589";
 
     /**
-
      * AES 加密操作  ECBPK5Hex
      *
      * @param content 待加密内容
      * @return 返回Base64转码后的加密数据
      */
-    public static String encryptECBPK5Hex(String content, String sessionKey)  {
+    public static String encryptECBPK5Hex(String content, String sessionKey) {
         byte[] result = null;
         if (content == null || "".equals(content)) {
             return content;
@@ -45,7 +42,7 @@ public class AESUtilsWithDataBase {
              * 3. 补码方式(包含nopadding/PKCS5Padding等等)
              * 依据这三个参数可以创建很多种加密方式
              */
-            synchronized(Cipher.class) {
+            synchronized (Cipher.class) {
                 Cipher cipher = Cipher.getInstance(ECB_PKCS5_PADDING);//"AES/ECB/PKCS5Padding";
                 cipher.init(Cipher.ENCRYPT_MODE, skeySpec);// 初始化为加密模式的密码器
                 result = cipher.doFinal(byteContent);// 加密
@@ -78,12 +75,12 @@ public class AESUtilsWithDataBase {
                 result = cipher.doFinal(hexToByte(content));
             }
             returnStr = new String(result, CODE_TYPE);
-        }catch (Exception ex) {
+        } catch (Exception ex) {
         }
         return returnStr;
     }
 
-    public static String byteToHex(byte[] bytes){
+    public static String byteToHex(byte[] bytes) {
         String strHex = "";
         StringBuilder sb = new StringBuilder("");
         for (int n = 0; n < bytes.length; n++) {
@@ -102,7 +99,7 @@ public class AESUtilsWithDataBase {
             m = i * 2 + 1;
             n = m + 1;
             int intVal = Integer.decode("0x" + hex.substring(i * 2, m) + hex.substring(m, n));
-            ret[i] = Byte.valueOf((byte)intVal);
+            ret[i] = Byte.valueOf((byte) intVal);
         }
         return ret;
     }
@@ -111,7 +108,7 @@ public class AESUtilsWithDataBase {
     public static <T> T decryptMessage(String s, Class<T> c, String message, String sessionKey) {
         log.info("---------> 解密前的参数:{}", s);
         // 解密
-        String text = decryptECBPK5Hex(s.replace("\n", ""),  sessionKey);
+        String text = decryptECBPK5Hex(s.replace("\n", ""), sessionKey);
         log.info("---------> {}:{}", message, text);
         return JSON.parseObject(text, c);
     }