From b6f60bbf40e437aadff91a5dbbe2d43f470d5524 Mon Sep 17 00:00:00 2001 From: Nivetharamesh99 Date: Tue, 1 Apr 2025 13:55:43 +0530 Subject: [PATCH] panelDelete and AssetsGet API created --- src/api-server/Routes/floadWidgetRoute.ts | 7 ++++-- .../controller/lines/zone-Services.ts | 2 +- .../controller/lines/zoneService.ts | 2 +- .../simulation/assetsFloorservice.ts | 16 ++++++------- .../visualization/floatWidgetService.ts | 5 ++-- .../controller/visualization/panelService.ts | 17 ++++++++++---- .../model/builder/assets/asset-Model.ts | 23 +++++++++++-------- 7 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/api-server/Routes/floadWidgetRoute.ts b/src/api-server/Routes/floadWidgetRoute.ts index 784b218..0e2183d 100644 --- a/src/api-server/Routes/floadWidgetRoute.ts +++ b/src/api-server/Routes/floadWidgetRoute.ts @@ -7,5 +7,8 @@ router.get( "/floadData/:zoneId/:organization", floatWidgetService.getfloatWidget ); -router.get("/A_floatWidget/:floatWidgetID/:organization",floatWidgetService.getsinglefloatWidget) -export default router; \ No newline at end of file +router.get( + "/A_floatWidget/:floatWidgetID/:organization", + floatWidgetService.getsinglefloatWidget +); +export default router; diff --git a/src/api-server/controller/lines/zone-Services.ts b/src/api-server/controller/lines/zone-Services.ts index 6fe520f..5ce8cdc 100644 --- a/src/api-server/controller/lines/zone-Services.ts +++ b/src/api-server/controller/lines/zone-Services.ts @@ -4,7 +4,7 @@ export class zone { static async setZone(req: Request, res: Response) { try { const { organization, userId, zoneData } = req.body - console.log('req.body: ', req.body); + // console.log('req.body: ', req.body); const zoneId = zoneData.zoneId const points = zoneData.points const zoneName = zoneData.zoneName diff --git a/src/api-server/controller/lines/zoneService.ts b/src/api-server/controller/lines/zoneService.ts index 973be85..0152198 100644 --- a/src/api-server/controller/lines/zoneService.ts +++ b/src/api-server/controller/lines/zoneService.ts @@ -4,7 +4,7 @@ import panelSchema from "../../../shared/model/vizualization/panelmodel.ts"; import widgetSchema from "../../../shared/model/vizualization/widgemodel.ts"; export class Zoneservice { static async addandUpdateZone(req: Request, res: Response): Promise { - console.log("req.body: ", req.body); + // console.log("req.body: ", req.body); try { const organization = req.body.organization; const zoneDatas = req.body.zonesdata; diff --git a/src/api-server/controller/simulation/assetsFloorservice.ts b/src/api-server/controller/simulation/assetsFloorservice.ts index cc05e19..d7d99fc 100644 --- a/src/api-server/controller/simulation/assetsFloorservice.ts +++ b/src/api-server/controller/simulation/assetsFloorservice.ts @@ -11,9 +11,9 @@ export class assetsFloorservice { const { modeluuid, modelname, - assetPosition, + position, modelfileID, - assetRotation, + rotation, isLocked, isVisible, organization, @@ -29,8 +29,8 @@ export class assetsFloorservice { const updatevalue = await assetModel(organization).findOneAndUpdate( { modeluuid, modelname }, { - assetPosition, - assetRotation, + position, + rotation, isVisible, isLocked, }, @@ -41,9 +41,9 @@ export class assetsFloorservice { let assetData: any = { modeluuid, modelname, - assetPosition, + position, modelfileID, - assetRotation, + rotation, isLocked, isVisible, }; @@ -144,9 +144,9 @@ export class assetsFloorservice { let responseItem: any = { modeluuid: item.modeluuid, modelname: item.modelname, - assetPosition: item.assetPosition, + position: item.position, modelfileID: item.modelfileID, - assetRotation: item.assetRotation, + rotation: item.rotation, isLocked: item.isLocked, isVisible: item.isVisible, }; diff --git a/src/api-server/controller/visualization/floatWidgetService.ts b/src/api-server/controller/visualization/floatWidgetService.ts index 325e2ad..12492d0 100644 --- a/src/api-server/controller/visualization/floatWidgetService.ts +++ b/src/api-server/controller/visualization/floatWidgetService.ts @@ -98,17 +98,18 @@ export class floatWidgetService { static async deletefloatWidget(req: Request, res: Response): Promise { try { + console.log("req.body: ", req.body); const { floatWidgetID, organization } = req.body; const findfloatWidget = await floatWidgetModel(organization).findOne({ floatWidgetID: floatWidgetID, isArchive: false, }); - if (!findfloatWidget) - return res.status(409).json({ message: "Widget not found" }); + if (!findfloatWidget) return res.json({ message: "Widget not found" }); const widgetData = await floatWidgetModel(organization).updateOne( { _id: findfloatWidget._id, isArchive: false }, { $set: { isArchive: true } } ); + console.log("widgetData: ", widgetData); return res .status(200) .json({ message: "FloatingWidget deleted successfully" }); diff --git a/src/api-server/controller/visualization/panelService.ts b/src/api-server/controller/visualization/panelService.ts index e95cedd..aa5162e 100644 --- a/src/api-server/controller/visualization/panelService.ts +++ b/src/api-server/controller/visualization/panelService.ts @@ -66,6 +66,7 @@ export class panelService { } static async deletePanel(req: Request, res: Response): Promise { try { + console.log("req.body: ", req.body); const { organization, panelName, zoneId } = req.body; const existingZone = await zoneSchema(organization).findOne({ zoneId: zoneId, @@ -80,15 +81,15 @@ export class panelService { }); if (!existingPanel) return res.status(409).json({ message: "Panel Already Deleted" }); - const updatePanel = await panelSchema(organization).updateOne( + const updatePanel = await panelSchema(organization).findOneAndUpdate( { _id: existingPanel._id, isArchive: false }, - { $set: { isArchive: true } } + { isArchive: true }, + { new: true } ); const existingWidgets = await widgetSchema(organization).find({ panelID: existingPanel._id, isArchive: false, }); - for (const widgetData of existingWidgets) { widgetData.isArchive = true; await widgetData.save(); @@ -96,9 +97,15 @@ export class panelService { if (existingZone.panelOrder.includes(existingPanel.panelName)) { const index1 = existingZone.panelOrder.indexOf(existingPanel.panelName); - existingZone.panelOrder.splice(index1, 1); + const zonepanelname = await zoneSchema(organization).updateOne( + { _id: existingZone._id }, + { $pull: { panelOrder: existingPanel.panelName } } + ); + console.log("zonepanelname: ", zonepanelname); + // existingZone.panelOrder.splice(index1, 1); + // existingZone.markModified("panelOrder"); // Mark modified + // await existingZone.save(); } - await existingZone.save(); return res.status(200).json({ message: "Panel deleted successfully" }); } catch (error: any) { diff --git a/src/shared/model/builder/assets/asset-Model.ts b/src/shared/model/builder/assets/asset-Model.ts index 868eb71..68c890a 100644 --- a/src/shared/model/builder/assets/asset-Model.ts +++ b/src/shared/model/builder/assets/asset-Model.ts @@ -33,8 +33,13 @@ export interface assetData extends Document { ]; }[]; }[]; - assetPosition: number[]; - assetRotation: number[]; + position: []; + // rotation: []; + rotation: { + x: number; + y: number; + z: number; + }; speed: number | string; } @@ -66,16 +71,16 @@ const assetDataSchema: Schema = new Schema({ }, }, ], - assetPosition: { type: [Number] }, - assetRotation: { type: [Number] }, + position: { type: Array}, + // rotation: { type: Array }, + rotation: { + x: { type: Number }, + y: { type: Number }, + z: { type: Number }, + }, speed: { type: Schema.Types.Mixed }, isLocked: { type: Boolean }, isVisible: { type: Boolean }, - // rotation: { - // x: { type: Number }, - // y: { type: Number }, - // z: { type: Number }, - // }, }); // export default floorItemsModel;