mm_os 2.3.2 → 2.3.3

package/core/com/mqtt/config.tpl.json

@@ -2,19 +2,19 @@
 	// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
 	"name": "{0}",
 	// mqtt 服务标题
-	"title": "",
+	"title": "{1}",
 	// mqtt 服务介绍
 	"description": "",
 	// 状态 0未启用，1启用
 	"state": 1,
 	// 订阅的主题
-	"topic": ["mqtt/server/sn/#", "mqtt/face/sn/#"],
-	// 主题回复
-	"topic_receive": ["mqtt/client/", "mqtt/face/"],
+	"topic": ["mqtt/face/#", "face/+/response", "mqtt/server/#"],
+	// 回复订阅主题
+	"topic_receive": ["mqtt/face/${clientid}", "face/${clientid}/request"],
 	// 给客户端推送的主题
-	"topic_push": "mqtt/client/${clientid}",
+	"topic_push": "mqtt/face/${clientid}",
 	// 接收方式
-	"qos": 1,
+	"qos": 2,
 	// 保持接收
 	"retain": true,
 	// 超时反馈
@@ -24,7 +24,7 @@
 	// 客户端ID
 	"clientid": "clientid",
 	// 消息ID
-	"msgid": "msgid",
+	"msgid": "messageId",
 	// 请求方法
 	"method": "operator",
 	// 参数

package/core/com/mqtt/drive.js

@@ -2,7 +2,6 @@ const os = require('os');
 const util = require('util');
 const Item = require('mm_machine').Item;
 
-
 /**
  * mqtt驱动类
  * @extends {Item}
@@ -90,9 +89,9 @@ Drive.prototype.model = function() {
 		// 状态 0未启用，1启用
 		"state": 1,
 		// 订阅的主题
-		"topic": ["mqtt/server/sn/#", "mqtt/face/sn/#"],
+		"topic": ["mqtt/face/#", "face/+/response", "mqtt/server/#"],
 		// 回复订阅主题
-		"topic_receive": ["mqtt/client/", "mqtt/face/"],
+		"topic_receive": ["mqtt/face/${clientid}", "face/${clientid}/request"],
 		// 给客户端推送的主题
 		"topic_push": "mqtt/client/${clientid}",
 		// 接收方式
@@ -301,6 +300,29 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
 	});
 }
 
+/**
+ * 更新设备在线
+ * @param {String} clientid 客户端ID
+ */
+Drive.prototype.update_online = async function(clientid) {
+	if (!_this.drives[clientid]) {
+		_this.drives[clientid] = {};
+	}
+	var time_last = new Date().getTime(); // 跟新时间戳
+	_this.drives[clientid].online = 1;
+	_this.drives[clientid].time_last = time_last;
+	var {
+		tip,
+		device
+	} = await $.server.check_device(clientid);
+	if (device) {
+		if (!device.online) {
+			device.online = 1;
+		}
+		device.time_last = time_last;
+	}
+}
+
 /**
  * 推送消息
  * @param {String} method 方法

package/core/com/mqtt/index.js

@@ -36,13 +36,17 @@ class MQTT extends Index {
 			password: "asd123",
 			clean: false,
 			longtime: 15000,
+			// 在线有效期时长判断 单位：毫秒，150000毫秒为2.5分钟
+			online_expires: 150000,
+			online_interval: 10000,
 			connectTimeout: 4000,
 			// maxInflight: 20,
 			// 重连间隔
 			// interval: 6000,
 			reconnectPeriod: 6000 // 重连间隔1秒
 		}
-
+		// 定时器
+		this.timer = null;
 		// mqtt客户端服务器
 		this.client = null;
 		/**
@@ -177,6 +181,7 @@ MQTT.prototype.init = function(config) {
  * @param {Object} config 配置参数
  */
 MQTT.prototype.start = function() {
+	this.start_timer();
 	this.connecting = true;
 	var err;
 	try {
@@ -405,6 +410,87 @@ MQTT.prototype.reqASync = function(topic, method, params) {
 	});
 };
 
