From 06bf2ead134f1c8813b6bfcbd1629110e07cadd4 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Thu, 17 Aug 2023 17:41:20 +0200 Subject: [PATCH] input directly the firstName --- src/appointment.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/appointment.js b/src/appointment.js index fbb2392..d74cf39 100644 --- a/src/appointment.js +++ b/src/appointment.js @@ -4,16 +4,18 @@ const CommandorPage = require("./workers/CommandorPage"); const {MongoManager, formatDate} = require("./workers/mongo_manager"); const alert = require('alert'); const schedule = require("node-schedule"); +const DeviceExcludeMode = require("./models/DeviceExcludeMode"); const mongoManager = new MongoManager(); const SEVEN_DAYS_IN_S = 3600 * 24 * 7; const NINETY_DAYS_IN_S = 3600 * 24 * 30 * 3; let excelUtil = new ExcelUtil(); let collectionName = formatDate(new Date()) -// device_to_excludes = ["47e7e36b", "e30eb015"] -// device_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "47e7e36b", "e30eb015"] -device_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "e30eb015"] -// device_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "e30eb015", "47e7e36b"] +let excludeMode = DeviceExcludeMode.THREE +let three_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518"] +let four_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "e30eb015", "EPHUT20825001518"] +let nine_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "e30eb015", "47e7e36b", "p7d6nbw8cu7duous", "njzxojhim7gedyvw", "fmiz5pa6rsx4u4ts", "fy65eqs4wkvcpf9h", "fuljaueqguugf6pn", "EPHUT20825001518"] + attributedPorts = [] const device_port_info = new Map(); startPort = 9000 @@ -213,7 +215,13 @@ async function startBookWithNumbers(startNumber, endNumber, selectedStore, pathT alert("未找到连接的设备"); return } - let filteredDeviceList = devices.filter(device => !device_to_excludes.includes(device.serial())) + let device_to_excludes = three_to_excludes; + if (excludeMode === DeviceExcludeMode.FOUR) { + device_to_excludes = four_to_excludes; + } else if (excludeMode === DeviceExcludeMode.NINE) { + device_to_excludes = nine_to_excludes; + } + filteredDeviceList = devices.filter(device => !device_to_excludes.includes(device.serial())) let segmentNumber = listWithoutBlackContact.length / filteredDeviceList.length; console.log("connected device number:" + filteredDeviceList.length) console.log("segmentNumber:" + segmentNumber)