"scada压力数据存储"

tofly-zhongmou-gas/service/zmourq/src/main/java/com/tofly/zmrq/mqtt/MqttMessageHandler.java

@@ -101,7 +101,7 @@ public class MqttMessageHandler implements MessageHandler {
                 Scada scadaHistory = new Scada();
                 scadaHistory.setId(SnowFlake.nextId());
                 scadaHistory.setCode(scadaMqttInfo.getCode() + "_" + "temperature");
-                scadaHistory.setValue(String.valueOf(indexData.getTemperature()));
+                scadaHistory.setValue(String.valueOf(BigDecimal.valueOf(indexData.getTemperature()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)));
                 scadaHistory.setUnit("℃");
                 scadaHistory.setScadaTime(DateUtil.parse(indexData.getScadaTime(), "yyyy-MM-dd HH:mm:ss"));
                 scadaHistory.setUpdateTime(DateUtil.parse(scadaMqttInfo.getReportTime(), "yyyy-MM-dd HH:mm:ss"));

tofly-zhongmou-gas/service/zmourq/src/main/java/com/tofly/zmrq/service/impl/ScadaDtuServiceImpl.java

@@ -40,6 +40,22 @@ public class ScadaDtuServiceImpl extends ServiceImpl<ScadaDtuMapper, ScadaDtu> i
         realData.forEach(info -> {
             List<ScadaStationDtuDataResult> scadaDyuDataList = info.getScadaDyuDataList();
             scadaDyuDataList.forEach(data -> {
+                // 封装指标简称
+                if (data.getFieldName().contains("pressure")) {
+                    data.setFieldShortDesc(info.getDtuId() + "_" + "压力");
+                } else
+                if (data.getFieldName().contains("temperature")) {
+                    data.setFieldShortDesc(info.getDtuId() + "_" + "温度");
+                }
+                if (data.getFieldName().contains("signalStrength")) {
+                    data.setFieldShortDesc(info.getDtuId() + "_" + "信号强度");
+                }
+                if (data.getFieldName().contains("pressureMax")) {
+                    data.setFieldShortDesc(info.getDtuId() + "_" + "压⼒最大值");
+                }
+                if (data.getFieldName().contains("pressureMin")) {
+                    data.setFieldShortDesc(info.getDtuId() + "_" + "压⼒最⼩值");
+                }
                 // 判断是否自定义报警开启
                 String flag = data.getFlag();
                 if (ComConstans.YES.equals(flag)) {