pc端车型查询接口，手机端车型查询接口

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppCarConfigSummaryVo.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basemodelconfig;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppCarConfigSummaryVo {
+
+    @ApiModelProperty("常用配置")
+    private String config;
+
+    @ApiModelProperty("更多配置")
+    private String moreConfig;
+
+    @ApiModelProperty("车型名称")
+    private String model;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeign.java

@@ -28,9 +28,9 @@ import org.springframework.web.bind.annotation.*;
         fallback = BaseVehicleFeignFallback.class)
 public interface AppBaseVehicleFeign {
 
-    @ApiOperation("手机端现车详细配置")
+    @ApiOperation("手机端现车详细配置(新)")
-    @GetMapping("/appCarParams/{modelSid}/{configSid}")
+    @GetMapping("/appCarParams")
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppCurrentCarDetailConfigVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid);
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeignFallback.java

@@ -1,15 +1,7 @@
 package com.yxt.anrui.base.api.basevehicle;
 
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -28,7 +20,7 @@ import java.util.Map;
 public class AppBaseVehicleFeignFallback implements AppBaseVehicleFeign {
 
     @Override
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid) {
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid,String userSid) {
         return null;
     }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelQuery.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBaseVehicleNowModelQuery implements Query {
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("排放标准")
+    private String emissionStandard;
+
+    @ApiModelProperty("驱动")
+    private String driver;
+
+    @ApiModelProperty("变速箱")
+    private String gearbox;
+
+    @ApiModelProperty("产品系列")
+    private String series;
+
+    @ApiModelProperty("功能")
+    private String vehicleFunction;
+
+    @ApiModelProperty("细分市场")
+    private String marketSegments;
+
+    @ApiModelProperty("版本")
+    private String vehicleVersion;
+
+    @ApiModelProperty("燃料")
+    private String fuelType;
+
+    @ApiModelProperty("马力")
+    private String horsepower;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("品牌")
+    private String brand;
+
+    @ApiModelProperty("分公司")
+    private String useOrg;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBaseVehicleNowModelVo implements Vo {
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型图片")
+    private String modelImage;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+    @ApiModelProperty("版本号")
+    private String versionValue;
+    @ApiModelProperty("燃料")
+    private String fuelTypeValue;
+    @ApiModelProperty("变速箱")
+    private String gearboxTypeValue;
+    @ApiModelProperty("指导价")
+    private String guidedPrice;
+    @ApiModelProperty("配置数量")
+    private String configNum;
+    @ApiModelProperty("现车数量")
+    private String nowCarNum;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class AppCurrentCarDetailConfigQuery implements Query {
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("配置sid")
+    private String configSid;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java

@@ -0,0 +1,46 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
+import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo;
+import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class AppCurrentCarDetailConfigVo implements Vo {
+
+    @ApiModelProperty(value = "车型信息")
+    private List<List<ConfigInfoSpanSize>> modelInfo;
+
+    @ApiModelProperty(value = "常用配置")
+    private List<ConfigInfoSpanSize> configInfo;
+
+    @ApiModelProperty(value = "更多配置")
+    private String moreConfig;
+
+    @ApiModelProperty(value = "指导价")
+    private String price;
+
+    @ApiModelProperty(value = "价格有效期")
+    private String date;
+
+    @ApiModelProperty(value = "价格有效期")
+    private Long dateLong;
+
+    @ApiModelProperty(value = "车型名称")
+    private String model;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
+
+    @ApiModelProperty(value = "现车和排产车总数")
+    private String num;
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailCongfigVo.java

@@ -1,31 +0,0 @@
-package com.yxt.anrui.base.api.basevehicle;
-
-import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
-import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo;
-import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo;
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-
-@Data
-public class AppCurrentCarDetailCongfigVo implements Vo {
-
-    @ApiModelProperty(value = "车型信息")
-    private List<List<ConfigInfoSpanSize>> modleInfo;
-
-    @ApiModelProperty(value = "常用配置")
-    private List<ConfigInfoSpanSize> commonConfigInfo;
-
-    @ApiModelProperty(value = "更多配置")
-    private String moreConfigDescibe;
-
-    /*@ApiModelProperty(value = "上装")
-    private List<List<ConfigInfoSpanSize>> trailerInfo;
-
-    @ApiModelProperty(value = "挂车")
-    private List<List<ConfigInfoSpanSize>> topInfo;*/
-
-}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java

@@ -1,44 +1,11 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
-import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
-import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
-import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
-import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.base.utils.ExportExcelUtils;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -69,9 +36,9 @@ public class AppBaseVehicleRest implements AppBaseVehicleFeign {
      * @return
      */
     @Override
-    public ResultBean<AppCurrentCarDetailCongfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid) {
+    public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
-        AppCurrentCarDetailCongfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid);
+        AppCurrentCarDetailConfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid);
-        return new ResultBean<AppCurrentCarDetailCongfigVo>().success().setData(vo);
+        return new ResultBean<AppCurrentCarDetailConfigVo>().success().setData(vo);
     }