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 6d400d7ca..9ff31351d 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 @@ -81,9 +81,9 @@ public class OtaManageApplyEOController extends JeroController getOtaCarList() { - Map result = otaManageApplyEOService.getOtaCarList(); + @GetMapping(value = "/getPullDownList") + public Result getPullDownList() { + Map result = otaManageApplyEOService.getPullDownList(); return Result.OK(result); } @@ -141,4 +141,12 @@ public class OtaManageApplyEOController extends JeroController getCarList() { + List result = otaManageApplyEOService.getCarList(); + return Result.OK(result); + } + } 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 5077c470f..b406cfc29 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 @@ -84,5 +84,11 @@ public interface IOtaManageApplyEOService extends IService { * 下拉数据-软件版本,适用车型,市场 * @return */ - Map getOtaCarList(); + Map getPullDownList(); + + /** + 下拉数据-全部和分车型(不含年款) + * @return + */ + List getCarList(); } 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 a38ec4f87..1f00730cc 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 @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -222,7 +223,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarList() { + public Map getPullDownList() { List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(); Map result = new HashMap<>(); if(!otaManageApplyEOS.isEmpty()){ @@ -262,4 +263,39 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getCarList() { + List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(); + List result = new LinkedList<>(); + result.add("全部"); + if(!otaManageApplyEOS.isEmpty()){ + + //适用车型 appliedVehicleProject + List appliedVehicleProjectList = otaManageApplyEOS.stream() + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList()); + //过滤掉特殊的适用车型 +// List otaNameList = OtaCarEnum.getOtaNameList(); + + Set carSet = new HashSet<>();//适用车型 + Set marketSet = new HashSet<>();//市场 + for (String appliedVehicleProject : appliedVehicleProjectList) { + for (String s : appliedVehicleProject.split(",")) { + String[] split = s.split(" "); + if (split.length == 2) { + result.add(s); + } else if (split.length == 3) { + result.add(split[0]+" "+split[2]); + } + } + } + } + result = result.stream().distinct().collect(Collectors.toList()); + return result; + } }