4/23 工单修改

src/main/java/com/example/xiaoshiweixinback/service/common/OPSService.java

@@ -55,9 +55,9 @@ public class OPSService {
         //String param = new Gson().toJson(pn);
         //RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(600, TimeUnit.SECONDS)
+                .writeTimeout(600, TimeUnit.SECONDS)
+                .readTimeout(600, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
                 .url(OPSUrl + "/api/OPSQuery/GetImagesInfo?Pn=" + pn)

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsService.java

@@ -77,6 +77,21 @@ public class EsService {
         return indexResponse.id();
     }
 
+    public Integer updatePatentVector(PatentVector patentVector, String id) {
+        UpdateRequest<PatentVector, PatentVector> req;
+
+        req = UpdateRequest.of(
+                b -> b.index(patentVectorName).id(id)
+                        .doc(patentVector)
+        );
+
+        try {
+            client.update(req, PatentVector.class);
+            return 1;
+        } catch (IOException e) {
+            return -1;
+        }
+    }
     /**
      * @param patent
      * @throws Exception
@@ -254,26 +269,11 @@ public class EsService {
         if (hits != null && hits.size() > 0) {
             id = hits.get(0).id();
           patentVector =hits.get(0).source();
+          patentVector.setId(id);
         }
         return patentVector;
     }
 
-    //更新patent
-    public Integer updatePatentVector(Patent patent, String id) {
-        UpdateRequest<Patent, Patent> req;
-
-        req = UpdateRequest.of(
-                b -> b.index("wxpatent").id(id)
-                        .doc(patent)
-        );
-
-        try {
-            client.update(req, Patent.class);
-            return 1;
-        } catch (IOException e) {
-            return -1;
-        }
-    }
 
 
     /**
@@ -310,22 +310,6 @@ public class EsService {
     }
 
 
-    //更新patent
-    public Integer updatePatentVector(PatentVector patentVector, String id) {
-        UpdateRequest<PatentVector, PatentVector> req;
-
-        req = UpdateRequest.of(
-                b -> b.index("patent_vector").id(id)
-                        .doc(patentVector)
-        );
-
-        try {
-            client.update(req, PatentVector.class);
-            return 1;
-        } catch (IOException e) {
-            return -1;
-        }
-    }
 }
 
 

src/main/java/com/example/xiaoshiweixinback/service/importPatent/GetPatentPictureFromWebService.java

@@ -55,9 +55,9 @@ public class GetPatentPictureFromWebService {
                 for (int i=0;i<pictureUrls.size();i++){
                     String pictureUrl =pictureUrls.get(i);
                     File file = FileUtils.getPictureFileByUrl(pictureUrl);
-                    String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getApplicationNo());
+                    String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getApplicationNo())+i;
                     fileManagerService.uploadFileWithGuid(file, guid);
-                    PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), 0);
+                    PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), i);
                     if (patentVectorOrg != null) {
                         return;
                     }
@@ -80,14 +80,13 @@ public class GetPatentPictureFromWebService {
             List<File> files = opsService.getImageFiles(infoVO, appNo);
             if (files != null && files.size() > 0) {
                 for (int i = 0; i < files.size(); i++) {
-                    String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo());
+                    String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo())+i;
                     File file = files.get(i);
                     fileManagerService.uploadFileWithGuid(file, guid);
-                    PatentVector patentVectorOrg = esService.getVectorByIndex(patent.getAppNo(), 0);
-                    if (patentVectorOrg != null) {
-                        return;
-                    }
-                    this.addPatentVector(uploadPatentWebDTO, file, i);
+
+                        this.addPatentVector(uploadPatentWebDTO, file, i);
+
+                    org.apache.commons.io.FileUtils.deleteQuietly(file);
                 }
             }
 
@@ -98,9 +97,12 @@ public class GetPatentPictureFromWebService {
 
 
     public void addPatentVector(UploadPatentWebDTO uploadPatentWebDTO, File file, Integer index) throws Exception {
-        String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo());
+
+
+        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());
@@ -118,9 +120,14 @@ public class GetPatentPictureFromWebService {
             floats.add(a);
 
         });
-        org.apache.commons.io.FileUtils.deleteQuietly(file);
         patentVector.setMyVector(floats);
-        esService.addPatentVector(patentVector);
+        if(patentVectorOrg!=null){
+            esService.updatePatentVector(patentVector,patentVectorOrg.getId());
+        }
+        else {
+            esService.addPatentVector(patentVector);
+        }
+
     }
 
 }