diff --git a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java index 331422a..f3abf25 100644 --- a/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/overview/impl/ProOverviewServiceImpl.java @@ -260,9 +260,9 @@ public class ProOverviewServiceImpl implements IProOverviewService { return list.stream() .filter(item -> // 离心机入口温度 (device_type=14, order_num=4, param_type=31) - ("14".equals(item.getDeviceType()) && - "12".equals(item.getParamType()) && - Integer.valueOf(4).equals(item.getOrderNum())) || + ("28".equals(item.getDeviceType()) && + "99".equals(item.getParamType()) && + Integer.valueOf(2).equals(item.getOrderNum())) || // 离心机出水温度 (device_type=6, order_num=1, param_type=12, other_name like '%出水温度%') ("6".equals(item.getDeviceType()) && "12".equals(item.getParamType()) && @@ -290,7 +290,7 @@ public class ProOverviewServiceImpl implements IProOverviewService { // 根据条件确定设备类型名称 String deviceTypeName = ""; - if ("14".equals(item.getDeviceType()) && "12".equals(item.getParamType()) && Integer.valueOf(4).equals(item.getOrderNum())) { + if ("28".equals(item.getDeviceType()) && "99".equals(item.getParamType()) && Integer.valueOf(2).equals(item.getOrderNum())) { deviceTypeName = "离心机入口温度"; } else if ("6".equals(item.getDeviceType()) && "12".equals(item.getParamType()) && Integer.valueOf(1).equals(item.getOrderNum())) { deviceTypeName = "离心机出水温度";