From 3e08f23e92e24734e937b99a128da9b217ffef46 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 十月 2025 17:09:40 +0800
Subject: [PATCH] 数采调整
---
src/main/java/com/chinaztt/mes/docx/service/impl/DocxServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..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
@@ -3,16 +3,16 @@
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;
import net.sourceforge.tess4j.TesseractException;
-import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
-import java.io.*;
-import java.sql.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -23,7 +23,7 @@
@Override
public R<?> getFile(GetFileDto getFileDto) throws IOException, SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, TesseractException {
File file = getFileStart(getFileDto.getFilePath(), getFileDto.getFileExtension());
- if (file != null) {
+ if (file != null && !file.exists()) {
return R.failed("鏈煡璇㈠埌璇ヨ矾寰勶細" + getFileDto.getFilePath() + "涓嬪瓨鍦細" + getFileDto.getFileExtension() + "缁撳熬鐨勬枃浠讹紒");
}
switch (getFileDto.getFileExtension()) {
@@ -59,6 +59,8 @@
return R.ok(TakeWords.getMysqlFile(getFileDto));
case ".png":
return R.ok(TakeWords.readPngFile(file));
+ case ".mqtt":
+ return R.ok("mqtt---");
default:
return R.failed("鍚庣紑鍚嶉厤缃敊璇紒");
}
@@ -112,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