From 22594e714c57c9e243fe9973515ea9467d71c2db Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 07 十一月 2023 18:35:11 +0800
Subject: [PATCH] Changes11
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/ParamServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 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 3ec470e..2e1a7e6 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
@@ -30,6 +30,8 @@
import com.chinaztt.mes.basic.mapper.ParamMapper;
import com.chinaztt.mes.basic.service.ParamService;
import com.chinaztt.mes.basic.util.DictUtils;
+import com.chinaztt.mes.common.feign.DictApi;
+import com.chinaztt.mes.common.util.easyexcel.template.ParamTemplate;
import com.chinaztt.ztt.admin.api.entity.SysDictItem;
import com.chinaztt.ztt.common.core.util.R;
import lombok.AllArgsConstructor;
@@ -39,7 +41,10 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -53,6 +58,8 @@
public class ParamServiceImpl extends ServiceImpl<ParamMapper, Param> implements ParamService {
private ParamJoinTemplateMapper paramJoinTemplateMapper;
private DictUtils dictUtils;
+
+ private DictApi dictApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -169,4 +176,52 @@
return code;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importExcelPlus(List<ParamTemplate> paramTemplates) {
+ //浜岀骇鍙傛暟id 133
+ //涓夌骇鍙傛暟 134
+ List<SysDictItem> dictTwo = dictUtils.getDict("second_param");
+ List<SysDictItem> dictThree = dictUtils.getDict("third_param");
+ List<Integer> count = new ArrayList<Integer>();
+ int num = 0;
+ for (int i = 0; i < paramTemplates.size(); i++) {
+ if (StringUtils.isNotEmpty(paramTemplates.get(i).getParamItem())) {
+ count.add(num);
+ }
+ num++;
+ }
+ count.add(paramTemplates.size());
+
+ System.out.println(count);
+ List<List<ParamTemplate>> list = new ArrayList<>();
+ paramTemplates.forEach(p -> {
+ Optional.ofNullable(p.getParamItemTwo()).ifPresent(t -> {
+ int size = dictTwo.stream().filter(d -> Objects.equals(p.getParamItemTwo(), d.getLabel())).collect(Collectors.toList()).size();
+ if (size < 1) {
+ throw new RuntimeException(("瀛楀吀涓棤姝や簩绾у弬鏁�,璇锋鏌ュ悗鍐嶆瀵煎叆锛屽弬鏁颁负锛�---------銆�" + p.getParamItemTwo()));
+ }
+ });
+ Optional.ofNullable(p.getParamItemThree()).ifPresent(t -> {
+ int size = dictThree.stream().filter(d -> Objects.equals(p.getParamItemThree(), d.getLabel())).collect(Collectors.toList()).size();
+ if (size < 1) {
+ throw new RuntimeException(("瀛楀吀涓棤姝や笁绾у弬鏁�,璇锋鏌ュ悗鍐嶆瀵煎叆锛屽弬鏁颁负锛�---------銆�" + p.getParamItemThree()));
+ }
+ });
+ });
+ for (int i = 0; i < paramTemplates.size(); i++) {
+ for (int j = 0; j < count.size(); j++) {
+ if(i==count.get(j)-1){
+
+ }else {
+
+ }
+ }
+ }
+ list.forEach(l->{
+ System.out.println("======================");
+ l.forEach(System.out::println);
+ });
+ }
+
}
--
Gitblit v1.9.3