mm_os 2.4.0 → 2.4.3

package/demo/com/server/index.js

@@ -1,11 +1,9 @@
+var fs = require("fs");
 var sql = $.mysql_admin('sys');
 var dbs = sql.db();
 
-/**
- * 服务端类
- */
 class Server {
-
+	
 }
 
 /**
@@ -18,8 +16,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 +56,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 +90,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 +98,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 +106,7 @@ Server.prototype.get_user = async function(project_id, customId, name, phone, id
 	}
 	return {
 		user_type,
-		user: Object.assign({}, enter)
+		enter
 	}
 }
 
@@ -146,13 +144,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 +160,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 +182,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 +203,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 +231,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 +267,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 +282,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 +299,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 +347,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 +358,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 +379,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 +408,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 +430,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 +444,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 = {

package/index.js

@@ -239,8 +239,9 @@ OS.prototype.main = async function(state) {
 	}
 
 	if (cg.sys && cg.sys.task) {
-		await $.task.update();
-		$.task.run();
+		$.task.update().then(() => {
+			$.task.run();
+		});
 	}
 	console.log(tip);
 };

package/package.json

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