From 5058481100d938bc4680725c3659757a09a2dd8a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 03 六月 2026 17:50:39 +0800
Subject: [PATCH] 采集器调整:支持文件名匹配查找
---
src/main/java/com/chinaztt/mes/docx/util/TakeWords.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
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 e563da7..284072e 100644
--- a/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
+++ b/src/main/java/com/chinaztt/mes/docx/util/TakeWords.java
@@ -7,6 +7,7 @@
import com.opencsv.CSVReader;
import com.opencsv.CSVReaderBuilder;
import com.opencsv.exceptions.CsvValidationException;
+import lombok.extern.slf4j.Slf4j;
import net.sourceforge.tess4j.Tesseract;
import net.sourceforge.tess4j.TesseractException;
import org.apache.commons.lang3.ObjectUtils;
@@ -27,6 +28,7 @@
import java.util.*;
import java.util.regex.Pattern;
+@Slf4j
public class TakeWords {
private static final String splitIdentifier = "@-@"; // 鑷畾涔夊敮涓�鏍囪瘑绗�
@@ -35,6 +37,11 @@
private static final Pattern SCIENTIFIC_PATTERN = Pattern.compile(
"^[+-]?\\d+(\\.\\d+)?[eE][+-]?\\d+$"
);
+
+ /**
+ * 澶勭悊mdb鏁版嵁搴撴帓闄ゅ瓧娈电被鍨�
+ */
+ private final static List<String> MDB_EXCLUDE_TYPES = Arrays.asList("java.sql.Blob");
public static Object readWordFile(File file) {
String result = "";
@@ -243,11 +250,17 @@
rs = preparedStatement.executeQuery();
ResultSetMetaData data = rs.getMetaData();
while (rs.next()) {
- Map<String, String> map = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
for (int i = 1; i <= data.getColumnCount(); i++) {
//鍒楀悕
String columnName = data.getColumnName(i);
- map.put(columnName, rs.getString(i));
+ //鍒楀瓧娈电被鍨�
+ String columnClassName = data.getColumnClassName(i);
+ Object columnValue = null;
+ if(!MDB_EXCLUDE_TYPES.contains(columnClassName)){
+ columnValue = rs.getObject(i);
+ }
+ map.put(columnName, columnValue);
}
list.add(map);
}
@@ -477,7 +490,7 @@
return Result.failed("鏁版嵁搴撳悕鎴栬〃鍚嶄笉鑳戒负绌�");
}
// 鏁版嵁搴撹繛鎺ヤ俊鎭�
- String url = "jdbc:sqlserver://localhost:1433;DatabaseName="+dbName+";encrypt=true;trustServerCertificate=true";
+ String url = "jdbc:sqlserver://localhost:1433;DatabaseName="+dbName+";encrypt=false;trustServerCertificate=true";
Connection connection = null;
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;
@@ -489,17 +502,17 @@
String sql = "SELECT * FROM "+table+" WHERE 1=1";
if(StringUtils.isNotBlank(getFileDto.getMdbEntrustCode()) ){
- sql+=" AND (" + getFileDto.getMdbEntrustCode() + " = TRIM('" + getFileDto.getEntrustCode()+ "')";
+ sql+=" AND (" + getFileDto.getMdbEntrustCode() + " = LTRIM(RTRIM('" + getFileDto.getEntrustCode()+ "'))";
if(StringUtils.isNotBlank(getFileDto.getLotBatchNo())){
- sql+=" OR "+ getFileDto.getMdbEntrustCode() + " = TRIM('" + getFileDto.getLotBatchNo()+ "')";
+ sql+=" OR "+ getFileDto.getMdbEntrustCode() + " = LTRIM(RTRIM('" + getFileDto.getLotBatchNo()+ "'))";
}
sql+=")";
}
if(StringUtils.isNotBlank(getFileDto.getMdbSampleCode())){
sql+=" AND " + getFileDto.getMdbSampleCode() + " = '" + getFileDto.getSampleCode() + "'";
}
- if(StringUtils.isNotBlank(getFileDto.getCableTag())){
- sql+=" AND Color = '" + getFileDto.getCableTag() + "'";
+ if(StringUtils.isNotBlank(getFileDto.getLastSql())){
+ sql+=getFileDto.getLastSql();
}
// 鍒涘缓 PreparedStatement 瀵硅薄鎵ц SQL
preparedStatement = connection.prepareStatement(sql);
@@ -537,4 +550,5 @@
}
return tableMap;
}
+
}
--
Gitblit v1.9.3