+/**
+ * 保存在线到数据库
+ * @param {Array} arr 客户端ID数组
+ * @param {Number} online 在线情况 0为不在线，1为在线
+ * @param {Number} time_last 最后上线时间
+ */
+MQTT.prototype.save_online = async function(arr, online, time_last) {
+	if (!arr || !arr.length) {
+		return
+	}
+	var body = {
+		online
+	}
+	if (time_last) {
+		body.time_last = time_last;
+		// time_last = (new Date()).toStr('yyyy-MM-dd hh:mm:ss');
+	}
+	var sql = $.mysql_admin('sys');
+	sql.open();
+	var db = sql.db();
+	db.table = "face_device";
+	db.size = 0;
+	await db.set({
+		clientid_has: arr
+	}, body);
+}
+
+/**
+ * 更新在线设备
+ */
+MQTT.prototype.update_online = async function() {
+	var list = this.list;
+	var list_online = [];
+	var list_offline = [];
+	var now = new Date().getTime();
+	var online_expires = this.config.online_expires; // 180 
+	for (var i = 0; i < list.length; i++) {
+		var dict = list[i].drives;
+		for (var clientid in dict) {
+			var o = dict[clientid];
+			if (!o.online) {
+				list_offline.push(clientid);
+			} else {
+				if (o.time_last) {
+					var cha = now - o.time_last;
+					if (cha > online_expires) {
+						list_offline.push(clientid);
+						o.online = 0;
+						delete dict[clientid];
+					} else {
+						list_online.push(clientid);
+					}
+				}
+			}
+		}
+	}
+	var list_on = list_online.to2D(30);
+	for (var i = 0; i < list_on.length; i++) {
+		await this.save_online(list_on[i], 1);
+	}
+	var list_off = list_offline.to2D(30);
+	for (var i = 0; i < list_off.length; i++) {
+		await this.save_online(list_off[i], 0);
+	}
+}
+
+/**
+ * 开始计时器
+ */
+MQTT.prototype.start_timer = function() {
+	if (!this.timer) {
+		this.timer = setInterval(() => {
+			try {
+				this.update_online();
+			} catch (err) {
+
+			}
+		}, this.config.online_interval);
+	}
+}
+
 module.exports = MQTT;
 
 

package/core/com/mqtt/script.js

@@ -1,34 +1,435 @@
 /**
- * 主函数, 用于处理订阅内容
- * @param {String} topic 订阅的主题
- * @param {Object} body 消息格式
- * @param {Number} index 索引
- * @return {Object} 返回执行结果
+ * 查询个人记录
+ * @param {String} clientid 客户端ID
+ * @param {Object} param
  */
