|
@@ -53,11 +53,16 @@ public class GetPatentPictureFromWebService {
|
|
|
Patent patent = uploadPatentWebDTO.getPatent();
|
|
|
if (pictureUrls != null && pictureUrls.size()>0) {
|
|
|
for (int i=0;i<pictureUrls.size();i++){
|
|
|
+ PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), i);
|
|
|
+ if(patentVectorOrg!=null){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
String pictureUrl =pictureUrls.get(i);
|
|
|
File file = FileUtils.getPictureFileByUrl(pictureUrl);
|
|
|
String guid = FormatUtil.getPictureFormat(patent.getAppNo())+i;
|
|
|
fileManagerService.uploadFileWithGuid(file, guid);
|
|
|
- this.addPatentVector(uploadPatentWebDTO, file, i);
|
|
|
+
|
|
|
+ this.addPatentVector(uploadPatentWebDTO, file, i,patentVectorOrg);
|
|
|
org.apache.commons.io.FileUtils.deleteQuietly(file);
|
|
|
}
|
|
|
|
|
@@ -80,8 +85,9 @@ public class GetPatentPictureFromWebService {
|
|
|
String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo())+i;
|
|
|
File file = files.get(i);
|
|
|
fileManagerService.uploadFileWithGuid(file, guid);
|
|
|
+ PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), i);
|
|
|
|
|
|
- this.addPatentVector(uploadPatentWebDTO, file, i);
|
|
|
+ this.addPatentVector(uploadPatentWebDTO, file, i,patentVectorOrg);
|
|
|
|
|
|
org.apache.commons.io.FileUtils.deleteQuietly(file);
|
|
|
}
|
|
@@ -93,13 +99,12 @@ public class GetPatentPictureFromWebService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public void addPatentVector(UploadPatentWebDTO uploadPatentWebDTO, File file, Integer index) throws Exception {
|
|
|
+ public void addPatentVector(UploadPatentWebDTO uploadPatentWebDTO, File file, Integer index,PatentVector patentVectorOrg) throws Exception {
|
|
|
|
|
|
|
|
|
String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo())+index;
|
|
|
|
|
|
Patent patent = uploadPatentWebDTO.getPatent();
|
|
|
- PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), index);
|
|
|
PatentVector patentVector = new PatentVector();
|
|
|
patentVector.setAppNo(patent.getAppNo());
|
|
|
patentVector.setTitle(patent.getTitle());
|