From af389156a78401b1e51807efe90b7310fc4c20f6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 10 十一月 2023 19:50:28 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java
index 1035e66..0ccd4d3 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java
@@ -81,7 +81,7 @@
Param second=new Param();
SysDictItem sysDictItem = second_param.stream().filter(p -> p.getId().equals(Integer.valueOf(String.valueOf(s)))).collect(Collectors.toList()).get(0);
second.setParameterItem(sysDictItem.getLabel());
- second.setCode(""+s);
+ second.setCode(father.getCode()+"-"+s);
second.setParentId(father.getId());
baseMapper.insert(second);
//涓夌骇
@@ -89,7 +89,7 @@
Param third=new Param();
SysDictItem sysThirdDictItem = third_param.stream().filter(p -> p.getId().equals(Integer.valueOf(String.valueOf(t)))).collect(Collectors.toList()).get(0);
third.setParameterItem(sysThirdDictItem.getLabel());
- third.setCode(""+t);
+ third.setCode(second.getCode()+"-"+t);
third.setParentId(second.getId());
baseMapper.insert(third);
});
@@ -228,20 +228,14 @@
}
listParamTemplates.add(paramTemplateLists);
}
- listParamTemplates.forEach(l-> {
- System.out.println("=========================================");
- l.forEach(System.out::println);
- });
List<List<Param>>paramList=new ArrayList<>();
AtomicInteger nums = new AtomicInteger();
List<Long>secondIds=new ArrayList();
+ List<String>secondCode=new ArrayList();
for (int i = 0; i < listParamTemplates.size(); i++) {
List<ParamTemplate> l = listParamTemplates.get(i);
List<Param>paramList1=new ArrayList<>();
- System.out.println("=========================================");
- l.forEach(System.out::println);
ParamTemplate paramTemplate = l.get(0);
- System.out.println("鏁扮粍鏁版嵁=======銆�"+paramTemplate);
Param paramFirst=new Param();
paramFirst.setCode("ZS-CS"+IdWorker.getIdStr());
//涓�绾у弬鏁�
@@ -256,7 +250,6 @@
paramFirst.setUnit(paramTemplate.getUnit());
}
paramFirst.setId(IdWorker.getId());
- System.out.println("涓�绾�--------銆�"+paramFirst);
paramList1.add(paramFirst);
if(l.size()>1){
for (int k = 0; k < l.size(); k++) {
@@ -265,7 +258,8 @@
Param second=new Param();
second.setId(IdWorker.getId());
secondIds.add(second.getId());
- second.setCode(dictTwo.stream().filter(d -> Objects.equals(c.getParamItemTwo(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
+ second.setCode(paramFirst.getCode()+"-"+dictTwo.stream().filter(d -> Objects.equals(c.getParamItemTwo(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
+ secondCode.add(second.getCode());
second.setParameterItem(c.getParamItemTwo());
if(c.getParamItemThree()==null){
second.setType(type.stream().filter(d -> Objects.equals(c.getParamType(), d.getLabel())).collect(Collectors.toList()).get(0).getValue());
@@ -279,10 +273,11 @@
Param third=new Param();
third.setId(IdWorker.getId());
long paramItemTwo = secondIds.get(secondIds.size()-1);
+ String paramItemCode=secondCode.get(secondCode.size()-1);
//System.out.println(nums.get()+"鎵�灞炰簩绾�======銆�"+secondIds.get(secondIds.size()-1));
third.setParentId(paramItemTwo);
third.setParameterItem(c.getParamItemThree());
- third.setCode(dictThree.stream().filter(d -> Objects.equals(c.getParamItemThree(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
+ third.setCode(paramItemCode+"-"+dictThree.stream().filter(d -> Objects.equals(c.getParamItemThree(), d.getLabel())).collect(Collectors.toList()).get(0).getId()+"");
third.setType(type.stream().filter(d -> Objects.equals(c.getParamType(), d.getLabel())).collect(Collectors.toList()).get(0).getValue());
third.setParameterFormat(c.getParamFormat());
third.setUnit(c.getUnit());
@@ -292,10 +287,8 @@
}
paramList.add(paramList1);
}
- System.out.println("==================");
paramList.forEach(p->{
p.forEach(cc->{
- System.out.println(cc);
baseMapper.insert(cc);
});
});
--
Gitblit v1.9.3