owl-cli 6.168.0 → 6.170.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.
@@ -11,77 +11,131 @@ function main(){
11
11
  return;
12
12
  }
13
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
14
 
27
- }
28
- owl_process_job_logService.add(log);
15
+ try{
16
+ var s = null;
17
+ var url = batchImport.importFile[0].url;
18
+ if(!url){
19
+ return;
20
+ }
21
+ if(url.endsWith(".zip")){
22
+ s = $.unzipUrl(url,batchImport.zipPass,batchImport.contentFileName);
23
+ }
24
+ else{
25
+ s = $.get(url);
26
+ }
29
27
 
30
- var rows = s.split("\n");
31
- var log = {
32
- objId:batchImport.id,
33
- name:"批量导入" + batchImport.id,
34
- remark:"读取记录完成,记录数" + rows.length
28
+ var now = new Date().getTime();
29
+ var log = {
30
+ objId:batchImport.id,
31
+ startTime:now,
32
+ endTime:now,
33
+ name:"批量导入" + batchImport.id,
34
+ remark:"下载完成,文件长度" + s.length
35
35
 
36
- }
36
+ }
37
+ owl_process_job_logService.add(log);
38
+
39
+ var contentType = batchImport.contentType;
40
+ if(!contentType){
41
+ if(s.startsWith("[")){
42
+ contentType = "json";
43
+ }
44
+ else {
45
+ contentType = "jsonl";
46
+ }
47
+ }
48
+ var rows = null;
49
+
50
+ if(contentType==="jsonl"){
51
+ rows = s.split("\n");
52
+ }
53
+ else{
54
+ rows = JSON.parse(s);
55
+ }
56
+
57
+ var log = {
58
+ objId:batchImport.id,
59
+ name:"批量导入" + batchImport.id,
60
+ remark:"读取记录完成,记录数" + rows.length
61
+
62
+ }
37
63
 
38
- owl_process_job_logService.add(log);
64
+ owl_process_job_logService.add(log);
39
65
 
40
- var nImported = 0;
41
- for(var i=0; i<rows.length; i++){
42
- var row = rows[i];
43
- try{
66
+ var nImported = 0;
67
+ for(var i=0; i<rows.length; i++){
44
68
  var row = rows[i];
45
- var rec = JSON.parse(row);
69
+ try{
70
+ var row = rows[i];
71
+ var rec = null;
72
+ if(contentType==="jsonl") {
73
+ rec = JSON.parse(row);
74
+ }
75
+ else{
76
+ rec = row;
77
+ }
46
78
  @projectCodeService.add( rec);
47
- nImported++;
79
+ nImported++;
48
80
 
49
- if(i%1000==0){
81
+ if(i%1000==0){
82
+ var now = new Date().getTime();
83
+ var log = {
84
+ objId:batchImport.id,
85
+ startTime:now,
86
+ endTime:now,
87
+ name:"批量导入" + batchImport.id,
88
+ remark:"成功导入记录:" + i
89
+ }
90
+ owl_process_job_logService.add(log);
91
+ }
92
+ }
93
+ catch(e){
50
94
  var now = new Date().getTime();
51
95
  var log = {
52
96
  objId:batchImport.id,
53
97
  startTime:now,
54
98
  endTime:now,
55
99
  name:"批量导入" + batchImport.id,
56
- remark:"成功导入记录:" + i
100
+ remark:"错误记录,行号" + i + ",内容:" + row
57
101
  }
58
102
  owl_process_job_logService.add(log);
59
103
  }
60
104
  }
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);
105
+
106
+ var now = new Date().getTime();
107
+ var log = {
108
+ objId:batchImport.id,
109
+ startTime:now,
110
+ endTime:now,
111
+ name:"批量导入" + batchImport.id,
112
+ remark:"导入成功"+ nImported + "条记录"
71
113
  }
72
- }
114
+ owl_process_job_logService.add(log);
73
115
 
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 + "条记录"
116
+ batchImport.state = "success";
117
+ owl_batch_importService.update(batchImport);
118
+ }catch(e){
119
+ var msg = "";
120
+ if(typeof e === "string"){
121
+ msg = e;
122
+ }
123
+ else{
124
+ msg = e.msg;
125
+ }
126
+ var now = new Date().getTime();
127
+ var log = {
128
+ objId:batchImport.id,
129
+ startTime:now,
130
+ endTime:now,
131
+ name:"批量导入" + batchImport.id,
132
+ remark:"出现错误:" + msg
133
+ }
134
+ owl_process_job_logService.add(log);
135
+ batchImport.state = "failed";
136
+ owl_batch_importService.update(batchImport);
81
137
  }
82
- owl_process_job_logService.add(log);
83
138
 
84
- batchImport.state = "success";
85
139
  }
86
140
  main();
87
141
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "owl-cli",
3
- "version": "6.168.0",
3
+ "version": "6.170.0",
4
4
  "main": "index.js",
5
5
  "preferGlobal": true,
6
6
  "bin": {