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/controller/ParamController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 eec09c0..c2b8a24 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
@@ -17,20 +17,16 @@
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.util.StringUtils;
import com.chinaztt.mes.common.util.easyexcel.EasyExcelUtils;
-import com.chinaztt.mes.common.util.easyexcel.ExcelListener;
import com.chinaztt.mes.common.util.easyexcel.template.ParamTemplate;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.ztt.admin.api.entity.SysDictItem;
@@ -43,7 +39,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -224,7 +219,8 @@
public R upload(@RequestParam("file") MultipartFile file) {
try {
// EasyExcel.read(file.getInputStream(), ParamTemplate.class, new ExcelListener<ParamTemplate>()).sheet().doRead();
- EasyExcelUtils.readModelExcel(ParamTemplate.class,file);
+ List<ParamTemplate> paramTemplates = EasyExcelUtils.readModelExcel(ParamTemplate.class, file);
+ paramService.importExcelPlus(paramTemplates);
} catch (IOException e) {
e.printStackTrace();
}
--
Gitblit v1.9.3