update gatewayInfoRedis

Author: “jinyuxing”

lib/gatewayHandler/index.js

@@ -3,30 +3,38 @@ const { ERROR, consts } = require('../lora-lib');
 const config = require('../../config');
 
 class GatewayHandler {
-  constructor (models, log, mqClient) {
+  constructor(models, log, mqClient) {
     this._GatewayInfoMySQL = models.MySQLModel.GatewayInfo;
     this._GatewayInfoRedis = models.RedisModel.GatewayInfo;
     this._mqClient = mqClient;
     this._log = log;
   }
 
-  verifyGateway (gatewayId) {
-    const query = { gatewayId: gatewayId };
-    return this._GatewayInfoMySQL.existItem(query)
-    .then((result) => {
-      if (result) {
-        return bluebird.resolve(null);
-      } else {
-        return bluebird.reject(new ERROR.GatewayNotExistError({
-          msg: 'The received Gateway is not registered, the whole package is ignored',
-          receivedGatewayId: gatewayId,
-        }));
-      }
-
-    });
+  verifyGateway(gatewayId) {
+    const query = { gatewayId };
+    const attributes = ['userID'];
+    // return this._GatewayInfoMySQL.existItem(query)
+    return this._GatewayInfoRedis.readUserID(gatewayId)
+      .then((res) => {
+        if (res.userID) {
+          return bluebird.resolve(null);
+        } else {
+          return this._GatewayInfoMySQL.readItem(query, attributes)
+          .then((res) => {
+            if (res.userID) {
+              return this._GatewayInfoRedis.updateUserID(gatewayId, res);
+            }else {
+              return bluebird.reject(new ERROR.GatewayNotExistError({
+                msg: 'The received Gateway is not registered, the whole package is ignored',
+                receivedGatewayId: gatewayId,
+              }));
+            }
+          });
+        }
+      });
   }
 
-  updateGatewayAddress (gatewayConfig) {
+  updateGatewayAddress(gatewayConfig) {
     if (gatewayConfig.identifier.readUInt8() === consts.UDP_ID_PULL_DATA) {
       gatewayConfig.pullPort = gatewayConfig.port;
     } else {
@@ -38,7 +46,7 @@ class GatewayHandler {
     );
   }
 
-  uploadPushData (pushData) {
+  uploadPushData(pushData) {
     const msgHeader = {
       version: pushData.origin.version,
       token: pushData.origin.token,

lib/lora-lib

@@ -10,10 +10,10 @@ const MACParser = new MACCmdParser();
 function PHYParser(modelIns, joinHandler, log) {
   this.MySQLModel = modelIns.MySQLModel;
   this.RedisModel = modelIns.RedisModel;
-  this.DeviceInfo = this.MySQLModel.DeviceInfo;
+  this.DeviceInfoMysql = this.MySQLModel.DeviceInfo;
   this.DeviceConfig = this.MySQLModel.DeviceConfig;
   this.DeviceRouting = this.MySQLModel.DeviceRouting;
-  this.deviceInfo = this.RedisModel.DeviceInfo;
+  this.DeviceInfoRedis = this.RedisModel.DeviceInfo;
   this.joinHandler = joinHandler;
   this.log = log;
 }
@@ -181,11 +181,11 @@ PHYParser.prototype.parser = function (phyPayloadRaw) {
         };
 
         const getAndCacheDeviceInfo = function (queryOpts, queryAttributes) {
-          return _this.deviceInfo.read(queryOpts.DevAddr, queryAttributes)
+          return _this.DeviceInfoRedis.read(queryOpts.DevAddr, queryAttributes)
             .then((res) => {
               if (!res.NwkSKey) {
                 let devInfo = {};
-                return _this.DeviceInfo.readItem(queryOpts, consts.DEVICEINFO_CACHE_ATTRIBUTES)
+                return _this.DeviceInfoMysql.readItem(queryOpts, consts.DEVICEINFO_CACHE_ATTRIBUTES)
                   .then((res) => {
                     Object.keys(res).forEach((key) => {
                       devInfo[key] = res[key];
@@ -202,7 +202,7 @@ PHYParser.prototype.parser = function (phyPayloadRaw) {
                     Object.keys(res).forEach((key) => {
                       devInfo[key] = res[key];
                     });
-                    return _this.deviceInfo.update(queryOpts.DevAddr, devInfo);
+                    return _this.DeviceInfoRedis.update(queryOpts.DevAddr, devInfo);
                   })
                   .then(() => {
                     const res = {