-exports.main = async function(topic, msg, index) {
-	$.log.debug('收到消息', topic, msg, index);
-};
+exports.get_log = function(clientid, param) {
+	return this.push("GetRecordsByPicOrID", clientid, param);
+}
+
+/**
+ * 考勤打卡
+ * @param {String} clientid 客户端ID
+ * @param {Object} uuid 用户唯一标识
+ * @param {String} avatar base64头像
+ * @param {Number} longtime 超时回馈
+ */
+exports.sign_in = function(clientid, uuid, avatar) {
+	return this.push("PullRecordOnlyPic", clientid, {
+		"personID": uuid,
+		"picinfo": avatar
+	});
+}
+
+/**
+ * 下发二维码(没用到)
+ * @param {String} clientid
+ * @param {Object} param
+ * @param {Number} longtime 超时回馈
+ */
+exports.push_qrcode = function(clientid, param) {
+	return this.push("ShowQRCode", clientid, param);
+}
+
+/**
+ * 以图搜人
+ * @param {String} clientid 客户端ID
+ * @param {Object} avatar 人脸照片
+ * @param {Number} longtime 超时回馈
+ */
+exports.get_member_pic = async function(clientid, avatar) {
+	var res = await this.push("GetPictureSearch", clientid, {
+		"facesluiceId": clientid,
+		"MaxSimilarity": 80,
+		"MaxNum": 1,
+		"picinfo": avatar
+	});
+	var user;
+	if (res) {
+		if (res.result == "fail") {
+
+		} else {
+			var u = res.SearchInfo[0];
+			var name = u.name || u.persionName;
+			var customId = u.customId.trim();
+			var phone = (u.telnum || "").trim();
+			var idcard = (u.idCard || "").trim();
+			user = {
+				name,
+				customId,
+				phone,
+				idcard
+			}
+		}
+	}
+	return user
+}
+
+/**
+ * 远程开门
+ * @param {String} clientid 客户端ID
+ * @param {String} uuid 用户唯一标识
+ * @param {Boolean} pass 是否可通行 true为是
+ * @param {String} tip 提示
+ */
+exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
+	var res = await this.push("Unlock", clientid, {
+		"uid": uuid,
+		// 0不开门，1开门
+		"openDoor": pass ? "1" : "0",
+		"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, {
+		"customId": uuid
+	});
+}
+
+/**
+ * 批量删除成员
+ * @param {String} clientid 客户端ID
+ * @param {Object} arr 成员列表
+ * @param {Number} longtime 超时回馈
+ */
+exports.delete_member_batch = function(clientid, arr, longtime) {
+	return this.push("DeletePersons", clientid, {
+		DataBegin: "BeginFlag",
+		DataEnd: "EndFlag",
+		PersonNum: arr.length.toString(),
+		customId: arr
+	}, longtime);
+}
+
+/**
+ * 重启设备
+ * @param {String} clientid 设备sn
+ */
+exports.reboot_device = function(clientid) {
+	return this.push("RebootDevice", clientid, {});
+}
+
+/**
+ * 设置设备时间
+ * @param {String} clientid 设备sn
+ * @param {String} datetime 日期时间
+ */
+exports.set_device_time = async function(clientid, datetime) {
+	var res = await this.push("SetSysTime", clientid, {
+		"SysTime": datetime.replace(" ", "T")
+	});
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "重置时间失败"
+}
+
+/**
+ * 恢复出厂设置
+ * @param {String} clientid 设备sn
+ * @param {Boolean} record 是否恢复控制记录，true为恢复
+ * @param {Boolean} member 是否恢复成员，true为恢复
+ * @param {Boolean} log 是否恢复请求日志，true为恢复
+ */
+exports.reset_device = async function(clientid, record = true, member = false, log = true) {
+	var res = await this.push("SetFactoryDefault", clientid, {
+		DefaltRecord: record ? "1" : "0",
+		DefaltPerson: member ? "1" : "0",
+		DefaltLog: log ? "1" : "0"
+	});
+
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "恢复出厂设置失败"
+}
+
+/**
+ * 查询下发进度
+ * @param {String} clientid 设备sn
+ * @param {String} mode 查询方式 默认为更新
+ */
+exports.get_progress = async function(clientid, mode = 'update') {
+	var type = "";
+	if (mode == 'update') {
+		type = "EditPersonsNew";
+	} else {
+		type = "DeletePersons";
+	}
+	var res = await this.push("QueryProgress", clientid, {
+		"QueryType": type
+	});
+	if (res) {
+		if (res.Status !== "0") {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	return -1;
+}
+
+/**
+ * 考勤补卡
+ * @param {String} clientid 设备sn
+ * @param {Object} param 其他信息
+ * @param {Number} longtime 超时回馈
+ */
+exports.replacement = function(clientid, uuid, time, avatar) {
+	return this.push("PullRecordOnlyName", clientid, {
+		"personID": uuid,
+		"time": time,
+		"picinfo": avatar
+	}, longtime);
+}
+
+/**
+ * 查询人员名单
+ * @param {String} clientid 客户端ID
+ * @param {Number} longtime 超时回馈
+ */
+exports.get_member = function(clientid, longtime = 0) {
+	return this.push("QueryPerson", clientid, longtime);
+}
+
+/**
+ * 查询人员名单
+ * @param {String} clientid 客户端ID
+ * @param {String} uuid 用户唯一标识
+ * @param {Number} longtime 超时回馈
+ */
+exports.get_member_one = function(clientid, uuid, longtime = 0) {
+	return this.push("QueryPerson", clientid, {
+		"personId": uuid
+	}, longtime);
+}
+
+/**
+ * 成员模型
+ * @param {Object} m 原始的成员
+ */
+exports.member_model_out = function(m) {
+	var nfc = m.nfc || '';
+	var obj = {
+		"customId": m.customId,
+		"name": m.name,
+		"native": m.place || '',
+		"nation": m.nation || '',
+		"address": m.address || '',
+		"idCard": m.idcard || '',
+		"gender": m.sex - 1,
+		"phone": m.phone,
+		"birthday": m.birthday,
+		"cardType2": 2,
+		"cardNum2": nfc,
+		"RFCardMode": 0,
+		"RFIDCard": nfc,
+		"notes": "",
+		"personType": m.state == 4 ? 1 : 0,
+		"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 <=
+		"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");
+		} else {
+			obj.cardValidBegin = m.time_valid_start.toTime().toStr("yyyy-MM-dd hh:mm:ss");
+		}
+		if (typeof(m.time_valid_end) == "object") {
+			obj.cardValidEnd = m.time_valid_end.toStr("yyyy-MM-dd hh:mm:ss");
+		} else {
+			obj.cardValidEnd = m.time_valid_end.toTime().toStr("yyyy-MM-dd hh:mm:ss");
+		}
+		obj.tempCardType = 1;
+	} else {
+		obj.tempCardType = 0;
+	}
+	return obj
+}
+
+/**
+ * 批量下发人员名单
+ * @param {String} clientid 客户端ID
+ * @param {Array} list 人员名单
+ * @param {Number} longtime 超时回馈
+ */
+exports.update_member_batch = async function(clientid, list, longtime = 180) {
+	var res = await this.pushS(clientid, {
+		"messageId": this.get_msgid('EditPersonsNew'),
+		"DataBegin": "BeginFlag",
+		"DataEnd": "EndFlag",
+		"operator": "EditPersonsNew",
+		"PersonNum": list.length,
+		"info": list.map((o) => {
+			return this.member_model_out(o);
+		})
+	}, longtime);
+	return res;
+}
+
+/**
+ * 下发人员名单
+ * @param {String} clientid 设备ID
+ * @param {Object} user 人员信息
+ * @param {Number} longtime 超时回馈
+ */
+exports.update_member = function(clientid, user, longtime = 0) {
+	return this.pushS(clientid, {
+		"messageId": this.get_msgid('EditPerson'),
+		"DataBegin": "BeginFlag",
+		"DataEnd": "EndFlag",
+		"method": "EditPerson",
+		"info": this.member_model_out(user)
+	}, longtime);
+}
 
 /**
  * 初始化函数, 用于定义开放给前端的函数
  */
