diff --git a/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java b/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java index 0541368d..f4e50de1 100644 --- a/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java +++ b/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java @@ -34,5 +34,11 @@ public class HomeWindTurbineMatrixDataVoVo { */ private Double nominalCapacity; + private String deviceCode; + private Map attributeMap; + + + + } diff --git a/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java b/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java index 956a8b63..403e48ab 100644 --- a/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java +++ b/das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java @@ -11,7 +11,7 @@ import java.util.List; public interface TemperatureDashboardService { /** * 根据设备id获取该设备对应的温度相关测点的限制配置信息 - * @param deviceId 设备id + * @param temperatureLimitDto 设备信息 * @return 限制配置列表(如果限制未设置 则不返回对应测点信息) */ List getTemperatureLimitByDeviceId(TemperatureLimitDto temperatureLimitDto); diff --git a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java index 020d04b9..73fffd18 100644 --- a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java +++ b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java @@ -82,6 +82,7 @@ public class HomeServiceImpl implements HomeService { homeWindRealTimeVoResult.setIrn(item.getId()); homeWindRealTimeVoResult.setName(item.getName()); homeWindRealTimeVoResult.setModel(item.getModel()); + homeWindRealTimeVoResult.setDeviceCode(item.getCode()); homeWindRealTimeVoResult.setModelId(item.getIotModelId()); homeWindRealTimeVoResult.setBelongLine(item.getBelongLine()); homeWindRealTimeVoResult.setStandard(item.getStandard()); diff --git a/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java index 970b837c..f03ce5fb 100644 --- a/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java +++ b/das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java @@ -9,10 +9,7 @@ import com.das.modules.page.service.TemperatureDashboardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class TemperatureDashboardServiceImpl implements TemperatureDashboardService { @@ -62,7 +59,8 @@ public class TemperatureDashboardServiceImpl implements TemperatureDashboardServ } }); } - - return new ArrayList<>(map.values()); + ArrayList temperatureLimitVos = new ArrayList<>(map.values()); + temperatureLimitVos.sort(Comparator.comparing(TemperatureLimitVo::getMeasPointName)); + return temperatureLimitVos; } }