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 | 5 +++++
pom.xml | 6 ------
src/main/java/com/chinaztt/mes/docx/util/TakeWords.java | 13 +++----------
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index b427f73..b39de63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,12 +35,6 @@
<artifactId>tess4j</artifactId>
<version>5.12.0</version>
</dependency>
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv-platform</artifactId>
- <!-- 鎸囧畾鍏蜂綋鐗堟湰鍙� -->
- <version>1.5.10</version>
- </dependency>
<!-- 澶勭悊 .xls (OLE2) 鏍煎紡 -->
<dependency>
<groupId>org.apache.poi</groupId>
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 4a45243..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
@@ -51,6 +51,11 @@
if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
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));
diff --git a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
index 12bad80..2814371 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -2,36 +2,29 @@
import cn.hutool.core.io.FileUtil;
import com.chinaztt.mes.docx.dto.GetFileDto;
+import com.chinaztt.mes.docx.dto.ThicknessData;
import com.opencsv.CSVReader;
import com.opencsv.CSVReaderBuilder;
import com.opencsv.exceptions.CsvValidationException;
-import com.chinaztt.mes.docx.dto.ThicknessData;
import net.sourceforge.tess4j.Tesseract;
import net.sourceforge.tess4j.TesseractException;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.POIXMLDocument;
import org.apache.poi.POIXMLTextExtractor;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
import org.apache.poi.hssf.usermodel.HSSFPictureData;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import javax.imageio.ImageIO;
import java.io.*;
import java.sql.*;
import java.util.*;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TakeWords {
--
Gitblit v1.9.3