laolan

gsb-marketplat/app/base/db/impl/mediaaggregation/mediaaggregationDao.js

@@ -259,7 +259,7 @@ class MediaaggregationDao extends Dao {
   }
   }
 
 
 
 
-  async redisInfo(sql, countSql, optionType, functionName, params = "") {
+  async redisInfo(sql, countSql, optionType, functionName, params = {}) {
     var template = "mediaaggregation";
     var template = "mediaaggregation";
     let shaStr;         // 将linkObj转为字符串并计算出sha256的值
     let shaStr;         // 将linkObj转为字符串并计算出sha256的值
     let rtn;            // 根据shaStr从redis库中查询返回的值。
     let rtn;            // 根据shaStr从redis库中查询返回的值。
@@ -269,8 +269,8 @@ class MediaaggregationDao extends Dao {
     };
     };
     // shaStr = await sha256(JSON.stringify(params));
     // shaStr = await sha256(JSON.stringify(params));
     // shaStr = template + "_" + shaStr + "_" + functionName;
     // shaStr = template + "_" + shaStr + "_" + functionName;
-    shaStr = template + "_" + params + "_" + functionName;
-    rtn = await this.redisClient.get(shaStr);
+    shaStr = template + "_" + functionName;
+    // rtn = await this.redisClient.get(shaStr);
     if (params) {
     if (params) {
       var list = await this.customQuery(sql, params);
       var list = await this.customQuery(sql, params);
       var dataCount = await this.customQuery(countSql, params);
       var dataCount = await this.customQuery(countSql, params);
@@ -280,7 +280,8 @@ class MediaaggregationDao extends Dao {
     }
     }
     if (optionType == "get") {
     if (optionType == "get") {
       if (rtn) {
       if (rtn) {
-        rtnObj = JSON.parse(rtn);
+        rtnObj.rows = JSON.parse(rtn);
+        rtnObj.total = dataCount && dataCount.length > 0 ? dataCount[0].dataCount : 0;
         return rtnObj;
         return rtnObj;
       } else {
       } else {
         rtnObj.rows = list;
         rtnObj.rows = list;