node_modules

core/Util/WXSDK.js

@@ -90,7 +90,6 @@ class WXSDK{
 				r(JSON.parse(data));
 			})
 			.on('error', (error) => {
-				console.log(error)
 				j(error);
 			});
 		});

core/controller/DeviceController.js

@@ -32,19 +32,8 @@ class DeviceController extends ControllerBase{
 	* @param {number} number - 每页条数 默认10
 	*/
 	async getListAction(data){
-		let product=this.getConfig();
-		let params=data.params;
-		params.user_id=data.user.uid;//获取userid
-		if (params.product_id){
-			if(typeof params.product_id=='object') {
-				for (let i = 0; i < params.product_id.length; i++) {
-					params.product_id[i]=product[params.product_id[i]];
-				}
-			}else{
-				params.product_id=product[params.product_id]
-			}
-		}
-		let res = await this.dao.get('device').findList(params);
+		data.params.user_id=data.user.uid;//获取userid
+		let res = await this.dao.get('device').findList(data.params);
 		return res;
  	}
 
@@ -260,7 +249,6 @@ class DeviceController extends ControllerBase{
  		}
  		this.error("fail to update",30500);
 	}
-	
 	@NoAuth
 	async getVersionAction(data){
 		switch(data.params.type){
@@ -271,36 +259,5 @@ class DeviceController extends ControllerBase{
 		}
 		this.error('type is undefined',30010)
 	}
-
-	@NoAuth
-	async setVersionAction(data){
-		let params={};
-		switch(data.params.type){
-			case 'ios':
-				params={
-					key:this.getConfig().wxAppId,
-					'value.ios':{
-						version:data.params.version,
-						url:data.params.url
-					}
-				}
-				break;
-			case 'android':
-				params={
-					key:this.getConfig().wxAppId,
-					'value.android':{
-						version:data.params.version,
-						url:data.params.url
-					}
-				}
-				break;
-		}
-		if (!params.key) {
-			this.error('type is undefined',30010)
-		}
-		let res = await this.public.core.setVersion(params);
-		return res;
-	}
-
 }
 module.exports = DeviceController;
\ No newline at end of file

core/dao/DeviceDao.js

