From 92dee51fd4dfb7535f4da5cfdfa8d04a1b69330f Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Fri, 8 Apr 2022 15:34:04 +0800 Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCarConfigSummaryVo.java | 17 +++++++ .../api/basevehicle/AppBaseVehicleFeign.java | 6 +-- .../AppBaseVehicleFeignFallback.java | 10 +--- .../AppBaseVehicleNowModelQuery.java | 49 +++++++++++++++++++ .../basevehicle/AppBaseVehicleNowModelVo.java | 33 +++++++++++++ .../AppCurrentCarDetailConfigQuery.java | 20 ++++++++ .../AppCurrentCarDetailConfigVo.java | 46 +++++++++++++++++ .../AppCurrentCarDetailCongfigVo.java | 31 ------------ .../biz/basevehicle/AppBaseVehicleRest.java | 39 ++------------- 9 files changed, 172 insertions(+), 79 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppCarConfigSummaryVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java delete mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailCongfigVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppCarConfigSummaryVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppCarConfigSummaryVo.java new file mode 100644 index 0000000000..49fe013ca5 --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeign.java index 07bf032309..fdfb08e7cd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeign.java +++ b/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("手机端现车详细配置") - @GetMapping("/appCarParams/{modelSid}/{configSid}") - public ResultBean getAppCurrentCarDetailConfigVo(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + @ApiOperation("手机端现车详细配置(新)") + @GetMapping("/appCarParams") + public ResultBean getAppCurrentCarDetailConfigVo(@RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid, @RequestParam("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeignFallback.java index 101202b01f..24992421e6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleFeignFallback.java +++ b/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(安瑞基础信息模块)
@@ -28,7 +20,7 @@ import java.util.Map; public class AppBaseVehicleFeignFallback implements AppBaseVehicleFeign { @Override - public ResultBean getAppCurrentCarDetailConfigVo(String modelSid, String configSid) { + public ResultBean getAppCurrentCarDetailConfigVo(String modelSid, String configSid,String userSid) { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelQuery.java new file mode 100644 index 0000000000..b88304a42d --- /dev/null +++ b/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; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseVehicleNowModelVo.java new file mode 100644 index 0000000000..ac791361f0 --- /dev/null +++ b/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; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigQuery.java new file mode 100644 index 0000000000..05bf68819f --- /dev/null +++ b/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; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailConfigVo.java new file mode 100644 index 0000000000..1fbb533705 --- /dev/null +++ b/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> modelInfo; + + @ApiModelProperty(value = "常用配置") + private List 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; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailCongfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailCongfigVo.java deleted file mode 100644 index 591668901d..0000000000 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCurrentCarDetailCongfigVo.java +++ /dev/null @@ -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> modleInfo; - - @ApiModelProperty(value = "常用配置") - private List commonConfigInfo; - - @ApiModelProperty(value = "更多配置") - private String moreConfigDescibe; - - /*@ApiModelProperty(value = "上装") - private List> trailerInfo; - - @ApiModelProperty(value = "挂车") - private List> topInfo;*/ - -} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java index d28c72b1fc..e094c7d795 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java +++ b/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(安瑞基础信息模块)
@@ -69,9 +36,9 @@ public class AppBaseVehicleRest implements AppBaseVehicleFeign { * @return */ @Override - public ResultBean getAppCurrentCarDetailConfigVo(String modelSid, String configSid) { - AppCurrentCarDetailCongfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid); - return new ResultBean().success().setData(vo); + public ResultBean getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) { + AppCurrentCarDetailConfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid); + return new ResultBean().success().setData(vo); }