From abfe636ee5c8ad51af20505bb4e4054c2b603cb7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 01 八月 2025 12:28:44 +0800
Subject: [PATCH] 增添标识类，方法名
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java | 10 ++--------
cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java | 4 ++--
cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java | 14 ++++++++++++++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java b/cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java
new file mode 100644
index 0000000..1d8026c
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java
@@ -0,0 +1,14 @@
+package com.ruoyi.device.constant;
+
+/**
+ * 浼搁暱鐜噈qtt灞炴�с�恉ataStream銆戠殑鏍囪瘑甯搁噺
+ */
+public class ElongationMqttConstants {
+ public final static String NSTSSC_TSSC_SCL = "NSTSSC.TSSC.SCL";
+
+ public final static String NSTSSC_TSSC_LSSDSD = "NSTSSC.TSSC.LSSDSD";
+
+ public final static String NSTSSC_TSSC_WY = "NSTSSC.TSSC.WY";
+ public final static String NSTSSC_TSSC_BJSD = "NSTSSC.TSSC.BJSD";
+
+}
\ No newline at end of file
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
index 9e6676f..8c3dfd0 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java
@@ -24,7 +24,7 @@
List<Double> weightList = weightRequest.getWeights();
// 鍦ㄨ繖閲屾坊鍔犳暟鎹鐞嗛�昏緫锛屼緥濡傛墦鍗般�佸瓨鍌ㄥ埌鏁版嵁搴撶瓑
System.out.println("鎺ユ敹鍒扮殑鏁版嵁: " + weightList);
- processThreeTimesValueDataStream(weightList, WeightRequestDto.DENSITY);
+ processValueDataStream(weightList, WeightRequestDto.DENSITY);
// 澶勭悊鎴愬姛杩斿洖 200 鐘舵�佺爜鍜屾秷鎭�
return ResponseEntity.ok("鏁版嵁澶勭悊鎴愬姛");
@@ -34,7 +34,7 @@
}
}
- private void processThreeTimesValueDataStream(List<Double> weightList, String dataStream) {
+ private void processValueDataStream(List<Double> weightList, String dataStream) {
// 澶勭悊 weightList 涓� null 鐨勬儏鍐�
if (weightList == null) {
// 鑻� weightList 涓� null锛屽彲閫夋嫨鍒犻櫎 Redis 涓殑瀵瑰簲閿垨瀛樺叆绌烘暟缁勶紝杩欓噷閫夋嫨瀛樺叆绌烘暟缁�
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
index 8fa0b1c..a44f275 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.RedisUtil;
import com.ruoyi.device.constant.DCResistanceMqttConstants;
+import com.ruoyi.device.constant.ElongationMqttConstants;
import com.ruoyi.device.mapper.CollectBridgeMapper;
import com.ruoyi.device.pojo.CollectBridge;
import com.ruoyi.device.service.CollectBridgeService;
@@ -115,14 +116,7 @@
// 澶勭悊 NSDQCS.DQCS.DZZ 鏁版嵁
processSingleValueDataStream(dataList, DCResistanceMqttConstants.NSDQCS_DQCS_DZZ);
// 澶勭悊 NSTSSC.TSSC.WY 鏁版嵁
- processThreeTimesValueDataStream(dataList, DCResistanceMqttConstants.NSTSSC_TSSC_WY);
-// DCResistanceMqttVO dcResistanceMqttVO = dataList.stream().filter(f -> StringUtils.equals(f.getDataStream(), DCResistanceMqttConstants.NSDQCS_DQCS_DZZ)).findFirst().orElse(null);
-// if(Objects.nonNull(dcResistanceMqttVO)){
-// List<DCResistanceMqttVO.DataPoint> dataPoints = dcResistanceMqttVO.getDataPoints();
-// BigDecimal value = CollectionUtil.isNotEmpty(dataPoints)?dataPoints.get(0).getValue():BigDecimal.ZERO;
-// //淇濆瓨瀹為檯鐢甸樆鍊煎埌redis
-// RedisUtil.set(DCResistanceMqttConstants.NSDQCS_DQCS_DZZ,value.doubleValue());
-// }
+ processThreeTimesValueDataStream(dataList, ElongationMqttConstants.NSTSSC_TSSC_WY);
}
}
/**
--
Gitblit v1.9.3