修改车架查询

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

@@ -21,7 +21,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Api(tags = "中煤财险 API ")
@@ -36,7 +38,8 @@ public class ZhongMeiOrderApiController {
 
     private final ZhongmeiApiConfigurationProperties properties;
 
-    public ZhongMeiOrderApiController(ZhongMeiOrderApiService zhongMeiOrderApiService, InsOrdersComponents insOrdersComponents, ZhongmeiApiConfigurationProperties properties) {
+    public ZhongMeiOrderApiController(ZhongMeiOrderApiService zhongMeiOrderApiService, InsOrdersComponents insOrdersComponents,
+                                      ZhongmeiApiConfigurationProperties properties) {
         this.zhongMeiOrderApiService = zhongMeiOrderApiService;
         this.insOrdersComponents = insOrdersComponents;
         this.properties = properties;
@@ -45,7 +48,10 @@ public class ZhongMeiOrderApiController {
     @PostMapping(value = "/modelsQuery")
     @ApiOperation(value = "车型查询接口")
     public HttpResult<List<CarModelDTO>> modelsQuery(@RequestSingleParam(value = "modelName") String modelName) {
-        return this.zhongMeiOrderApiService.modelsQuery(modelName);
+        List<CarModelDTO> map = this.zhongMeiOrderApiService.modelsQuery(modelName);
+        List<CarModelDTO> carModelDTOS =
+                map.stream().sorted(Comparator.comparing(CarModelDTO::getReplacementValue)).collect(Collectors.toList());
+        return HttpResult.ok(carModelDTOS);
     }
 
     @QuoteVerification("报价授权")
@@ -112,4 +118,4 @@ public class ZhongMeiOrderApiController {
         return this.zhongMeiOrderApiService.rideAccidentQuery(accidentalDrivingVo);
     }
 
-}
+}

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

@@ -20,7 +20,7 @@ public interface ZhongMeiOrderApiService extends BaseOrderService<AccidentalDriv
      * @param modelName 车型名称
      * @return
      */
-    HttpResult<List<CarModelDTO>> modelsQuery(String modelName);
+    List<CarModelDTO> modelsQuery(String modelName);
 
     /**
      * 提交影像信息

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

@@ -125,7 +125,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
     }
 
     @Override
-    public HttpResult<List<CarModelDTO>> modelsQuery(String modelName) {
+    public List<CarModelDTO> modelsQuery(String modelName) {
         //初始Key
         StringBuilder redisKey = new StringBuilder();
         redisKey.append(BRAND_MODEL_KEY);
@@ -134,7 +134,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         if (!Objects.isNull(redisTemplate.opsForValue().get(modelName))) {
             String carModeStr = redisTemplate.opsForValue().get(modelName);
             List<CarModelDTO> carModelDTOS = JSON.parseArray(carModeStr, CarModelDTO.class);
-            return HttpResult.ok(carModelDTOS);
+            return carModelDTOS;
         }
         ModelsQueryRequest modelsQueryResponse = new ModelsQueryRequest();
         modelsQueryResponse.setModelName(modelName);
@@ -144,13 +144,12 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         modelInquiry(modelName, car);
 
         List<CarModelDTO> map = SimpleStadarCarDTOConvert.INSTANCE.map(car);
-        List<CarModelDTO> carModelDTOS = map.stream().sorted(Comparator.comparing(CarModelDTO::getReplacementValue)).collect(Collectors.toList());
 
         //数据存储到缓存中
-        if (!carModelDTOS.isEmpty()) {
+        if (!map.isEmpty()) {
             redisTemplate.opsForValue().set(redisKey.toString(), JSON.toJSONString(map), VIN_SEARCH_KEY_TIME, TimeUnit.HOURS);
         }
-        return HttpResult.ok(carModelDTOS);
+        return map;
     }
 
     @Override