mm_os 2.3.9 → 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) {