mm_os 2.4.0 → 2.4.1

package/core/com/mqtt/script.js

@@ -3,8 +3,9 @@
  * @param {String} clientid 客户端ID
  * @param {Object} param
  */
-exports.get_log = function(clientid, param) {
-	return this.push("GetRecordsByPicOrID", clientid, param);
+exports.get_log = async function(clientid, param) {
+	var res = await this.push("GetRecordsByPicOrID", clientid, param);
+	return res;
 }
 
 /**
@@ -14,11 +15,15 @@ exports.get_log = function(clientid, param) {
  * @param {String} avatar base64头像
  * @param {Number} longtime 超时回馈
  */
-exports.sign_in = function(clientid, uuid, avatar) {
-	return this.push("PullRecordOnlyPic", clientid, {
+exports.sign_in = async function(clientid, uuid, avatar) {
+	var res = await this.push("PullRecordOnlyPic", clientid, {
 		"personID": uuid,
 		"picinfo": avatar
 	});
+
+	if (!res || res.result == "fail") {
+		return "打卡失败！";
+	}
 }
 
 /**
@@ -85,16 +90,37 @@ exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没
 	}
 }
 
+
+/**
+ * 远程锁门(没用到)
+ * @param {String} clientid 客户端ID
+ * @param {String} uuid 用户唯一标识
+ * @param {Boolean} pass 是否可通行 true为是
+ * @param {String} tip 提示
+ */
+exports.lock = async function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
+	var res = await this.push("Lock", clientid, {
+		"uid": uuid,
+		"showInfo": tip
+	});
+
+	if (!res || res.result == "fail") {
+		return "已锁门！";
+	}
+}
+
 /**
  * 删除成员
  * @param {String} clientid 客户端ID
  * @param {String} uuid 用户唯一标识
  * @param {Number} longtime 超时回馈
  */
-exports.delete_member = function(clientid, uuid) {
-	return this.push("DeletePersons", clientid, {
+exports.delete_member = async function(clientid, uuid) {
+	var res = await this.push("DeletePersons", clientid, {
 		"customId": uuid
 	});
+
+	return
 }
 
 /**
@@ -103,21 +129,59 @@ exports.delete_member = function(clientid, uuid) {
  * @param {Object} arr 成员列表
  * @param {Number} longtime 超时回馈
  */
-exports.delete_member_batch = function(clientid, arr, longtime) {
-	return this.push("DeletePersons", clientid, {
+exports.delete_member_batch = async function(clientid, arr, longtime) {
+	var res = await this.push("DeletePersons", clientid, {
 		DataBegin: "BeginFlag",
 		DataEnd: "EndFlag",
 		PersonNum: arr.length.toString(),
 		customId: arr
 	}, longtime);
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+
+	if (res) {
+		if (res.result == 'ok') {
+			var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
+			error = Number(res.DelErrNum);
+			success = Number(res.DelSucNum);
+			error_info = res.DelErrInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			success_info = res.DelSucInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			result = res.result;
+		} else if (res.detail && res.detail.indexOf('busy') === -1) {
+			result = 'fail';
+		}
+	}
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result
+	};
+
+	return
 }
 
 /**
  * 重启设备
  * @param {String} clientid 设备sn
  */
-exports.reboot_device = function(clientid) {
-	return this.push("RebootDevice", clientid, {});
+exports.reboot_device = async function(clientid) {
+	var res = await this.push("RebootDevice", clientid, {});
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "重启设备失败"
 }
 
 /**
@@ -186,12 +250,17 @@ exports.get_progress = async function(clientid, mode = 'update') {
  * @param {Object} param 其他信息
  * @param {Number} longtime 超时回馈
  */
-exports.replacement = function(clientid, uuid, time, avatar) {
-	return this.push("PullRecordOnlyName", clientid, {
+exports.replacement = async function(clientid, uuid, time, avatar) {
+	var res = await this.push("PullRecordOnlyPic", clientid, {
 		"personID": uuid,
 		"time": time,
 		"picinfo": avatar
-	}, longtime);
+	});
+
+	if (!res || res.result == "fail") {
+		return "补卡失败！";
+	}
+	return
 }
 
 /**
@@ -241,7 +310,8 @@ exports.member_model_out = function(m) {
 		"picURI": this.fullUrl(m.avatar)
 	}
 
-	if (m.time_valid_end && m.time_valid_end > "2021-01-01 00:00:00".toTime() && m.time_valid_end <=
+	if (m.time_valid_end && m.time_valid_end.toTime() > "2021-01-01 00:00:00".toTime() && m.time_valid_end
+	.toTime() <=
 		"2038-01-01 00:00:00".toTime()) {
 		if (typeof(m.time_valid_start) == "object") {
 			obj.cardValidBegin = m.time_valid_start.toStr("yyyy-MM-dd hh:mm:ss");
@@ -277,7 +347,37 @@ exports.update_member_batch = async function(clientid, list, longtime = 180) {
 			return this.member_model_out(o);
 		})
 	}, longtime);
-	return res;
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+	if (res) {
+		if (res.result == 'ok') {
+			var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
+			error = Number(res.AddErrNum);
+			success = Number(res.AddSucNum);
+			error_info = res.AddErrInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			success_info = res.AddSucInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			result = res.result;
+		} else if (res.detail && res.detail.indexOf('busy') === -1) {
+			result = 'fail';
+		}
+	}
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result
+	};
 }
 
 /**
@@ -309,24 +409,16 @@ exports.init = function() {
 		}
 		_this.drives[clientid].online = 1;
 		_this.drives[clientid].time_last = new Date().getTime();
+		// console.log("心跳", clientid, _this.drives[clientid]);
 	}
 
 	/**
-	 * 在线通知
+	 * 离线通知
 	 * @param {String} clientid 设备sn
 	 * @param {Object} param 其他信息
 	 */
 	m["Offline"] = async function(clientid, params) {
-		if (_this.drives[clientid]) {
-			_this.drives[clientid].online = 0;
-		}
-		var {
-			tip,
-			device
-		} = await $.server.check_device(clientid);
-		if (device) {
-			device.online = 0;
-		}
+		_this.update_online(clientid, 0);
 		// console.log("离线", clientid, _this.drives[clientid]);
 	};
 
@@ -336,19 +428,87 @@ exports.init = function() {
 	 * @param {Object} param 其他信息
 	 */
 	m["Online"] = async function(clientid, params) {
-		await this.update_online(clientid);
+		await _this.update_online(clientid, 1, params.ip);
 		return {
 			"facesluiceId": clientid,
 			"result": "ok",
 			"detail": ""
 		};
-		// console.log("上线", clientid, _this.drives[clientid]);
+		console.log("上线", clientid, _this.drives[clientid]);
+	};
+
+	/**
+	 * 更新人体生命体征，如温度、湿度、位置、
+	 * @param {String} clientid 设备sn
+	 * @param {Object} param 其他信息
+	 */
+	m["life"] = async function(clientid, params) {
+		_this.update_life(clientid, {
+			// 心率
+			heart_rate: 0,
+			// 睡眠状态 是深度睡眠还是浅睡眠
+			sleep: 0,
+			// 血氧饱和度
+			oxygen: 0,
+			// 行走步数
+			step: 0,
+			// 压力
+			pressure: 0,
+			// GPS横坐标，保留生命体脱下设备时的最后位置
+			gps_x: 0,
+			// GPS纵坐标，保留生命体脱下设备时的最后位置
+			gps_y: 0
+		});
+		// console.log("离线", clientid, _this.drives[clientid]);
 	};
 
+	/**
+	 * 更新设备信息，如温度、湿度、位置
+	 * @param {String} clientid 设备sn
+	 * @param {Object} param 其他信息
+	 */
+	m["info"] = async function(clientid, params) {
+		_this.update_device_info(clientid, {
+			// 温度
+			temperature: 0,
+			// 湿度
+			humidity: 0,
+			// 氧气
+			oxygen: 0,
+			// 二氧化碳
+			carbon_dioxide: 0,
+			// 光照强度
+			light: 0,
+			// 烟雾浓度
+			smoke: 0,
+			// 压力
+			pressure: 0,
+			// GPS横坐标
+			gps_x: 0,
+			// GPS纵坐标
+			gps_y: 0
+		});
+		// console.log("离线", clientid, _this.drives[clientid]);
+	};
+
+
+	/**
+	 * 上报
+	 * @param {String} clientid 设备sn
+	 * @param {Object} param 其他信息
+	 */
 	m["RecPush"] = async function(clientid, params, msg, id) {
+		_this.send(`mqtt/face/${clientid}`, {
+			"messageId": _this.get_msgid('PushAck'),
+			"operator": "PushAck",
+			"info": {
+				"PushAckType": "2",
+				"SnapOrRecordID": params.RecordID
+			}
+		});
 		var type = 1;
 		switch (params.otype) {
-			// (1人脸验证|2远程开门|3智码开门|4刷卡验证)
+			// (1刷脸验证|2远程开门|3智码开门|4刷卡验证)
 			case "7":
 			case "27":
 				type = 2;
@@ -385,6 +545,9 @@ exports.init = function() {
 		var phone = (params.telnum || "").trim();
 		var idcard = (params.idCard || "").trim();
 		var nfc = (params.cardNum2 || params.RFIDCard || "").trim();
+		if (nfc == "0") {
+			ncf = ""
+		}
 		var time = params.time;
 		var avatar = "";
 		if (params.pic) {
@@ -405,19 +568,11 @@ exports.init = function() {
 			type,
 			person_type,
 			record_type,
+			action: "刷脸验证",
 			time,
 			avatar
 		}
 		$.server.exec_log(clientid, log);
-
-		_this.send(`mqtt/face/${clientid}`, {
-			"messageId": _this.get_msgid('PushAck'),
-			"operator": "PushAck",
-			"info": {
-				"PushAckType": "2",
-				"SnapOrRecordID": params.RecordID
-			}
-		});
 	}
 
 	m["QRCodePush"] = async function(clientid, params, msg, id) {
@@ -427,7 +582,7 @@ exports.init = function() {
 			pass,
 			tip,
 			device
-		} = $.server.exec_qrcode(clientid, qrcode);
+		} = await $.server.exec_qrcode(clientid, qrcode);
 		if (device && device.online) {
 			await _this.unlock(clientid, uuid, pass, tip);
 		}

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

@@ -14,11 +14,15 @@ exports.get_log = function(clientid, param) {
  * @param {String} avatar base64头像
  * @param {Number} longtime 超时回馈
  */
-exports.sign_in = function(clientid, uuid, avatar) {
-	return this.push("PullRecordOnlyPic", clientid, {
+exports.sign_in = async function(clientid, uuid, avatar) {
+	var res = await this.push("PullRecordOnlyPic", clientid, {
 		"personID": uuid,
 		"picinfo": avatar
 	});
+
+	if (!res || res.result == "fail") {
+		return "打卡失败！";
+	}
 }
 
 /**
@@ -91,10 +95,12 @@ exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没
  * @param {String} uuid 用户唯一标识
  * @param {Number} longtime 超时回馈
  */
-exports.delete_member = function(clientid, uuid) {
-	return this.push("DeletePersons", clientid, {
+exports.delete_member = async function(clientid, uuid) {
+	var res = await this.push("DeletePersons", clientid, {
 		"customId": uuid
 	});
+
+	return
 }
 
 /**
@@ -103,21 +109,59 @@ exports.delete_member = function(clientid, uuid) {
  * @param {Object} arr 成员列表
  * @param {Number} longtime 超时回馈
  */
-exports.delete_member_batch = function(clientid, arr, longtime) {
-	return this.push("DeletePersons", clientid, {
+exports.delete_member_batch = async function(clientid, arr, longtime) {
+	var res = await this.push("DeletePersons", clientid, {
 		DataBegin: "BeginFlag",
 		DataEnd: "EndFlag",
 		PersonNum: arr.length.toString(),
 		customId: arr
 	}, longtime);
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+
+	if (res) {
+		if (res.result == 'ok') {
+			var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
+			error = Number(res.DelErrNum);
+			success = Number(res.DelSucNum);
+			error_info = res.DelErrInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			success_info = res.DelSucInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			result = res.result;
+		} else if (res.detail && res.detail.indexOf('busy') === -1) {
+			result = 'fail';
+		}
+	}
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result
+	};
+
+	return
 }
 
 /**
  * 重启设备
  * @param {String} clientid 设备sn
  */
-exports.reboot_device = function(clientid) {
-	return this.push("RebootDevice", clientid, {});
+exports.reboot_device = async function(clientid) {
+	var res = await this.push("RebootDevice", clientid, {});
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "重启设备失败"
 }
 
 /**
@@ -186,12 +230,17 @@ exports.get_progress = async function(clientid, mode = 'update') {
  * @param {Object} param 其他信息
  * @param {Number} longtime 超时回馈
  */
-exports.replacement = function(clientid, uuid, time, avatar) {
-	return this.push("PullRecordOnlyName", clientid, {
+exports.replacement = async function(clientid, uuid, time, avatar) {
+	var res = await this.push("PullRecordOnlyPic", clientid, {
 		"personID": uuid,
 		"time": time,
 		"picinfo": avatar
-	}, longtime);
+	});
+
+	if (!res || res.result == "fail") {
+		return "补卡失败！";
+	}
+	return 
 }
 
 /**
@@ -240,8 +289,8 @@ exports.member_model_out = function(m) {
 		"cardType": 0,
 		"picURI": this.fullUrl(m.avatar)
 	}
-
-	if (m.time_valid_end && m.time_valid_end > "2021-01-01 00:00:00".toTime() && m.time_valid_end <=
+	
+	if (m.time_valid_end && m.time_valid_end.toTime() > "2021-01-01 00:00:00".toTime() && m.time_valid_end.toTime() <=
 		"2038-01-01 00:00:00".toTime()) {
 		if (typeof(m.time_valid_start) == "object") {
 			obj.cardValidBegin = m.time_valid_start.toStr("yyyy-MM-dd hh:mm:ss");
@@ -277,7 +326,37 @@ exports.update_member_batch = async function(clientid, list, longtime = 180) {
 			return this.member_model_out(o);
 		})
 	}, longtime);
-	return res;
+
+	var result;
+	var error = 0;
+	var success = 0;
+	var error_info = [];
+	var success_info = [];
+	if (res) {
+		if (res.result == 'ok') {
+			var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
+			error = Number(res.AddErrNum);
+			success = Number(res.AddSucNum);
+			error_info = res.AddErrInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			success_info = res.AddSucInfo.map((o) => {
+				o.time_create = now;
+				return o
+			});
+			result = res.result;
+		} else if (res.detail && res.detail.indexOf('busy') === -1) {
+			result = 'fail';
+		}
+	}
+	return {
+		error,
+		success,
+		error_info,
+		success_info,
+		result
+	};
 }
 
 /**
@@ -338,9 +417,17 @@ exports.init = function() {
 	};
 
 	m["RecPush"] = async function(clientid, params, msg, id) {
+		_this.send(`mqtt/face/${clientid}`, {
+			"messageId": _this.get_msgid('PushAck'),
+			"operator": "PushAck",
+			"info": {
+				"PushAckType": "2",
+				"SnapOrRecordID": params.RecordID
+			}
+		});
 		var type = 1;
 		switch (params.otype) {
-			// (1人脸验证|2远程开门|3智码开门|4刷卡验证)
+			// (1刷脸验证|2远程开门|3智码开门|4刷卡验证)
 			case "7":
 			case "27":
 				type = 2;
@@ -377,6 +464,9 @@ exports.init = function() {
 		var phone = (params.telnum || "").trim();
 		var idcard = (params.idCard || "").trim();
 		var nfc = (params.cardNum2 || params.RFIDCard || "").trim();
+		if (nfc == "0") {
+			ncf = ""
+		}
 		var time = params.time;
 		var avatar = "";
 		if (params.pic) {
@@ -397,19 +487,11 @@ exports.init = function() {
 			type,
 			person_type,
 			record_type,
+			action: "刷脸验证",
 			time,
 			avatar
 		}
 		$.server.exec_log(clientid, log);
-
-		_this.send(`mqtt/face/${clientid}`, {
-			"messageId": _this.get_msgid('PushAck'),
-			"operator": "PushAck",
-			"info": {
-				"PushAckType": "2",
-				"SnapOrRecordID": params.RecordID
-			}
-		});
 	}
 
 	m["QRCodePush"] = async function(clientid, params, msg, id) {

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/com/server/index.js

@@ -1,13 +1,8 @@
+var fs = require("fs");
+var Server = require("../../../com/server/com.js");
 var sql = $.mysql_admin('sys');
 var dbs = sql.db();
 
-/**
- * 服务端类
- */
-class Server {
-
-}
-
 /**
  * 获取用户
  * @param {String} table 数据表
@@ -18,8 +13,8 @@ class Server {
  * @param {String} idcard 用户身份证号
  * @returns {Object} 返回用户对象
  */
-Server.prototype.get_user_sub = async function(table, project_id, customId, name, phone, idcard) {
-	var db1 = dbs.new("face_" + table, "user_id");
+Server.prototype.get_enter_sub = async function(table, project_id, customId, name, phone, idcard) {
+	var db1 = dbs.new("face_" + table, table == "enter" ? "user_id" : "visitor_id");
 	var query = {
 		project_id
 	}
@@ -58,15 +53,15 @@ Server.prototype.get_user_sub = async function(table, project_id, customId, name
  * @param {String} idcard 用户身份证号
  * @returns {Object} 返回用户对象和用户类型
  */
-Server.prototype.get_user = async function(project_id, customId, name, phone, idcard) {
+Server.prototype.get_enter = async function(project_id, customId, name, phone, idcard) {
 	// 默认为 1内部人员类型
 	var user_type = 1;
-	var enter = await this.get_user_sub("enter", project_id, customId, name, phone, idcard);
+	var enter = await this.get_enter_sub("enter", project_id, customId, name, phone, idcard);
 
 	if (!enter) {
 		// 2为访客
 		user_type = 2;
-		enter = await this.get_user_sub("visitor", project_id, customId, name, phone, idcard);
+		enter = await this.get_enter_sub("visitor", project_id, customId, name, phone, idcard);
 	}
 
 	if (enter) {
@@ -92,7 +87,7 @@ Server.prototype.get_user = async function(project_id, customId, name, phone, id
 				qy.project_id = enter.project_id;
 			}
 			await db3.set(qy, by);
-			enter = Object.assign({}, enter, by);
+			enter = await db3.getObj(qy);
 		}
 	} else {
 		// 3为外部人员(非平台成员)
@@ -100,7 +95,7 @@ Server.prototype.get_user = async function(project_id, customId, name, phone, id
 		enter = {
 			department_id: 0,
 			team_id: 0,
-			name: "",
+			name,
 			job: "",
 			phone,
 			idcard
@@ -108,7 +103,7 @@ Server.prototype.get_user = async function(project_id, customId, name, phone, id
 	}
 	return {
 		user_type,
-		user: Object.assign({}, enter)
+		enter
 	}
 }
 
@@ -146,13 +141,15 @@ Server.prototype.exec_log = async function(clientid, log) {
 		type,
 		record_type,
 		person_type,
-		action
+		action,
+		avatar,
+		nfc
 	} = log;
 	// 通过项目id和用户唯一标识获取用户
 	var {
-		user,
+		enter,
 		user_type
-	} = await this.get_user(project_id, customId, name, phone, idcard);
+	} = await this.get_enter(project_id, customId, name, phone, idcard);
 
 	// 如果不记录外部人员，则终止，不保存记录
 	if (!project.save_outboard && user_type === 3) {
@@ -160,17 +157,16 @@ Server.prototype.exec_log = async function(clientid, log) {
 	}
 
 	log = {
-		project_id: 0,
+		project_id,
 		user_id: 0,
 		name: "",
 		// 1内部人员|2访客|3非系统名单
 		user_type,
-		clientid: "",
 		direction: "",
-		// 1人脸验证|2远程开门|3扫码开门|4刷卡验证
+		// 1刷脸验证|2远程开门|3扫码开门|4刷卡验证
 		type,
 		record_type,
-		action: action || "人脸验证",
+		action: action || "刷脸验证",
 		// 1白名单|2黑名单
 		person_type,
 		department_id: 0,
@@ -183,10 +179,17 @@ Server.prototype.exec_log = async function(clientid, log) {
 		time: ""
 	}
 
-	$.push(log, user);
+	$.push(log, enter);
+	log.avatar = avatar;
 	log.time = time;
 	log.clientid = clientid;
 	log.direction = device.direction;
+	if (nfc && !log.nfc) {
+		log.nfc = nfc;
+	}
+	if (log.person_type === 0) {
+		log.person_type = enter.state == 4 ? 2 : 1;
+	}
 	return this.save_log(log, project.upload_pic);
 }
 
@@ -197,7 +200,7 @@ Server.prototype.exec_log = async function(clientid, log) {
  */
 Server.prototype.check_device = async function(clientid, key) {
 	var tip;
-	var db2 = dbs.new("face_device");
+	var db2 = dbs.new("face_device", "device_id");
 	var device = await db2.getObj({
 		clientid
 	});
@@ -225,7 +228,7 @@ Server.prototype.check_device = async function(clientid, key) {
  */
 Server.prototype.check_project = async function(project_id, key) {
 	var tip;
-	var db2 = dbs.new("sys_project");
+	var db2 = dbs.new("sys_project", "project_id");
 	var project = await db2.getObj({
 		project_id
 	});
@@ -261,13 +264,14 @@ Server.prototype.save_log = async function(log, upload_pic) {
 	var time = log.time;
 	var clientid = log.clientid;
 	var count = await db.count({
-		clientid,
+		project_id,
 		user_id,
+		clientid,
 		time
-	});
+	}, false);
 
 	// 如果记录已存在，则不再保存
-	if (count) {
+	if (count > 0) {
 		return
 	}
 
@@ -275,8 +279,8 @@ Server.prototype.save_log = async function(log, upload_pic) {
 	var direction = log.direction;
 	if (user_id && direction == "通用") {
 		var qy = {
-			user_id,
 			project_id,
+			user_id,
 			type_has: "1,3,4",
 			time_min: time.toTime().toStr('yyyy-MM-dd 00:00:00')
 		};
@@ -292,15 +296,17 @@ Server.prototype.save_log = async function(log, upload_pic) {
 	// 重新定义头像
 	var pic;
 	var fname = time.replace(/[-: ]/g, '_');
-	var avatar = log.avatar;
+	var avatar = log.avatar || '';
+	var p = `/file/image/user/${user_id}/${fname}.png`;
 	if (avatar) {
 		if (upload_pic) {
 			pic = avatar;
-			avatar = `/face/img/user/${user_id}/${fname}.png`;
+			avatar = p;
 		} else {
 			avatar = "";
 		}
 	}
+	log.avatar = avatar;
 
 	// 如果是访客则追加备注
 	var visitor_id = log.visitor_id;
@@ -338,8 +344,8 @@ Server.prototype.save_log = async function(log, upload_pic) {
 		if (log.user_type == 1) {
 			var db4 = dbs.new("face_enter", "enter_id");
 			await db4.set({
-				user_id,
-				project_id
+				project_id,
+				user_id
 			}, body);
 		} else if (log.user_type == 2) {
 			var db4 = dbs.new("face_visitor", "visitor_id");
@@ -349,7 +355,7 @@ Server.prototype.save_log = async function(log, upload_pic) {
 		}
 
 		if (pic) {
-			var file = (`/static/img/user/${user_id}/${fname}.png`).fullname();
+			var file = ('/static' + p).fullname();
 			file.addDir();
 			var po = pic.replace(/^data:image\/\w+;base64,/, "");
 			var bf = Buffer.from(po, 'base64');
@@ -370,10 +376,19 @@ Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
 	var now = new Date();
 	var time = now.toStr('yyyy-MM-dd hh:mm:ss');
 	var obj = await db.getObj({
-		qrcode,
-		time_end_min: time
+		qrcode
 	});
+
 	if (obj) {
+		if (now.getTime() > obj.time_end.getTime()) {
+			// 发送开门控制
+			return {
+				"uuid": obj.user_id,
+				// 0不开门，1开门
+				"pass": false,
+				"tip": "二维码已过期"
+			}
+		};
 		var {
 			device,
 			tip
@@ -390,12 +405,13 @@ Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
 			if (obj.count == 0 || obj.num < obj.count) {
 				var db = dbs.new("face_enter");
 				var user = await db.getObj({
-					user_id: obj.user_id,
 					project_id: obj.project_id,
+					user_id: obj.user_id,
 					state: 3
 				});
 				if (user) {
-					if (user.client && user.client.indexOf(clientid) !== -1) {
+					if (user.client && user.client.toLocaleUpperCase().indexOf(clientid.toLocaleUpperCase()) !==
+						-1) {
 						obj.num++;
 						// 发送开门控制
 						ret = {
@@ -411,7 +427,7 @@ Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
 							name: "",
 							// 1内部人员|2访客|3非系统名单
 							user_type: 1,
-							// 1人脸验证|2远程开门|3扫码开门|4刷卡验证
+							// 1刷脸验证|2远程开门|3扫码开门|4刷卡验证
 							type: 3,
 							record_type: 1,
 							action: "智码开门",
@@ -425,11 +441,17 @@ Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
 							nfc: "",
 							note: ""
 						}
-						$.push(u, user);
+						$.push(log, user);
 						log.direction = device.direction;
 						log.clientid = clientid;
 						log.time = time;
 						await this.save_log(log);
+						ret = {
+							"uuid": user.customId || user.project_id + "-" + user.user_id,
+							"pass": true,
+							"tip": "请通行",
+							device
+						}
 					} else {
 						// 发送开门控制
 						ret = {
@@ -469,6 +491,4 @@ Server.prototype.exec_qrcode = async function(clientid, qrcode = "") {
 	}
 
 	return ret;
-}
-
-$.server = new Server();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {