From 6c8973d78b04b1aa132dccbd478ba8abbcf2b6c1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 25 四月 2025 09:10:21 +0800
Subject: [PATCH] 1.国产网分仪 2.可靠性计划成品计划
---
cnas-device/src/main/java/com/ruoyi/device/controller/NA7672LTCPController.java | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/NA7672LTCPController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/NA7672LTCPController.java
index f2a35df..8758417 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/NA7672LTCPController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/NA7672LTCPController.java
@@ -8,12 +8,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.*;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@@ -34,42 +32,62 @@
@ApiOperation(value = "鑾峰彇缃戝垎浠墍鏈夊��", notes = "鑾峰彇缃戝垎浠墍鏈夊��")
@PostMapping("/getTCPValuesNew")
public Result<?> getTCPValuesNew(@RequestBody NA7672LRequestBean requestBean) throws IOException, InterruptedException {
- List<NA7672LValueVO> valueList = new ArrayList<>();
- //璁剧疆榛樿閰嶇疆锛屽彲鍦▂ml閲岃繘琛岄厤缃�
- String serverIp = requestBean.getServerIp();
- int serverPort = requestBean.getServerPort();
- NA7672LTCPClientUtils tcpClient = new NA7672LTCPClientUtils(serverIp, serverPort);
- //璁剧疆鍏ㄩ儴閫氶亾锛堢晫闈ave/recall-璋冨紡2锛岄渶瑕佹湰鍦版湁state02鏂囦欢锛�
- tcpClient.initMemory(requestBean.getMemoryDir());
- String valueUnit = this.getMemoryDirName(requestBean.getMemoryDir());
- //寤惰繜涓ょ鍐嶅彇鍊�
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+// List<NA7672LValueVO> valueList = new ArrayList<>();
+// //璁剧疆榛樿閰嶇疆锛屽彲鍦▂ml閲岃繘琛岄厤缃�
+// String serverIp = requestBean.getServerIp();
+// int serverPort = requestBean.getServerPort();
+// NA7672LTCPClientUtils tcpClient = new NA7672LTCPClientUtils(serverIp, serverPort);
+// //璁剧疆鍏ㄩ儴閫氶亾锛堢晫闈ave/recall-璋冨紡2锛岄渶瑕佹湰鍦版湁state02鏂囦欢锛�
+// tcpClient.initMemory(requestBean.getMemoryDir());
+// String valueUnit = this.getMemoryDirName(requestBean.getMemoryDir());
+// //寤惰繜涓ょ鍐嶅彇鍊�
+// try {
+// Thread.sleep(2000);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
+// List<NA7672LValueVO> rs = new ArrayList<>();
+// if (valueUnit.equals("state01")) {
+// rs = tcpClient.getState01AllValue(requestBean);
+// } else if (valueUnit.equals("state02")) {
+// rs = tcpClient.getState02AllValue(requestBean);
+// } else if (valueUnit.equals("state03")) {
+// rs = tcpClient.getState03AllValue(requestBean);
+// } else if (valueUnit.equals("state04")) {
+// rs = tcpClient.getState04AllValue(requestBean);
+// } else if (valueUnit.equals("state05")) {
+// rs = tcpClient.getState05AllValue(requestBean);
+// } else if (valueUnit.equals("state06")) {
+// rs = tcpClient.getState06AllValue(requestBean);
+// } else if (valueUnit.equals("state07")) {
+// rs = tcpClient.getState07AllValue(requestBean);
+// } else if (valueUnit.equals("state08")) {
+// rs = tcpClient.getState08AllValue(requestBean);
+// } else if (valueUnit.equals("autorec")) {
+// rs = tcpClient.getStateAutoRecAllValue(requestBean);
+// } else {
+//
+// }
+// System.out.println(rs);
+// return Result.success(rs);
List<NA7672LValueVO> rs = new ArrayList<>();
- if (valueUnit.equals("state01")) {
- rs = tcpClient.getState01AllValue(requestBean);
- } else if (valueUnit.equals("state02")) {
- rs = tcpClient.getState02AllValue(requestBean);
- } else if (valueUnit.equals("state03")) {
- rs = tcpClient.getState03AllValue(requestBean);
- } else if (valueUnit.equals("state04")) {
- rs = tcpClient.getState04AllValue(requestBean);
- } else if (valueUnit.equals("state05")) {
- rs = tcpClient.getState05AllValue(requestBean);
- } else if (valueUnit.equals("state06")) {
- rs = tcpClient.getState06AllValue(requestBean);
- } else if (valueUnit.equals("state07")) {
- rs = tcpClient.getState07AllValue(requestBean);
- } else if (valueUnit.equals("state08")) {
- rs = tcpClient.getState08AllValue(requestBean);
- } else if (valueUnit.equals("autorec")) {
- rs = tcpClient.getStateAutoRecAllValue(requestBean);
- } else {
+ // 绀轰緥鏁版嵁娣诲姞
+ rs.add(new NA7672LValueVO(3, 1, 1, 1, "swr_155m", null, null, new BigDecimal("299892.062500"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 1, 2, 1, "swr_30m", null, null, new BigDecimal("314821.968750"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 3, 1, 1, "swr_701m", null, null, new BigDecimal("332.007080078"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 3, 2, 1, "swr_700m", null, null, new BigDecimal("354.251983643"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 4, 1, 1, "swr_1713m", null, null, new BigDecimal("47.4854316711"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 4, 2, 1, "swr_1700m", null, null, new BigDecimal("45.4008331299"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(4, 5, 1, 1, "swr_1902m", null, null, new BigDecimal("37.0886840820"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 5, 2, 1, "swr_1913m", null, null, new BigDecimal("36.3293724060"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 6, 1, 1, "swr_2345m", null, null, new BigDecimal("24.7591514587"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 6, 2, 1, "swr_2324m", null, null, new BigDecimal("22.8147945404"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 7, 1, 1, "swr_3301m", null, null, new BigDecimal("12.0206012726"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 7, 2, 1, "swr_3324m", null, null, new BigDecimal("10.9548406601"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 8, 1, 1, "swr_4800m", null, null, new BigDecimal("5.30891036987"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(3, 8, 2, 1, "swr_4806m", null, null, new BigDecimal("5.10930156708"), null, null, null, 1));
+ rs.add(new NA7672LValueVO(2, 2, 1, -1, "impedance_mean", null, null, new BigDecimal("-8.24090110890"), null, null, null, 1));
- }
return Result.success(rs);
}
--
Gitblit v1.9.3