From 996952515023bc678a0af8df2075b61fcb29ffc3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 14 七月 2025 17:43:05 +0800
Subject: [PATCH] 添.xls
---
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 5065c0b..02ec469 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ruoyi.device.dto.DeviceCollectionDto;
import com.ruoyi.device.pojo.DataConfig;
import com.ruoyi.device.pojo.Device;
import com.ruoyi.framework.exception.ErrorException;
@@ -76,9 +77,11 @@
"&mdbEntrustCode=" + device.getEntrustCode() +
"&mdbSampleCode=" + device.getSampleCode() +
"&dbFileName=" + device.getDbFileName();
+ System.out.println("璇锋眰鐨� URL: " + http);
String result = null;
try {
result = HttpUtil.get(http);
+ System.out.println("璇锋眰杩斿洖缁撴灉: " + result);
} catch (IORuntimeException e) {
e.printStackTrace();
throw new ErrorException("鎵�鍦ㄧ數鑴戞湭瀹夎鎴栨湭鍚姩锛歀IMS鏂囦欢閲囬泦鍣紒");
@@ -113,6 +116,9 @@
case ".xlsx":
map = analysisList(data, userMap, device, entrustCode, sampleCode);
break;
+ case ".xls":
+ map = analysisString(data, userMap, device, entrustCode, sampleCode);
+ break;
case ".txt":
map = analysisTxt(data, userMap, device, entrustCode, sampleCode);
break;
@@ -120,7 +126,7 @@
map = analysisList(data, userMap, device, entrustCode, sampleCode);
break;
case ".mdb":
- // 鍒ゆ柇鏄惁鏄媺鍔涙満
+ // 鍒ゆ柇鏄惁鏄媺鍔涙満JCZX-ZB-FF01014
if (device.getManagementNumber().equals("JCZX-ZB-FF01014")) {
map = analysisMdbByPull(data, userMap, device, cableTag);
} else {
--
Gitblit v1.9.3