center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 抽取 excel 数据

Browse Source
This commit is contained in:
taojinlong 2021-05-07 18:08:45 +08:00
parent 260d09a1a0
commit 9bd7de1934
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -647,12 +647,14 @@ public class DataSetTableService {
private String saveFile(MultipartFile file) throws Exception {
String filename = file.getOriginalFilename();
String suffix = filename.substring(filename.lastIndexOf(".") + 1);
filename = Md5Utils.md5(filename.substring(0, filename.length() - suffix.length()));
String dirPath = path + AuthUtils.getUser().getUsername() + "/";
File p = new File(dirPath);
if (!p.exists()) {
p.mkdirs();
}
String filePath = dirPath + filename;
String filePath = dirPath + filename + "." + suffix;
File f = new File(filePath);
FileOutputStream fileOutputStream = new FileOutputStream(f);
fileOutputStream.write(file.getBytes());

8
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -273,11 +273,11 @@ public class ExtractDataService {
jobExecutionConfiguration.setRepository(repository);
String lastCarteObjectId = Job.sendToSlaveServer(jobMeta, jobExecutionConfiguration, repository, null);
SlaveServerJobStatus jobStatus = null;
boolean running = true;
while(running) {
boolean executing = true;
while(executing) {
jobStatus = remoteSlaveServer.getJobStatus(jobMeta.getName(), lastCarteObjectId, 0);
running = jobStatus.isRunning();
if(!running)
executing = jobStatus.isRunning() || jobStatus.isWaiting();
if(!executing)
break;
Thread.sleep(1000);
}