pms 成套监控 参数调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/devicegroup/IotDeviceGroupController.java

@@ -202,6 +202,8 @@ public class IotDeviceGroupController {
                                     monitors.add(monitor);
                                 }
                             });
+                            // 增压机参数 列表 逆序
+                            Collections.reverse(monitors);
                         }
                         resultMap.put("增压机", monitors);
                     }
@@ -257,10 +259,14 @@ public class IotDeviceGroupController {
                         List<IotDeviceGroupMonitorVO> monitors = new ArrayList<>();
                         if (CollUtil.isNotEmpty(rows)) {
                             rows.forEach(row -> {
-                                if (row.getModelName().contains("进口温度") || row.getModelName().contains("出口温度") || row.getModelName().contains("出口压力") ||
-                                        row.getModelName().contains("冷干机运行状态") || row.getModelName().contains("风机运行状态")) {
+                                if (row.getModelName().contains("进口温度") || "出口温度".equals(row.getModelName()) || row.getModelName().contains("出口压力")
+                                        || row.getModelName().contains("风机运行状态")) {
                                     IotDeviceGroupMonitorVO monitor = new IotDeviceGroupMonitorVO();
-                                    monitor.setModelName(row.getModelName());
+                                    if (row.getModelName().contains("出口压力")) {
+                                        monitor.setModelName("出口压力");
+                                    } else {
+                                        monitor.setModelName(row.getModelName());
+                                    }
                                     monitor.setValue(row.getValue());
                                     monitors.add(monitor);
                                 }
@@ -276,13 +282,13 @@ public class IotDeviceGroupController {
                             outTemp.setValue("");
                             monitors.add(outTemp);
                             IotDeviceGroupMonitorVO outPress = new IotDeviceGroupMonitorVO();
-                            outPress.setModelName("空气处理撬出口压力");
+                            outPress.setModelName("出口压力");
                             outPress.setValue("");
                             monitors.add(outPress);
-                            IotDeviceGroupMonitorVO status = new IotDeviceGroupMonitorVO();
+                            /* IotDeviceGroupMonitorVO status = new IotDeviceGroupMonitorVO();
                             status.setModelName("冷干机运行状态");
                             status.setValue("");
-                            monitors.add(status);
+                            monitors.add(status); */
                             IotDeviceGroupMonitorVO windStatus = new IotDeviceGroupMonitorVO();
                             windStatus.setModelName("风机运行状态");
                             windStatus.setValue("");
@@ -357,7 +363,7 @@ public class IotDeviceGroupController {
                                 if (row.getModelName().contains("累计运行时间") || row.getModelName().contains("累计加载时间") || row.getModelName().contains("排气压力") ||
                                         row.getModelName().contains("排气温度") || row.getModelName().contains("环境温度") || row.getModelName().contains("系统压力")
                                         || row.getModelName().contains("喷油温度") || row.getModelName().contains("喷油压力") ||
-                                        row.getModelName().contains("运行状态") || row.getModelName().contains("加载状态")) {
+                                        row.getModelName().contains("运行状态")) {
                                     IotDeviceGroupMonitorVO monitor = new IotDeviceGroupMonitorVO();
                                     // 属性名称去掉 空压x
                                     // 获取"空压x"前缀部分
@@ -505,10 +511,10 @@ public class IotDeviceGroupController {
                     outPress.setModelName("空气处理撬出口压力");
                     outPress.setValue("");
                     monitors.add(outPress);
-                    IotDeviceGroupMonitorVO status = new IotDeviceGroupMonitorVO();
+                    /* IotDeviceGroupMonitorVO status = new IotDeviceGroupMonitorVO();
                     status.setModelName("冷干机运行状态");
                     status.setValue("");
-                    monitors.add(status);
+                    monitors.add(status); */
                     IotDeviceGroupMonitorVO windStatus = new IotDeviceGroupMonitorVO();
                     windStatus.setModelName("风机运行状态");
                     windStatus.setValue("");

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -769,11 +769,11 @@ public class IotRhDailyReportController {
                 BigDecimal power = reportVO.getDailyPowerUsage();
                 BigDecimal gas = reportVO.getDailyGasInjection();
                 if (power.compareTo(BigDecimal.ZERO) > 0) {
-                    BigDecimal tempResult = gas.divide(power, 4, RoundingMode.HALF_UP);
+                    BigDecimal tempResult = gas.divide(power, 2, RoundingMode.HALF_UP);
                     if (deptName.contains("塔里木") || deptName.contains("吐哈")) {
                         reportVO.setGasElectricityRatio(tempResult);
                     } else {
-                        reportVO.setGasElectricityRatio(tempResult.divide(BigDecimal.valueOf(1.07), 4, RoundingMode.HALF_UP));
+                        reportVO.setGasElectricityRatio(tempResult.divide(BigDecimal.valueOf(1.07), 2, RoundingMode.HALF_UP));
                     }
                 }
             }