|
|
|
@ -2821,8 +2821,8 @@ exports.getIotDataByCustomerAndHardwareId = async (req, reply) => {
|
|
|
|
|
tankhardwareId: slaveId,
|
|
|
|
|
tankName: slave.tankName ?? null,
|
|
|
|
|
tankLocation: slave.tankLocation ?? null,
|
|
|
|
|
masterName: slave.masterName ?? fallbackMasterInfo.masterName,
|
|
|
|
|
location: slave.location ?? fallbackMasterInfo.location,
|
|
|
|
|
// masterName: slave.masterName ?? fallbackMasterInfo.masterName,
|
|
|
|
|
// location: slave.location ?? fallbackMasterInfo.location,
|
|
|
|
|
message: loraMessage,
|
|
|
|
|
latestTankData: matchedTank ?? null
|
|
|
|
|
};
|
|
|
|
@ -2835,8 +2835,8 @@ exports.getIotDataByCustomerAndHardwareId = async (req, reply) => {
|
|
|
|
|
data: {
|
|
|
|
|
hardwareId,
|
|
|
|
|
message: gsmMessage,
|
|
|
|
|
masterName: connectedSlaves[0]?.masterName ?? fallbackMasterInfo.masterName,
|
|
|
|
|
location: connectedSlaves[0]?.location ?? fallbackMasterInfo.location,
|
|
|
|
|
// masterName: connectedSlaves[0]?.masterName ?? fallbackMasterInfo.masterName,
|
|
|
|
|
// location: connectedSlaves[0]?.location ?? fallbackMasterInfo.location,
|
|
|
|
|
tanks
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|