Skip to content

Commit 19be454

Browse files
563750789563750789
committed
更新万象图片审核接口字段
1 parent d5b3275 commit 19be454

File tree

5 files changed

+212
-94
lines changed

5 files changed

+212
-94
lines changed

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

+73-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import com.qcloud.cos.model.ciModel.auditing.AudioSectionInfo;
44
import com.qcloud.cos.model.ciModel.auditing.AudtingCommonInfo;
5-
import com.qcloud.cos.model.ciModel.auditing.ListInfo;
5+
import com.qcloud.cos.model.ciModel.auditing.BatchImageJobDetail;
6+
import com.qcloud.cos.model.ciModel.auditing.LibResult;
67
import com.qcloud.cos.model.ciModel.auditing.ListResult;
78
import com.qcloud.cos.model.ciModel.auditing.OcrResults;
89
import com.qcloud.cos.model.ciModel.auditing.PoliticsInfoObjectResults;
@@ -29,6 +30,8 @@
2930
import com.qcloud.cos.model.ciModel.template.MediaWatermark;
3031
import com.qcloud.cos.model.ciModel.template.SpriteSnapshotConfig;
3132

33+
import java.util.List;
34+
3235
/**
3336
* MediaInfo 解析工具类
3437
*/
@@ -600,7 +603,13 @@ public static void ParsingAuditingUserInfo(UserInfo userInfo, String name, Strin
600603
}
601604
}
602605

