Skip to content

Commit e450809

Browse files
markjrzhangaldoli
markjrzhang
authored and
aldoli
committed
update DocumentAuditing api
1 parent 765c83a commit e450809

File tree

7 files changed

+204
-7
lines changed

7 files changed

+204
-7
lines changed

‎src/main/java/com/qcloud/cos/demo/ci/DocumentAuditingJobDemo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ public static void createAuditingDocumentJobs(COSClient client) {
2424
//1.创建任务请求对象
2525
DocumentAuditingRequest request = new DocumentAuditingRequest();
2626
//2.添加请求参数 参数详情请见api接口文档
27-
request.setBucketName("markjrzhang-1251704708");
27+
request.setBucketName("demo-123456789");
2828
//2.1.1设置对象地址
2929
// request.getInput().setObject("1.txt");
3030
//2.1.2或直接设置请求内容,文本内容的Base64编码
31-
request.getInput().setUrl("https://markjrzhang-1251704708.cos.ap-chongqing.myqcloud.com/%E9%97%AE%E9%A2%98%E6%B1%87%E6%80%BB.pptx");
31+
request.getInput().setUrl("https://demo-123456789.cos.ap-chongqing.myqcloud.com/test.docx");
3232
//2.2设置审核类型参数
3333
request.getConf().setDetectType("all");
3434
//2.3设置审核模板（可选）
@@ -46,8 +46,8 @@ public static void describeAuditingDocumentJob(COSClient client) {
4646
//1.创建任务请求对象
4747
DocumentAuditingRequest request = new DocumentAuditingRequest();
4848
//2.添加请求参数 参数详情请见api接口文档
49-
request.setBucketName("markjrzhang-1251704708");
50-
request.setJobId("sdd5d1cc630fdc11ecb3fa525400946f76");
49+
request.setBucketName("demo-123456789");
50+
request.setJobId("sd0312aa91510711eca163525400863904");
5151
//3.调用接口,获取任务响应对象
5252
DocumentAuditingResponse response = client.describeAuditingDocumentJob(request);
5353
}

‎src/main/java/com/qcloud/cos/internal/XmlResponsesSaxParser.java

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingResponse;
7878
import com.qcloud.cos.model.ciModel.auditing.DocumentResultInfo;
7979
import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
80+
import com.qcloud.cos.model.ciModel.auditing.ObjectResults;
8081
import com.qcloud.cos.model.ciModel.auditing.OcrResults;
8182
import com.qcloud.cos.model.ciModel.auditing.SectionInfo;
8283
import com.qcloud.cos.model.ciModel.auditing.SnapshotInfo;
@@ -6082,6 +6083,14 @@ protected void doStartElement(String uri, String name, String qName, Attributes
60826083
List<DocumentResultInfo> pageSegment = response.getJobsDetail().getPageSegment();
60836084
if (in("Response", "JobsDetail", "PageSegment") && "Results".equals(name)) {
60846085
pageSegment.add(new DocumentResultInfo());
6086+
} else if (in("Response", "JobsDetail", "PageSegment", "Results","PoliticsInfo") && "ObjectResults".equals(name)) {
6087+
pageSegment.get(pageSegment.size() - 1).getPoliticsInfo().getObjectResults().add(new ObjectResults());
6088+
}else if (in("Response", "JobsDetail", "PageSegment", "Results","PornInfo") && "ObjectResults".equals(name)) {
6089+
pageSegment.get(pageSegment.size() - 1).getPornInfo().getObjectResults().add(new ObjectResults());
6090+
}else if (in("Response", "JobsDetail", "PageSegment", "Results","AdsInfo") && "ObjectResults".equals(name)) {
6091+
pageSegment.get(pageSegment.size() - 1).getAdsInfo().getObjectResults().add(new ObjectResults());
6092+
}else if (in("Response", "JobsDetail", "PageSegment", "Results","TerroristInfo") && "ObjectResults".equals(name)) {
6093+
pageSegment.get(pageSegment.size() - 1).getTerroristInfo().getObjectResults().add(new ObjectResults());
60856094
}
60866095
}
60876096

@@ -6151,15 +6160,39 @@ protected void doEndElement(String uri, String name, String qName) {
61516160
resultDetail.setText(getText());
61526161
} else if ("Url".equalsIgnoreCase(name)) {
61536162
resultDetail.setUrl(getText());
6154-
}
6155-
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo","OcrResults")) {
6163+
} else if ("Label".equalsIgnoreCase(name)) {
6164+
resultDetail.setLabel(getText());
6165+
} else if ("Suggestion".equalsIgnoreCase(name)) {
6166+
resultDetail.setSuggestion(getText());
6167+
} else if ("PageNumber".equalsIgnoreCase(name)) {
6168+
resultDetail.setPageNumber(getText());
6169+
} else if ("SheetNumber".equalsIgnoreCase(name)) {
6170+
resultDetail.setSheetNumber(getText());
6171+
}
6172+
} else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo","OcrResults")) {
61566173
parseResultInfo(resultDetail.getPornInfo().getOcrResults(), name, getText());
61576174
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PoliticsInfo","OcrResults")) {
61586175
parseResultInfo(resultDetail.getPoliticsInfo().getOcrResults(), name, getText());
61596176
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "TerrorismInfo","OcrResults")) {
61606177
parseResultInfo(resultDetail.getTerroristInfo().getOcrResults(), name, getText());
61616178
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "AdsInfo","OcrResults")) {
61626179
parseResultInfo(resultDetail.getAdsInfo().getOcrResults(), name, getText());
6180+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo","ObjectResults")) {
6181+
parseResultInfo(resultDetail.getPornInfo().getObjectResults(), name, getText());
6182+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PoliticsInfo","ObjectResults")) {
6183+
parseResultInfo(resultDetail.getPoliticsInfo().getObjectResults(), name, getText());
6184+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "TerrorismInfo","ObjectResults")) {
6185+
parseResultInfo(resultDetail.getTerroristInfo().getObjectResults(), name, getText());
6186+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "AdsInfo","ObjectResults")) {
6187+
parseResultInfo(resultDetail.getAdsInfo().getObjectResults(), name, getText());
6188+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo","ObjectResults","Location")) {
6189+
parseResultInfo(resultDetail.getPornInfo().getObjectResults(), name, getText());
6190+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "PoliticsInfo","ObjectResults","Location")) {
6191+
parseResultInfo(resultDetail.getPoliticsInfo().getObjectResults(), name, getText());
6192+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "TerrorismInfo","ObjectResults","Location")) {
6193+
parseResultInfo(resultDetail.getTerroristInfo().getObjectResults(), name, getText());
6194+
}else if (in("Response", "JobsDetail", "PageSegment", "Results", "AdsInfo","ObjectResults","Location")) {
6195+
parseResultInfo(resultDetail.getAdsInfo().getObjectResults(), name, getText());
61636196
}
61646197
}
61656198

