From d8d129a2e41f7099968cb4f4dc1b028ab985135f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 20:20:47 +0800
Subject: [PATCH] Changes14
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
index 2a63237..4d6a5dd 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java
@@ -71,6 +71,21 @@
return R.ok(paramService.page(page, gen));
}
+
+ @ApiOperation(value = "宸ヨ壓缁戝畾鏌ヨ", notes = "鏌ヨ")
+ @PostMapping("/pageInId")
+ @PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
+ public R getParamPageInId(Page page, @RequestParam("idList") List<Long>idList) {
+ System.out.println(idList);
+ QueryWrapper<Param> gen = new QueryWrapper<>();
+ gen.lambda().in(Param::getId,idList);
+ List<SysDictItem> dict = dictUtils.getDict("technology_param");
+ Page page1 = paramService.page(page, gen);
+ List records = page1.getRecords();
+ List<Map<String, Object>> tree = getTree(records, dict);
+ page1.setRecords(tree);
+ return R.ok(page1);
+ }
/**
* 鍒嗛〉鏌ヨ
@@ -83,12 +98,18 @@
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
public R getParamPage(Page page, ParamDTO param) {
- List<Map<String,Object>> all = new ArrayList<>();
List<SysDictItem> dict = dictUtils.getDict("technology_param");
QueryWrapper<Param> gen = QueryWrapperUtil.gen(param);
gen.lambda().eq(Param::getParentId,0L);
Page page1 = paramService.page(page, gen);
List records = page1.getRecords();
+ List<Map<String, Object>> tree = getTree(records, dict);
+ page1.setRecords(tree);
+ return R.ok(page1);
+ }
+
+ public List<Map<String,Object>> getTree(List records,List<SysDictItem> dict){
+ List<Map<String,Object>> all = new ArrayList<>();
records.forEach(l->{
System.out.println("涓�绾ф暟鎹�--"+l);
Map pojo = JsonUtil.jsonToPojo(JsonUtil.jsonToString(l), Map.class);
@@ -109,6 +130,7 @@
oneMap.put("paramType",StringUtils.defaultString((String) pojo.get("type"),""));
oneMap.put("paramFormat",StringUtils.defaultString((String) pojo.get("parameterFormat"),""));
oneMap.put("unit",StringUtils.defaultString((String) pojo.get("unit"),""));
+ oneMap.put("parentId",pojo.get("parentId"));
all.add(oneMap);
}
secondList.forEach(s->{
@@ -125,6 +147,7 @@
p.setType(s.getType());
p.setParameterFormat(s.getParameterFormat());
p.setUnit(s.getUnit());
+ p.setParentId(s.getParentId());
third.add(p);
}
third.forEach(t->{
@@ -143,12 +166,12 @@
allMap.put("paramType",StringUtils.defaultString(t.getType(),""));
allMap.put("paramFormat",StringUtils.defaultString(t.getParameterFormat(),""));
allMap.put("unit", StringUtils.defaultString(t.getUnit(),""));
+ allMap.put("parentId",t.getParentId());
all.add(allMap);
});
});
});
- page1.setRecords(all);
- return R.ok(page1);
+ return all;
}
/**
--
Gitblit v1.9.3