|
@@ -3,19 +3,24 @@ import { User } from '../database/models/User'
|
|
|
import { Equipment } from '../database/models/Equipment'
|
|
import { Equipment } from '../database/models/Equipment'
|
|
|
import { sequelize } from '../database'
|
|
import { sequelize } from '../database'
|
|
|
import { networkError } from './Error'
|
|
import { networkError } from './Error'
|
|
|
|
|
+import { Site } from '../database/models/Site'
|
|
|
|
|
+import { sendAlarm } from '../firebase'
|
|
|
|
|
|
|
|
class EquipmentController {
|
|
class EquipmentController {
|
|
|
async getEquipments(req: Request, res: Response) {
|
|
async getEquipments(req: Request, res: Response) {
|
|
|
try {
|
|
try {
|
|
|
- const result = await sequelize.query(
|
|
|
|
|
- `SELECT * FROM equipment_data
|
|
|
|
|
|
|
+ const [equipments] = await sequelize.query(
|
|
|
|
|
+ `SELECT equipment_data.*, equipments.id AS equipment_id, equipments.name AS equipment_name, equipments.site_id, equipments.current_user_id, users.name AS user_name FROM equipment_data
|
|
|
JOIN equipments ON aid_id = equipments.id
|
|
JOIN equipments ON aid_id = equipments.id
|
|
|
|
|
+ LEFT JOIN users ON equipments.current_user_id = users.id
|
|
|
WHERE equipment_data.id IN
|
|
WHERE equipment_data.id IN
|
|
|
(SELECT max(id) FROM equipment_data GROUP BY aid_id)
|
|
(SELECT max(id) FROM equipment_data GROUP BY aid_id)
|
|
|
`
|
|
`
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
- res.json(result[0])
|
|
|
|
|
|
|
+ const sites = await Site.findAll()
|
|
|
|
|
+
|
|
|
|
|
+ res.json({ equipments, sites })
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
networkError(res, JSON.stringify(error))
|
|
networkError(res, JSON.stringify(error))
|
|
|
}
|
|
}
|
|
@@ -47,6 +52,11 @@ class EquipmentController {
|
|
|
networkError(res, JSON.stringify(error))
|
|
networkError(res, JSON.stringify(error))
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ async receiveEquipmentData(req: Request, res: Response) {
|
|
|
|
|
+ sendAlarm('輔具 A', '緊急')
|
|
|
|
|
+ res.json({ message: 'ok' })
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
export default EquipmentController
|
|
export default EquipmentController
|