WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA待办中心

Browse Source
This commit is contained in:
高嵩
2023-09-18 15:47:27 +08:00
parent ddfff05de2
commit 04c0271d6b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+10 -1
View File
@@ -2306,22 +2306,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
List<OtaManageApplyEO> omaList = this.getListByVdrList(vdrList); List<OtaManageApplyEO> omaList = this.getListByVdrList(vdrList);
for (OtaManagePermission omp : ompList) { for (OtaManagePermission omp : ompList) {
if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseName()) && !omp.getApplyId().contains(otaManageReceiveNsdp.getReleaseName())) {
continue;
}
String vehicleStr = omp.getVehicle(); String vehicleStr = omp.getVehicle();
String[] vehicleList = vehicleStr.split(","); String[] vehicleList = vehicleStr.split(",");
for (String vehicle : vehicleList) { for (String vehicle : vehicleList) {
if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getVehicle()) && !vehicle.contains(otaManageReceiveNsdp.getVehicle())) {
continue;
}
List<OtaManageReceive> omrVehicleList = omrList.stream() List<OtaManageReceive> omrVehicleList = omrList.stream()
.filter(obj -> StringUtils.isNotEmpty(obj.getPlannedBpLaunchBatch()) && obj.getPlannedBpLaunchBatch().equals(omp.getApplyId()) .filter(obj -> StringUtils.isNotEmpty(obj.getPlannedBpLaunchBatch()) && obj.getPlannedBpLaunchBatch().equals(omp.getApplyId())
&& StringUtils.isNotEmpty(obj.getVehicleMatch()) && obj.getVehicleMatch().contains(vehicle)) && StringUtils.isNotEmpty(obj.getVehicleMatch()) && obj.getVehicleMatch().contains(vehicle))
.collect(Collectors.toList()); .collect(Collectors.toList());
for (OtaManageReceive mrVehicle : omrVehicleList) { for (OtaManageReceive mrVehicle : omrVehicleList) {
if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseType()) && !otaManageReceiveNsdp.getReleaseType().equals(mrVehicle.getReleaseType())) {
continue;
}
if (!OtaHomoImpactEnum.YES.getValue().equals(mrVehicle.getHomologationImpact()) if (!OtaHomoImpactEnum.YES.getValue().equals(mrVehicle.getHomologationImpact())
&& !OtaHomoImpactEnum.INTER_VALID.getValue().equals(mrVehicle.getHomologationImpact())) { && !OtaHomoImpactEnum.INTER_VALID.getValue().equals(mrVehicle.getHomologationImpact())) {
List<OtaManageApplyEO> applyList = omaList.stream() List<OtaManageApplyEO> applyList = omaList.stream()
.filter(obj -> StringUtils.isNotEmpty(obj.getVdr()) && obj.getVdr().equals(mrVehicle.getId()) .filter(obj -> StringUtils.isNotEmpty(obj.getVdr()) && obj.getVdr().equals(mrVehicle.getId())
&& StringUtils.isNotEmpty(obj.getVehicleType()) && obj.getVehicleType().equals(vehicle)) && StringUtils.isNotEmpty(obj.getVehicleType()) && obj.getVehicleType().equals(vehicle))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())){ if (CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())) {
OtaManageReceiveNsdp omrn = new OtaManageReceiveNsdp(); OtaManageReceiveNsdp omrn = new OtaManageReceiveNsdp();
omrn.setId(UUID.randomUUID().toString().replace("-", "")); omrn.setId(UUID.randomUUID().toString().replace("-", ""));
omrn.setReleaseName(omp.getApplyId()); omrn.setReleaseName(omp.getApplyId());