From 9eb36911c111ab74b1e8302ce32a29cff0fe1ed5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 24 Oct 2023 16:29:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E5=AD=97=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=88=96=E8=BD=A6=E5=9E=8B=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 6 +++ .../modules/project/enums/PlatformEnum.java | 45 +++++++++++++++++++ .../service/IProjectLibraryBaseService.java | 2 + .../service/impl/NcrTrackServiceImpl.java | 14 ------ .../impl/ProjectLibraryBaseServiceImpl.java | 18 ++++++++ 5 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PlatformEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 2f4fcbf67..376d38b12 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -354,4 +354,10 @@ public class ProjectLibraryBaseController extends JeroController overallReplacementUser(@RequestBody JSONObject json){ return this.projectLibraryBaseService.overallReplacementUser(json); } + @AutoLog(value = "查询数字平台或车型平台") + @ApiOperation(value="查询数字平台或车型平台", notes="查询数字平台或车型平台") + @GetMapping(value = "/getPlatform") + public List getPlatform(String platform){ + return projectLibraryBaseService.getPlatform(platform); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PlatformEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PlatformEnum.java new file mode 100644 index 000000000..1c6f7490b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/PlatformEnum.java @@ -0,0 +1,45 @@ +package com.jero.modules.project.enums; + +/** + * 任务状态枚举类 + */ +public enum PlatformEnum { + NUMBER_PLATFORM("数字平台","numberPlatform"), + CAR_PLATFORM("车型平台","carPlatform"), + ; + + + String name; + String value; + + private PlatformEnum(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 String getTextByValue(String value) { + PlatformEnum[] values = values(); + for (PlatformEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + return taskStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index 49fe9059a..50252c98b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -204,4 +204,6 @@ public interface IProjectLibraryBaseService extends IService List queryList(List projectIdList); List getListByIds(List projectIdList); + + List getPlatform(String platform); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index e18ac1d78..c25c47fb8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -116,20 +116,6 @@ public class NcrTrackServiceImpl extends ServiceImpl public List getPageInfo(NcrTrackVO ncrTrackVO) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); ncrTrackVO.setUserId(loginUser.getId()); -// if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){ -// if(ncrTrackVO.getSerialNumber().contains("%")){ -// ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%")); -// } -// ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*","")); -// } -// if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){ -// if(ncrTrackVO.getTitle().contains("%")){ -// ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%")); -// } -// ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); -// } -// List sysUserList = sysUserService.list(); - ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue()); ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index dd9a6d384..2d7b05d0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -42,6 +42,7 @@ import com.jero.modules.project.enums.FlowStateEnum; import com.jero.modules.project.enums.HSStatisticalNodesEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.PermissionDescriptionEnum; +import com.jero.modules.project.enums.PlatformEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum; import com.jero.modules.project.enums.ProjectUserLocationEnum; @@ -4219,6 +4220,23 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getPlatform(String platform) { + List projectLibraryBaseList = this.list(); + List platformList = new ArrayList<>(); + if(PlatformEnum.NUMBER_PLATFORM.getValue().equals(platform)){ + platformList = projectLibraryBaseList.stream() + .filter(e -> StringUtils.isNotBlank(e.getDigitalPlatform())) + .map(ProjectLibraryBase::getDigitalPlatform).distinct().collect(Collectors.toList()); + } + if(PlatformEnum.CAR_PLATFORM.getValue().equals(platform)){ + platformList = projectLibraryBaseList.stream() + .filter(e -> StringUtils.isNotBlank(e.getVehiclePlatform())) + .map(ProjectLibraryBase::getVehiclePlatform).distinct().collect(Collectors.toList()); + } + return platformList; + } }