From 5a2b88139e6a11f70c757ca6a2d40e7040e502d6 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Tue, 12 Nov 2024 00:22:51 +0100 Subject: [PATCH] add appointment mode --- src/appointment.js | 36 ++++++++++++++++----------------- src/models/DeviceExcludeMode.js | 5 +++-- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/appointment.js b/src/appointment.js index 57c4f43..a72c8f8 100644 --- a/src/appointment.js +++ b/src/appointment.js @@ -8,17 +8,17 @@ const {Sender} = require("./queue/Sender"); const {devices} = require("./android/adb"); const mongoManager = new MongoManager(); const SEVEN_DAYS_IN_S = 3600 * 24 * 7; -// const NINETY_DAYS_IN_S = 3600 * 24 * 30 * 3; const NINETY_DAYS_IN_S = 30 * 3; let excelUtil = new ExcelUtil(); let collectionName = formatDate(new Date()) -let excludeMode = DeviceExcludeMode.ZERO +// let includeMode = DeviceExcludeMode.ZERO +let includeMode = DeviceExcludeMode.APPOINTMENT -let three_to_excludes = [] -let four_to_excludes = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518"] +let three_to_include = [] +let four_to_include = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518"] let seven_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518", "bec11752", "fuljaueqguugf6pn", "EPHUT20825001518"] -let six_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518", "bec11752", "07fbd156", "NFD669QK8XNFSCNN", "6X494TTWQGFALB79", "71a0371d", "YP6HVKLFE67T598L"] -let nine_to_excludes = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "47e7e36b", "p7d6nbw8cu7duous", "njzxojhim7gedyvw", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "EPHUT20825001518"] +let appointment_to_include = ["bec11752", "07fbd156", "71a0371d", "J4AXB761H2322WJ", "W8GMFELRHIKZS84T", "ZY32GLBN5P", "ZY32GVW4NC", "becb6e99", "b41c1b72"] +let nine_to_include = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "47e7e36b", "p7d6nbw8cu7duous", "njzxojhim7gedyvw", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "EPHUT20825001518"] let for_scrpay = ["07fbd156", "47e7e36b", "4f55c3d4", "5ac879a2", "69db59f0", "71a0371d", "774687ff", "7b71fb20", "8f76f9e7", "99cyfiaebqcy6poj", "EPHUT20825001518", "J4AXB761H2322WJ", "W8GMFELRHIKZS84T", "ai9xv8hy599hvkee", "b41c1b72", "bec11752", "becb6e99", "c3ba032e", "d54e946", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "fy65eqs4wkvcpf9h", "hi7ljr5xduyt9pfi", "njzxojhim7gedyvw", "p7d6nbw8cu7duous"] attributedPorts = [] const device_port_info = new Map(); @@ -180,21 +180,21 @@ async function startBookWithNumbers(startNumber, endNumber, selectedStore, pathT alert("未找到连接的设备"); return } - let device_to_excludes = three_to_excludes; - if (excludeMode === DeviceExcludeMode.FOUR) { - device_to_excludes = four_to_excludes; - } else if (excludeMode === DeviceExcludeMode.THREE) { - device_to_excludes = three_to_excludes; - } else if (excludeMode === DeviceExcludeMode.NINE) { - device_to_excludes = nine_to_excludes; - } else if (excludeMode === DeviceExcludeMode.SEVEN) { + let device_to_excludes = three_to_include; + if (includeMode === DeviceExcludeMode.FOUR) { + device_to_excludes = four_to_include; + } else if (includeMode === DeviceExcludeMode.THREE) { + device_to_excludes = three_to_include; + } else if (includeMode === DeviceExcludeMode.NINE) { + device_to_excludes = nine_to_include; + } else if (includeMode === DeviceExcludeMode.SEVEN) { device_to_excludes = seven_to_excludes - } else if (excludeMode === DeviceExcludeMode.SIX) { - device_to_excludes = six_to_excludes - } else if (excludeMode === DeviceExcludeMode.ZERO) { + } else if (includeMode === DeviceExcludeMode.APPOINTMENT) { + device_to_excludes = appointment_to_include + } else if (includeMode === DeviceExcludeMode.ZERO) { device_to_excludes = [] } - filteredDeviceList = devices.filter(device => !device_to_excludes.includes(device.serial)) + 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) diff --git a/src/models/DeviceExcludeMode.js b/src/models/DeviceExcludeMode.js index 781c5a9..8d66529 100644 --- a/src/models/DeviceExcludeMode.js +++ b/src/models/DeviceExcludeMode.js @@ -1,9 +1,10 @@ -const DeviceExcludeMode = { +const DeviceIncludeMode = { ZERO: Symbol("ZERO"), NINE: Symbol("NINE"), THREE: Symbol("THREE"), SIX: Symbol("SIX"), SEVEN: Symbol("SEVEN"), + APPOINTMENT: Symbol("APPOINTMENT"), FOUR: Symbol("FOUR") } -module.exports = DeviceExcludeMode \ No newline at end of file +module.exports = DeviceIncludeMode \ No newline at end of file