风机运行列表风机没有排序问题处理、风机功率曲线有功功率只保留了一位小数

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -569,8 +569,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<String> axisData = new ArrayList<>();
         Integer size = indicatorDataListWindSpeed.size() > indicatorDataListActivePower.size() ? indicatorDataListActivePower.size() : indicatorDataListWindSpeed.size();
         for (int i = 0; i < size; i++) {
-            windSpeeds.add(indicatorDataListWindSpeed.get(i).getValue());
-            activePowers.add(indicatorDataListActivePower.get(i).getValue());
+            windSpeeds.add(String.format(CommonConstans.Twodecimalplaces,indicatorDataListWindSpeed.get(i).getValue()));
+            activePowers.add(String.format(CommonConstans.Twodecimalplaces,indicatorDataListActivePower.get(i).getValue()));
             axisData.add(DateUtil.format(indicatorDataListWindSpeed.get(i).getCreatedTime(), "HH:mm"));
         }
         List<Map<String, Object>> seriesData = new ArrayList<>();
@@ -1015,7 +1015,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             result.setTotal(statusMaps.size());
             i += 1;
             try {
-                emqKeeper.getMqttClient().publish(stationId + "/fj/group" + i, JSON.toJSONString(result).getBytes(), 0, false);
+                emqKeeper.getMqttClient().publish(stationId + "/fj/group1" + i, JSON.toJSONString(result).getBytes(), 1, true);
             } catch (MqttException e) {
                 log.info("消息发送失败");
                 e.printStackTrace();