From 32bb7e3b79ebd3901365b1952d1b7191dd28355c Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 4 Mar 2025 17:51:57 +0700 Subject: [PATCH 1/2] updated condition position & salary --- src/controllers/ProfileSalaryController.ts | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts index b6d95842..5780e4fc 100644 --- a/src/controllers/ProfileSalaryController.ts +++ b/src/controllers/ProfileSalaryController.ts @@ -19,7 +19,7 @@ import HttpError from "../interfaces/http-error"; import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory"; import { RequestWithUser } from "../middlewares/user"; import { Profile } from "../entities/Profile"; -import { LessThan, MoreThan } from "typeorm"; +import { In, LessThan, MoreThan } from "typeorm"; import permission from "../interfaces/permission"; import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/org/profile/salary") @@ -62,7 +62,7 @@ export class ProfileSalaryController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const record = await this.salaryRepo.find({ - where: { profileId: profileId }, + where: { profileId: profileId, commandCode: In(["5", "6", "7"]) }, order: { order: "ASC" }, }); return new HttpSuccess(record); @@ -74,7 +74,25 @@ export class ProfileSalaryController extends Controller { if (_workflow == false) await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const record = await this.salaryRepo.find({ - where: { profileId: profileId }, + where: { + profileId: profileId, + commandCode: In([ + "0", + "9", + "1", + "2", + "3", + "4", + "8", + "10", + "11", + "12", + "13", + "14", + "15", + "16", + ]), + }, order: { order: "ASC" }, }); return new HttpSuccess(record); From d3565376043939bc41c0eb63c01801338b7c4498 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 4 Mar 2025 18:05:56 +0700 Subject: [PATCH 2/2] websocket test --- package-lock.json | 31 +++++++++++++++++++++++++++++ package.json | 2 ++ src/app.ts | 29 +++++++++++++++++++++++++++ src/controllers/ReportController.ts | 19 +++++++++++++++++- 4 files changed, 80 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index bc87192d..ae0f1399 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,6 +32,7 @@ "tsoa": "^6.0.1", "typeorm": "^0.3.19", "typeorm-cli": "^1.0.7", + "ws": "^8.18.1", "xlsx": "^0.20.2" }, "devDependencies": { @@ -41,6 +42,7 @@ "@types/node": "^20.11.5", "@types/node-cron": "^3.0.11", "@types/swagger-ui-express": "^4.1.6", + "@types/ws": "^8.5.14", "nodemon": "^3.0.3", "prettier": "^3.2.2", "ts-node": "^10.9.2", @@ -563,6 +565,15 @@ "@types/serve-static": "*" } }, + "node_modules/@types/ws": { + "version": "8.5.14", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz", + "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/zen-observable": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz", @@ -5389,6 +5400,26 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, + "node_modules/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xlsx": { "version": "0.20.2", "resolved": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz", diff --git a/package.json b/package.json index 8fbb1317..424b45ba 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@types/node": "^20.11.5", "@types/node-cron": "^3.0.11", "@types/swagger-ui-express": "^4.1.6", + "@types/ws": "^8.5.14", "nodemon": "^3.0.3", "prettier": "^3.2.2", "ts-node": "^10.9.2", @@ -51,6 +52,7 @@ "tsoa": "^6.0.1", "typeorm": "^0.3.19", "typeorm-cli": "^1.0.7", + "ws": "^8.18.1", "xlsx": "^0.20.2" } } diff --git a/src/app.ts b/src/app.ts index 36df20ea..a1506e2c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -12,6 +12,9 @@ import { RegisterRoutes } from "./routes"; import { OrganizationController } from "./controllers/OrganizationController"; import logMiddleware from "./middlewares/logs"; import { CommandController } from "./controllers/CommandController"; +import { WebSocketServer } from "ws"; +import http from "http"; +export const wss = new WebSocketServer({ noServer: true }); async function main() { await AppDataSource.initialize(); @@ -86,6 +89,32 @@ async function main() { } runMessageQueue(); + + // สร้างเซิร์ฟเวอร์ HTTP + const server = http.createServer(app); + + // การจัดการคำขออัปเกรดจาก HTTP เป็น WebSocket + server.on("upgrade", (request:any, socket:any, head:any) => { + console.log("🔹 Handling upgrade request..."); + wss.handleUpgrade(request, socket, head, (ws:any) => { + console.log("🔹 WebSocket connection established"); + wss.emit("connection", ws, request); + }); + }); + + wss.on("connection", (ws:any) => { + console.log("✅ Client connected to WebSocket"); + + ws.on("close", () => { + console.log("❌ Client disconnected"); + }); + }); + + // เริ่มเซิร์ฟเวอร์ที่พอร์ต 5000 + server.listen(APP_PORT, () => { + console.log("✅ HTTP Server is listening on port 5000"); + }); + } main(); diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 77a8a2ec..3d8b1661 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -31,6 +31,9 @@ import { Profile } from "../entities/Profile"; import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer"; import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee"; import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster"; +import { WebSocket } from "ws"; +import { wss } from "../app"; + @Route("api/v1/org/report") @Tags("Report") @Security("bearerAuth") @@ -3514,7 +3517,21 @@ export class ReportController extends Controller { } } } - return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } }); + // console.log(">>",data); + + wss.clients.forEach((client: any) => { + if (client.readyState === WebSocket.OPEN) { + const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } }); + console.log("📤 Sending data to client:", message); + client.send(message, (err:any) => { + if (err) { + console.error("❌ Error sending message:", err); + } + }); + } + }); + + // return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } }); } /**