@@ -6191,6 +6224,36 @@ private void parseInfo(AudtingCommonInfo obj, String name, String value) {
61916224
default:
61926225
break;
61936226
}
6227+
6228+
}
6229+
6230+
private void parseResultInfo(List<ObjectResults> obj, String name, String value) {
6231+
if (!obj.isEmpty()) {
6232+
ObjectResults objectResult = obj.get(obj.size() - 1);
6233+
ObjectResults.Location location = objectResult.getLocation();
6234+
switch (name) {
6235+
case "Name":
6236+
objectResult.setName(value);
6237+
break;
6238+
case "Height":
6239+
location.setHeight(value);
6240+
break;
6241+
case "Rotate":
6242+
location.setRotate(value);
6243+
break;
6244+
case "Width":
6245+
location.setWidth(value);
6246+
break;
6247+
case "X":
6248+
location.setX(value);
6249+
break;
6250+
case "Y":
6251+
location.setY(value);
6252+
break;
6253+
default:
6254+
break;
6255+
}
6256+
}
61946257
}
61956258

61966259
private void parseResultInfo(OcrResults obj, String name, String value) {

‎src/main/java/com/qcloud/cos/model/ciModel/auditing/AudtingCommonInfo.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.qcloud.cos.model.ciModel.auditing;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
/**
47
* 审核信息公共实体类 https://cloud.tencent.com/document/product/460/37318
58
*/
@@ -32,6 +35,8 @@ public class AudtingCommonInfo {
3235

3336
private OcrResults ocrResults;
3437

38+
private List<ObjectResults> objectResults = new ArrayList<>();
39+
3540
public AudtingCommonInfo() {
3641
}
3742

@@ -103,6 +108,14 @@ public void setOcrResults(OcrResults ocrResults) {
103108
this.ocrResults = ocrResults;
104109
}
105110

111+
public List<ObjectResults> getObjectResults() {
112+
return objectResults;
113+
}
114+
115+
public void setObjectResults(List<ObjectResults> objectResults) {
116+
this.objectResults = objectResults;
117+
}
118+
106119
@Override
107120
public String toString() {
108121
final StringBuffer sb = new StringBuffer("AudtingCommonInfo{");

‎src/main/java/com/qcloud/cos/model/ciModel/auditing/DocumentAuditingJobsDetail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public void setDataId(String dataId) {
156156

157157
@Override
158158
public String toString() {
159-
final StringBuilder sb = new StringBuilder("DocumentAuditingJobsDetail{");
159+
final StringBuffer sb = new StringBuffer("DocumentAuditingJobsDetail{");
160160
sb.append("jobId='").append(jobId).append('\'');
161161
sb.append(", state='").append(state).append('\'');
162162
sb.append(", creationTime='").append(creationTime).append('\'');

‎src/main/java/com/qcloud/cos/model/ciModel/auditing/DocumentAuditingResponse.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@ public DocumentAuditingJobsDetail getJobsDetail() {
1919
public void setJobsDetail(DocumentAuditingJobsDetail jobsDetail) {
2020
this.jobsDetail = jobsDetail;
2121
}
22+
23+
@Override
24+
public String toString() {
25+
final StringBuffer sb = new StringBuffer("DocumentAuditingResponse{");
26+
sb.append("jobsDetail=").append(jobsDetail);
27+
sb.append('}');
28+
return sb.toString();
29+
}
2230
}

‎src/main/java/com/qcloud/cos/model/ciModel/auditing/DocumentResultInfo.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ public class DocumentResultInfo extends SnapshotInfo {
77
private String text;
88
private String pageNumber;
99
private String sheetNumber;
10+
private String label;
11+
private String suggestion;
1012

1113
public String getText() {
1214
return text;
@@ -32,6 +34,22 @@ public void setSheetNumber(String sheetNumber) {
3234
this.sheetNumber = sheetNumber;
3335
}
3436

37+
public String getLabel() {
38+
return label;
39+
}
40+
41+
public void setLabel(String label) {
42+
this.label = label;
43+
}
44+
45+
public String getSuggestion() {
46+
return suggestion;
47+
}
48+
49+
public void setSuggestion(String suggestion) {
50+
this.suggestion = suggestion;
51+
}
52+
3553
@Override
3654
public String toString() {
3755
final StringBuffer sb = new StringBuffer("DocumentResultInfo{");

‎src/main/java/com/qcloud/cos/model/ciModel/auditing/ObjectResults.java

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package com.qcloud.cos.model.ciModel.auditing;
2+
3+
/**
4+
* @author markjrzhang
5+
* @date 2021/11/29 8:00 下午
6+
*/
7+
public class ObjectResults {
8+
private String name;
9+
private String keywords;
10+
private Location location = new Location();
11+
12+
public class Location {
13+
private String height;
14+
private String rotate;
15+
private String width;
16+
private String x;
17+
private String y;
18+
19+
public String getHeight() {
20+
return height;
21+
}
22+
23+
public void setHeight(String height) {
24+
this.height = height;
25+
}
26+
27+
public String getRotate() {
28+
return rotate;
29+
}
30+
31+
public void setRotate(String rotate) {
32+
this.rotate = rotate;
33+
}
34+
35+
public String getWidth() {
36+
return width;
37+
}
38+
39+
public void setWidth(String width) {
40+
this.width = width;
41+
}
42+
43+
public String getX() {
44+
return x;
45+
}
46+
47+
public void setX(String x) {
48+
this.x = x;
49+
}
50+
51+
public String getY() {
52+
return y;
53+
}
54+
55+
public void setY(String y) {
56+
this.y = y;
57+
}
58+
59+
@Override
60+
public String toString() {
61+
final StringBuffer sb = new StringBuffer("Location{");
62+
sb.append("height='").append(height).append('\'');
63+
sb.append(", rotate='").append(rotate).append('\'');
64+
sb.append(", width='").append(width).append('\'');
65+
sb.append(", x='").append(x).append('\'');
66+
sb.append(", y='").append(y).append('\'');
67+
sb.append('}');
68+
return sb.toString();
69+
}
70+
}
71+
72+
public String getName() {
73+
return name;
74+
}
75+
76+
public void setName(String name) {
77+
this.name = name;
78+
}
79+
80+
public Location getLocation() {
81+
return location;
82+
}
83+
84+
public void setLocation(Location location) {
85+
this.location = location;
86+
}
87+
88+
public String getKeywords() {
89+
return keywords;
90+
}
91+
92+
public void setKeywords(String keywords) {
93+
this.keywords = keywords;
94+
}
95+
}

0 commit comments

Comments
 (0)