apass-opensdk-hugong 1.0.2 → 1.0.4

package/apass/object_.js

@@ -0,0 +1,69 @@
+class Object_{
+  #hg = null
+  constructor(hg){
+    this.#hg = hg
+  }
+
+  async clearData(table,id){
+    await application.data.object(table).select('_id').where({_id: id ? id : application.operator.gte(0)}).findStream(async records=>{
+      this.#hg.log4('clear data len', records.length)
+      await application.data.object(table).batchDelete(records.map(it=>({_id: it._id})))
+    })
+  }
+
+  async findList(table,field,where,callback){
+    const list = []
+    await application.data.object(table).select(field || ['_id','_name']).where(where || {_id : application.operator.gte(0)}).findStream(async records=>{
+      if(callback){
+        this.#hg.log4('find all len', list.length)
+        await callback(records)
+      }else{
+        this.#hg.log4('find all size', list.length)
+        list.push(...records)
+      }
+    })
+    if(!callback){
+      this.#hg.log4('find all len', list.length)
+    }
+    return list
+  }
+  async findOne(table,field,where){
+    return await application.data.object(table).select(field || ['_id','_name']).where(where || {_id : application.operator.gte(0)}).findOne()
+  }
+  async findOneById(table,id,field){
+    return await application.data.object(table).select(field || ['_id','_name']).where({_id: id}).findOne()
+  }
+
+  async batchCreate(table,list){
+    if(list.length){
+      return await application.data.object(table).batchCreate(list)
+    }
+    return null
+  }
+  async create(table,data){
+    return await application.data.object(table).create(data)
+  }
+
+  async batchUpdate(table,list){
+    if(list.length){
+      return application.data.object(table).batchUpdate(list)
+    }
+    return null
+  }
+  async update(table,data){
+    return application.data.object(table).update(data)
+  }
+
+  async delete(table,_id){
+    return application.data.object(table).delete(_id)
+  }
+  async delete(table,_ids){
+    if(_ids.length){
+      return application.data.object(table).batchDelete(_ids)
+    }
+    return null
+  }
+  
+
+}
+module.exports = Object_

package/index.js

@@ -3,20 +3,24 @@ const Document = require('./opensdk/document')
 const Utils = require('./utils/index')
 const Employee = require('./opensdk/employee')
 const Contract = require('./opensdk/contract')
-
+const Object_ = require('./apass/object_')
 class HG{
   #logger
   #app_id
   #app_secret
   constructor(logger){
+    this.setLogger(logger)
+    this._time = null
+  }
+  setLogger(logger){
     this.#logger = logger
-    this.users = new Users(logger, this)
-    this.document = new Document(logger, this)
-    this.employee = new Employee(logger, this)
-    this.contract = new Contract(logger, this)
+    this.users = new Users(this)
+    this.document = new Document(this)
+    this.employee = new Employee(this)
+    this.contract = new Contract(this)
+    this.object = new Object_(this)
     
-    this.utils = new Utils(logger, this)
-    this._time = null
+    this.utils = new Utils(this)
   }
   /**
    * 运行函数
@@ -38,7 +42,7 @@ class HG{
    * @returns 
    */
   async sleep(time){
-    return new Promise((r)=>setTimeout(()=>{ this.#logger.log(`sleep ${(time || 1000)/1000}s`);r();},time || 1000))
+    return new Promise((r)=>setTimeout(()=>{ this.log4(`sleep ${(time || 1000)/1000}s`);r();},time || 1000))
   }
 
   /**
@@ -46,9 +50,9 @@ class HG{
    */
   newTime(){
     if(this._time){
-      this.#logger.log('#time reset to before',(Date.now() - this._time)/1000, 's')
+      this.log4('#time reset to before',(Date.now() - this._time)/1000, 's')
     }
-    this.#logger.log('#time reset')
+    this.log4('#time reset')
     this._time = Date.now()
   }
   /**
@@ -58,7 +62,7 @@ class HG{
     if(!this._time){
       return this.#logger.error('#time Error','The time has not been initialized ')
     }
-    this.#logger.log('#time',(Date.now() - this._time)/1000, 's')
+    this.log4('#time',(Date.now() - this._time)/1000, 's')
   }
 
   /**
@@ -100,7 +104,7 @@ class HG{
     }else{
       newHeaders = { ...newHeaders,...(headers || {}) }
     }
-    this.#logger.log('req=',url,data,newHeaders)
+    this.log4('req =',url,data,newHeaders)
     let _url = url
     let params = null
     if(Array.isArray(url)){
@@ -110,11 +114,11 @@ class HG{
     return new Promise((r,s)=>{
       const now = Date.now()
       axios({ method, params, url: _url, data, headers: newHeaders}).then(response=>{
-        this.#logger.info('resp=',(Date.now() - now) / 1000, 's',response.status, response.statusText,response.data)
+        this.log8('resp =',(Date.now() - now) / 1000, 's',response.status, response.statusText,response.data)
         r(response.data)
       }).catch(e=>{
         console.log(e)
-        this.#logger.error('resp=',(Date.now() - now) / 1000, 's',e.response.data)
+        this.#logger.error('resp =',(Date.now() - now) / 1000, 's',e.response.data)
         s(e.response.data)
       })
     })
@@ -146,20 +150,18 @@ class HG{
       page_token = result.data.page_token
       has_more = result.data.has_more
       if(callback){
-        await callback(result.data.items || [])
+          await callback(result.data.hasOwnProperty('items') ? result.data.items || [] : result.data)
       }else{
-        list.push(...(result.data.items || []))
+        if(result.data.hasOwnProperty('items')){
+          list.push(...(result.data.items || []))
+        }else{
+          list.push(result.data)
+        }
       }
     } while (has_more);
     return list
   }
 
-  async getAllUser(field){
-    const list = []
-    await application.data.object('_user').select(field || ['_id','_name']).findStream(async records=>list.push(...records))
-    return list
-  }
-
   /**
    * 生成多语言对象
    * @param {*} zh 
@@ -174,6 +176,11 @@ class HG{
         const _en = this.toSafeValue(zh.find(it=>it.lang == 'en-US'),'value')
         return new application.constants.type.Multilingual({ zh: _zh || _en, en: _en || _zh })
       }
+      if(zh[0].hasOwnProperty('locale')){
+        const _zh = this.toSafeValue(zh.find(it=>it.locale == 'zh_CN'),'value')
+        const _en = this.toSafeValue(zh.find(it=>it.locale == 'en_US'),'value')
+        return new application.constants.type.Multilingual({ zh: _zh || _en, en: _en || _zh })
+      }
     }
     return new application.constants.type.Multilingual({ zh: zh || en, en: en || zh })
   }
@@ -196,7 +203,30 @@ class HG{
     return _obj[key] || defValue
   }
 
+  listFind(list,key,target,defValue){
+    return list.find(it=>it[ key ] == target) || defValue
+  }
+  listMap(list,key){
+    return list.map(it=>it[ key ])
+  }
 
+  textToFloat(textAmount,defValue = 0) {
+    return parseFloat((textAmount || '').replace(/,/g, '') || defValue);
+  }
 
+  log(...arg){
+    this.#logger.log(...arg)
+  }
+  log4(...arg){
+    this.logm(4,...arg)
+  }
+  log8(...arg){
+    this.logm(8,...arg)
+  }
+  logm(space,...arg){
+    const result = ''.padEnd(space, "-");
+    this.#logger.log(result,...arg)
+  }
+  
 }
 module.exports = HG

package/opensdk/contract.js

@@ -1,8 +1,6 @@
 class Contract{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }
   

package/opensdk/document.js

@@ -1,8 +1,6 @@
 class Document{
-  #logger = null
   #hg = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }
   /**

package/opensdk/employee.js

@@ -1,8 +1,6 @@
 class Employee{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }
   

package/opensdk/users.js

@@ -1,8 +1,6 @@
 class Users{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apass-opensdk-hugong",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "飞书Apass低代码平台-飞书开放平台-相关的接口整合和常用的方法整合",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,6 @@
     "APASS",
     "feish"
   ],
-  "author": "IAMRuiyu",
+  "author": "微信：IAMRuiyu",
   "license": "ISC"
 }

package/readme.md

@@ -8,6 +8,21 @@ apass-opensdk-hugong 是一个基于apass-opensdk的封装，提供了一些常
 
 ```
 在飞书低代码平台（云函数）依赖管理-右侧-搜索： apass-opensdk-hugong
+
+最近有同学私聊我说Apass无法安装1.0.0以上的包，解决思路： 先安装1.0.0版本，然后打开yarn.lock文件
+====== 找到这一行 =====
+apass-opensdk-hugong@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/apass-opensdk-hugong/-/apass-opensdk-hugong-1.0.0.tgz#ef2d0a19e793358784cb764de4b885fd86befd66"
+  integrity sha512-Q8Gpo9v8a/2G43y/Lh2POyDEOcealFuUlGdqGSA9wyfjET4+LWs/PnzK9EB1YZCjQotW7cGO/9a0MiQ6Sgw1LA==
+====== 找到这一行 =====
+
+将版本改为最新的版本号后，然后保存，重写部署即可使用NPM源最新的版本
+修改后的yarn.lock文件如下， 一共三处地方：
+apass-opensdk-hugong@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/apass-opensdk-hugong/-/apass-opensdk-hugong-1.0.3.tgz#ef2d0a19e793358784cb764de4b885fd86befd66"
+  integrity sha512-Q8Gpo9v8a/2G43y/Lh2POyDEOcealFuUlGdqGSA9wyfjET4+LWs/PnzK9EB1YZCjQotW7cGO/9a0MiQ6Sgw1LA==
 ```
 
 ## 如何使用
@@ -131,3 +146,10 @@ await hg.paginatedSearchGet(url, params, async (items)=>{
     // do something  假设服务端有300条数据，每次返回100条，会调用3次, 如果希望一次性返回所有数据，callback传null即可
 })
 ```
+
+
+
+## 交流学习
+
+从事飞书低代码平台（APASS）开发人员3年，欢迎交流学习
+VX：IAMRuiyu 

package/utils/date_.js

@@ -0,0 +1,72 @@
+
+class Date_{
+  #hg = null
+  constructor(hg){
+    this.#hg = hg
+  }
+  moment(){
+    const moment = require('moment-timezone');
+    moment.tz.setDefault("Asia/Shanghai");
+    return moment()
+  }
+  nowFormat(format) {
+    const moment = require('moment-timezone');
+    moment.tz.setDefault("Asia/Shanghai");
+    return moment().format(format || 'YYYY-MM-DD HH:mm:ss')
+  }
+
+  splitDateRange(startDate, endDate, splitMonths) {
+    // 将输入的日期字符串转换为Date对象
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+  
+    // 检查输入的合法性
+    if (start >= end) {
+      throw new Error("开始日期必须早于结束日期");
+    }
+    if (splitMonths <= 0) {
+      throw new Error("分割持续月份必须大于0");
+    }
+  
+    // 用于存储分割后的日期范围
+    const result = [];
+  
+    // 当前处理的开始日期
+    let currentStart = new Date(start);
+  
+    // 计算总月份数
+    const totalMonths = (end.getFullYear() - currentStart.getFullYear()) * 12 + end.getMonth() - currentStart.getMonth() + 1;
+  
+    // 循环分割日期范围
+    while (currentStart < end) {
+      // 计算当前分割的结束日期
+      const currentEnd = new Date(currentStart);
+      currentEnd.setMonth(currentEnd.getMonth() + splitMonths);
+  
+      // 如果当前分割的结束日期超过了总结束日期，则调整为总结束日期
+      if (currentEnd > end) {
+        currentEnd.setTime(end.getTime());
+      }
+  
+      // 计算当前分割的持续月份数
+      const len = (currentEnd.getFullYear() - currentStart.getFullYear()) * 12 + currentEnd.getMonth() - currentStart.getMonth() + 1;
+  
+      // 计算当前分割的天数
+      const days = (currentEnd - currentStart) / (1000 * 60 * 60 * 24) + 1;
+  
+      // 将当前分割的日期范围添加到结果数组中
+      result.push({
+        begin: currentStart.toISOString().split("T")[0],
+        end: currentEnd.toISOString().split("T")[0],
+        len: len,
+        days: Math.floor(days) // 向下取整，因为天数应该是整数
+      });
+  
+      // 更新当前处理的开始日期为当前分割的结束日期
+      currentStart = new Date(currentEnd);
+    }
+  
+    return result;
+  }
+}
+module.exports = Date_

package/utils/file_.js

@@ -1,9 +1,7 @@
 const fs = require('fs')
 class File_{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }
   getCurrentTimeFolderName() {
@@ -23,11 +21,11 @@ class File_{
    * @returns 
    */
   async downloadFileToUpload(url, header = {}){
-    this.#logger.log(`download url=${url}`)
+    this.#hg.log4(`download url=${url}`)
     const resp = await axios({ url, method: 'get', responseType: 'stream', headers: {...header} });
     // 上传文件获取文件 token
     const file_info = await application.resources.file.upload(resp.data);
-    this.#logger.log('file_info',file_info)
+    this.#hg.log4('file_info',file_info)
     return file_info
   }
   /**
@@ -37,10 +35,10 @@ class File_{
    * @returns 
    */
   async downloadFileToTmp(file_info, file_path){
-    this.#logger.log(`download input=${ JSON.stringify(file_info)}`)
+    this.#hg.log4(`download input=${ JSON.stringify(file_info)}`)
     const _file_path = file_path || `/tmp/${Date.now()}.${ file_info.mime_type }`
     await application.resources.file.download({id: file_info.id}, _file_path);
-    this.#logger.log(`download success, path=` + _file_path)
+    this.#hg.log4(`download success, path=` + _file_path)
     return _file_path
   }
   /**
@@ -77,5 +75,15 @@ class File_{
       });
     })
   }
+
+  async excelReader(path,callback){
+    const XLSX = require('xlsx');
+    const stream = fs.createReadStream(path.join(__dirname, 'example.xlsx'));
+    const workbook = XLSX.read(stream, { type: 'buffer' });
+    const sheetName = workbook.SheetNames[0];
+    const worksheet = workbook.Sheets[sheetName];
+    const data = XLSX.utils.sheet_to_json(worksheet);
+    console.log(data);
+  }
 }
 module.exports = File_

package/utils/index.js

@@ -1,14 +1,14 @@
 const Url = require('./url')
 const File_ = require('./file_')
+const Date_ = require('./date_')
 class Utils{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
 
-    this.url = new Url(logger,hg)
-    this.file = new File_(logger,hg)
+    this.url = new Url(hg)
+    this.file = new File_(hg)
+    this.date = new Date_(hg)
   }
 
   /**
@@ -20,8 +20,10 @@ class Utils{
    */
    async splitArray(list, chunkSize, callback) {
     const result = [];
+    this.#hg.log4('splitArray len ', list.length)
     for (let i = 0; i < list.length; i += chunkSize) {
       const batch = list.slice(i, i + chunkSize)
+      this.#hg.log8('splitArray item ',i, i + chunkSize)
       if(callback){
         await callback(batch)
         continue
@@ -30,12 +32,15 @@ class Utils{
     }
     return result;
   }
-  
 
-
-  
-
-  
+  toMD5(data){
+    const crypto = require('crypto');
+    const hash = crypto.createHash('md5');
+    hash.update(data);
+    const md5Hash = hash.digest('hex');
+    this.#hg.log4(`MD5 Hash of "${data}": ${md5Hash}`)
+    return md5Hash
+  }
 
 }
 module.exports = Utils

package/utils/url.js

@@ -1,9 +1,7 @@
 
 class Url{
   #hg = null
-  #logger = null
-  constructor(logger,hg){
-    this.#logger = logger
+  constructor(hg){
     this.#hg = hg
   }