Skip to content

Add hvac circuit 1 and layout api updates #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukama merged 2 commits into from
Apr 21, 2026
Merged

Add hvac circuit 1 and layout api updates #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d17ac
Add hvac circuit 1 and layout api updates
paragmore Apr 21, 2026
623f238
Update hvac circuit2 api
paragmore Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions workers/lib/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ const COOLING_SYSTEM_PROJECTIONS = {
'last.snap.stats.dcs_specific.equipment.levels': 1,
'last.snap.stats.dcs_specific.equipment.chillers': 1,
'last.snap.stats.dcs_specific.equipment.fan_coils': 1,
'last.snap.stats.dcs_specific.equipment.fans': 1,
'last.snap.stats.dcs_specific.equipment.valves': 1,
'last.snap.stats.dcs_specific.equipment.tanks': 1,
'last.snap.stats.dcs_specific.equipment.flow_switches': 1,
Expand All @@ -392,9 +393,11 @@ const COOLING_SYSTEM_PROJECTIONS = {
'last.snap.stats.dcs_specific.equipment.chillers': 1,
'last.snap.stats.dcs_specific.equipment.cooling_towers': 1,
'last.snap.stats.dcs_specific.equipment.fan_coils': 1,
'last.snap.stats.dcs_specific.equipment.fans': 1,
'last.snap.stats.dcs_specific.equipment.valves': 1,
'last.snap.stats.dcs_specific.equipment.tanks': 1,
'last.snap.stats.dcs_specific.equipment.flow_switches': 1,
'last.snap.stats.dcs_specific.equipment.vibration_sensors': 1,
'last.snap.config.cooling_system': 1
},
ambient: {
Expand Down
221 changes: 177 additions & 44 deletions workers/lib/server/handlers/coolingSystem.handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,42 +434,70 @@ function buildHvacCircuit1View (equipment, config) {
const fanCoils = equipment.fan_coils
const valves = equipment.valves
const tanks = equipment.tanks
const fans = equipment.fans
const flowSwitches = equipment.flow_switches
const chilledConfig = config?.cooling_system?.hvac_chilled_water || {}
const viewConfig = config?.cooling_system?.view_metadata?.hvac?.circuit1 || {}

const supplyReturnConfig = chilledConfig.supply_return || {}
const condenserConfig = chilledConfig.condenser || {}

const chiller = chillers?.[0]
const chillerData = chiller
? {
id: chiller.equipment,
name: chiller.equipment,
is_running: chiller.is_running,
mode: chiller.mode,
capacity_tr: chilledConfig.chiller_capacity_tr || null,
cooling_capacity: chiller.cooling_capacity,
compressor_load: chiller.compressor_load,
power_consumption: chiller.power_consumption,
evaporator_temp: chiller.evaporator_temp,
condenser_temp: chiller.condenser_temp
condenser_temp: chiller.condenser_temp,
chilled_water_side: {
inlet_temp: getSensorWithTag(temperatures, supplyReturnConfig.return_temp_sensor),
outlet_temp: getSensorWithTag(temperatures, supplyReturnConfig.supply_temp_sensor),
inlet_flow: getSensorWithTag(flows, supplyReturnConfig.return_flow_sensor),
outlet_flow: getSensorWithTag(flows, supplyReturnConfig.supply_flow_sensor),
flow_switch: supplyReturnConfig.flow_switches?.[0]
? { tag: supplyReturnConfig.flow_switches[0], is_active: (flowSwitches || []).find(fs => fs.equipment === supplyReturnConfig.flow_switches[0])?.is_active }
: null
},
condenser_water_side: {
inlet_temp: getSensorWithTag(temperatures, condenserConfig.inlet_temp_sensor),
outlet_temp: getSensorWithTag(temperatures, condenserConfig.outlet_temp_sensor),
inlet_flow: getSensorWithTag(flows, condenserConfig.inlet_flow_sensor),
outlet_flow: getSensorWithTag(flows, condenserConfig.outlet_flow_sensor),
flow_switch: supplyReturnConfig.flow_switches?.[1]
? { tag: supplyReturnConfig.flow_switches[1], is_active: (flowSwitches || []).find(fs => fs.equipment === supplyReturnConfig.flow_switches[1])?.is_active }
: null
}
}
: null

const supplyReturnConfig = chilledConfig.supply_return || {}
const supplyTemp = getSensorReading(temperatures, supplyReturnConfig.supply_temp_sensor, chilledConfig.defaults?.supply_temp)
const returnTemp = getSensorReading(temperatures, supplyReturnConfig.return_temp_sensor, chilledConfig.defaults?.return_temp)
const supplyFlow = getSensorReading(flows, supplyReturnConfig.supply_flow_sensor)
const returnFlow = getSensorReading(flows, supplyReturnConfig.return_flow_sensor)
const systemPressure = getSensorReading(pressures, supplyReturnConfig.pressure_sensor)

const supplyReturn = {
supply: {
temperature: getSensorReading(temperatures, supplyReturnConfig.supply_temp_sensor, chilledConfig.defaults?.supply_temp),
flow: getSensorReading(flows, supplyReturnConfig.supply_flow_sensor),
pressure: getSensorReading(pressures, supplyReturnConfig.pressure_sensor)
temperature: supplyTemp,
flow: supplyFlow,
pressure: systemPressure
},
return: {
temperature: getSensorReading(temperatures, supplyReturnConfig.return_temp_sensor, chilledConfig.defaults?.return_temp),
flow: getSensorReading(flows, supplyReturnConfig.return_flow_sensor)
temperature: returnTemp,
flow: returnFlow
},
flow_switches: (flowSwitches || []).map(fs => ({
id: fs.equipment,
is_active: fs.is_active
}))
flow_switches: (supplyReturnConfig.flow_switches || []).map(fsId => {
const fs = (flowSwitches || []).find(f => f.equipment === fsId)
return { id: fsId, is_active: fs?.is_active || false }
})
}

const condenserConfig = chilledConfig.condenser || {}
const condenser = {
inlet: {
temperature: getSensorReading(temperatures, condenserConfig.inlet_temp_sensor),
Expand All @@ -481,56 +509,99 @@ function buildHvacCircuit1View (equipment, config) {
}
}

const tempUnit = supplyTemp?.unit
const flowUnit = supplyFlow?.unit
const avgSupplyTemp = supplyTemp?.value
const avgReturnTemp = returnTemp?.value
const totalFlow = supplyFlow?.value
const deltaT = (avgSupplyTemp != null && avgReturnTemp != null)
? Math.round((avgReturnTemp - avgSupplyTemp) * 10) / 10
: null

const bufferConfig = chilledConfig.buffer_tank || {}
const bufferTankId = bufferConfig.tank || tanks?.[0]?.equipment
const makeupValve = valves?.find(v => v.equipment === bufferConfig.makeup_valve)
const bufferTank = {
id: bufferTankId,
name: bufferTankId,
volume: chilledConfig.defaults?.buffer_tank_volume || null,
level: getSensorReading(levels, bufferConfig.level_sensor),
level_sensor: bufferConfig.level_sensor,
makeup_valve: bufferConfig.makeup_valve
? {
id: bufferConfig.makeup_valve,
position: makeupValve?.position
type: makeupValve?.type || null,
description: makeupValve?.description || null,
position: makeupValve?.position,
is_open: makeupValve?.position?.value > 50
}
: null
}

const bypassValveId = chilledConfig.control_valves?.pressure_bypass
const bypassValve = valves?.find(v => v.equipment === bypassValveId)
const controlValves = bypassValveId
? {
pressure_bypass: {
id: bypassValveId,
position: bypassValve?.position
}
}
: null
const controlValveEntries = chilledConfig.control_valves || {}
const controlValves = {}
for (const [role, valveId] of Object.entries(controlValveEntries)) {
const valve = valves?.find(v => v.equipment === valveId)
controlValves[role] = {
id: valveId,
type: valve?.type || null,
description: valve?.description || null,
position: valve?.position || null,
setpoint: valve?.setpoint || null,
controlled_by: supplyReturnConfig.pressure_sensor || null
}
}

const returnPumps = filterPumpsByCircuit(pumps, 'HVAC_RETURN').map(formatPump)
const supplyPumps = filterPumpsByCircuit(pumps, 'HVAC_SUPPLY').map(formatPump)

const fanCoilsSummary = {
total: (fanCoils || []).length,
running: (fanCoils || []).filter(fc => fc.is_running).length,
units: (fanCoils || []).map(fc => ({
id: fc.equipment,
is_running: fc.is_running,
temperature: fc.temperature,
valve_position: fc.valve_position
}))
units: (fanCoils || []).map(fc => {
const fcNumber = fc.equipment.replace(/^FCT?-/, '')
const fanId = `V-${fcNumber}`
const valveId = `PIV-${fcNumber}`
const tempSensorId = `TT-${fcNumber}`
const fan = (fans || []).find(f => f.equipment === fanId)
const valve = valves?.find(v => v.equipment === valveId)

return {
id: fc.equipment,
is_running: fc.is_running,
fan_id: fanId,
fan_running: fan?.fbk_run_out || false,
fan_speed: fc.fan_speed,
valve_tag: valveId,
valve_position: valve?.position || fc.valve_position,
temperature_tag: tempSensorId,
temperature: fc.temperature
}
})
}

return {
title: chilledConfig.name || viewConfig.title,
description: chilledConfig.description || viewConfig.description,
target_supply_temp: chilledConfig.defaults?.supply_temp,
target_return_temp: chilledConfig.defaults?.return_temp,
summary: {
supply_temp: avgSupplyTemp != null ? { value: avgSupplyTemp, unit: tempUnit } : null,
return_temp: avgReturnTemp != null ? { value: avgReturnTemp, unit: tempUnit } : null,
delta_t: deltaT != null ? { value: deltaT, unit: tempUnit } : null,
total_flow: totalFlow != null ? { value: totalFlow, unit: flowUnit } : null,
rated_flow: chilledConfig.defaults?.rated_flow || null,
system_pressure: systemPressure
? { ...systemPressure, sensor: supplyReturnConfig.pressure_sensor }
: null
},
chiller: chillerData,
supply_return: supplyReturn,
condenser,
buffer_tank: bufferTank,
control_valves: controlValves,
control_valves: Object.keys(controlValves).length > 0 ? controlValves : null,
return_pumps_config: chilledConfig.defaults?.return_pumps_config || null,
supply_pumps_config: chilledConfig.defaults?.supply_pumps_config || null,
return_pumps: returnPumps,
supply_pumps: supplyPumps,
fan_coils: fanCoilsSummary
Expand All @@ -541,31 +612,68 @@ function buildHvacCircuit2View (equipment, config) {
const pumps = equipment.pumps
const temperatures = equipment.temperatures
const flows = equipment.flows
const levels = equipment.levels
const coolingTowers = equipment.cooling_towers
const condenserConfig = config?.cooling_system?.hvac_condenser || {}
const viewConfig = config?.cooling_system?.view_metadata?.hvac?.circuit2 || {}

const supplyReturnConfig = condenserConfig.supply_return || {}

const supplyTemp = getSensorReading(temperatures, supplyReturnConfig.supply_temp_sensor, condenserConfig.defaults?.supply_temp)
const returnTemp = getSensorReading(temperatures, supplyReturnConfig.return_temp_sensor, condenserConfig.defaults?.return_temp)
const supplyFlow = getSensorReading(flows, supplyReturnConfig.supply_flow_sensor)
const returnFlow = getSensorReading(flows, supplyReturnConfig.return_flow_sensor)

const supplyReturn = {
supply: {
temperature: getSensorReading(temperatures, supplyReturnConfig.supply_temp_sensor, condenserConfig.defaults?.supply_temp),
flow: getSensorReading(flows, supplyReturnConfig.supply_flow_sensor)
temperature: supplyTemp,
flow: supplyFlow,
sensors: [
getSensorWithTag(temperatures, supplyReturnConfig.supply_temp_sensor),
getSensorWithTag(flows, supplyReturnConfig.supply_flow_sensor)
].filter(Boolean)
},
return: {
temperature: getSensorReading(temperatures, supplyReturnConfig.return_temp_sensor, condenserConfig.defaults?.return_temp),
flow: getSensorReading(flows, supplyReturnConfig.return_flow_sensor)
temperature: returnTemp,
flow: returnFlow,
sensors: [
getSensorWithTag(temperatures, supplyReturnConfig.return_temp_sensor),
getSensorWithTag(flows, supplyReturnConfig.return_flow_sensor)
].filter(Boolean)
}
}

const towerData = (coolingTowers || []).map(ct => ({
id: ct.equipment,
name: ct.equipment,
is_running: ct.is_running,
fan_status: ct.fan_status,
fan_power: ct.fan_power,
level: ct.level,
vibration: ct.vibration
}))
const tempUnit = supplyTemp?.unit
const flowUnit = supplyFlow?.unit
const totalFlow = supplyFlow?.value != null && returnFlow?.value != null
? Math.round(((supplyFlow.value + returnFlow.value) / 2) * 10) / 10
: (supplyFlow?.value || returnFlow?.value || null)
const deltaT = (supplyTemp?.value != null && returnTemp?.value != null)
? Math.round((returnTemp.value - supplyTemp.value) * 10) / 10
: null

const towerConfigRef = condenserConfig.tower || {}
const towerLevelSensorId = towerConfigRef.level_sensor
const towerLevel = getSensorReading(levels, towerLevelSensorId)

const towerData = (coolingTowers || []).map(ct => {
const isConfiguredTower = ct.equipment === towerConfigRef.equipment
return {
id: ct.equipment,
name: ct.equipment,
is_running: ct.is_running,
fan_status: ct.fan_status,
fan_speed: ct.fan_speed,
fan_power: ct.fan_power,
fan_id: isConfiguredTower ? towerConfigRef.fan : null,
level: ct.level,
level_sensor: isConfiguredTower ? towerConfigRef.level_sensor : null,
vibration: ct.vibration,
vibration_sensor: isConfiguredTower ? towerConfigRef.vibration_sensor : null,
capacity_mcal: condenserConfig.defaults?.tower_capacity_mcal || null,
capacity_flow: condenserConfig.defaults?.tower_flow || null
}
})

const condenserPumps = filterPumpsByCircuit(pumps, 'HVAC_CONDENSER').map(formatPump)

Expand All @@ -574,6 +682,17 @@ function buildHvacCircuit2View (equipment, config) {
description: condenserConfig.description || viewConfig.description,
target_supply_temp: condenserConfig.defaults?.supply_temp,
target_return_temp: condenserConfig.defaults?.return_temp,
summary: {
supply_temp: supplyTemp,
return_temp: returnTemp,
delta_t: deltaT != null ? { value: deltaT, unit: tempUnit } : null,
total_flow: totalFlow != null ? { value: totalFlow, unit: flowUnit } : null,
rated_flow: condenserConfig.defaults?.pumps_config?.rated_flow || null,
tower_level: towerLevel
? { ...towerLevel, sensor: towerLevelSensorId }
: null
},
pumps_config: condenserConfig.defaults?.pumps_config || null,
supply_return: supplyReturn,
cooling_towers: towerData,
pumps: condenserPumps
Expand All @@ -597,16 +716,30 @@ function buildHvacLayoutView (equipment, config) {
pumps_running: (pumps || []).filter(p => p.fbk_run_out).length,
pumps_total: (pumps || []).length
},
legend: {
c1_supply_temp: circuit1.summary?.supply_temp,
c1_return_temp: circuit1.summary?.return_temp,
c2_condenser_cold: circuit2.target_supply_temp,
c2_condenser_hot: circuit2.target_return_temp
},
circuit1: {
name: circuit1.title,
summary: circuit1.summary,
chiller: circuit1.chiller,
supply_return: circuit1.supply_return,
condenser: circuit1.condenser,
buffer_tank: circuit1.buffer_tank,
control_valves: circuit1.control_valves,
return_pumps_config: circuit1.return_pumps_config,
supply_pumps_config: circuit1.supply_pumps_config,
return_pumps: circuit1.return_pumps,
supply_pumps: circuit1.supply_pumps
supply_pumps: circuit1.supply_pumps,
fan_coils: circuit1.fan_coils
},
circuit2: {
name: circuit2.title,
summary: circuit2.summary,
pumps_config: circuit2.pumps_config,
supply_return: circuit2.supply_return,
cooling_towers: circuit2.cooling_towers,
pumps: circuit2.pumps
Expand Down
Loading