From 50dfbd9e9375677180ee2d6bbd3593c9e97215a4 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 15 七月 2024 18:51:34 +0800
Subject: [PATCH] 数采配置添加 调整
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 14 +++++++++++---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 4 +++-
cnas-server/src/main/resources/mapper/DataConfigMapper.xml | 3 ---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 9 +++++++++
cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java | 13 ++-----------
5 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 14e33c1..f30909a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -27,6 +27,7 @@
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -166,7 +167,8 @@
@ApiModelProperty("/鏁伴噰")
@GetMapping("/text")
public Result<?> text(HttpServletRequest request) {
- return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device()));
+ List<DataConfig> list = new ArrayList<>();
+ return Result.success(DataAcquisition.dataAcquisitionEntrance(request,list));
}
@ValueClassify("璁惧")
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
index 254d103..a501281 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
@@ -32,15 +32,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚庣紑")
- private String fileType;
-
- @ApiModelProperty("閲囬泦鍦板潃")
- private String collectUrl;
-
- @ApiModelProperty("瀛樺偍鍦板潃")
- private String storageUrl;
-
@ApiModelProperty("鍏紡")
private String formula;
@@ -51,10 +42,10 @@
private String refery;
@ApiModelProperty("x")
- private Integer x;
+ private String x;
@ApiModelProperty("y")
- private Integer y;
+ private String y;
@ApiModelProperty("璁惧id")
private Integer deviceId;
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 6a2e465..a7ee499 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -118,4 +118,13 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
+ @ApiModelProperty("鏂囦欢鍚庣紑")
+ private String fileType;
+
+ @ApiModelProperty("閲囬泦鍦板潃")
+ private String collectUrl;
+
+ @ApiModelProperty("瀛樺偍鍦板潃")
+ private String storageUrl;
}
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;
}
}
diff --git a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
index 8730f30..135e544 100644
--- a/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DataConfigMapper.xml
@@ -5,9 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DataConfig">
<id column="id" property="id" />
- <result column="file_type" property="fileType" />
- <result column="collect_url" property="collectUrl" />
- <result column="storage_url" property="storageUrl" />
<result column="formula" property="formula" />
<result column="referx" property="referx" />
<result column="refery" property="refery" />
--
Gitblit v1.9.3