From b1ff3475c44738107398f4e502d9b54aac97fc48 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 十月 2025 17:14:47 +0800
Subject: [PATCH] 数采调整2
---
src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java b/src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java
index 1843c1a..c9dcdfd 100644
--- a/src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java
+++ b/src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java
@@ -7,10 +7,11 @@
import com.chinaztt.mes.docx.util.R;
import com.chinaztt.mes.docx.util.TakeWords;
import net.sourceforge.tess4j.TesseractException;
-import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -22,12 +23,15 @@
@Override
public R<?> getFile(GetFileDto getFileDto) throws IOException, SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, TesseractException {
File file = getFileStart(getFileDto.getFilePath(), getFileDto.getFileExtension());
- if (!file.exists()) {
+ if (file != null && !file.exists()) {
return R.failed("鏈煡璇㈠埌璇ヨ矾寰勶細" + getFileDto.getFilePath() + "涓嬪瓨鍦細" + getFileDto.getFileExtension() + "缁撳熬鐨勬枃浠讹紒");
}
switch (getFileDto.getFileExtension()) {
case ".docx":
return R.ok(TakeWords.readWordFile(file));
+ //鍚庣紑涓�.xls鐨勬枃浠�
+ case ".xls":
+ return R.ok(TakeWords.readExcelxlsFile(file));
case ".xlsx":
try {
return R.ok(TakeWords.readExcelFile(file));
@@ -48,8 +52,15 @@
return R.failed("鏈厤缃�.db閲囬泦鏂囦欢鍚嶇О锛�");
}
return R.ok(TakeWords.readDbFile(file, getFileDto));
+ case ".mysql":
+ if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
+ return R.failed("鏈厤缃�.mysql閲囬泦鏂囦欢鍚嶇О锛�");
+ }
+ return R.ok(TakeWords.getMysqlFile(getFileDto));
case ".png":
return R.ok(TakeWords.readPngFile(file));
+ case ".mqtt":
+ return R.ok("mqtt---");
default:
return R.failed("鍚庣紑鍚嶉厤缃敊璇紒");
}
@@ -80,6 +91,7 @@
}
}
+
public static File getLatestFile(List<File> files) {
File latestFile = null;
long latestTime = 0;
@@ -102,10 +114,11 @@
boolean b;
switch (fileExtension) {
case ".docx":
- b = i.getName().endsWith(".docx") || i.getName().endsWith(".doc");
+ b = i.getName().endsWith(".docx") || i.getName().endsWith(".doc") || i.getName().endsWith(".DOCX") || i.getName().endsWith(".DOC");
break;
case ".xlsx":
- b = i.getName().endsWith(".xlsx") || i.getName().endsWith(".xls");
+
+ b = i.getName().endsWith(".xlsx") || i.getName().endsWith(".xls") || i.getName().endsWith(".XLSX") || i.getName().endsWith(".XLS");
break;
default:
b = i.getName().endsWith(fileExtension);
--
Gitblit v1.9.3