From b161f15b57913f02d4f28af1a70a3f4dff4a62d3 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Fri, 12 Dec 2025 09:05:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=87=83=E7=83=A7=E7=B1=BB=E5=9E=8B=E6=8E=92?= =?UTF-8?q?=E6=94=BE=E6=8E=92=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/DataEntryEngineModelDto.java | 14 ++++++++++++++ .../service/impl/EngineParamDetailServiceImpl.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java b/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java index f9bffe8..7fcf7eb 100644 --- a/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java +++ b/src/main/java/com/xdap/self_development/pojo/dto/DataEntryEngineModelDto.java @@ -74,6 +74,20 @@ public class DataEntryEngineModelDto extends MpaasBasePojo { * 品牌 */ private String brand; + /** + * 品牌 + */ + private String emission; + + /** + * 品牌 + */ + private String burnType; + + /** + * 品牌 + */ + private String engineCapacity; /** * 生产日期 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 a746ccb..a3c8c3a 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 @@ -155,7 +155,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { public Map>> selectParamListAndModel(String modelID) { HashMap>> map = new HashMap<>(); DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID); - String s = dataEntryEngineModelPojo.getModelName() + "+" + dataEntryEngineModelPojo.getProductNumber(); + String s =dataEntryEngineModelPojo.getProductNumber(); HashMap> stringListMap = selectParamList(modelID); map.put(s, stringListMap); return map; From ce1337c94a6b4ca09858b9b58cc150611ca4f811 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Fri, 12 Dec 2025 09:13:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EngineParamDetailServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 a3c8c3a..1a9aac6 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 @@ -122,6 +122,10 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { String projectNumber = dataEntryEngineModelPojo.getProjectNumber(); //品牌 String brand = dataEntryEngineModelPojo.getBrand(); + //排放 + String emission = dataEntryEngineModelPojo.getEmission(); + String burnType = dataEntryEngineModelPojo.getBurnType(); + String engineCapacity = dataEntryEngineModelPojo.getEngineCapacity(); ArrayList strings = new ArrayList<>(); if (dataEntryEngineModelPojo.getYcOrOth().equals("玉柴")) { strings.add("状态代号:" + productNumber); @@ -135,6 +139,9 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { strings.add("项目名称:" + projectName); strings.add("项目编号:" + projectNumber); strings.add("品牌:" + brand); + strings.add("排放:" + emission); + strings.add("燃烧类型:" + burnType); + strings.add("排量:" + engineCapacity); collect.put("整车参数", strings); } From 6b69a8b65e6fe6ecc60592cdc062ce177a86cd95 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Fri, 12 Dec 2025 10:33:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnalysisCommonController.java | 7 ++-- .../AnalysisCommonParametersService.java | 3 ++ .../AnalysisCommonParametersServiceImpl.java | 38 ++++++++++++++++--- .../impl/EngineParamDetailServiceImpl.java | 3 +- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java b/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java index a9d6aaf..832468d 100644 --- a/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java +++ b/src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java @@ -2,6 +2,7 @@ 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.controller.request.ReportRequest; import com.xdap.self_development.pojo.view.AnalysisModelParamterView; import com.xdap.self_development.service.AnalysisCommonParametersService; import org.springframework.beans.factory.annotation.Autowired; @@ -23,10 +24,10 @@ public class AnalysisCommonController { } - //统计分析图标 + //统计分析图表 @PostMapping("/showReport") - public Response showReport(@RequestBody AnalysisRequest analysisRequest) { - ArrayList lists = analysisCommonParametersService.selectModelParamByCommon(analysisRequest); + public Response showReport(@RequestBody ReportRequest request) { + ArrayList lists = analysisCommonParametersService.showReport(request); return Response.ok().data(lists); } diff --git a/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java index 21e75bb..fbb6af4 100644 --- a/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java +++ b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java @@ -3,6 +3,7 @@ package com.xdap.self_development.service; import com.xdap.self_development.controller.request.AnalysisRequest; import com.xdap.self_development.controller.request.ApprovalNodeRequest; +import com.xdap.self_development.controller.request.ReportRequest; import com.xdap.self_development.pojo.dto.ActivitiDataAndRecordDTO; import com.xdap.self_development.pojo.dto.ActivitiDataDTO; import com.xdap.self_development.pojo.dto.HandleApprovalDTO; @@ -15,4 +16,6 @@ import java.util.List; public interface AnalysisCommonParametersService { //查询常用参数返回机型数据 ArrayList selectModelParamByCommon(AnalysisRequest analysisRequest); + + ArrayList showReport(ReportRequest 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 18616b6..d3e2911 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 @@ -1,13 +1,11 @@ package com.xdap.self_development.service.impl; +import com.definesys.mpaas.query.db.PageQueryResult; import com.xdap.api.moudle.department.pojo.entity.XdapDepartments; import com.xdap.api.moudle.user.pojo.XdapUsers; import com.xdap.self_development.config.BusinessDatabase; -import com.xdap.self_development.controller.request.AnalysisRequest; -import com.xdap.self_development.controller.request.ModelRolesRequest; -import com.xdap.self_development.controller.request.RolePerJoinRequest; -import com.xdap.self_development.controller.request.UserRoleBindingRequest; +import com.xdap.self_development.controller.request.*; import com.xdap.self_development.enums.ParamPermissionEnum; import com.xdap.self_development.exception.CommonException; import com.xdap.self_development.pojo.*; @@ -23,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.function.Predicate; import java.util.stream.Collectors; @@ -64,11 +63,40 @@ public class AnalysisCommonParametersServiceImpl implements AnalysisCommonParame AnalysisModelParamterView analysisModelParamterView = new AnalysisModelParamterView(); DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelId); analysisModelParamterView.setModelID(modelId); - analysisModelParamterView.setModelName(ObjectUtils.isEmpty(dataEntryEngineModelPojo.getModelName())?"":dataEntryEngineModelPojo.getModelName()); + analysisModelParamterView.setModelName(ObjectUtils.isEmpty(dataEntryEngineModelPojo.getModelName()) ? "" : dataEntryEngineModelPojo.getModelName()); analysisModelParamterView.setPojos(pojoListAll); analysisModelParamterViews.add(analysisModelParamterView); } return analysisModelParamterViews; } + + @Override + public ArrayList showReport(ReportRequest request) { + + List queryResult = businessDatabase.getBusinessDatabase() +// .eq("yc_or_oth", request.getYcOrOth()) + .like("model_name", request.getModelName()) +// .like("product_number", request.getProductNumber()) + .like("plate", request.getPlate()) + .like("platform", request.getPlatform()) + .like("series", request.getSeries()) +// .like("market_segment", request.getMarketSegment()) + .like("project_name", request.getProjectName()) + .like("project_number", request.getProjectNumber()) + .like("emission", request.getEmission()) + .like("burn_type", request.getBurnType()) + .doQuery(DataEntryEngineModelPojo.class); + + String engineCapacityMin = request.getEngineCapacityMin(); + String engineCapacityMax = request.getEngineCapacityMax(); +// queryResult.stream().filter(new Predicate() { +// @Override +// public boolean test(DataEntryEngineModelPojo dataEntryEngineModelPojo) { +// dataEntryEngineModelPojo.get +// return false; +// } +// }) + return null; + } } 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 1a9aac6..cd0de68 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 @@ -131,14 +131,15 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService { strings.add("状态代号:" + productNumber); } else { strings.add("产品编号:" + productNumber); + strings.add("品牌:" + brand); } + strings.add("产品型号:" + dataEntryEngineModelPojo.getModelName()); strings.add("板块:" + plate); strings.add("平台:" + platform); strings.add("系列:" + series); strings.add("细分市场:" + marketSegment); strings.add("项目名称:" + projectName); strings.add("项目编号:" + projectNumber); - strings.add("品牌:" + brand); strings.add("排放:" + emission); strings.add("燃烧类型:" + burnType); strings.add("排量:" + engineCapacity);