diff --git a/src/api-server/controller/assets/pointService.ts b/src/api-server/controller/assets/pointService.ts index 9d25159..9bbc079 100644 --- a/src/api-server/controller/assets/pointService.ts +++ b/src/api-server/controller/assets/pointService.ts @@ -24,8 +24,8 @@ interface IPointConveyor extends IPointBase { bufferTime: number; }>; connections: { - source: { pathUUID: string; pointUUID: string }; - targets: Array<{ pathUUID: string; pointUUID: string }>; + source: { modelUUID: string; pointUUID: string }; + targets: Array<{ modelUUID: string; pointUUID: string }>; }; } @@ -41,7 +41,7 @@ interface IPointVehicle extends IPointBase { }; connections: { source: { modelUUID: string; pointUUID: string }; - targets: Array<{ pathUUID: string; pointUUID: string }>; + targets: Array<{ modelUUID: string; pointUUID: string }>; }; speed: number; } @@ -94,8 +94,8 @@ export class pointService { }, ], connections: { - source: { pathUUID: "modelUUID", pointUUID: "point1UUID" }, - targets: [{ pathUUID: "modelUUID", pointUUID: "point1UUID" }], + source: { modelUUID: "modelUUID", pointUUID: "point1UUID" }, + targets: [{ modelUUID: "modelUUID", pointUUID: "point1UUID" }], }, }, { @@ -123,8 +123,8 @@ export class pointService { }, ], connections: { - source: { pathUUID: "modelUUID", pointUUID: "point2UUID" }, - targets: [{ pathUUID: "modelUUID", pointUUID: "point2UUID" }], + source: { modelUUID: "modelUUID", pointUUID: "point2UUID" }, + targets: [{ modelUUID: "modelUUID", pointUUID: "point2UUID" }], }, }, { @@ -152,8 +152,8 @@ export class pointService { }, ], connections: { - source: { pathUUID: "modelUUID", pointUUID: "point3UUID" }, - targets: [{ pathUUID: "modelUUID", pointUUID: "point3UUID" }], + source: { modelUUID: "modelUUID", pointUUID: "point3UUID" }, + targets: [{ modelUUID: "modelUUID", pointUUID: "point3UUID" }], }, }, ]; @@ -183,7 +183,7 @@ export class pointService { }, connections: { source: { modelUUID: "modelUUID", pointUUID: "point1UUID" }, - targets: [{ pathUUID: "modelUUID", pointUUID: "point1UUID" }], + targets: [{ modelUUID: "modelUUID", pointUUID: "point1UUID" }], }, speed: 2, }; diff --git a/src/shared/model/builder/assets/asset-Model.ts b/src/shared/model/builder/assets/asset-Model.ts index 3f358e3..3e20c5f 100644 --- a/src/shared/model/builder/assets/asset-Model.ts +++ b/src/shared/model/builder/assets/asset-Model.ts @@ -68,12 +68,12 @@ export default assetModel; // triggers: [mongoose.Types.ObjectId]; // connections: { // source: { -// pathUUID: string; +// modelUUID: string; // pointUUID: string; // }; // targets: [ // { -// pathUUID: string; +// modelUUID: string; // pointUUID: string; // } // ]; @@ -106,12 +106,12 @@ export default assetModel; // triggers: [{ type: mongoose.Schema.Types.ObjectId, ref: "Triggers" }], // connections: { // source: { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // targets: [ // { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // ], diff --git a/src/shared/model/builder/assets/assetPoint-Model.ts b/src/shared/model/builder/assets/assetPoint-Model.ts index d13dfba..960f105 100644 --- a/src/shared/model/builder/assets/assetPoint-Model.ts +++ b/src/shared/model/builder/assets/assetPoint-Model.ts @@ -17,12 +17,12 @@ import MainModel from "../../../connect/mongoose.ts"; // } // interface IConnectionConveyor { -// source: { pathUUID: string; pointUUID: string }; -// targets: { pathUUID: string; pointUUID: string }[]; +// source: { modelUUID: string; pointUUID: string }; +// targets: { modelUUID: string; pointUUID: string }[]; // } // interface IConnectionVehicle { // source: { modelUUID: string; pointUUID: string }; -// targets: { pathUUID: string; pointUUID: string }[]; +// targets: { modelUUID: string; pointUUID: string }[]; // } // Point Types @@ -50,8 +50,8 @@ interface IPointConveyor extends IPointBase { bufferTime: number; }>; connections: { - source: { pathUUID: string; pointUUID: string }; - targets: Array<{ pathUUID: string; pointUUID: string }>; + source: { modelUUID: string; pointUUID: string }; + targets: Array<{ modelUUID: string; pointUUID: string }>; }; } @@ -68,7 +68,7 @@ interface IPointVehicle extends IPointBase { speed: number; connections: { source: { modelUUID: string; pointUUID: string }; - targets: Array<{ pathUUID: string; pointUUID: string }>; + targets: Array<{ modelUUID: string; pointUUID: string }>; }; } @@ -130,8 +130,8 @@ export default pointModel; // } // interface IConnection { -// source: { pathUUID: string; pointUUID: string }; -// targets: { pathUUID: string; pointUUID: string }[]; +// source: { modelUUID: string; pointUUID: string }; +// targets: { modelUUID: string; pointUUID: string }[]; // } // interface IActionVehicle { // uuid: string; @@ -191,12 +191,12 @@ export default pointModel; // ], // connections: { // source: { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // targets: [ // { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // ], @@ -228,12 +228,12 @@ export default pointModel; // ], // connections: { // source: { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // targets: [ // { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // ], @@ -335,8 +335,8 @@ export default pointModel; // } // interface IConnection { -// source: { pathUUID: string; pointUUID: string }; -// targets: { pathUUID: string; pointUUID: string }[]; +// source: { modelUUID: string; pointUUID: string }; +// targets: { modelUUID: string; pointUUID: string }[]; // } // interface IPoint { // uuid: string; @@ -384,12 +384,12 @@ export default pointModel; // ], // connections: { // source: { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // targets: [ // { -// pathUUID: { type: String }, +// modelUUID: { type: String }, // pointUUID: { type: String }, // }, // ], diff --git a/src/shared/model/simulation/productFlowmodel.ts b/src/shared/model/simulation/productFlowmodel.ts index 90e5580..4755676 100644 --- a/src/shared/model/simulation/productFlowmodel.ts +++ b/src/shared/model/simulation/productFlowmodel.ts @@ -17,12 +17,12 @@ // rotation: [number]; // connections: { // source: { -// // pathUUID: { type: String }; +// // modelUUID: { type: String }; // pointUUID: string; // }; // targets: [ // { -// // pathUUID: { type: String }; +// // modelUUID: { type: String }; // pointUUID: string; // } // ]; @@ -61,12 +61,12 @@ // ], // connections: { // source: { -// // pathUUID: { type: String }; +// // modelUUID: { type: String }; // pointUUID: { type: String }, // }, // targets: [ // { -// // pathUUID: { type: String }; +// // modelUUID: { type: String }; // pointUUID: { type: String }, // }, // ],