owl-cli 6.166.0 → 6.168.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,88 @@
1
+ //#import $@projectCode:services/modelService.jsx
2
+ //#import $owl_batch_import:services/modelService.jsx
3
+ //#import $owl_process_job_log:services/modelService.jsx
4
+
5
+
6
+ var batchId = batchImportId;
7
+
8
+ function main(){
9
+ var batchImport = owl_batch_importService.get(batchId);
10
+ if(!batchImport || !batchImport.importFile || batchImport.importFile.length==0){
11
+ return;
12
+ }
13
+
14
+ var url = batchImport.importFile[0].url;
15
+ if(!url){
16
+ return;
17
+ }
18
+ var s = $.get(url);
19
+ var now = new Date().getTime();
20
+ var log = {
21
+ objId:batchImport.id,
22
+ startTime:now,
23
+ endTime:now,
24
+ name:"批量导入" + batchImport.id,
25
+ remark:"下载完成,文件长度" + s.length
26
+
27
+ }
28
+ owl_process_job_logService.add(log);
29
+
30
+ var rows = s.split("\n");
31
+ var log = {
32
+ objId:batchImport.id,
33
+ name:"批量导入" + batchImport.id,
34
+ remark:"读取记录完成,记录数" + rows.length
35
+
36
+ }
37
+
38
+ owl_process_job_logService.add(log);
39
+
40
+ var nImported = 0;
41
+ for(var i=0; i<rows.length; i++){
42
+ var row = rows[i];
43
+ try{
44
+ var row = rows[i];
45
+ var rec = JSON.parse(row);
46
+ @projectCodeService.add( rec);
47
+ nImported++;
48
+
49
+ if(i%1000==0){
50
+ var now = new Date().getTime();
51
+ var log = {
52
+ objId:batchImport.id,
53
+ startTime:now,
54
+ endTime:now,
55
+ name:"批量导入" + batchImport.id,
56
+ remark:"成功导入记录:" + i
57
+ }
58
+ owl_process_job_logService.add(log);
59
+ }
60
+ }
61
+ catch(e){
62
+ var now = new Date().getTime();
63
+ var log = {
64
+ objId:batchImport.id,
65
+ startTime:now,
66
+ endTime:now,
67
+ name:"批量导入" + batchImport.id,
68
+ remark:"错误记录,行号" + i + ",内容:" + row
69
+ }
70
+ owl_process_job_logService.add(log);
71
+ }
72
+ }
73
+
74
+ var now = new Date().getTime();
75
+ var log = {
76
+ objId:batchImport.id,
77
+ startTime:now,
78
+ endTime:now,
79
+ name:"批量导入" + batchImport.id,
80
+ remark:"导入成功"+ nImported + "条记录"
81
+ }
82
+ owl_process_job_logService.add(log);
83
+
84
+ batchImport.state = "success";
85
+ }
86
+ main();
87
+
88
+
@@ -13,30 +13,32 @@ taskInfo.processState = "processing";
13
13
  taskInfo.msg = "获取导出总数成功......";
14
14
  taskInfo.percent = "1";
15
15
  taskInfo.fileUrls = [];
16
+ @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
17
+
16
18
 
17
19
  var from = 0;
20
+ var allListObjs = [];
18
21
  while(from < taskInfo.total){
19
22
  var listObjs = @projectCodeService.getAllObjectsEx(from, 10000);
20
-
23
+ allListObjs = allListObjs.concat(listObjs);
24
+ from = from + listObjs.length;
21
25
  taskInfo.lastTime = new Date().getTime();
22
26
  taskInfo.processState = "processing";
23
- taskInfo.msg = "导出数据成功,生成zip......";
24
- taskInfo.percent = (from + listObjs.length) * 100 / taskInfo.total;
25
-
26
- var s = JSON.stringify(listObjs);
27
- var fileId = "" + $.addAsZip(s);
28
-
29
- taskInfo.fileId = fileId;
30
- taskInfo.fileUrl = FileService.getFullPath(fileId);
31
- taskInfo.fileUrls.push(taskInfo.fileUrl);
27
+ taskInfo.msg = "正在导出......";
28
+ taskInfo.percent = (allListObjs.length) * 100 / taskInfo.total;
32
29
  taskInfo.exportedRows = from + listObjs.length;
33
- from = from + listObjs.length;
34
30
  @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
35
31
  }
36
32
 
33
+ var s = JSON.stringify(allListObjs);
34
+ var fileId = "" + $.addAsZip(s);
35
+
37
36
  taskInfo.processState = "success";
38
37
  taskInfo.percent = 100;
39
38
  taskInfo.msg = "导出文件成功";
39
+ taskInfo.fileId = fileId;
40
+ taskInfo.fileUrl = FileService.getFullPath(fileId);
41
+ taskInfo.fileUrls.push(taskInfo.fileUrl);
40
42
  @projectCodeService.updateExportTaskInfo( taskInfoId, taskInfo );
41
43
 
42
44
 
@@ -47,3 +49,5 @@ taskInfo.msg = "导出文件成功";
47
49
 
48
50
 
49
51
 
52
+
53
+
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "owl-cli",
3
- "version": "6.166.0",
3
+ "version": "6.168.0",
4
4
  "main": "index.js",
5
5
  "preferGlobal": true,
6
6
  "bin": {