603-
public static void ParsingAuditingListResultInfo(ListResult result, String name, String value) {
606+
public static void parsingLastLibResult(List<LibResult> results, String name, String value) {
607+
if (!results.isEmpty()) {
608+
parsingLibResults(results.get(results.size() - 1), name, value);
609+
}
610+
}
611+
612+
public static void parsingAuditingListResultInfo(ListResult result, String name, String value) {
604613
switch (name) {
605614
case "ListName":
606615
result.setListName(value);
@@ -616,6 +625,19 @@ public static void ParsingAuditingListResultInfo(ListResult result, String name,
616625
}
617626
}
618627

628+
public static void parsingLibResults(LibResult result, String name, String value) {
629+
switch (name) {
630+
case "ImageId":
631+
result.setImageId(value);
632+
break;
633+
case "Score":
634+
result.setScore(value);
635+
break;
636+
default:
637+
break;
638+
}
639+
}
640+
619641
public static void ParsingAuditingCommonInfo(AudtingCommonInfo obj, String name, String value) {
620642
switch (name) {
621643
case "Code":
@@ -838,4 +860,53 @@ public static void ParsingSegment(MediaSegmentObject segment, String name, Strin
838860
break;
839861
}
840862
}
863+
864+
public static void ParsingAuditingBatchImageJobDetail(BatchImageJobDetail jobsDetail, String name, String value) {
865+
switch (name) {
866+
case "Object":
867+
jobsDetail.setObject(value);
868+
break;
869+
case "DataId":
870+
jobsDetail.setDataId(value);
871+
break;
872+
case "Label":
873+
jobsDetail.setLabel(value);
874+
break;
875+
case "Result":
876+
jobsDetail.setResult(value);
877+
break;
878+
case "Score":
879+
jobsDetail.setScore(value);
880+
case "Text":
881+
jobsDetail.setText(value);
882+
case "SubLabel":
883+
jobsDetail.setSubLabel(value);
884+
break;
885+
case "Code":
886+
jobsDetail.setCode(value);
887+
break;
888+
case "Message":
889+
jobsDetail.setMessage(value);
890+
break;
891+
case "Url":
892+
jobsDetail.setUrl(value);
893+
break;
894+
case "JobId":
895+
jobsDetail.setJobId(value);
896+
break;
897+
case "Category":
898+
jobsDetail.setCategory(value);
899+
break;
900+
case "CompressionResult":
901+
jobsDetail.setCompressionResult(value);
902+
break;
903+
case "State":
904+
jobsDetail.setState(value);
905+
break;
906+
default:
907+
break;
908+
}
909+
}
910+
911+
841912
}

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

+43-59
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingResponse;
9797
import com.qcloud.cos.model.ciModel.auditing.DocumentResultInfo;
9898
import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
99-
import com.qcloud.cos.model.ciModel.auditing.ListInfo;
99+
import com.qcloud.cos.model.ciModel.auditing.LibResult;
100100
import com.qcloud.cos.model.ciModel.auditing.ListResult;
101101
import com.qcloud.cos.model.ciModel.auditing.ObjectResults;
102102
import com.qcloud.cos.model.ciModel.auditing.OcrResults;
@@ -115,7 +115,6 @@
115115
import com.qcloud.cos.model.ciModel.common.MediaOutputObject;
116116
import com.qcloud.cos.model.ciModel.image.ImageLabelResponse;
117117
import com.qcloud.cos.model.ciModel.image.ImageLabelV2Response;
118-
import com.qcloud.cos.model.ciModel.image.ImageSearchResponse;
119118
import com.qcloud.cos.model.ciModel.image.Lobel;
120119
import com.qcloud.cos.model.ciModel.image.LobelV2;
121120
import com.qcloud.cos.model.ciModel.image.LocationLabel;
@@ -148,7 +147,6 @@
148147
import com.qcloud.cos.model.ciModel.mediaInfo.MediaStream;
149148
import com.qcloud.cos.model.ciModel.persistence.CIObject;
150149
import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
151-
import com.qcloud.cos.model.ciModel.persistence.DetectCarResponse;
152150
import com.qcloud.cos.model.ciModel.persistence.ImageInfo;
153151
import com.qcloud.cos.model.ciModel.persistence.OriginalInfo;
154152
import com.qcloud.cos.model.ciModel.persistence.ProcessResults;
@@ -5581,7 +5579,7 @@ protected void doEndElement(String uri, String name, String qName) {
55815579
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
55825580
List<ListResult> listResults = response.getJobsDetail().getListInfo().getListResults();
55835581
if (!listResults.isEmpty()) {
5584-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
5582+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
55855583
}
55865584
}
55875585
}
@@ -5727,7 +5725,7 @@ protected void doEndElement(String uri, String name, String qName) {
57275725
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
57285726
List<ListResult> listResults = response.getJobsDetail().getListInfo().getListResults();
57295727
if (!listResults.isEmpty()) {
5730-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
5728+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
57315729
}
57325730
}
57335731
}
@@ -6060,11 +6058,16 @@ public static class TextAuditingDescribeJobHandler extends AbstractHandler {
60606058

60616059
@Override
60626060
protected void doStartElement(String uri, String name, String qName, Attributes attrs) {
6063-
List<SectionInfo> sectionList = response.getJobsDetail().getSectionList();
6061+
AuditingJobsDetail jobsDetail = response.getJobsDetail();
6062+
List<SectionInfo> sectionList = jobsDetail.getSectionList();
60646063
if ((in("Response", "Detail") || in("Response", "JobsDetail")) && "Section".equals(name)) {
60656064
sectionList.add(new SectionInfo());
6066-
} else if (in("Response", "JobsDetail", "ListInfo") && "ListResults".equals(name)) {
6067-
response.getJobsDetail().getListInfo().getListResults().add(new ListResult());
6065+
} else if (in("Response", "JobsDetail", "Section","PornInfo") && "LibResults".equals(name)) {
6066+
if (!sectionList.isEmpty()){
6067+
SectionInfo sectionInfo = sectionList.get(sectionList.size() - 1);
6068+
List<LibResult> libResults = sectionInfo.getPornInfo().getLibResults();
6069+
libResults.add(new LibResult());
6070+
}
60686071
}
60696072
}
60706073

@@ -6127,7 +6130,7 @@ protected void doEndElement(String uri, String name, String qName) {
61276130
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
61286131
List<ListResult> listResults = response.getJobsDetail().getListInfo().getListResults();
61296132
if (!listResults.isEmpty()) {
6130-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
6133+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
61316134
}
61326135
} else if (in("Response", "Detail", "Section") || in("Response", "JobsDetail", "Section")) {
61336136
SectionInfo sectionInfo = sectionList.get(sectionList.size() - 1);
@@ -6364,7 +6367,7 @@ protected void doEndElement(String uri, String name, String qName) {
63646367
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
63656368
List<ListResult> listResults = response.getJobsDetail().getListInfo().getListResults();
63666369
if (!listResults.isEmpty()) {
6367-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
6370+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
63686371
}
63696372
}
63706373
}
@@ -6456,6 +6459,15 @@ protected void doStartElement(String uri, String name, String qName, Attributes
64566459
List<ListResult> listResults = jobList.get(jobList.size() - 1).getListInfo().getListResults();
64576460
listResults.add(new ListResult());
64586461
}
6462+
} else if (in("Response", "JobsDetail", "PornInfo") && "LibResults".equals(name)) {
6463+
jobList.get(jobList.size() - 1).getPornInfo().getLibResults().add(new LibResult());
6464+
} else if (in("Response", "JobsDetail", "PoliticsInfo") && "LibResults".equals(name)) {
6465+
jobList.get(jobList.size() - 1).getPoliticsInfo().getLibResults().add(new LibResult());
6466+
} else if (in("Response", "JobsDetail", "TerroristInfo") && "LibResults".equals(name) ||
6467+
in("Response", "JobsDetail", "TerrorismInfo") && "LibResults".equals(name)) {
6468+
jobList.get(jobList.size() - 1).getTerroristInfo().getLibResults().add(new LibResult());
6469+
} else if (in("Response", "JobsDetail", "AdsInfo") && "LibResults".equals(name)) {
6470+
jobList.get(jobList.size() - 1).getAdsInfo().getLibResults().add(new LibResult());
64596471
}
64606472
}
64616473

