yaowanxin
昨天 abfe636ee5c8ad51af20505bb4e4054c2b603cb7
增添标识类,方法名
已修改2个文件
已添加1个文件
28 ■■■■■ 文件已修改
cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/controller/WeightController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cnas-device/src/main/java/com/ruoyi/device/constant/ElongationMqttConstants.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.ruoyi.device.constant;
/**
 * ä¼¸é•¿çއmqtt属性【dataStream】的标识常量
 */
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";
}
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 ä¸­çš„对应键或存入空数组,这里选择存入空数组
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);
        }
    }
    /**