From 7f5af45919cbda45e8be3b82d613708fad93718b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 15 七月 2024 21:00:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index 6864ecb..7766817 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -1,9 +1,10 @@
package com.yuanchu.mom.utils;
-import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.vo.Result;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
public class DataAcquisition {
@@ -13,12 +14,19 @@
private static final String MOVEFILE = "/lims/moveFile";
- public static Result<?> dataAcquisitionEntrance(HttpServletRequest request, Device device) {
+ public static Result<?> dataAcquisitionEntrance(HttpServletRequest request, List<DataConfig> dataConfig) {
String ipAddress = request.getRemoteAddr();
// 闃叉鍥炵幆鍦板潃鍙樹负IPv6
String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
-// String http = HTTP + ip + GETFILE + "?filePath=" + device.getCollectUrl() + "&fileExtension=" + device.getFileExtension();
+// String http = HTTP + ip + GETFILE + "?filePath=" + dataConfig.get(0).getCollectUrl() + "&fileExtension=" + dataConfig.get(0).getFileType();
// String result = HttpUtil.get(http);
+// JSONObject jsonObject = JSON.parseObject(result);
+// if (Objects.equals(jsonObject.get("code"), 1)) {
+// throw new ErrorException(jsonObject.get("message").toString());
+// } else {
+// Object data = jsonObject.get("data");
+//
+// }
return null;
}
}
--
Gitblit v1.9.3