Merge remote-tracking branch 'origin/master'

common/src/main/ets/db/BaseTable.ets

@@ -57,12 +57,19 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   bindToValuesBucket(bucket: ValuesBucket, item: T) {
-    Logger.info(this, "表结构数据>>" + JSON.stringify(this.getTableColumns()))
     this.getTableColumns().forEach((col) => {
       bucket[col] = item[col]
     })
   }
 
+  toBucket(bucket: ValuesBucket, item: T): ValuesBucket {
+    this.getTableColumns().forEach((col) => {
+      bucket[col] = item[col]
+    })
+    return bucket;
+  }
+
+
   /**
    * 清空表
    */
@@ -92,6 +99,27 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   /**
+   * 插入数据
+   * @param item 插入对象
+   */
+  async batchInsert(item: T[]): Promise<number> {
+    Logger.info(this, '批量插入数据>>' + JSON.stringify(item))
+    let bucket = [];
+    if (item) {
+      item.forEach(it => {
+        let tmp = {};
+        bucket.push(this.toBucket(tmp, it));
+      })
+      Logger.info(this, '绑定到Bucket数据>>' + JSON.stringify(bucket))
+      let db = await this.futureDb;
+      return db.batchInsert(this.tableName, bucket);
+    } else {
+      throw new Error('插入数据为空');
+    }
+  }
+
+
+  /**
    * 删除数据
    */
   async delete(item: T): Promise<number> {

common/src/main/ets/db/dao/DwInfoDao.ets

 import relationalStore from '@ohos.data.relationalStore';
 import { DwInfo } from '../../entity/DwInfo';
-import { Logger } from '../../utils/Logger';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
-import { BaseSql } from '../sql/BaseSql';
 
 /**
  * 单位的数据层