@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/CHANGELOG.md
CHANGED
package/dist/index.js
CHANGED
|
@@ -8797,7 +8797,22 @@ function useUserRepo() {
|
|
|
8797
8797
|
as: "unitInfo"
|
|
8798
8798
|
}
|
|
8799
8799
|
},
|
|
8800
|
-
{ $unwind: { path: "$unitInfo", preserveNullAndEmptyArrays: true } }
|
|
8800
|
+
{ $unwind: { path: "$unitInfo", preserveNullAndEmptyArrays: true } },
|
|
8801
|
+
{
|
|
8802
|
+
$lookup: {
|
|
8803
|
+
from: "sites",
|
|
8804
|
+
localField: "site",
|
|
8805
|
+
foreignField: "_id",
|
|
8806
|
+
pipeline: [{ $project: { _id: 0, category: 1 } }],
|
|
8807
|
+
as: "siteInfo"
|
|
8808
|
+
}
|
|
8809
|
+
},
|
|
8810
|
+
{
|
|
8811
|
+
$addFields: {
|
|
8812
|
+
siteCategory: { $first: "$siteInfo.category" }
|
|
8813
|
+
}
|
|
8814
|
+
},
|
|
8815
|
+
{ $project: { siteInfo: 0 } }
|
|
8801
8816
|
]).toArray();
|
|
8802
8817
|
const data = results.length > 0 ? results[0] : null;
|
|
8803
8818
|
if (!data) {
|
|
@@ -23682,8 +23697,8 @@ function useDahuaService() {
|
|
|
23682
23697
|
name: resident?.name,
|
|
23683
23698
|
nric: resident?.nric,
|
|
23684
23699
|
contact: resident?.phoneNumber,
|
|
23685
|
-
block: resident?.block,
|
|
23686
|
-
level: resident?.level,
|
|
23700
|
+
block: resident?.block?.toString(),
|
|
23701
|
+
level: resident?.level?.toString(),
|
|
23687
23702
|
unit: resident?.unit?.toString(),
|
|
23688
23703
|
unitName: resident?.unitName,
|
|
23689
23704
|
type: resident?.category,
|
|
@@ -23704,20 +23719,21 @@ function useDahuaService() {
|
|
|
23704
23719
|
await checkOutBySiteAndPlate(camera.site, plateNumber2);
|
|
23705
23720
|
const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
|
|
23706
23721
|
if (resident?._id) {
|
|
23707
|
-
|
|
23722
|
+
const data = {
|
|
23708
23723
|
site,
|
|
23709
23724
|
plateNumber: plateNumber2,
|
|
23710
23725
|
name: resident?.name,
|
|
23711
23726
|
nric: resident?.nric,
|
|
23712
23727
|
contact: resident?.phoneNumber,
|
|
23713
|
-
block: resident?.block,
|
|
23714
|
-
level: resident?.level,
|
|
23728
|
+
block: resident?.block?.toString(),
|
|
23729
|
+
level: resident?.level?.toString(),
|
|
23715
23730
|
unit: resident?.unit?.toString(),
|
|
23716
23731
|
unitName: resident?.unitName,
|
|
23717
23732
|
type: resident?.category,
|
|
23718
23733
|
status: "registered" /* REGISTERED */
|
|
23719
23734
|
// expiredAt: resident?.end,
|
|
23720
|
-
}
|
|
23735
|
+
};
|
|
23736
|
+
insert = await add(data, void 0, true);
|
|
23721
23737
|
loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Resident with plate ${plateNumber2} and transaction ID ${insert?._id}`);
|
|
23722
23738
|
}
|
|
23723
23739
|
} else if (cameraType == "visitors" && ANPRSwitches?.enableUnregistered) {
|