From 279b381d288cf6d1358408684d308d50ef3dd7a5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 6610d21..5c3169a 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
@@ -18,13 +18,18 @@
package com.chinaztt.mes.basic.controller;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.dto.ParamDTO;
+import com.chinaztt.mes.basic.dto.ParamPlusDto;
import com.chinaztt.mes.basic.entity.Param;
import com.chinaztt.mes.basic.excel.ParamData;
import com.chinaztt.mes.basic.excel.ParamUploadListener;
import com.chinaztt.mes.basic.service.ParamService;
+import com.chinaztt.mes.basic.util.DictUtils;
+import com.chinaztt.mes.common.util.JsonUtil;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
+import com.chinaztt.ztt.admin.api.entity.SysDictItem;
import com.chinaztt.ztt.common.core.util.R;
import com.chinaztt.ztt.common.log.annotation.SysLog;
import io.swagger.annotations.Api;
@@ -35,6 +40,8 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -51,6 +58,7 @@
private final ParamService paramService;
+ private DictUtils dictUtils;
/**
* 鍒嗛〉鏌ヨ
*
@@ -62,7 +70,43 @@
@GetMapping("/page")
@PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
public R getParamPage(Page page, ParamDTO param) {
- return R.ok(paramService.page(page, QueryWrapperUtil.gen(param)));
+ List<SysDictItem> dict = dictUtils.getDict("technology_param");
+ System.out.println(dict);
+ Page page1 = paramService.page(page, QueryWrapperUtil.gen(param));
+ List records = page1.getRecords();
+ List<Map>all = new ArrayList<Map>();
+ records.forEach(l->{
+ Map pojo = JsonUtil.jsonToPojo(JsonUtil.jsonToString(l), Map.class);
+ Optional.ofNullable(pojo.get("type")).ifPresent(o->{
+ pojo.put("type",dict.stream().filter(d-> Objects.equals(String.valueOf(d.getValue()),pojo.get("type"))).collect(Collectors.toList()).get(0).getLabel());
+ });
+ QueryWrapper<Param>queryWrapper=new QueryWrapper<>();
+ queryWrapper.lambda().eq(Param::getParentId,pojo.get("id"));
+ List<Param> secondList = paramService.list(queryWrapper);
+ List<Map>secondMapList = new ArrayList<>();
+ secondList.forEach(s->{
+ Map second = JsonUtil.jsonToPojo(JsonUtil.jsonToString(s), Map.class);
+ Optional.ofNullable(second.get("type")).ifPresent(o->{
+ second.put("type",dict.stream().filter(d-> Objects.equals(String.valueOf(d.getValue()),second.get("type"))).collect(Collectors.toList()).get(0).getLabel());
+ });
+ System.out.println(second);
+ QueryWrapper<Param>queryWrapperSecond=new QueryWrapper<>();
+ queryWrapperSecond.lambda().eq(Param::getParentId,second.get("id"));
+ List<Param> third = paramService.getBaseMapper().selectList(queryWrapperSecond);
+ third.forEach(t->{
+ Optional.ofNullable(t.getType()).ifPresent(o->{
+ t.setType(dict.stream().filter(d-> Objects.equals(String.valueOf(d.getValue()),t.getType())).collect(Collectors.toList()).get(0).getLabel());
+ });
+ });
+ System.out.println(third);
+ second.put("children",third);
+ secondMapList.add(second);
+ });
+ pojo.put("children",secondMapList);
+ all.add(pojo);
+ });
+ page1.setRecords(all);
+ return R.ok(page1);
}
/**
@@ -104,7 +148,7 @@
@SysLog("鏂板宸ュ簭鍙傛暟琛�")
@PostMapping
@PreAuthorize("@pms.hasPermission('technology_param_add')")
- public R save(@RequestBody Param param) {
+ public R save(@RequestBody ParamPlusDto param) {
return R.ok(paramService.fullSave(param));
}
--
Gitblit v1.9.3