From 97aba734a81b3d739c7f96e1fa6744d1096a1542 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Mon, 15 Dec 2025 19:30:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E4=BB=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=8F=B0=E5=AE=9E=E6=97=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8E=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=BB=93=E5=90=88=E5=BE=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TcDataQueryController.java | 32 ++++ .../controller/request/AnalysisRequest.java | 8 +- .../pojo/ClassificationAttribute.java | 3 + .../service/EngineParamDetailService.java | 1 + .../service/TcDataQueryService.java | 23 +++ .../AnalysisCommonParametersServiceImpl.java | 75 ++++---- .../impl/EngineParamDetailServiceImpl.java | 37 ++++ .../service/impl/TcDataQueryServiceImpl.java | 165 ++++++++++++++++++ 8 files changed, 305 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/xdap/self_development/controller/TcDataQueryController.java create mode 100644 src/main/java/com/xdap/self_development/service/TcDataQueryService.java create mode 100644 src/main/java/com/xdap/self_development/service/impl/TcDataQueryServiceImpl.java diff --git a/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java b/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java new file mode 100644 index 0000000..f4c2061 --- /dev/null +++ b/src/main/java/com/xdap/self_development/controller/TcDataQueryController.java @@ -0,0 +1,32 @@ +package com.xdap.self_development.controller; + + +import com.definesys.mpaas.common.http.Response; +import com.xdap.self_development.controller.request.AnalysisRequest; +import com.xdap.self_development.pojo.ClassificationAttribute; +import com.xdap.self_development.pojo.EngineParamDetailPojo; +import com.xdap.self_development.service.TcDataQueryService; +import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/custom/tcDataQuery") +public class TcDataQueryController { + + @Autowired + private TcDataQueryService tcDataQueryService; + + ; + //根据机型ID和子系统-零部件查询参数数据 + @PostMapping("/tcDataSelectByPartsNames") + public Response tcDataSelectByPartsNames(@RequestBody AnalysisRequest analysisRequest) { + Map> stringListHashMap = tcDataQueryService.tcDataSelectAllByPartsName(analysisRequest); + return Response.ok().data(stringListHashMap); + } + +} diff --git a/src/main/java/com/xdap/self_development/controller/request/AnalysisRequest.java b/src/main/java/com/xdap/self_development/controller/request/AnalysisRequest.java index 3ad631c..6f664a3 100644 --- a/src/main/java/com/xdap/self_development/controller/request/AnalysisRequest.java +++ b/src/main/java/com/xdap/self_development/controller/request/AnalysisRequest.java @@ -19,12 +19,10 @@ import java.util.List; @Data public class AnalysisRequest{ + private String engineModelID; /** - * 机型列表 + * 子系统+零部件名称路径 */ - private List modelIds; - - //常用参数id - private String commonId; + private List subsystemParts; } diff --git a/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java b/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java index 8019fca..f01f774 100644 --- a/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java +++ b/src/main/java/com/xdap/self_development/pojo/ClassificationAttribute.java @@ -9,7 +9,10 @@ import lombok.EqualsAndHashCode; @Data @Table("ads_prd_f_tc_flsxb") public class ClassificationAttribute extends MpaasBasePojo { + //图号 private String pitemId; + //参数名称 private String idattrtbutehame; + //参数值 private String fieldvalue; } diff --git a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java index 6b0f8e5..8875aaa 100644 --- a/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java +++ b/src/main/java/com/xdap/self_development/service/EngineParamDetailService.java @@ -37,6 +37,7 @@ public interface EngineParamDetailService { void updateToInsertFiledBy(List engineParamDetailPojos, String userID); List selectAllByNewVersion(); + List selectAllAndTcByNewVersion(); List selectByModelNewVersion(String model); //根据责任人查询最新发版的参数详情 diff --git a/src/main/java/com/xdap/self_development/service/TcDataQueryService.java b/src/main/java/com/xdap/self_development/service/TcDataQueryService.java new file mode 100644 index 0000000..f66c4dd --- /dev/null +++ b/src/main/java/com/xdap/self_development/service/TcDataQueryService.java @@ -0,0 +1,23 @@ +package com.xdap.self_development.service; + +import com.xdap.self_development.controller.request.AnalysisRequest; +import com.xdap.self_development.pojo.ClassificationAttribute; +import com.xdap.self_development.pojo.DataEntryEngineModelPojo; +import com.xdap.self_development.pojo.EngineParamDetailPojo; +import com.xdap.self_development.pojo.Parameter; +import com.xdap.self_development.pojo.dto.EngineParamDetailDTO; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public interface TcDataQueryService { + //查询TC数据返回格式Map> + HashMap> tcDataSelectByC(String productNumber, String partsName, String parameterName); + + ArrayList tcDataSelectAllByproductNumber(DataEntryEngineModelPojo engineModelPojo); + + Map> tcDataSelectAllByPartsName(AnalysisRequest analysisRequest); + +} diff --git a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java index 8667a22..75da08b 100644 --- a/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/AnalysisCommonParametersServiceImpl.java @@ -35,44 +35,47 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame @Autowired EngineParamDetailService engineParamDetailService; @Autowired + TcDataQueryService tcDataQueryService; + @Autowired DataEntryEngineModelService dataEntryEngineModelService; private static final Pattern ALL_NUMBER_PATTERN = Pattern.compile("^[-+]?\\d+(\\.\\d+)?([Ee][-+]?\\d+)?$"); @Override public ArrayList selectModelParamByCommon(AnalysisRequest analysisRequest) { - if (ObjectUtils.isEmpty(analysisRequest.getModelIds()) || ObjectUtils.isEmpty(analysisRequest) || ObjectUtils.isEmpty(analysisRequest.getCommonId())) { - log.warn("analysisRequest is empty"); - return null; - } - List commons = businessDatabase.getBusinessDatabase() - .eq("common_id", analysisRequest.getCommonId()) - .doQuery(ModelCommonParameters.class); - List paramIds = commons.stream().map(x -> x.getParameterId()).collect(Collectors.toList()); - if (ObjectUtils.isEmpty(paramIds)) { - return null; - } - - ArrayList analysisModelParamterViews = new ArrayList<>(); - //查找每个机型的参数并且根据常用筛选 - for (String modelId : analysisRequest.getModelIds()) { - List pojoListAll = new ArrayList<>(); - List pojoList = engineParamDetailService.selectByModelNewVersion(modelId); - List pojos = pojoList.stream() - .filter(x -> paramIds.contains(x.getParameterId())).collect(Collectors.toList()); - if (ObjectUtils.isNotEmpty(pojos)) { - pojoListAll.addAll(pojos); - } - AnalysisModelParamterView analysisModelParamterView = new AnalysisModelParamterView(); - DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelId); - analysisModelParamterView.setModelID(modelId); - analysisModelParamterView.setModelName(ObjectUtils.isEmpty(dataEntryEngineModelPojo.getModelName()) ? "" : dataEntryEngineModelPojo.getModelName()); - analysisModelParamterView.setPojos(pojoListAll); - analysisModelParamterViews.add(analysisModelParamterView); - - } - - return analysisModelParamterViews; +// if (ObjectUtils.isEmpty(analysisRequest.getModelIds()) || ObjectUtils.isEmpty(analysisRequest) || ObjectUtils.isEmpty(analysisRequest.getCommonId())) { +// log.warn("analysisRequest is empty"); +// return null; +// } +// List commons = businessDatabase.getBusinessDatabase() +// .eq("common_id", analysisRequest.getCommonId()) +// .doQuery(ModelCommonParameters.class); +// List paramIds = commons.stream().map(x -> x.getParameterId()).collect(Collectors.toList()); +// if (ObjectUtils.isEmpty(paramIds)) { +// return null; +// } +// +// ArrayList analysisModelParamterViews = new ArrayList<>(); +// //查找每个机型的参数并且根据常用筛选 +// for (String modelId : analysisRequest.getModelIds()) { +// List pojoListAll = new ArrayList<>(); +// List pojoList = engineParamDetailService.selectByModelNewVersion(modelId); +// List pojos = pojoList.stream() +// .filter(x -> paramIds.contains(x.getParameterId())).collect(Collectors.toList()); +// if (ObjectUtils.isNotEmpty(pojos)) { +// pojoListAll.addAll(pojos); +// } +// AnalysisModelParamterView analysisModelParamterView = new AnalysisModelParamterView(); +// DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelId); +// analysisModelParamterView.setModelID(modelId); +// analysisModelParamterView.setModelName(ObjectUtils.isEmpty(dataEntryEngineModelPojo.getModelName()) ? "" : dataEntryEngineModelPojo.getModelName()); +// analysisModelParamterView.setPojos(pojoListAll); +// analysisModelParamterViews.add(analysisModelParamterView); +// +// } +// +// return analysisModelParamterViews; + return null; } @Override @@ -102,13 +105,17 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame return (Double.compare(ec, engineCapacityMin) >= 0 && Double.compare(ec, engineCapacityMax) < 0); }).collect(Collectors.toList()); } + AnalysisModelParamterViewAndParam andParam = new AnalysisModelParamterViewAndParam(); ArrayList analysisModelParamterViews = new ArrayList<>(); for (DataEntryEngineModelPojo engineModelPojo : engineModelPojos) { AnalysisModelParamterView analysisModelParamterView = new AnalysisModelParamterView(); List pojoList = engineParamDetailService.selectByModelNewVersion(engineModelPojo.getId()); - pojoList = pojoList.stream().filter(x->ObjectUtils.isNotEmpty(x.getParameterValue()) && isNumber(x.getParameterValue())).collect(Collectors.toList()); +// 编号&&零部件名称-参数 + ArrayList engineParamDetailPojos = tcDataQueryService.tcDataSelectAllByproductNumber(engineModelPojo); + pojoList.addAll(engineParamDetailPojos); + pojoList = pojoList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParameterValue()) && isNumber(x.getParameterValue())).collect(Collectors.toList()); analysisModelParamterView.setModelID(engineModelPojo.getId()); analysisModelParamterView.setModelName(engineModelPojo.getModelName()); BeanUtils.copyProperties(engineModelPojo, analysisModelParamterView); @@ -117,7 +124,7 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame } List list = new ArrayList<>(); for (AnalysisModelParamterView analysisModelParamterView : analysisModelParamterViews) { - analysisModelParamterView.getPojos().stream().forEach(x->list.add(x.getParameterName())); + analysisModelParamterView.getPojos().stream().forEach(x -> list.add(x.getParameterName())); } List strings = list.stream().distinct().collect(Collectors.toList()); andParam.setParamList(strings); diff --git a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java index a0c555c..8e0b884 100644 --- a/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java @@ -599,6 +599,43 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { return parameterList; } + + @Override + public List selectAllAndTcByNewVersion() { + //读取已通过审核的版本 DRAFT(草稿)、APPROVING（审批中）、COMPLETE(已完成)、RETURNED(已撤回)、REJECTED(已拒绝) + List