From 78dd252a78d61c022d6f8ab3f1087fab8c3e110e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 17 Aug 2023 20:55:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE-=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=92=8C=E5=88=86=E8=BD=A6=E5=9E=8B=EF=BC=88=E4=B8=8D?=
 =?UTF-8?q?=E5=90=AB=E5=B9=B4=E6=AC=BE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtaManageApplyEOController.java           | 14 +++++--
 .../ota/service/IOtaManageApplyEOService.java |  8 +++-
 .../impl/OtaManageApplyEOServiceImpl.java     | 38 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 5 deletions(-)

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<OtaManageApplyEO,
 	 */
 	@AutoLog(value = "下拉数据-软件版本，适用车型，市场")
 	@ApiOperation(value="下拉数据-软件版本，适用车型，市场", notes="下拉数据-软件版本，适用车型，市场")
-	@GetMapping(value = "/getOtaCarList")
-	public Result<?> getOtaCarList() {
-		Map<String, Object> result = otaManageApplyEOService.getOtaCarList();
+	@GetMapping(value = "/getPullDownList")
+	public Result<?> getPullDownList() {
+		Map<String, Object> result = otaManageApplyEOService.getPullDownList();
 		return Result.OK(result);
 	}
 
@@ -141,4 +141,12 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
         return super.exportXls(request, otaManageApplyEO, OtaManageApplyEO.class, "数据对接表");
     }
 
+	@AutoLog(value = "下拉数据-全部和分车型（不含年款）")
+	@ApiOperation(value="下拉数据-全部和分车型（不含年款）", notes="下拉数据-全部和分车型（不含年款）")
+	@GetMapping(value = "/getCarList")
+	public Result<?> getCarList() {
+		List<String> 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<OtaManageApplyEO> {
 	 * 下拉数据-软件版本，适用车型，市场
 	 * @return
 	 */
-	Map<String,Object> getOtaCarList();
+	Map<String,Object> getPullDownList();
+
+	/**
+	 下拉数据-全部和分车型（不含年款）
+	 * @return
+	 */
+	List<String> 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<OtaManageApplyEOMap
 	 * @return
 	 */
 	@Override
-	public Map<String,Object> getOtaCarList() {
+	public Map<String,Object> getPullDownList() {
 		List<OtaManageApplyEO> otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList();
 		Map<String,Object> result = new HashMap<>();
 		if(!otaManageApplyEOS.isEmpty()){
@@ -262,4 +263,39 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		}
 		return result;
 	}
+
+	/**
+	 * 下拉数据-全部和分车型（不含年款）
+	 * @return
+	 */
+	@Override
+	public List<String> getCarList() {
+		List<OtaManageApplyEO> otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList();
+		List<String> result = new LinkedList<>();
+		result.add("全部");
+		if(!otaManageApplyEOS.isEmpty()){
+
+			//适用车型 appliedVehicleProject
+			List<String> appliedVehicleProjectList = otaManageApplyEOS.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
+					.map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList());
+			//过滤掉特殊的适用车型
+//			List<String> otaNameList = OtaCarEnum.getOtaNameList();
+
+			Set<String> carSet = new HashSet<>();//适用车型
+			Set<String> 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;
+	}
 }