Skip to content

A
amos-boot-biz
Commit ff506053 authored by tianyiming's avatar tianyiming
Browse files
Options

任务 8322

parent 93d3b1fa
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentIndexController.java
View file @ ff506053
...@@ -172,10 +172,12 @@ public class EquipmentIndexController { ...@@ -172,10 +172,12 @@ public class EquipmentIndexController {
queryWrapper.inSql(SignalClassify::getTypeCode, queryWrapper.inSql(SignalClassify::getTypeCode,
"SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'"); "SELECT type_code FROM wl_signal_classify WHERE UPPER(type_code) ='" + equipmentIndex.getTypeCode().toUpperCase() +"'");
signalClassify = signalClassifyMapper.selectOne(queryWrapper); signalClassify = signalClassifyMapper.selectOne(queryWrapper);
equipmentIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor()); if(!ObjectUtils.isEmpty(signalClassify)){
equipmentIndex.setIsAlarm(signalClassify.getIsAlarm()); equipmentIndex.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
equipmentIndex.setEmergencyLevel(signalClassify.getEmergencyLevel()); equipmentIndex.setIsAlarm(signalClassify.getIsAlarm());
equipmentIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe()); equipmentIndex.setEmergencyLevel(signalClassify.getEmergencyLevel());
equipmentIndex.setEmergencyLevelDescribe(signalClassify.getEmergencyLevelDescribe());
}
} }
QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>(); QueryWrapper<EquipmentDetail> equipmentDetailQueryWrapper = new QueryWrapper<>();
equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId()); equipmentDetailQueryWrapper.eq("equipment_id", equipmentIndex.getEquipmentId());
...@@ -205,7 +207,7 @@ public class EquipmentIndexController { ...@@ -205,7 +207,7 @@ public class EquipmentIndexController {
for (EquipmentSpecificIndex y : indexList) { for (EquipmentSpecificIndex y : indexList) {
y.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId()); y.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
y.setEquipmentIndexName(equipmentIndex.getPerfQuotaName()); y.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
if (bool.get()) { if (bool.get() && !ObjectUtils.isEmpty(signalClassify)) {
y.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor()); y.setEmergencyLevelColor(signalClassify.getEmergencyLevelColor());
y.setIsAlarm(signalClassify.getIsAlarm()); y.setIsAlarm(signalClassify.getIsAlarm());
y.setEmergencyLevel(signalClassify.getEmergencyLevel()); y.setEmergencyLevel(signalClassify.getEmergencyLevel());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment