diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index 6256d932..5d63b62c 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -96,5 +96,13 @@
3.2.1
+
+ com.github.stuxuhai
+ pinyin4j
+ 2.5.1
+ system
+ ${project.basedir}/src/main/resources/pinyin4j-2.5.0.jar
+
+
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/NeUploadExcelController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/NeUploadExcelController.java
index 63d02cfc..f72c2d4b 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/NeUploadExcelController.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/controller/NeUploadExcelController.java
@@ -1,6 +1,7 @@
package com.gccloud.dataroom.core.module.manage.controller;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gccloud.common.permission.ApiPermission;
@@ -13,6 +14,7 @@ import com.gccloud.dataroom.core.utils.DemoDataListener;
import com.gccloud.dataset.constant.DatasetConstant;
import com.gccloud.dataset.dto.DatasetDTO;
import com.gccloud.dataset.entity.DatasetEntity;
+import com.gccloud.dataset.entity.config.BaseDataSetConfig;
import com.gccloud.dataset.service.IBaseDataSetService;
import com.gccloud.dataset.service.IDatasetLabelService;
import io.swagger.annotations.Api;
@@ -26,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
+import java.util.UUID;
/**
* @author 17803
@@ -46,33 +49,50 @@ public class NeUploadExcelController {
@Autowired
private IBaseDataSetService dataSetService;
- @ApiOperation("新增Excel")
- @PostMapping("/newAdd")
+
+
+ @ApiOperation("上传Excel")
+ @PostMapping("/uploadExcel")
@ApiPermission(permissions = {DatasetConstant.Permission.Dataset.ADD})
@Transactional(rollbackFor = Exception.class)
- public R newAdd(String datasetDTO, @RequestParam("file") @RequestPart MultipartFile file) throws IOException {
- DatasetDTO datasetByJson = JSON.parseObject(datasetDTO, DatasetDTO.class);
- // IBaseDataSetService dataSetService = dataSetServiceFactory.build(datasetByJson.getDatasetType());
- String id = dataSetService.add(datasetByJson);
+ public R uploadExcel(@RequestParam("file") @RequestPart MultipartFile file,String userId) throws IOException {
+
//存储excel数据 根据id关联
+ String s = UUID.randomUUID().toString().replaceAll("-", "");
+
+ DemoDataListener demoDataListener = new DemoDataListener(neUploadExcelDao, userId, s);
// 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭
EasyExcel.read(file.getInputStream(), StuUploadExcelUser.class,
- new DemoDataListener(neUploadExcelDao, datasetByJson.getRemark(), id)).sheet().doRead();
+ new DemoDataListener(neUploadExcelDao, userId, s)).sheet().doRead();
+
+
+
+
+ return R.success(s);
+ }
+
+ @ApiOperation("分页查询excel")
+ @GetMapping("/getExcelByPage")
+ @ApiPermission(permissions = {DatasetConstant.Permission.Dataset.ADD})
+ public R getExcelByPage(String userId,Integer index,Integer size,String value) throws IOException {
+
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StuUploadExcelUser::getModule,value);
+ IPage page = new Page(index,size);
+ neUploadExcelDao.selectPage(page, wrapper);
+
+
+ R