From 3b258a2fd69dd2c4fcf291773672cc154514569a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 22 七月 2025 17:10:53 +0800
Subject: [PATCH] 采集器.db与.mysql方法调用错误问题修复
---
src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..0d506a7 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
@@ -3,6 +3,7 @@
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ObjectUtil;
import com.chinaztt.mes.docx.dto.GetFileDto;
+import com.chinaztt.mes.docx.dto.ThicknessData;
import com.chinaztt.mes.docx.service.DocxService;
import com.chinaztt.mes.docx.util.R;
import com.chinaztt.mes.docx.util.TakeWords;
@@ -11,7 +12,7 @@
import org.springframework.stereotype.Service;
import java.io.*;
-import java.sql.SQLException;
+import java.sql.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -28,6 +29,9 @@
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));
@@ -47,7 +51,12 @@
if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
return R.failed("鏈厤缃�.db閲囬泦鏂囦欢鍚嶇О锛�");
}
- return R.ok(TakeWords.readDbFile(file, getFileDto));
+ 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));
default:
@@ -80,6 +89,7 @@
}
}
+
public static File getLatestFile(List<File> files) {
File latestFile = null;
long latestTime = 0;
--
Gitblit v1.9.3