From b9bfb89658242f066a29b56a03fe6c462d19a158 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 17 Aug 2023 16:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 14 ++++++ .../modules/ota/entity/OtaManageApplyEO.java | 6 +-- .../jero/modules/ota/enums/OtaCarEnum.java | 45 +++++++++++++++++++ .../ota/mapper/OtaManageApplyEOMapper.java | 2 + .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 22 +++++++++ .../ota/service/IOtaManageApplyEOService.java | 8 +++- .../impl/OtaManageApplyEOServiceImpl.java | 35 ++++++++++++++- 7 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 60dfa8545..93d8cfc75 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -73,6 +73,20 @@ public class OtaManageApplyEOController extends JeroController pageList = otaManageApplyEOService.getOtaCarPage(otaManageApplyEO,pageNo,pageSize); return Result.OK(pageList); } + /** + * OTA下拉数据 + * + * @param otaManageApplyEO + * @return + */ + @AutoLog(value = "OTA下拉数据") + @ApiOperation(value="OTA下拉数据", notes="OTA下拉数据") + @GetMapping(value = "/getOtaCarList") + public Result getOtaCarList(OtaManageApplyEO otaManageApplyEO) { + + List otaCarList = otaManageApplyEOService.getOtaCarList(otaManageApplyEO); + return Result.OK(otaCarList); + } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 8082de331..66d5adaf1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -88,11 +88,7 @@ public class OtaManageApplyEO implements Serializable { /**软件版本*/ @TableField(exist = false) @ApiModelProperty(value = "软件版本") - private java.lang.String softwareVersion; - - @TableField(exist = false) - @ApiModelProperty(value = "平台") - private java.lang.String platform; + private java.lang.String plannedBpLaunchBatch; @TableField(exist = false) @ApiModelProperty(value = "适用车型") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java new file mode 100644 index 000000000..d2dc092dc --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java @@ -0,0 +1,45 @@ +package com.jero.modules.ota.enums; + +public enum OtaCarEnum { + + + ALL("All", "All"), + CN_ALL("CN All", "EU All"), + EU_ALL("EU All", "EU All"); + + String name; + String value; + + OtaCarEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + + + public static OtaCarEnum getOtaTitleEnum(String name) { + for (OtaCarEnum e : values()) { + if (e.getName().equals(name)) { + return e; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index e1ac0414e..b7ac2866a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -29,4 +29,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); + List getOtaCarList(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 4fdd9dfa5..4f777a837 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -78,4 +78,26 @@ + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index df820a308..737d66a67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -48,7 +48,7 @@ public interface IOtaManageApplyEOService extends IService { void deleteByIds(List ids); /** - * 通过id查询通过适用车型查询 + * 通过适用车型查询 * * @param appliedVehicleProject * @return @@ -79,4 +79,10 @@ public interface IOtaManageApplyEOService extends IService { * @return */ IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize); + /** + * OTA下拉数据 + * @param otaManageApplyEO + * @return + */ + List getOtaCarList(OtaManageApplyEO otaManageApplyEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index f6862824c..fb7292e4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -7,12 +7,15 @@ import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 数据对接表 @@ -75,7 +78,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); - otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); + Page otaCarPage = otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); + List records = otaCarPage.getRecords(); + if(!records.isEmpty()){ + List appliedVehicleProjectList = records.stream().filter(e-> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct() + .collect(Collectors.toList()); + + List list = new ArrayList<>(); + for (String appliedVehicleProject : appliedVehicleProjectList) { + list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + } + + + } return null; } + + @Override + public List getOtaCarList(OtaManageApplyEO otaManageApplyEO) { + List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(otaManageApplyEO); + if(!otaManageApplyEOS.isEmpty()){ + List appliedVehicleProjectList = otaManageApplyEOS.stream() + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList()); + List list = new ArrayList<>(); + for (String appliedVehicleProject : appliedVehicleProjectList) { + list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + } + } + return null; + } }