@7365admin1/core 3.15.0 → 3.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/index.js +23 -7
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +23 -7
- package/dist/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/index.mjs
CHANGED
|
@@ -8333,7 +8333,22 @@ function useUserRepo() {
|
|
|
8333
8333
|
as: "unitInfo"
|
|
8334
8334
|
}
|
|
8335
8335
|
},
|
|
8336
|
-
{ $unwind: { path: "$unitInfo", preserveNullAndEmptyArrays: true } }
|
|
8336
|
+
{ $unwind: { path: "$unitInfo", preserveNullAndEmptyArrays: true } },
|
|
8337
|
+
{
|
|
8338
|
+
$lookup: {
|
|
8339
|
+
from: "sites",
|
|
8340
|
+
localField: "site",
|
|
8341
|
+
foreignField: "_id",
|
|
8342
|
+
pipeline: [{ $project: { _id: 0, category: 1 } }],
|
|
8343
|
+
as: "siteInfo"
|
|
8344
|
+
}
|
|
8345
|
+
},
|
|
8346
|
+
{
|
|
8347
|
+
$addFields: {
|
|
8348
|
+
siteCategory: { $first: "$siteInfo.category" }
|
|
8349
|
+
}
|
|
8350
|
+
},
|
|
8351
|
+
{ $project: { siteInfo: 0 } }
|
|
8337
8352
|
]).toArray();
|
|
8338
8353
|
const data = results.length > 0 ? results[0] : null;
|
|
8339
8354
|
if (!data) {
|
|
@@ -23429,8 +23444,8 @@ function useDahuaService() {
|
|
|
23429
23444
|
name: resident?.name,
|
|
23430
23445
|
nric: resident?.nric,
|
|
23431
23446
|
contact: resident?.phoneNumber,
|
|
23432
|
-
block: resident?.block,
|
|
23433
|
-
level: resident?.level,
|
|
23447
|
+
block: resident?.block?.toString(),
|
|
23448
|
+
level: resident?.level?.toString(),
|
|
23434
23449
|
unit: resident?.unit?.toString(),
|
|
23435
23450
|
unitName: resident?.unitName,
|
|
23436
23451
|
type: resident?.category,
|
|
@@ -23451,20 +23466,21 @@ function useDahuaService() {
|
|
|
23451
23466
|
await checkOutBySiteAndPlate(camera.site, plateNumber2);
|
|
23452
23467
|
const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
|
|
23453
23468
|
if (resident?._id) {
|
|
23454
|
-
|
|
23469
|
+
const data = {
|
|
23455
23470
|
site,
|
|
23456
23471
|
plateNumber: plateNumber2,
|
|
23457
23472
|
name: resident?.name,
|
|
23458
23473
|
nric: resident?.nric,
|
|
23459
23474
|
contact: resident?.phoneNumber,
|
|
23460
|
-
block: resident?.block,
|
|
23461
|
-
level: resident?.level,
|
|
23475
|
+
block: resident?.block?.toString(),
|
|
23476
|
+
level: resident?.level?.toString(),
|
|
23462
23477
|
unit: resident?.unit?.toString(),
|
|
23463
23478
|
unitName: resident?.unitName,
|
|
23464
23479
|
type: resident?.category,
|
|
23465
23480
|
status: "registered" /* REGISTERED */
|
|
23466
23481
|
// expiredAt: resident?.end,
|
|
23467
|
-
}
|
|
23482
|
+
};
|
|
23483
|
+
insert = await add(data, void 0, true);
|
|
23468
23484
|
loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Resident with plate ${plateNumber2} and transaction ID ${insert?._id}`);
|
|
23469
23485
|
}
|
|
23470
23486
|
} else if (cameraType == "visitors" && ANPRSwitches?.enableUnregistered) {
|