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

src/main/java/com/ydtech/modules/ins/controller/InsZhongmeiController.java

@@ -10,8 +10,10 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysMethodLogDao;
 import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.ins.model.InsOrder;
+import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.service.InsZhongmeiService;
+import com.ydtech.modules.ins.service.YongAnService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@ public class InsZhongmeiController {
 
     private final InsZhongmeiService insZhongmeiService;
 
+    @Autowired
+    private YongAnService yongAnService;
+    
     public InsZhongmeiController(InsZhongmeiService insZhongmeiService) {
         this.insZhongmeiService = insZhongmeiService;
     }
@@ -44,12 +49,17 @@ public class InsZhongmeiController {
         if (StringUtils.isEmpty(modelName)) {
             throw new SystemException("车型不能为空");
         }
-        return insZhongmeiService.modelQuery(modelName);
+        CarModel_Req carModelReq = new CarModel_Req();
+        carModelReq.setModelName(modelName);
+
+        return yongAnService.modelsQuery(carModelReq);
+//        return insZhongmeiService.modelQuery(modelName);
     }
 
     @GetMapping("/vinSearch")
     @ApiOperation("vin码查询")
     public HttpResult vinSearch(@RequestParam String frameNo) {
+
         return insZhongmeiService.vinSearch(frameNo);
     }
 

src/main/java/com/ydtech/modules/ins/service/impl/InsZhongmeiServiceImpl.java

@@ -113,7 +113,6 @@ public class InsZhongmeiServiceImpl implements InsZhongmeiService {
         });
         List<ZmCarModel> data = model.getData();
         List<CarModelDTO> map1 = ZhongmeiCarModelConvert.INSTANCE.map(data);
-
         return HttpResult.ok(map1);
     }
 

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.controller;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.ins.service.InsPinganService;
 import com.ydtech.modules.order.service.CarModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,10 +19,15 @@ public class CarModelController {
     @Autowired
     private CarModelService carModelService;
 
+    @Autowired
+    private InsPinganService insPinganService;
+
     @GetMapping("/vinSearch")
     @ApiOperation("vin码查询")
     public HttpResult vinSearch(@RequestParam String frameNo) {
-        return carModelService.vinSearch(frameNo);
+
+        return  insPinganService.vinSearch(frameNo);
+//        return carModelService.vinSearch(frameNo);
     }
 
 

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

@@ -33,10 +33,10 @@ public class CarModelServiceImpl implements CarModelService {
         if(!ObjectUtils.isEmpty(carModelDTOS)){
             return HttpResult.ok(carModelDTOS);
         }
-        List<CarModelDTO> carModelDTOS1 = zhongMeiOrderService.vinSearch(frameNo);
-        if(!ObjectUtils.isEmpty(carModelDTOS1)){
-            return HttpResult.ok(carModelDTOS1);
-        }
+//        List<CarModelDTO> carModelDTOS1 = zhongMeiOrderService.vinSearch(frameNo);
+//        if(!ObjectUtils.isEmpty(carModelDTOS1)){
+//            return HttpResult.ok(carModelDTOS1);
+//        }
         List<CarModelDTO> carModelDTOS2 = yongAnOrderService.vinSearch(frameNo);
         if(!ObjectUtils.isEmpty(carModelDTOS2)){
             return HttpResult.ok(carModelDTOS2);

src/main/resources/application-prod.properties

@@ -230,7 +230,7 @@ zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
 #\u534E\u519Cvin\u7801\u67E5\u8BE2
 hn.vin.search.url=http://172.24.144.213:8088/hn/vinsearch
 #\u5E73\u5B89vin\u7801\u67E5\u8BE2
-pa.vin.search.url=http://172.24.144.213:8088/pingan/vinSearch
+pa.vin.search.url=http://172.24.144.213:8888/pingan/vinSearch
 # \u6052\u90A6\u63A5\u53E3
 hb.quote.url=http://172.24.144.213:8088/hb/hb_bfjs
 hb.audit.url=http://172.24.144.213:8088/hb/hb_hebao

src/main/resources/application-test.properties

@@ -200,7 +200,7 @@ zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
 #\u534E\u519Cvin\u7801\u67E5\u8BE2
 hn.vin.search.url=http://47.92.254.66:8088/hn/vinsearch
 #\u5E73\u5B89vin\u7801\u67E5\u8BE2
-pa.vin.search.url=http://47.92.254.66:8088/pingan/vinSearch
+pa.vin.search.url=http://47.92.254.66:8888/pingan/vinSearch
 # \u6052\u90A6\u63A5\u53E3
 hb.quote.url=http://47.92.254.66:8088/hb/hb_bfjs
 hb.audit.url=http://47.92.254.66:8088/hb/hb_hebao