owl-cli 6.169.0 → 6.171.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.
Files changed (2) hide show
  1. package/defaultTemplate/api/src/tasks/doBatchImport.jsx +118 -75
  2. package/package.json +1 -1
package/defaultTemplate/api/src/tasks/doBatchImport.jsx CHANGED
@@ -11,107 +11,150 @@ function main(){
11
11
  return;
12
12
  }
13
13
 
14
- var s = null;
15
- var url = batchImport.importFile[0].url;
16
- if(!url){
17
- return;
18
- }
19
- if(url.endsWith(".zip")){
20
- s = $.unzipUrl(url,batchImport.zipPass,batchImport.contentFileName);
21
- }
22
- else{
23
- s = $.get(url);
24
- }
25
14
 
26
- var now = new Date().getTime();
27
- var log = {
28
- objId:batchImport.id,
29
- startTime:now,
30
- endTime:now,
31
- name:"批量导入" + batchImport.id,
32
- remark:"下载完成，文件长度" + s.length
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
+ }
33
27
 
34
- }
35
- owl_process_job_logService.add(log);
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
36
35
 
37
- var contentType = batchImport.contentType;
38
- if(!contentType){
39
- if(s.startsWith("[")){
40
- contentType = "json";
41
36
  }
42
- else {
43
- contentType = "jsonl";
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
+ }
44
47
  }
45
- }
46
- var rows = null;
48
+ var rows = null;
47
49
 
48
- if(contentType==="jsonl"){
49
- rows = s.split("\n");
50
- }
51
- else{
52
- rows = JSON.parse(s);
53
- }
50
+ if(contentType==="jsonl"){
51
+ rows = s.split("\n");
52
+ }
53
+ else{
54
+ rows = JSON.parse(s);
55
+ }
54
56
 
55
- var log = {
56
- objId:batchImport.id,
57
- name:"批量导入" + batchImport.id,
58
- remark:"读取记录完成，记录数" + rows.length
57
+ var log = {
58
+ objId:batchImport.id,
59
+ name:"批量导入" + batchImport.id,
60
+ remark:"读取记录完成，记录数" + rows.length
59
61
 
60
- }
62
+ }
61
63
 
62
- owl_process_job_logService.add(log);
64
+ owl_process_job_logService.add(log);
63
65
 
64
- var nImported = 0;
65
- for(var i=0; i<rows.length; i++){
66
- var row = rows[i];
67
- try{
66
+ var nImported = 0;
67
+ for(var i=0; i<rows.length; i++){
68
68
  var row = rows[i];
69
- var rec = null;
70
- if(contentType==="jsonl") {
71
- rec = JSON.parse(row);
72
- }
73
- else{
74
- rec = row;
75
- }
76
- @projectCodeService.add( rec);
77
- nImported++;
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
+ }
78
+ if(!rec._orgId){
79
+ rec._orgId = batchImport._orgId;
80
+ rec._orgIds = batchImport._orgIds;
81
+ }
82
+ if(rec._orgId!=batchImport._orgId && batchImport._orgId!='0'){
83
+ throw "记录的_orgId不正确,应该是" + batchImport._orgId + ",实际是" + rec._orgId;
84
+ }
78
85
 
79
- if(i%1000==0){
86
+ //检查
87
+ var oldObj = @projectCodeService.get(rec.id);
88
+ if(oldObj && override!="true"){
89
+ throw "记录已经存在，id=" + rec.id;
90
+ }
91
+ if(oldObj && override=="true" && oldObj._orgId!=rec._orgId){
92
+ throw "记录的_orgId不正确,不能覆盖其他人的数据，应该是" + rec._orgId + ",实际是" + oldObj._orgId;
93
+ }
94
+ @projectCodeService.add( rec);
95
+ nImported++;
96
+
97
+ if(i%1000==0){
98
+ var now = new Date().getTime();
99
+ var log = {
100
+ objId:batchImport.id,
101
+ startTime:now,
102
+ endTime:now,
103
+ name:"批量导入" + batchImport.id,
104
+ remark:"成功导入记录：" + i
105
+ }
106
+ owl_process_job_logService.add(log);
107
+ }
108
+ }
109
+ catch(e){
80
110
  var now = new Date().getTime();
81
111
  var log = {
82
112
  objId:batchImport.id,
83
113
  startTime:now,
84
114
  endTime:now,
85
115
  name:"批量导入" + batchImport.id,
86
- remark:"成功导入记录：" + i
116
+ remark:"错误记录，行号" + i + ",内容:" + row
87
117
  }
88
118
  owl_process_job_logService.add(log);
89
119
  }
90
120
  }
91
- catch(e){
92
- var now = new Date().getTime();
93
- var log = {
94
- objId:batchImport.id,
95
- startTime:now,
96
- endTime:now,
97
- name:"批量导入" + batchImport.id,
98
- remark:"错误记录，行号" + i + ",内容:" + row
121
+
122
+ var now = new Date().getTime();
123
+ var log = {
124
+ objId:batchImport.id,
125
+ startTime:now,
126
+ endTime:now,
127
+ name:"批量导入" + batchImport.id,
128
+ remark:"导入成功"+ nImported + "条记录"
129
+ }
130
+ owl_process_job_logService.add(log);
131
+
132
+ batchImport.state = "success";
133
+ owl_batch_importService.update(batchImport);
134
+ }catch(e){
135
+ var msg = "";
136
+ if(typeof e === "string"){
137
+ msg = e;
138
+ }
139
+ else{
140
+ msg = e.msg;
141
+ if(!msg && e.getCause){
142
+ msg = e.getCause();
99
143
  }
100
- owl_process_job_logService.add(log);
101
144
  }
145
+ var now = new Date().getTime();
146
+ var log = {
147
+ objId:batchImport.id,
148
+ startTime:now,
149
+ endTime:now,
150
+ name:"批量导入" + batchImport.id,
151
+ remark:"出现错误:" + msg
152
+ }
153
+ owl_process_job_logService.add(log);
154
+ batchImport.state = "failed";
155
+ owl_batch_importService.update(batchImport);
102
156
  }
103
157
 
104
- var now = new Date().getTime();
105
- var log = {
106
- objId:batchImport.id,
107
- startTime:now,
108
- endTime:now,
109
- name:"批量导入" + batchImport.id,
110
- remark:"导入成功"+ nImported + "条记录"
111
- }
112
- owl_process_job_logService.add(log);
113
-
114
- batchImport.state = "success";
115
158
  }
116
159
  main();
117
160
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "owl-cli",
3
- "version": "6.169.0",
3
+ "version": "6.171.0",
4
4
  "main": "index.js",
5
5
  "preferGlobal": true,
6
6
  "bin": {