jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

树形结构调整

Browse Source
This commit is contained in:
ys.git 2025-12-11 19:50:36 +08:00
parent cdc1fb84da
commit fea69318b1
6 changed files with 84 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/xdap/self_development/controller/AnalysisCommonController.java
View File

@ -15,11 +15,19 @@ public class AnalysisCommonController {
@Autowired
AnalysisCommonParametersService analysisCommonParametersService;
//机型常用返回机型数据
//机型常用返回机型数据 暂未使用
@PostMapping("/selectModelParamByCommon")
public Response selectModelParamByCommon(@RequestBody AnalysisRequest analysisRequest) {
ArrayList<AnalysisModelParamterView> lists = analysisCommonParametersService.selectModelParamByCommon(analysisRequest);
return Response.ok().data(lists);
}
//统计分析图标
@PostMapping("/showReport")
public Response showReport(@RequestBody AnalysisRequest analysisRequest) {
ArrayList<AnalysisModelParamterView> lists = analysisCommonParametersService.selectModelParamByCommon(analysisRequest);
return Response.ok().data(lists);
}
}

2
src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
View File

@ -33,7 +33,7 @@ public class EngineParamDetailController {
//参数列表查询
@GetMapping("/selectParamList")
public Response selectParamList(@RequestParam(value = "modelID"/*, required = false*/) String modelID) {
public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID) {
Map<String, List<String>> list = engineParamDetailService.selectParamList(modelID);
return Response.ok().data(list);
}

3
src/main/java/com/xdap/self_development/controller/request/DataEntryEngineModelPageRequest.java
View File

@ -18,6 +18,9 @@ public class DataEntryEngineModelPageRequest {
private String projectName;
private String projectNumber;
private String brand;
private String emission;
private String burnType;
private String engineCapacity;
private String department;
private String resPerson;
private String distributeStatus;

31
src/main/java/com/xdap/self_development/controller/request/ReportRequest.java Normal file
View File

@ -0,0 +1,31 @@
package com.xdap.self_development.controller.request;
import lombok.Data;
import java.util.List;
/**
* <p>
* 待办事项表
* </p>
*
* @author Lys111
* @since 2025-11-18
*/
@Data
public class ReportRequest {
//产品型号 板块 平台 系列 项目名称及编号 排放 燃烧类型 排量Min,排量max
private String modelName;
private String plate;
private String platform;
private String series;
private String projectName;
private String projectNumber;
private String emission;
private String burnType;
private String engineCapacityMin;
private String engineCapacityMax;
}

4
src/main/java/com/xdap/self_development/pojo/dto/EngineParamDetailDTO.java
View File

@ -30,6 +30,10 @@ public class EngineParamDetailDTO {
* 类型
*/
private String parameterType;
/**
* 零部件名称
*/
private String partsName;
/**
* 参数名称

69
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -95,8 +95,6 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
Template::getOrderNum, // value: 排序号
(oldValue, newValue) -> oldValue
));
systemOrderMap.put("整车参数",0);
DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID);
Map<String, List<String>> collect = parameters.stream()
.collect(Collectors.groupingBy(
Parameter::getSubsystemName,
@ -105,37 +103,41 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
Collectors.toList()
)
));
//状态代号
String productNumber = dataEntryEngineModelPojo.getProductNumber();
//板块
String plate = dataEntryEngineModelPojo.getPlate();
//平台
String platform = dataEntryEngineModelPojo.getPlatform();
//系列
String series = dataEntryEngineModelPojo.getSeries();
//细分市场
String marketSegment = dataEntryEngineModelPojo.getMarketSegment();
//项目名称
String projectName = dataEntryEngineModelPojo.getProjectName();
//项目编号
String projectNumber = dataEntryEngineModelPojo.getProjectNumber();
//品牌
String brand = dataEntryEngineModelPojo.getBrand();
ArrayList<String> strings = new ArrayList<>();
if (dataEntryEngineModelPojo.getYcOrOth().equals("玉柴")) {
strings.add("状态代号:"+productNumber);
}else {
strings.add("产品编号:"+productNumber);
}
strings.add("板块:"+plate);
strings.add("平台:"+platform);
strings.add("系列:"+series);
strings.add("细分市场:"+marketSegment);
strings.add("项目名称:"+projectName);
strings.add("项目编号:"+projectNumber);
strings.add("品牌:"+brand);
if (ObjectUtils.isNotEmpty(modelID)) {
systemOrderMap.put("整车参数", 0);
DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID);
//状态代号
String productNumber = dataEntryEngineModelPojo.getProductNumber();
//板块
String plate = dataEntryEngineModelPojo.getPlate();
//平台
String platform = dataEntryEngineModelPojo.getPlatform();
//系列
String series = dataEntryEngineModelPojo.getSeries();
//细分市场
String marketSegment = dataEntryEngineModelPojo.getMarketSegment();
//项目名称
String projectName = dataEntryEngineModelPojo.getProjectName();
//项目编号
String projectNumber = dataEntryEngineModelPojo.getProjectNumber();
//品牌
String brand = dataEntryEngineModelPojo.getBrand();
ArrayList<String> strings = new ArrayList<>();
if (dataEntryEngineModelPojo.getYcOrOth().equals("玉柴")) {
strings.add("状态代号:" + productNumber);
} else {
strings.add("产品编号:" + productNumber);
}
strings.add("板块:" + plate);
strings.add("平台:" + platform);
strings.add("系列:" + series);
strings.add("细分市场:" + marketSegment);
strings.add("项目名称:" + projectName);
strings.add("项目编号:" + projectNumber);
strings.add("品牌:" + brand);
collect.put("整车参数",strings);
collect.put("整车参数", strings);
}
HashMap<String, List<String>> sortedCollect2 = collect.entrySet().stream()
.sorted(Comparator.comparing(entry ->
systemOrderMap.getOrDefault(entry.getKey(), Integer.MAX_VALUE)
@ -148,13 +150,14 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
));
return sortedCollect2;
}
@Override
public Map<String, HashMap<String, List<String>>> selectParamListAndModel(String modelID) {
HashMap<String, HashMap<String, List<String>>> map = new HashMap<>();
DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID);
String s = dataEntryEngineModelPojo.getModelName() + "+" + dataEntryEngineModelPojo.getProductNumber();
HashMap<String, List<String>> stringListMap = selectParamList(modelID);
map.put(s,stringListMap);
map.put(s, stringListMap);
return map;
}