hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'adiDev' into develop

Browse source 
# Conflicts:
#	src/controllers/ReportController.ts
This commit is contained in:
AdisakKanthawilang 2025-03-07 12:07:36 +07:00
commit b1b8ea3c33
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app.ts
View file

@ -17,9 +17,10 @@ import { ProfileSalaryController } from "./controllers/ProfileSalaryController";
import { WebSocketServer } from "ws"; import { WebSocketServer } from "ws";
import http from "http"; import http from "http";
export const wss = new WebSocketServer({ noServer: true, export const wss = new WebSocketServer({ noServer: true,
path: "/api/vi/org/socket", path: "/api/v1/org-socket",
}); });
async function main() { async function main() {
await AppDataSource.initialize(); await AppDataSource.initialize();

11
src/controllers/ReportController.ts
View file

@ -31,7 +31,7 @@ import { Profile } from "../entities/Profile";
import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer"; import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer";
import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee"; import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee";
import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster"; import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster";
// import { sendWebSocket } from "../services/webSocket"; import { sendWebSocket } from "../services/webSocket";
@Route("api/v1/org/report") @Route("api/v1/org/report")
@Tags("Report") @Tags("Report")
@ -3537,14 +3537,11 @@ export class ReportController extends Controller {
} }
} }
} }
<<<<<<< HEAD
======= const metaData = { template: "report2", reportName: "report2", data: { data } };
// const metaData = { template: "report2", reportName: "report2", data: { data } }; sendWebSocket(metaData)
// sendWebSocket(metaData)
>>>>>>> b24a900198a2e83d621975fe9d657157de8ffccf // return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
} }
/** /**

30
src/services/webSocket.ts
View file

@ -1,16 +1,16 @@
// import { WebSocket } from "ws"; import { WebSocket } from "ws";
// import { wss } from "../app"; import { wss } from "../app";
// export async function sendWebSocket(data:any){ export async function sendWebSocket(data:any){
// wss.clients.forEach((client: any) => { wss.clients.forEach((client: any) => {
// if (client.readyState === WebSocket.OPEN) { if (client.readyState === WebSocket.OPEN) {
// const message = JSON.stringify(data); const message = JSON.stringify(data);
// console.log("📤 Sending data to client:", message); console.log("📤 Sending data to client:", message);
// client.send(message, (err:any) => { client.send(message, (err:any) => {
// if (err) { if (err) {
// console.error("❌ Error sending message:", err); console.error("❌ Error sending message:", err);
// } }
// }); });
// } }
// }); });
// } }