@@ -6470,63 +6482,35 @@ protected void doEndElement(String uri, String name, String qName) {
64706482
}
64716483

64726484
if (in("Response", "JobsDetail")) {
6473-
switch (name) {
6474-
case "Object":
6475-
jobsDetail.setObject(getText());
6476-
break;
6477-
case "DataId":
6478-
jobsDetail.setDataId(getText());
6479-
break;
6480-
case "Label":
6481-
jobsDetail.setLabel(getText());
6482-
break;
6483-
case "Result":
6484-
jobsDetail.setResult(getText());
6485-
break;
6486-
case "Score":
6487-
jobsDetail.setScore(getText());
6488-
case "Text":
6489-
jobsDetail.setText(getText());
6490-
case "SubLabel":
6491-
jobsDetail.setSubLabel(getText());
6492-
break;
6493-
case "Code":
6494-
jobsDetail.setCode(getText());
6495-
break;
6496-
case "Message":
6497-
jobsDetail.setMessage(getText());
6498-
break;
6499-
case "Url":
6500-
jobsDetail.setUrl(getText());
6501-
break;
6502-
case "JobId":
6503-
jobsDetail.setJobId(getText());
6504-
break;
6505-
case "Category":
6506-
jobsDetail.setCategory(getText());
6507-
break;
6508-
case "CompressionResult":
6509-
jobsDetail.setCompressionResult(getText());
6510-
break;
6511-
default:
6512-
break;
6513-
}
6514-
}else if (in("Response","JobsDetail", "PornInfo")) {
6485+
ParserMediaInfoUtils.ParsingAuditingBatchImageJobDetail(jobsDetail, name, getText());
6486+
} else if (in("Response", "JobsDetail", "PornInfo")) {
65156487
parseInfo(jobsDetail.getPornInfo(), name, getText());
6516-
} else if (in("Response","JobsDetail", "PoliticsInfo")) {
6488+
} else if (in("Response", "JobsDetail", "PoliticsInfo")) {
65176489
parseInfo(jobsDetail.getPoliticsInfo(), name, getText());
6518-
} else if (in("Response", "JobsDetail","TerroristInfo") || in("Response", "JobsDetail","TerrorismInfo")) {
6490+
} else if (in("Response", "JobsDetail", "TerroristInfo") || in("Response", "JobsDetail", "TerrorismInfo")) {
65196491
parseInfo(jobsDetail.getTerroristInfo(), name, getText());
65206492
} else if (in("Response", "JobsDetail", "AdsInfo")) {
65216493
parseInfo(jobsDetail.getAdsInfo(), name, getText());
6494+
} else if (in("Response", "JobsDetail", "PornInfo", "LibResults")) {
6495+
List<LibResult> libResults = jobsDetail.getPornInfo().getLibResults();
6496+
ParserMediaInfoUtils.parsingLastLibResult(libResults, name, getText());
6497+
} else if (in("Response", "JobsDetail", "PoliticsInfo", "LibResults")) {
6498+
List<LibResult> libResults = jobsDetail.getPoliticsInfo().getLibResults();
6499+
ParserMediaInfoUtils.parsingLastLibResult(libResults, name, getText());
6500+
} else if (in("Response", "JobsDetail", "TerroristInfo", "LibResults") || in("Response", "JobsDetail", "TerrorismInfo", "LibResults")) {
6501+
List<LibResult> libResults = jobsDetail.getTerroristInfo().getLibResults();
6502+
ParserMediaInfoUtils.parsingLastLibResult(libResults, name, getText());
6503+
} else if (in("Response", "JobsDetail", "AdsInfo", "LibResults")) {
6504+
List<LibResult> libResults = jobsDetail.getAdsInfo().getLibResults();
6505+
ParserMediaInfoUtils.parsingLastLibResult(libResults, name, getText());
65226506
} else if (in("Response", "JobsDetail", "UserInfo")) {
65236507
ParserMediaInfoUtils.ParsingAuditingUserInfo(jobsDetail.getUserInfo(), name, getText());
6524-
} else if (in("Response", "JobsDetail", "ListInfo","ListResults")) {
6508+
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
65256509
List<ListResult> listResults = jobsDetail.getListInfo().getListResults();
6526-
if (listResults.isEmpty()){
6510+
if (listResults.isEmpty()) {
65276511
return;
65286512
}
6529-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size()-1), name, getText());
6513+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
65306514
} else if (in("Response", "JobsDetail", "PornInfo", "OcrResults")) {
65316515
ParserMediaInfoUtils.parseOrcInfo(jobsDetail.getPornInfo().getOcrResults(), name, getText());
65326516
} else if (in("Response", "JobsDetail", "PoliticsInfo", "OcrResults")) {
@@ -6714,7 +6698,7 @@ protected void doEndElement(String uri, String name, String qName) {
67146698
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
67156699
List<ListResult> listResults = response.getJobsDetail().getListInfo().getListResults();
67166700
if (!listResults.isEmpty()) {
6717-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
6701+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
67186702
}
67196703
}
67206704
}
@@ -6835,7 +6819,7 @@ protected void doEndElement(String uri, String name, String qName) {
68356819
} else if (in("Response", "JobsDetail", "ListInfo", "ListResults")) {
68366820
List<ListResult> listResults = response.getListInfo().getListResults();
68376821
if (!listResults.isEmpty()) {
6838-
ParserMediaInfoUtils.ParsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
6822+
ParserMediaInfoUtils.parsingAuditingListResultInfo(listResults.get(listResults.size() - 1), name, getText());
68396823
}
68406824
}
68416825
}

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

