添.xls

yaowanxin

4 天以前 996952515023bc678a0af8df2075b61fcb29ffc3

 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("所在电脑未安装或未启动：LIMS文件采集器！");
@@ -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 {