mm_os 2.3.9 → 2.4.1

package/demo/app/test/mqtt/zs/index.js

@@ -58,7 +58,10 @@ exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没
 		// 0不开门，1开门
 		"ctrl_type": pass ? "on" : "off"
 	});
-	return res
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
 }
 
 /**
@@ -67,13 +70,15 @@ exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没
  * @param {String} uuid 用户唯一标识
  * @param {Number} longtime 超时回馈
  */
-exports.del_member = function(clientid, uuid) {
-	var res = this.push("delete_face", clientid, {
+exports.delete_member = async function(clientid, uuid) {
+	var res = await this.push("delete_face", clientid, {
 		"per_id": uuid,
 		"type": 0
 	});
-	var bl = res.code == 0;
-	return $.ret.bl(bl, res.reply || "删除成功");
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
 }
 
 /**
@@ -82,33 +87,73 @@ exports.del_member = function(clientid, uuid) {
  * @param {Object} arr 成员列表
  * @param {Number} longtime 超时回馈
  */
-exports.del_member_batch = async function(clientid, arr, longtime) {
-	var list = [];
+exports.delete_member_batch = async function(clientid, arr, longtime) {
+	if (!this.drives[clientid]) {
+		this.drives[clientid] = {};
+	}
+	if (this.drives[clientid].pushing == 1) {
+		return {
+			detail: "busy"
+		}
+	}
+	this.drives[clientid].pushing = 1;
+	this.drives[clientid].mode = "update";
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+
+	var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
 	for (var i = 0; i < arr.length; i++) {
-		var uuid = arr[i];
+		var customId = arr[i];
 		var res = await this.push("delete_face", clientid, {
-			"per_id": uuid,
+			"per_id": customId,
 			"type": 0
 		});
-		var bl = false;
-		if (res.code == 0) {
-			bl = true;
+		if (res.message == "ACK") {
+			success++;
+			success_info.push({
+				customId,
+				time_create: now
+			});
+		} else {
+			error++;
+			// 407 人脸像素太大（大于 1072）
+			// 408 图片格式错误
+			// 410 获取到的特征数据为空
+			// 412 相似人脸禁止录入
+			// 419 缓存初始化中
+			// 420 图片长度小于 112
+			error_info.push({
+				customId,
+				errcode: res.code.toString(),
+				time_create: now
+			});
 		}
-		list.push({
-			uuid,
-			bl,
-			tip: res.reply || "删除成功"
-		});
 	}
-	return list;
+	this.drives[clientid].pushing = 0;
+	this.drives[clientid].mode = "";
+
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result: 'ok'
+	};
 }
 
 /**
  * 重启设备
  * @param {String} clientid 设备sn
  */
-exports.reboot_device = function(clientid) {
-	return this.push("reboot_cam", clientid, {});
+exports.reboot_device = async function(clientid) {
+	var res = await this.push("reboot_cam", clientid, {});
+	if (res.message !== "ACK") {
+		return res.code;
+	}
 }
 
 /**
@@ -122,7 +167,10 @@ exports.set_device_time = async function(clientid, datetime) {
 			"datetime": datetime
 		}
 	});
-	return
+
+	if (res.message !== "ACK") {
+		return res.code;
+	}
 }
 
 /**
@@ -151,7 +199,10 @@ exports.reset_device = function(clientid, record = true, member = false, log = t
  * @param {String} clientid 设备sn
  */
 exports.get_progress = function(clientid) {
-	// return this.push("QueryProgress", clientid, {});
+	if (!this.drives[clientid]) {
+		this.drives[clientid] = {};
+	}
+	return this.drives[clientid].pushing || 0;
 }
 
 /**
@@ -163,6 +214,11 @@ exports.get_progress = function(clientid) {
 exports.convert_in = function(push_topic, msg, topic) {
 	var cg = this.config;
 	var method = msg[cg.method];
+	if (push_topic.indexOf("heartbeat") !== -1) {
+		method = "mqtt_heartbeat";
+	} else if (push_topic.indexOf("face/response") !== -1) {
+		method = "push_face";
+	}
 	var json = {
 		clientid: "",
 		id: msg[cg.msgid] || this.get_msgid(method, 'client'),
@@ -172,13 +228,15 @@ exports.convert_in = function(push_topic, msg, topic) {
 		json.params = msg[cg.params];
 	}
 	if (msg[cg.result]) {
-		json.result = msg[cg.result];
+		json.result = {
+			code: msg.code,
+			message: msg[cg.result]
+		};
 	}
-	json.clientid = this.get_clientid(push_topic, json.params || json.result || {}, msg, topic);
-
-	if (push_topic.indexOf("heartbeat") !== -1) {
-		json.method = "mqtt_heartbeat";
+	if (!json.params && !json.result) {
+		json.result = msg;
 	}
+	json.clientid = this.get_clientid(push_topic, json.params || json.result || {}, msg, topic).toLocaleUpperCase();
 	return json;
 }
 
@@ -251,25 +309,24 @@ exports.member_model_out = function(m) {
 		"per_id": m.customId,
 		"per_name": m.name,
 		"idcardNum": m.nfc || '',
-		"img_url": m.avatar,
+		"img_url": this.fullUrl(m.avatar),
 		"idcardper": m.idcard,
-		// 	1 待审核 | 2 已拒绝 | 3 已通过 | 4 黑名单
-		"per_type": m.type == 4 ? 2 : 0,
+		"auth_type": 0,
+		// 	1 待审核 | 2 已拒绝 | 3 已通过 | 4 黑名单 , 设备0为白名单，2为黑名单
+		"per_type": m.state == 4 ? 2 : 0,
 		"usr_type": m.gm,
 		"gender": m.sex == 1 ? '男' : '女'
 	}
 
-	if (m.time_valid_end && m.time_valid_end > date && m.time_valid_end <= endDate) {
-		if (typeof(m.time_valid_start) == "object") {
-			obj.s_time = m.time_valid_start.toStr("yyyy-MM-dd hh:mm:ss");
-		} else {
-			obj.s_time = m.time_valid_start.toTime().toStr("yyyy-MM-dd hh:mm:ss");
-		}
-		if (typeof(m.time_valid_end) == "object") {
-			obj.e_time = m.time_valid_end.toStr("yyyy-MM-dd hh:mm:ss");
-		} else {
-			obj.e_time = m.time_valid_end.toTime().toStr("yyyy-MM-dd hh:mm:ss");
-		}
+	if (typeof(m.time_valid_start) == "object") {
+		obj.s_time = m.time_valid_start.stamp();
+	} else {
+		obj.s_time = m.time_valid_start.toTime().stamp();
+	}
+	if (typeof(m.time_valid_end) == "object") {
+		obj.e_time = m.time_valid_end.stamp();
+	} else {
+		obj.e_time = m.time_valid_end.toTime().stamp();
 	}
 	return obj
 }
@@ -279,37 +336,80 @@ exports.member_model_out = function(m) {
  * @param {String} clientid 设备ID
  * @param {Object} user 人员信息
  */
-exports.update_member = function(clientid, user) {
+exports.update_member = async function(clientid, user) {
 	var member = this.member_model_out(user);
-	return this.push(clientid, member);
+	var res = await this.push("update_face_ex", clientid, member);
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
 }
 
 /**
- * 批量下发人员名单
+ * 批量下发人员名单(模拟) 设备本身没有批量下发，因此需要自己设计一个来模拟
  * @param {String} clientid 客户端ID
  * @param {Array} list 人员名单
  * @param {Number} longtime 超时回馈
  */
 exports.update_member_batch = async function(clientid, list, longtime = 0) {
-	var list = [];
-	for (var i = 0; i < arr.length; i++) {
+	if (!this.drives[clientid]) {
+		this.drives[clientid] = {};
+	}
+	if (this.drives[clientid].pushing == 1) {
+		return {
+			detail: "busy"
+		}
+	}
+	this.drives[clientid].pushing = 1;
+	this.drives[clientid].mode = "delete";
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+
+	var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
+	for (var i = 0; i < list.length; i++) {
 		var user = list[i];
-		var res = await this.push(clientid, this.member_model_out(user));
-		var bl = false;
-		if (res.code == 0) {
-			bl = true;
+		var res = await this.push("update_face_ex", clientid, this.member_model_out(user));
+		if (res.message == "ACK") {
+			success++;
+			success_info.push({
+				customId: user.customId,
+				time_create: now
+			});
+		} else {
+			error++;
+			// 407 人脸像素太大（大于 1072）
+			// 408 图片格式错误
+			// 410 获取到的特征数据为空
+			// 412 相似人脸禁止录入
+			// 419 缓存初始化中
+			// 420 图片长度小于 112
+			error_info.push({
+				customId: user.customId,
+				errcode: res.code.toString(),
+				time_create: now
+			});
 		}
-		list.push({
-			uuid: user.customId,
-			bl,
-			tip: res.reply || "删除成功"
-		});
 	}
-	return list;
+	this.drives[clientid].pushing = 0;
+	this.drives[clientid].mode = "";
+
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result: 'ok'
+	};
 }
 
 /**
  * 播放语音
+ * @param {String} clientid 客户端ID
+ * @param {Number} type 语音类型 1为没有权限，2为鉴权失败，3为鉴权成功
  */
 exports.play_audio = async function(clientid, type = 3) {
 	var body = {};
@@ -333,11 +433,48 @@ exports.play_audio = async function(clientid, type = 3) {
 	var res = await this.push("trylisten_wav", clientid, {
 		body
 	});
+
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
+}
+
+/**
+ * 设置扫描二维码模式
+ * @param {String} clientid 客户端ID
+ * @param {Number} mode 模式
+ */
+exports.set_qrcode_mode = async function(clientid, mode = 1) {
+	var res = await this.push("set_qrcode_mode", clientid, {
+		body: {
+			"enable": 0,
+			mode
+		}
+	});
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
+}
+
+/**
+ * 发送灯光
+ * @param {String} clientid 客户端ID
+ * @param {Number} color 颜色选项
+ */
+exports.send_led = async function(clientid, color = 1) {
+	var res = await this.push("set_led_color_test", clientid, {
+		"body": {
+			color
+		}
+	});
+	if (res.message !== "ACK") {
+		return res.code;
+	}
+	return
 }
 
-// exports.convert_in = function(push_topic, msg, topic, index) {
-// 	console.log("收到", push_topic, msg, topic, index);
-// }
 
 /**
  * 初始化函数, 用于定义开放给前端的函数
@@ -352,7 +489,7 @@ exports.init = function() {
 		}
 		_this.drives[clientid].online = 1;
 		_this.drives[clientid].time_last = new Date().getTime();
-		console.log("心跳", clientid, _this.drives[clientid]);
+		// console.log("心跳", clientid, _this.drives[clientid]);
 	}
 
 	/**
@@ -362,100 +499,41 @@ exports.init = function() {
 	 */
 	m["mqtt_online"] = async function(clientid, params) {
 		_this.update_online(clientid, 1);
+		_this.set_qrcode_mode(clientid);
 		console.log("上线", clientid, _this.drives[clientid]);
 	};
 
-	m["RecPush"] = async function(clientid, params, msg, id) {
-		var info = msg.body;
-		// "body": {
-		// 	"e_imgsize": 13485,
-		// 	"ext_sec": 1709089205,
-		// 	"hat": -1,
-		// 	"hcode_status": 0,
-		// 	"idcard": "",
-		// 	"img_data": "/9j/4AAQSkZJRgABAQIAdgB2AAD/7wAPAAAAAAAAAAAAAAAAAP",
-		// 	"isRealtimeData": 601,
-		// 	"isurl": false,
-		// 	"mask": -1,
-		// 	"matched": 93,
-		// 	"name": "schmidt",
-		// 	"name_base64": "c2NobWlkdA==",
-		// 	"per_id": "1706099386778",
-		// 	"per_id_base64": "MTcwNjA5OTM4Njc3OA==",
-		// 	"role": 0,
-		// 	"sequence": 27307,
-		// 	"sn": "7560d2db-fd20feb7",
-		// 	"tep": 0,
-		// 	"usec": 1709118005
-		// }
-
+	m["push_face"] = async function(clientid, params, msg, id) {
 		var type = 1;
-		switch (params.otype) {
-			// (1人脸验证|2远程开门|3智码开门|4刷卡验证)
-			case "7":
-			case "27":
-				type = 2;
+		var action;
+		switch (msg.type) {
+			case "face_result":
+				type = 1;
 				break;
-			case "47":
-			case "48":
-			case "55":
-			case "56":
-			case "57":
-				type = 3;
-				break;
-			case "21":
-			case "22":
-			case "24":
-			case "25":
+			case "wgin_read":
 				type = 4;
 				break;
 			default:
 				break;
 		}
-		if (type == 2) {
-			return;
-		}
-		// 1白名单|2黑名单
-		var person_type = params.PersonType == "1" ? 2 : 1;
-		var record_type = params.RecordType ? Number(params.RecordType) + 1 : 1;
-
-		// 拿到打卡人的姓名
-		var name = params.persionName || params.name;
-		if (!name) {
-			return;
-		}
-		var customId = params.customId.trim();
-		var phone = (params.telnum || "").trim();
-		var idcard = (params.idCard || "").trim();
-		var nfc = (params.cardNum2 || params.RFIDCard || "").trim();
-		var time = params.time;
-		var avatar = "";
-		if (params.pic) {
-			avatar = params.pic;
-		}
 		var log = {
-			customId,
-			name,
-			phone,
-			idcard,
-			nfc,
+			customId: params.per_id,
+			name: params.name,
+			idcard: params.idcard,
 			clientid,
+			// (1刷脸验证|2远程开门|3智码开门|4刷卡验证)
 			type,
-			person_type,
-			record_type,
-			time,
-			avatar
+			// 1白名单|2黑名单
+			person_type: params.matchRole || params.role || 0,
+			record_type: 1,
+			action,
+			nfc: params.wg_num,
+			// usec / ext_sec
+			time: params.ext_sec.toTime().toStr("yyyy-MM-dd hh:mm:ss"),
+			avatar: params.img_data,
+			sex: params.gender == '男' ? 1 : 2
 		}
 		$.server.exec_log(clientid, log);
-
-		_this.send(`mqtt/face/${clientid}`, {
-			"messageId": _this.get_msgid('PushAck'),
-			"operator": "PushAck",
-			"info": {
-				"PushAckType": "2",
-				"SnapOrRecordID": params.RecordID
-			}
-		});
 	}
 
 	m["send_qr_msg"] = async function(clientid, params, msg, id) {
@@ -466,21 +544,18 @@ exports.init = function() {
 			tip,
 			device
 		} = await $.server.exec_qrcode(clientid, qrcode);
-		console.log('扫码', qrcode, uuid,
-			pass,
-			tip,
-			device)
 		if (device && device.online) {
-			console.log("看门", clientid.toLocaleUpperCase(), uuid, pass, tip);
-			await _this.unlock(clientid.toLocaleUpperCase(), uuid, pass, tip);
+			await _this.unlock(clientid, uuid, pass, tip);
 		}
 		if (tip) {
-			if (tip.indexOf("过期") !== -1) {
+			if (tip.indexOf("过期") !== -1 || tip.indexOf("超限") !== -1) {
 				_this.play_audio(clientid, 1);
+				_this.send_led(clientid);
 			} else if (tip.indexOf("通行") !== -1) {
 				// _this.play_audio(clientid, 3);
 			} else {
 				_this.play_audio(clientid, 2);
+				_this.send_led(clientid);
 			}
 		}
 	}

package/demo/app/test/task/demo_task/index.js

@@ -0,0 +1,37 @@
+/**
+ * 定时任务函数
+ */
+exports.main = async function main() {
+	$.log.debug('定时任务, 执行中...');
+};
+
+/**
+ * 执行结果通知
+ * @param {String} name 任务名称
+ * @param {String} state 状态
+ */
+exports.notify = async function(name, state) {
+	switch (state) {
+		case "init":
+			$.log.debug('初始化');
+			break;
+		case "start":
+			$.log.debug('开始执行');
+			break;
+		case "stop":
+			$.log.debug('已暂停');
+			break;
+		case "suspend":
+			// 主动中断
+			$.log.debug('已中断');
+			break;
+		case "time_end":
+			$.log.debug('已到期');
+			break;
+		case "completed":
+			$.log.debug('已完成');
+			break;
+		default:
+			break;
+	}
+};

package/demo/app/test/task/demo_task/task.json

@@ -0,0 +1,26 @@
+{
+	// 任务标题
+	"title": "示例任务",
+	// 任务描述
+	"description": "描述任务使用方法",
+	// 任务名称，用于动态增删改查
+	"name": "demo",
+	// 状态 0未启用，1启用
+	"state": 1,
+	// 任务驱动的脚本文件
+	"func_file": "./index.js",
+	// 任务执行次数，执行次数达标后不再执行。0为不限次数，一直执行
+	"num": 10,
+	// 任务间隔时长，单位：毫秒
+	"interval": 1000,
+	// 任务启动等待时长，单位：毫秒
+	"wait": 0,
+	// 任务触发的时间，可设置的格式分别为: yyyy-MM-dd hh:mm:ss, MM-dd hh:mm:ss, dd hh:mm:ss, hh:mm:ss, hh:mm, mm 例如: 08:00, 则为每天8点触发
+	"time": "",
+	// 任务开始日期，例如：2020-10-01开始执行，为空则不限制
+	"date_start": "",
+	// 任务结束日期，例如：2020-10-07不再执行，为空则不限制
+	"date_end": "",
+	// 任务排序，决定多个任务的执行优先顺序
+	"sort": 100
+}