Commit 32537375 authored by tangwei's avatar tangwei

点位图绑定优化

parent 3dd2e608
......@@ -149,5 +149,8 @@ public class EquipmentSpecificIndex extends BaseEntity {
@ApiModelProperty(value = "是否遥测")
@TableField(exist = false)
private Integer isTrend;
@ApiModelProperty(value = "绑定视屏数量")
@TableField(exist = false)
private int num;
}
......@@ -349,7 +349,9 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
Map<String, String> map = new HashMap<>();
map.put("equipCode", action.getQrCode());
map.put("color", EquipmentStateUtil.judgeEquipState(action));
data.add(map);
map.put("num", action.getNum()+"");
data.add(map);
});
return data;
}
......
......@@ -277,7 +277,9 @@
ei.type_code AS 'typeCode',
es.qr_code AS 'qrCode',
equipindex.color AS emergencyLevelColor,
equipindex.isAlarm AS isAlarm
equipindex.isAlarm AS isAlarm,
(select COUNT(id) from wl_video_equipment_specific where wl_video_equipment_specific.equipment_specific_id=es.id) num
FROM
(
SELECT
......@@ -321,7 +323,9 @@
es.iot_code AS 'iotCode',
es.realtime_iot_index_value AS 'value',
ei.is_alarm AS isAlarm,
ei.emergency_level_color AS 'emergencyLevelColor'
ei.emergency_level_color AS 'emergencyLevelColor',
(select COUNT(id) from wl_video_equipment_specific where wl_video_equipment_specific.equipment_specific_id=es.id) num
FROM
wl_equipment_specific es,
wl_equipment_index ei
......
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