Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -29,6 +29,8 @@ public class TokenInterceptor {
 
         // 文件访问路劲
         notMatchList.add("/upload/**");
+        // app 最大版本查询
+        notMatchList.add("/sysVersion/queryMaxNum");
         //财务 - 对账 - 保司数据下载
         notMatchList.add("/api/inv/insExternalBills/export/**");
 

src/main/java/com/ydtech/config/resttemplate/RestTemplateConfig.java

@@ -43,10 +43,11 @@ public class RestTemplateConfig {
         //路由是对maxTotal的细分
         connectionManager.setDefaultMaxPerRoute(100);
         RequestConfig requestConfig = RequestConfig.custom()
-                .setSocketTimeout(30000)  //返回数据的超时时间
+                .setSocketTimeout(40000)  //返回数据的超时时间
                 .setConnectTimeout(10000) //连接上服务器的超时时间
                 .setConnectionRequestTimeout(1000) //从连接池中获取连接的超时时间
                 .build();
         return HttpClientBuilder.create().setDefaultRequestConfig(requestConfig).setConnectionManager(connectionManager).build();
     }
+
 }

src/main/java/com/ydtech/constants/enums/FileType.java

@@ -13,7 +13,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FileType {
 
-    IMAGE("image");
+    IMAGE("image"),
+    APK("apk");
 
     private final String type;
 

src/main/java/com/ydtech/modules/esm/controller/SysVersionController.java

@@ -8,6 +8,7 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.SysVersion;
 import com.ydtech.modules.esm.service.SysVersionService;
 import com.ydtech.utils.idgen.IdGenerate;
+import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("sysVersion")
+@Api("APP版本管理")
 public class SysVersionController extends BaseController {
 
     @Autowired

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

@@ -26,7 +26,7 @@ public class InsCrawlerOrderComponents {
         HttpEntity<T> yaQuoteInfoVoHttpEntity = new HttpEntity<>(requestBody, httpHeaders);
 
         String request = JSON.toJSONString(requestBody);
-        log.info("---------> 请求参数: url {} {}", url, request);
+        log.info("---------> {} \n\t---------> URL: {} \n\t---------> 请求参数: {}", message, url, request);
 
         ResponseEntity<B> stringResponseEntity = restTemplate.postForEntity(url, yaQuoteInfoVoHttpEntity, responseType);
         B body = stringResponseEntity.getBody();
@@ -35,7 +35,7 @@ public class InsCrawlerOrderComponents {
         }
 
         String response = JSON.toJSONString(body);
-        log.info("---------> 响应参数:{}", response);
+        log.info("---------> {} \n\t---------> 响应参数:{}", message, response);
         return body;
     }
 

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

@@ -56,7 +56,7 @@ public class ZhongmeiRequestApiComponents {
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 
         String jsonString = JSON.toJSONString(q, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty);
-        log.info("---------> 请求参数:{}", jsonString);
+        log.info("---------> URl: {} \n---------> 请求参数:{}", url, jsonString);
         // 加密
         String sessionKey = properties.getSessionKey();
         String s = AESUtilsWithDataBase.encryptECBPK5Hex(jsonString, sessionKey);

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

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
- * @description: 资金财险请求
+ * @description: 紫金财险请求
  * @author: wenks
  * @date: 2023/8/9 16:57
  **/
@@ -290,7 +290,6 @@ public class ZijinRequestApiComponents {
      * 未缴费保单撤单
      *
      * @param orderNoRequest 紫金财险 未缴费保单撤单 入参实体
-     * @return 出参实体
      */
     public void cancel(OrderNoRequest orderNoRequest, HttpHeaders httpHeaders) {
         request(RequestUrl.CANCEL, orderNoRequest, BaseResponse.class, httpHeaders);

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

@@ -18,6 +18,7 @@ import com.ydtech.utils.idgen.IdGenerate;
 import com.ydtech.validation.annotation.CheckObjectNotNull;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -33,6 +34,7 @@ import java.util.Map;
 @Api(tags = "影像")
 @RequestMapping("/ins/taskImage")
 @RestController
+@Slf4j
 public class OrderTaskImageController extends BaseController {
 
     private final InsTaskImageService insTaskImageService;
@@ -115,7 +117,7 @@ public class OrderTaskImageController extends BaseController {
             String s = Base64.getEncoder().encodeToString(bytesBytes);
             return HttpResult.ok("转换成功", s);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.debug(e.getMessage());
             throw new SystemException("图片压缩失败");
         }
     }

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

@@ -51,6 +51,12 @@ public class ZijinOrderApiController {
         return this.zijinOrderApiService.quote(quoteInfo, quoteVo);
     }
 
+    @PostMapping(value = "/submitImage")
+    @ApiOperation(value = "提交影像信息")
+    public HttpResult<Object> submitImage(@RequestSingleParam(value = "companyId") String companyId) {
+        return this.zijinOrderApiService.submitImage(companyId);
+    }
+
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {
@@ -75,15 +81,10 @@ public class ZijinOrderApiController {
         return this.zijinOrderApiService.getOrderDetail(companyId);
     }
 
-
     @PostMapping("/getPolicyPrint")
     @ApiOperation(value = "电子保单")
     public HttpResult<String> getPolicyPrint(@RequestBody PolicyPrintVo policyPrintVo) {
         return this.zijinOrderApiService.getPolicyPrint(policyPrintVo);
     }
 
-
-
-
-
 }

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

@@ -0,0 +1,20 @@
+package com.ydtech.modules.order.entity.api.zj.constants.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum CarCheckReasonEnum {
+
+    CCR_1("1", "新车"),
+    CCR_2("2", "按期续保"),
+    CCR_3("3", "单保三者"),
+    CCR_4("4", "车队业务");
+
+    private final String code;
+
+    private final String name;
+
+}

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

@@ -34,11 +34,12 @@ public class GetAccessTokenRequest implements Serializable {
      * 过期时间 过期时间设定需在1~7天之间
      */
     @JsonProperty("tokenExpireDay")
-    private String tokenExpireDay = "7";
+    private String tokenExpireDay;
 
     public GetAccessTokenRequest(String appKey, String appSecret) {
         this.appKey = appKey;
         this.appSecret = appSecret;
+        this.tokenExpireDay = "7";
     }
 
 }

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

@@ -1,6 +1,8 @@
 package com.ydtech.modules.order.entity.api.zj.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ydtech.constants.enums.dict.agreement.ProductsType;
+import com.ydtech.modules.order.entity.api.zj.constants.enums.CarCheckReasonEnum;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -31,11 +33,17 @@ public class SubmitVerifyRequest implements Serializable {
     @JsonProperty("orderNo")
     private String orderNo;
 
-    public SubmitVerifyRequest(String orderId, String orderNo) {
+    public SubmitVerifyRequest(String orderId, String orderNo, String productId) {
         this.orderId = orderId;
         this.orderNo = orderNo;
         this.engageList = Collections.emptyList();
-        this.underWritingRequestVehicleDto = new UnderWritingRequestVehicleDTO();
+        String code;
+        if (productId.equals(ProductsType.PT_034002.getCode())) {
+             code = CarCheckReasonEnum.CCR_3.getCode();
+        }else {
+             code = CarCheckReasonEnum.CCR_2.getCode();
+        }
+        this.underWritingRequestVehicleDto = new UnderWritingRequestVehicleDTO(code);
     }
 
     @NoArgsConstructor
@@ -64,8 +72,15 @@ public class SubmitVerifyRequest implements Serializable {
         private static final long serialVersionUID = 5446089370940891817L;
 
         @JsonProperty("carCheckStatus")
-        private String carCheckStatus = "1";
+        private String carCheckStatus ;
 
+        @JsonProperty("carCheckReason")
+        private String carCheckReason;
+
+        public UnderWritingRequestVehicleDTO(String carCheckReason) {
+            this.carCheckStatus = "2";
+            this.carCheckReason = carCheckReason;
+        }
     }
 
 }

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

@@ -15,6 +15,7 @@ public class QueryClauseDataResponse extends BaseResponse implements Serializabl
 
 
     private static final long serialVersionUID = 1275058219674614480L;
+
     @JsonProperty("clauseInfoDtoList")
     private List<ClauseInfoDtoListDTO> clauseInfoDtoList;
 

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author: wenks
  * @date: 2023/8/23 10:48
  **/
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 public class QueryVehicProductsResponse extends BaseResponse {

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

@@ -23,6 +23,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -60,7 +61,9 @@ public class QuotedPriceRequest extends BaseRequest {
     @AllArgsConstructor
     @NoArgsConstructor
     @Data
-    public static class BusinessDataDTO {
+    public static class BusinessDataDTO implements Serializable {
+
+        private static final long serialVersionUID = 6724538360514954885L;
 
         // 保单归属地
         @JsonProperty("policyLocation")
@@ -109,7 +112,8 @@ public class QuotedPriceRequest extends BaseRequest {
         @AllArgsConstructor
         @NoArgsConstructor
         @Data
-        public static class AccidentDTO {
+        public static class AccidentDTO implements Serializable {
+            private static final long serialVersionUID = -8335832893055836433L;
             // 方案代码
             @JsonProperty("rideRiskCode")
             private String rideRiskCode;
@@ -122,7 +126,8 @@ public class QuotedPriceRequest extends BaseRequest {
         @AllArgsConstructor
         @NoArgsConstructor
         @Data
-        public static class PolicyLocationDTO {
+        public static class PolicyLocationDTO implements Serializable {
+            private static final long serialVersionUID = -4868884351793208747L;
             @JsonProperty("province")
             private String province;
             @JsonProperty("city")
@@ -144,8 +149,9 @@ public class QuotedPriceRequest extends BaseRequest {
 
         @NoArgsConstructor
         @Data
-        public static class InsuredObjectDTO {
+        public static class InsuredObjectDTO implements Serializable {
 
+            private static final long serialVersionUID = -7398031787228945507L;
             @JsonProperty("policyCar")
             private PolicyCarDTO policyCar;
 
@@ -159,7 +165,8 @@ public class QuotedPriceRequest extends BaseRequest {
 
             @NoArgsConstructor
             @Data
-            public static class PolicyCarDTO {
+            public static class PolicyCarDTO implements Serializable {
+                private static final long serialVersionUID = -6802193456312684016L;
                 // 发动机号
                 @JsonProperty("engine")
                 private String engine;
@@ -251,14 +258,14 @@ public class QuotedPriceRequest extends BaseRequest {
                 }
             }
 
-
         }
     }
 
     @NoArgsConstructor
     @Data
-    public static class ContractDTO {
+    public static class ContractDTO implements Serializable {
 
+        private static final long serialVersionUID = -4583284662908149711L;
         @JsonProperty("contractMain")
         private ContractMainDTO contractMain;
 
@@ -284,7 +291,8 @@ public class QuotedPriceRequest extends BaseRequest {
 
         @NoArgsConstructor
         @Data
-        public static class ContractMainDTO {
+        public static class ContractMainDTO implements Serializable {
+            private static final long serialVersionUID = 1931505160644020807L;
             // 失效日期（终保日期）
             @JsonProperty("expiryDate")
             private String expiryDate;
@@ -327,7 +335,8 @@ public class QuotedPriceRequest extends BaseRequest {
 
         @NoArgsConstructor
         @Data
-        public static class CoverageDTO {
+        public static class CoverageDTO implements Serializable {
+            private static final long serialVersionUID = -7935060830529629416L;
             // 单位限额
             @JsonProperty("unitAmount")
             private Integer unitAmount;
@@ -409,7 +418,8 @@ public class QuotedPriceRequest extends BaseRequest {
     @AllArgsConstructor
     @NoArgsConstructor
     @Data
-    public static class CustomerDTO {
+    public static class CustomerDTO implements Serializable {
+        private static final long serialVersionUID = -2139900793333349385L;
         // 名称
         @JsonProperty("name")
         private String name;

src/main/java/com/ydtech/modules/order/entity/filter/CarModelsFilterUtils.java

@@ -22,15 +22,17 @@ public class CarModelsFilterUtils<T extends CarModelsFilter> {
 
         if (!stadarCarDTOS.isEmpty()) {
             carModelsFilterList = stadarCarDTOS;
+        } else {
+            stadarCarDTOS = carModelsFilterList;
         }
 
         carModelsFilterList = carModelsFilterList.stream().filter(car -> carInfo.getPurchasePrice().equals(String.valueOf(car.getPurchasePrice()))).collect(Collectors.toList());
 
         if (carModelsFilterList.isEmpty()) {
-            carModelsFilterList = stadarCarDTOS;
+            return stadarCarDTOS.get(0);
         }
+
         return carModelsFilterList.get(0);
     }
 
-
 }

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

@@ -59,6 +59,7 @@ public class InsUploadFilesServiceImpl extends ServiceImpl<InsUploadFilesMapper,
         String suffix = filename.substring(filename.lastIndexOf("."));
         String objectName = fileMD5 + suffix;
         String uploadPath = uploadFilePath + datePath;
+
         File folder = new File(uploadPath);
         // 路劲不存在创建目录
         if (!folder.isDirectory()) {

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

@@ -155,7 +155,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
 
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         JSONObject ownerinfo = insOrders.getApplyinfo();
-        CustomerInfoVo customerInfoVo = JSON.toJavaObject(ownerinfo, CustomerInfoVo.class);
+        CustomerInfoVo customerInfoVo = ownerinfo.toJavaObject(CustomerInfoVo.class);
         // 2. 提交核保
         SubmitResponse response = submitForUnderwriting(insAreaCompany.getId(), insOrders.getFrameno(), customerInfoVo, zmConfigureParameters);
         // 3. 人工核保

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

@@ -127,7 +127,9 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
     @Override
     public HttpResult<Object> audit(String companyId) {
+
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
+        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
 
         // 1 通过 协议id获取配置实体
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
@@ -148,7 +150,9 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         }
 
         // 3 提交核保
-        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(insAreaCompany.getInsOrderNo(), insAreaCompany.getId());
+        String productid = insOrders.getProductid();
+
+        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(insAreaCompany.getInsOrderNo(), insAreaCompany.getId(), productid);
         SubmitVerifyResponse submitVerifyResponse = zijinRequestApiComponents.submitVerify(submitVerifyRequest, httpHeaders);
         SubmitVerifyResponse.SubmitVerifyInfoDTO submitVerifyInfo = submitVerifyResponse.getSubmitVerifyInfo();
 

src/main/resources/application-test.yml

@@ -327,7 +327,7 @@ zm:
     imageUrl: https://test.echinacoal.com/singlePlatform/others/
     smsUrl: https://test.echinacoal.com/singlePlatform/prpall/
     pageUrl: https://www.baidu.com/
-    callbackDomain: http://test.baoxianzhanggui.com:8080
+    callbackDomain: http://39.98.239.48/web-api/
     callbackUrl: /order/zhongMeiApi/underwritingCallback
     passMsgUrl: /order/zhongMeiApi/auditCallback
     sessionKey: 1237891234567589