+28-13
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public class AudtingCommonInfo {
5050

5151
private List<ObjectResults> objectResults = new ArrayList<>();
5252

53+
private List<LibResult> libResults;
54+
5355
public AudtingCommonInfo() {
5456
}
5557

@@ -153,20 +155,33 @@ public void setCategory(String category) {
153155
this.category = category;
154156
}
155157

158+
public List<LibResult> getLibResults() {
159+
if (libResults == null) {
160+
libResults = new ArrayList<>();
161+
}
162+
return libResults;
163+
}
164+
165+
public void setLibResults(List<LibResult> libResults) {
166+
this.libResults = libResults;
167+
}
168+
156169
@Override
157170
public String toString() {
158-
return "AudtingCommonInfo{" +
159-
"code='" + code + '\'' +
160-
", msg='" + msg + '\'' +
161-
", hitFlag='" + hitFlag + '\'' +
162-
", score='" + score + '\'' +
163-
", label='" + label + '\'' +
164-
", keywords='" + keywords + '\'' +
165-
", count='" + count + '\'' +
166-
", subLabel='" + subLabel + '\'' +
167-
", ocrResults=" + ocrResults +
168-
", category='" + category + '\'' +
169-
", objectResults=" + objectResults +
170-
'}';
171+
final StringBuffer sb = new StringBuffer("AudtingCommonInfo{");
172+
sb.append("code='").append(code).append('\'');
173+
sb.append(", msg='").append(msg).append('\'');
174+
sb.append(", hitFlag='").append(hitFlag).append('\'');
175+
sb.append(", score='").append(score).append('\'');
176+
sb.append(", label='").append(label).append('\'');
177+
sb.append(", keywords='").append(keywords).append('\'');
178+
sb.append(", count='").append(count).append('\'');
179+
sb.append(", subLabel='").append(subLabel).append('\'');
180+
sb.append(", ocrResults=").append(ocrResults);
181+
sb.append(", category='").append(category).append('\'');
182+
sb.append(", objectResults=").append(objectResults);
183+
sb.append(", libResults=").append(libResults);
184+
sb.append('}');
185+
return sb.toString();
171186
}
172187
}

0 commit comments

Comments
 (0)