-/**
+/**
  * DeviceDao.js
  * Version: 0.1
  * User: zym
@@ -603,23 +603,6 @@ class DeviceDao extends DaoBase {
         }
         return res.role
     }
-    //查找用户与设备直接是否有关系
-    async findStatusByDeviceIdAndUserId(data) {
-        this.checkKeyExists(data, "user_id","device_id")
-        let res = await this.models.mysql.user_device.findAll({
-            attributes: ['id'],
-            raw: true,
-            where: {
-                status:1,
-                user_id: data.user_id,
-                device_id: data.device_id
-            }
-        });
-        if (res.length>0) {
-            return true;
-        }
-        return false;
-    }
     //根据user_id获取info字段
     async findUserInfo(data) {
         this.checkKeyExists(data, "user_id", "Key")
@@ -947,7 +930,7 @@ class DeviceDao extends DaoBase {
                 as: 'device',
                 attributes: [],
                 where: {
-                    device_id:data.mac
+                    mac:data.mac
                 }
             },{
                 model: this.models.mysql.user,

core/model/mysql/Device.js

@@ -43,7 +43,17 @@ class Device extends MysqlBase {
                         device.info = JSON.parse(device.info)
                 }
             },
-            freezeTableName: true
+            indexes:[
+                {
+                    unique: false, 
+                    fields: ['product_id']
+                },
+                {
+                    unique: false, 
+                    fields: ['mac']
+                }
+            ],
+			freezeTableName: true,
         });
         return model;
     }

core/public/Public.js

@@ -39,13 +39,6 @@ class Public extends PublicFunBase{
 	checkRole(role,...action){
 		return this.role.checkRole(role,action);
 	}
-	checkStatus(user,...device){
-		let params={
-			user_id:user,
-			device_id:device
-		}
-		return this.dao.get('device').findStatusByDeviceIdAndUserId(params);
-	}
 
 	async sendModel(data){
 		ServiceManager.execute("wxpush","push_wx", {appid:this.getConfig().wxAppId,msg:data.data});
@@ -128,28 +121,24 @@ class Public extends PublicFunBase{
 	}
 	//单独绑定一个设备
 	async bindDevice(data,condition){
-		console.log("product_id"+data.product_id);
-		if (!data.device_id&&!data.mac) {
-			this.error('没有设备mac或id',30805)
+        if (!data.device_id&&!data.mac && !data.product_id) {
+            this.error('缺少参数(device_id、mac、product_id)',30805)
         }
 		let tip=this.getConfig();
-		console.log(tip);
-		console.log(tip[data.product_id]);
+        let product_id = tip[data.product_id]?tip[data.product_id]:data.product_id;
 		let auth;
 		if (condition) {
-			auth = await ServiceManager.execute("devices","deviceAuth", {'mac':data.mac?data.mac:data.device_id,'product_id':tip[data.product_id]});
+			auth = await this.checkOrCreateDeviceAuth({'mac':data.mac?data.mac:data.device_id,'product_id':product_id});
 		}else{
-			auth = await ServiceManager.execute("devices","cloudDeviceAuth", {'mac':data.mac?data.mac:data.device_id,'product_id':tip[data.product_id]});
+			auth = await ServiceManager.execute("devices","cloudDeviceAuth", {'mac':data.mac?data.mac:data.device_id,'product_id':product_id});
 		}
-				console.log("res")
-				console.log(auth)
 		if (!auth) {
 			this.error('没有权限注册设备',30806);
 		}
 		let res = await this.dao.get('device').findDevice(data);//查询绑定设备是否存在
 		let device_date={
 			device_id:data.device_id?data.device_id:data.mac,
-			product_id:tip[data.product_id],
+			product_id:product_id,
 			mac:data.mac?data.mac:data.device_id,
             device_name: data.nickname?data.nickname:"我的设备",
             parent_id: 0,
@@ -365,7 +354,7 @@ class Public extends PublicFunBase{
 	//注册设备
 	async regDevice(data){
 		let tip=this.getConfig();
-		data.product_id=tip[data.product_id];
+        data.product_id = tip[data.product_id]?tip[data.product_id]:data.product_id;
 		return await this.dao.get('device').createDevice(data);
 	}
 	//设置权限
@@ -492,16 +481,5 @@ class Public extends PublicFunBase{
 	    newUser.utoken = data.auth.sign(Calculation.signParams(newUser.id));
 	    return newUser;
 	}
-
-	async findDeviceUser(data){
-		let params=data;
-		params.status=1;
-		let res={};
-		res.count = await this.dao.get('device').countDeviceUser(params);
-		console.log(params)
-		res.info = await this.dao.get('device').findDeviceUserByMac(params);
-		return res;
-	}
-
 }
 module.exports = Public;
\ No newline at end of file

data/dao/DataPublicDao.js

@@ -125,7 +125,7 @@ class DataPublicDao extends DaoBase{
 		// get._id = {$gt:data.start_id};
 		// get.action = data.action;
 
-		console.log(HistoryProgram)
+
 		//变量接收getHistoryList
 		let getHistoryList = await this.models.mongo.data_history.find(HistoryProgram).limit(parseInt(data.page_size)).sort({create_time:data.order});
 		//返回getHistoryList		
@@ -181,9 +181,6 @@ class DataPublicDao extends DaoBase{
 	}
 
 	async getHistoryByAggregaate(data){
-		if(data[0].$match._id){
-			data[0].$match._id = {$lt:mongoose.Types.ObjectId(data[0].$match._id)};
-		}
 		let getHistoryList = await this.models.mongo.data_history.aggregate(data);
 		//返回getHistoryList		
 		return getHistoryList;