From bf95078dab81dcd0639fdb1a41e998b31c940fb1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 24 三月 2026 09:37:04 +0800
Subject: [PATCH] 采集器调整3
---
src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 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 2748d2d..8a55cec 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,69 +3,93 @@
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.handler.SerialPortListener;
+import com.chinaztt.mes.docx.pojo.TestBatch;
import com.chinaztt.mes.docx.service.DocxService;
-import com.chinaztt.mes.docx.util.R;
+import com.chinaztt.mes.docx.util.XMLFileListener;
+import com.chinaztt.mes.docx.util.Result;
import com.chinaztt.mes.docx.util.TakeWords;
+import lombok.extern.slf4j.Slf4j;
import net.sourceforge.tess4j.TesseractException;
-import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.io.*;
-import java.sql.*;
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@Service
+@Slf4j
public class DocxServiceImpl implements DocxService {
+ @Autowired
+ private SerialPortListener serialPortListener;
+
@Override
- public R<?> getFile(GetFileDto getFileDto) throws IOException, SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, TesseractException {
- File file = getFileStart(getFileDto.getFilePath(), getFileDto.getFileExtension());
- if (file != null) {
- return R.failed("鏈煡璇㈠埌璇ヨ矾寰勶細" + getFileDto.getFilePath() + "涓嬪瓨鍦細" + getFileDto.getFileExtension() + "缁撳熬鐨勬枃浠讹紒");
+ public Result<?> getFile(GetFileDto getFileDto) throws IOException, SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, TesseractException {
+ String fileExtension = getFileDto.getFileExtension();
+ if(StringUtils.equals(".pngInExcel",getFileDto.getFileExtension())){
+ fileExtension = ".xls";
+ }
+ File file = getFileStart(getFileDto.getFilePath(), fileExtension);
+ if (file != null && !file.exists()) {
+ return Result.failed("鏈煡璇㈠埌璇ヨ矾寰勶細" + getFileDto.getFilePath() + "涓嬪瓨鍦細" + getFileDto.getFileExtension() + "缁撳熬鐨勬枃浠讹紒");
}
switch (getFileDto.getFileExtension()) {
case ".docx":
- return R.ok(TakeWords.readWordFile(file));
- //鍚庣紑涓�.xls鐨勬枃浠�
+ return Result.ok(TakeWords.readWordFile(file));
+ case ".pngInExcel":
+ return Result.ok(TakeWords.readPngContextInExcel(file));
case ".xls":
- return R.ok(TakeWords.readExcelxlsFile(file));
case ".xlsx":
try {
- return R.ok(TakeWords.readExcelFile(file));
- } catch (FileNotFoundException e) {
- return R.failed("鍙︿竴涓▼搴忔鍦ㄤ娇鐢ㄦ鏂囦欢锛屾棤娉曡繘琛屾暟鎹噰闆嗐��");
+ return Result.ok(TakeWords.readExcelFile(file));
+ } catch (Exception e) {
+ return Result.failed("鍙︿竴涓▼搴忔鍦ㄤ娇鐢ㄦ鏂囦欢锛屾棤娉曡繘琛屾暟鎹噰闆嗐��");
}
case ".txt":
- return R.ok(TakeWords.readTxtFile(file));
+ return Result.ok(TakeWords.readTxtFile(file));
case ".csv":
- return R.ok(TakeWords.readCsvFile(file));
+ return Result.ok(TakeWords.readCsvFile(file));
case ".mdb":
if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
- return R.failed("鏈厤缃�.mdb閲囬泦鏂囦欢鍚嶇О锛�");
+ return Result.failed("鏈厤缃�.mdb閲囬泦鏂囦欢鍚嶇О锛�");
}
- return R.ok(TakeWords.readMdbFile(file, getFileDto));
+ return Result.ok(TakeWords.readMdbFile(file, getFileDto));
case ".db":
if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
- return R.failed("鏈厤缃�.db閲囬泦鏂囦欢鍚嶇О锛�");
+ return Result.failed("鏈厤缃�.db閲囬泦鏂囦欢鍚嶇О锛�");
}
- return R.ok(TakeWords.readDbFile(file, getFileDto));
+ return Result.ok(TakeWords.readDbFile(file, getFileDto));
case ".mysql":
if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
- return R.failed("鏈厤缃�.mysql閲囬泦鏂囦欢鍚嶇О锛�");
+ return Result.failed("鏈厤缃�.mysql閲囬泦鏂囦欢鍚嶇О锛�");
}
- return R.ok(TakeWords.getMysqlFile(getFileDto));
+ return Result.ok(TakeWords.getMysqlFile(getFileDto));
case ".png":
- return R.ok(TakeWords.readPngFile(file));
+ return Result.ok(TakeWords.readPngFile(file));
+ case ".mqtt":
+ return Result.ok("mqtt---");
+ case ".serialPort":
+ List<Double> valList = new ArrayList<>(serialPortListener.dataList);
+ serialPortListener.dataList.clear();
+ return Result.ok(valList);
+ case ".sqlserver":
+ if (ObjectUtil.isEmpty(getFileDto.getDbFileName()) || Objects.equals(getFileDto.getDbFileName(), "null")) {
+ return Result.failed("鏈厤缃�.sqlserver閲囬泦鏂囦欢鍚嶇О锛�");
+ }
+ return Result.ok(TakeWords.readSqlServerDataBase(getFileDto));
default:
- return R.failed("鍚庣紑鍚嶉厤缃敊璇紒");
+ return Result.failed("鍚庣紑鍚嶉厤缃敊璇紒");
}
}
@Override
- public R<?> moveFile(String startFilePath, String endFilePath, String fileType) {
+ public Result<?> moveFile(String startFilePath, String endFilePath, String fileType) {
// 婧愭枃浠惰矾寰�
File startFile= getFileStart(startFilePath, fileType);
// 鐩殑鐩綍璺緞
@@ -80,15 +104,14 @@
try {
// 璋冪敤File绫荤殑鏍稿績鏂规硶renameTo
if (startFile.renameTo(endFile)) {
- return R.ok("鏂囦欢绉诲姩鎴愬姛锛�");
+ return Result.ok("鏂囦欢绉诲姩鎴愬姛锛�");
} else {
- return R.failed("鏂囦欢绉诲姩澶辫触锛�");
+ return Result.failed("鏂囦欢绉诲姩澶辫触锛�");
}
}catch(Exception e) {
- return R.failed("鏂囦欢绉诲姩鍑虹幇寮傚父锛�");
+ return Result.failed("鏂囦欢绉诲姩鍑虹幇寮傚父锛�");
}
}
-
public static File getLatestFile(List<File> files) {
File latestFile = null;
@@ -112,10 +135,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);
@@ -127,4 +151,12 @@
});
return getLatestFile(list);
}
+
+ @Override
+ public void readXml() {
+ XMLFileListener fileListener = new XMLFileListener();
+ List<TestBatch> testBatches = fileListener.explainXml(new File("C:\\Users\\27233\\Desktop\\251117鏁伴噰鏂囦欢\\鏁伴噰鏂囦欢\\鍏夎氨浠猂esults_20251018133246.xml"));
+ testBatches.forEach(System.out::println);
+ }
+
}
--
Gitblit v1.9.3