-exports.init = async function() {
+exports.init = function() {
 	var m = this.methods;
+	var _this = this;
+
+	m["HeartBeat"] = function(clientid, params) {
+		if (!_this.drives[clientid]) {
+			_this.drives[clientid] = {};
+		}
+		_this.drives[clientid].online = 1;
+		_this.drives[clientid].time_last = new Date().getTime();
+	}
 
 	/**
-	 * 获取所有方法
-	 * @param {Object} params 参数
-	 * @param {Object} mqtt MQTT服务
+	 * 在线通知
+	 * @param {String} clientid 设备sn
+	 * @param {Object} param 其他信息
 	 */
-	m.get_method = function(params, mqtt) {
-		return Object.keys(m);
+	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;
+		}
+		// console.log("离线", clientid, _this.drives[clientid]);
 	};
 
 	/**
-	 * @param {Object} params 参数
-	 * @param {Object} mqtt MQTT服务
+	 * 在线通知
+	 * @param {String} clientid 设备sn
+	 * @param {Object} param 其他信息
 	 */
-	m.test = function(params, mqtt) {
-		return "你好"
+	m["Online"] = async function(clientid, params) {
+		await this.update_online(clientid);
+		return {
+			"facesluiceId": clientid,
+			"result": "ok",
+			"detail": ""
+		};
+		// console.log("上线", clientid, _this.drives[clientid]);
 	};
+
+	m["RecPush"] = async function(clientid, params, msg, id) {
+		var type = 1;
+		switch (params.otype) {
+			// (1人脸验证|2远程开门|3智码开门|4刷卡验证)
+			case "7":
+			case "27":
+				type = 2;
+				break;
+			case "47":
+			case "48":
+			case "55":
+			case "56":
+			case "57":
+				type = 3;
+				break;
+			case "21":
+			case "22":
+			case "24":
+			case "25":
+				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;
+		}
+		if (typeof(time) == "object") {
+			time = time.toStr("yyyy-MM-dd hh:mm:ss");
+		} else {
+			time = time.toTime().toStr("yyyy-MM-dd hh:mm:ss");
+		}
+		var log = {
+			customId,
+			name,
+			phone,
+			idcard,
+			nfc,
+			clientid,
+			type,
+			person_type,
+			record_type,
+			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) {
+		var qrcode = params.QRCodeInfo;
+		var {
+			uuid,
+			pass,
+			tip,
+			device
+		} = $.server.exec_qrcode(clientid, qrcode);
+		if (device && device.online) {
+			await _this.unlock(clientid, uuid, pass, tip);
+		}
+	}
 };

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

@@ -103,9 +103,13 @@ exports.reboot_device = function(clientid) {
  * @param {String} datetime 日期时间
  */
 exports.set_device_time = function(clientid, datetime) {
-	return this.push("SetSysTime", clientid, {
+	var res = this.push("SetSysTime", clientid, {
 		"SysTime": datetime.replace(" ", "T")
 	});
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "重置时间失败"
 }
 
 /**
@@ -252,6 +256,7 @@ exports.init = function() {
 			_this.drives[clientid] = {};
 		}
 		_this.drives[clientid].online = 1;
+		_this.drives[clientid].time_last = new Date().getTime();
 		console.log("心跳", clientid, _this.drives[clientid]);
 	}
 

package/demo/config/development.json

@@ -66,7 +66,7 @@
 		// 协议头
 		"protocol": "mqtt",
 		// MQTT服务器地址
-		"hostname": "mqtt.laieliantong.com",
+		"hostname": "mqtt.aieliantong.com",
 		// "hostname": "127.0.0.1",
 		// MQTT服务器用户名
 		"username": "developer",

package/middleware/waf_ip/index.js

@@ -66,7 +66,11 @@ module.exports = function(server, config) {
 			var str = await $.cache.get("ip_" + ip);
 			var json;
 			if (str) {
-				json = JSON.parse(str);
+				if (typeof(str) === "string") {
+					json = JSON.parse(str);
+				} else {
+					json = str;
+				}
 				if (json.date !== date) {
 					num = 1;
 				} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "mm_machine": "^1.7.4",
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
-    "mm_mysql": "^1.8.0",
+    "mm_mysql": "^1.8.1",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.7",