sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

温度管理排序修改;

Browse Source 
风机矩阵修改;
This commit is contained in:
yu 2024-11-26 17:31:11 +08:00
parent 9871b04e37
commit 02d9dba748
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java
View File

@ -34,5 +34,11 @@ public class HomeWindTurbineMatrixDataVoVo {
*/ */
private Double nominalCapacity; private Double nominalCapacity;
private String deviceCode;
private Map<String,Object> attributeMap; private Map<String,Object> attributeMap;
} }

2
das/src/main/java/com/das/modules/page/service/TemperatureDashboardService.java
View File

@ -11,7 +11,7 @@ import java.util.List;
public interface TemperatureDashboardService { public interface TemperatureDashboardService {
/** /**
* 根据设备id获取该设备对应的温度相关测点的限制配置信息 * 根据设备id获取该设备对应的温度相关测点的限制配置信息
* @param deviceId 设备id * @param temperatureLimitDto 设备信息
* @return 限制配置列表(如果限制未设置 则不返回对应测点信息) * @return 限制配置列表(如果限制未设置 则不返回对应测点信息)
*/ */
List<TemperatureLimitVo> getTemperatureLimitByDeviceId(TemperatureLimitDto temperatureLimitDto); List<TemperatureLimitVo> getTemperatureLimitByDeviceId(TemperatureLimitDto temperatureLimitDto);

1
das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java
View File

@ -82,6 +82,7 @@ public class HomeServiceImpl implements HomeService {
homeWindRealTimeVoResult.setIrn(item.getId()); homeWindRealTimeVoResult.setIrn(item.getId());
homeWindRealTimeVoResult.setName(item.getName()); homeWindRealTimeVoResult.setName(item.getName());
homeWindRealTimeVoResult.setModel(item.getModel()); homeWindRealTimeVoResult.setModel(item.getModel());
homeWindRealTimeVoResult.setDeviceCode(item.getCode());
homeWindRealTimeVoResult.setModelId(item.getIotModelId()); homeWindRealTimeVoResult.setModelId(item.getIotModelId());
homeWindRealTimeVoResult.setBelongLine(item.getBelongLine()); homeWindRealTimeVoResult.setBelongLine(item.getBelongLine());
homeWindRealTimeVoResult.setStandard(item.getStandard()); homeWindRealTimeVoResult.setStandard(item.getStandard());

10
das/src/main/java/com/das/modules/page/service/impl/TemperatureDashboardServiceImpl.java
View File

@ -9,10 +9,7 @@ import com.das.modules.page.service.TemperatureDashboardService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service @Service
public class TemperatureDashboardServiceImpl implements TemperatureDashboardService { public class TemperatureDashboardServiceImpl implements TemperatureDashboardService {
@ -62,7 +59,8 @@ public class TemperatureDashboardServiceImpl implements TemperatureDashboardServ
} }
}); });
} }
ArrayList<TemperatureLimitVo> temperatureLimitVos = new ArrayList<>(map.values());
return new ArrayList<>(map.values()); temperatureLimitVos.sort(Comparator.comparing(TemperatureLimitVo::getMeasPointName));
return temperatureLimitVos;
} }
} }