1.10 lrj

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -62,7 +62,6 @@ public class ProjectImportController {
 //    @Async("singleThreadAsyncTaskExecutor")
     public String importSysPatent(@RequestBody TaskParams taskParams) {
         return uploadPatentBatchService.uploadPatentBatchBro(taskParams);
-
     }
 
     @GetMapping("list")

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -130,12 +130,12 @@ public class UploadPatentBatchService {
      * @return uploadParamsVO 返回一个由processData方法填充完数据的Pojo类
      * @date 2022/7/7
      * @name 解析配置文件
-     * @description  uploadPatentBatch的兄弟方法
+     * @description uploadPatentBatch的兄弟方法
      */
 //    @Async("singleThreadAsyncTaskExecutor")
-    public String  uploadPatentBatchBro(TaskParams params) {
+    public String uploadPatentBatchBro(TaskParams params) {
         Integer total = params.getTotal();
-        Integer index =params.getIndex();
+        Integer index = params.getIndex();
         try {
             //先解析Json文件 获得配置文件的Json串
             String getSettingJson = fileUtils.analysisJsonFile();
@@ -143,44 +143,44 @@ public class UploadPatentBatchService {
             List<UploadSettingVO.Column> jsonData = UploadPatentBatchUtil.parsingConfigurationFilesBro(getSettingJson);
             Map<String, PictureData> pictureDataMap = ExcelUtils.getDataFromExcel(params.getPath());
             //将数据进行装配并进行数据库操作
-                //获取每一行的数据
-                Map<Object, Object> row = params.getRowList().get(0);
-                //基础数据装配
-                UploadParamsVO uploadParamsVO = UploadPatentBatchUtil.processData(row, jsonData);
-                //查询数据是否存在 如果存在 返回该条数据 如果不存在 新增一条数据
-                getOneOrInsertOne(uploadParamsVO);
-                //专利信息需要特殊处理部分
-                //专利信息(摘要附图)数据装配
-                PictureData pictureData = pictureDataMap.get(String.valueOf(index+ 1));
-                if (uploadParamsVO.getPatent() != null) {
-                    if (uploadParamsVO.getPatent().getId() != null && pictureData != null) {
-                        uploadParamsVO.getPatent().setAbstractPath(patentImageService.updatePatentImage(uploadParamsVO.getPatent().getId(), pictureData));
-                    }
+            //获取每一行的数据
+            Map<Object, Object> row = params.getRowList().get(0);
+            //基础数据装配
+            UploadParamsVO uploadParamsVO = UploadPatentBatchUtil.processData(row, jsonData);
+            //查询数据是否存在 如果存在 返回该条数据 如果不存在 新增一条数据
+            getOneOrInsertOne(uploadParamsVO);
+            //专利信息需要特殊处理部分
+            //专利信息(摘要附图)数据装配
+            PictureData pictureData = pictureDataMap.get(String.valueOf(index + 1));
+            if (uploadParamsVO.getPatent() != null) {
+                if (uploadParamsVO.getPatent().getId() != null && pictureData != null) {
+                    uploadParamsVO.getPatent().setAbstractPath(patentImageService.updatePatentImage(uploadParamsVO.getPatent().getId(), pictureData));
                 }
-                //专利信息(代理机构)数据装配
-                if (uploadParamsVO.getPatent() != null) {
-                    if (uploadParamsVO.getPatent().getAgencyId() != null) {
-                        uploadParamsVO.getPatent().setAgencyId(patentAgencyService.getAgencyStringIdByName(uploadParamsVO.getPatent().getAgencyId()));
-                    }
-
+            }
+            //专利信息(代理机构)数据装配
+            if (uploadParamsVO.getPatent() != null) {
+                if (uploadParamsVO.getPatent().getAgencyId() != null) {
+                    uploadParamsVO.getPatent().setAgencyId(patentAgencyService.getAgencyStringIdByName(uploadParamsVO.getPatent().getAgencyId()));
                 }
-                //将装配对象中的数据保存到数据库
-                dataToDBBro(params, uploadParamsVO);
-            ImportTaskPatent importTaskPatent =new ImportTaskPatent();
+
+            }
+            //将装配对象中的数据保存到数据库
+            dataToDBBro(params, uploadParamsVO);
+            ImportTaskPatent importTaskPatent = new ImportTaskPatent();
             importTaskPatent.setImportTaskId(params.getTaskId());
             importTaskPatent.setPatentNo(uploadParamsVO.getPatent().getPatentNo());
             importTaskPatent.insert();
-                //通过WebSocket 在每一次循环结束后 向前端发送完成进度
-                WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
-                        .setTaskId(params.getTaskId())
-                        .setComplete(false)
-                        .setIndex(0)
-                        .setTaskType(Constants.TASK_IMPORT_PATENT)
-                        .setPercentage(total == 0 ? 0 : Math.round((total.equals(index) ? (index * 1D) : (index + 1D)) / total * 100D))
-                        .setFileName("")
-                        .setOldName(params.getOldName())
-                        .setUrl("")
-                        .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), params.getUserId());
+            //通过WebSocket 在每一次循环结束后 向前端发送完成进度
+            WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
+                    .setTaskId(params.getTaskId())
+                    .setComplete(false)
+                    .setIndex(0)
+                    .setTaskType(Constants.TASK_IMPORT_PATENT)
+                    .setPercentage(total == 0 ? 0 : Math.round((total.equals(index) ? (index * 1D) : (index + 1D)) / total * 100D))
+                    .setFileName("")
+                    .setOldName(params.getOldName())
+                    .setUrl("")
+                    .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), params.getUserId());
 
             return Response.success();
         } catch (Exception e) {
@@ -232,10 +232,12 @@ public class UploadPatentBatchService {
             patentSimplyFamilyBusiness(uploadParamsVO);
             //发明人 OS_PATENT_INVENTOR
             patentInventorBusiness(uploadParamsVO);
-            if(uploadParamsVO.getPatentApplicantOriginalName() == null)
-            {uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());}
-            if(uploadParamsVO.getPatentApplicantCurrentName() == null)
-            {uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());}
+            if (uploadParamsVO.getPatentApplicantOriginalName() == null) {
+                uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());
+            }
+            if (uploadParamsVO.getPatentApplicantCurrentName() == null) {
+                uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());
+            }
             //申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
             if (uploadParamsVO.getPatentApplicantStandardCurrentName() != null && uploadParamsVO.getPatentApplicantOriginalName() != null && uploadParamsVO.getPatentApplicantStandardOriginalName() != null) {
                 patentApplicationBusiness(uploadParamsVO);
@@ -326,10 +328,12 @@ public class UploadPatentBatchService {
             //发明人 OS_PATENT_INVENTOR
             patentInventorBusiness(uploadParamsVO);
             //申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
-            if(uploadParamsVO.getPatentApplicantOriginalName() == null)
-            {uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());}
-            if(uploadParamsVO.getPatentApplicantCurrentName() == null)
-            {uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());}
+            if (uploadParamsVO.getPatentApplicantOriginalName() == null) {
+                uploadParamsVO.setPatentApplicantOriginalName(uploadParamsVO.getPatentApplicantStandardOriginalName());
+            }
+            if (uploadParamsVO.getPatentApplicantCurrentName() == null) {
+                uploadParamsVO.setPatentApplicantCurrentName(uploadParamsVO.getPatentApplicantStandardCurrentName());
+            }
             if (uploadParamsVO.getPatentApplicantStandardCurrentName() != null && uploadParamsVO.getPatentApplicantOriginalName() != null && uploadParamsVO.getPatentApplicantStandardOriginalName() != null) {
                 patentApplicationBusiness(uploadParamsVO);
             }
@@ -422,7 +426,6 @@ public class UploadPatentBatchService {
     }
 
 
-
     //许可人 OS_PATENT_LICENSOR
     private void patentLicensorBusiness(UploadParamsVO uploadParamsVO) {
         PatentLicensorParams patentLicensorParams = new PatentLicensorParams();
@@ -455,6 +458,7 @@ public class UploadPatentBatchService {
 
         patentSimpleFamilyService.updatePatentSimpleFamily(patentSimpleFamilyParams);
     }
+
     //发明人 OS_PATENT_INVENTOR
     private void patentInventorBusiness(UploadParamsVO uploadParamsVO) {
         PatentInventorParams patentInventorParams = new PatentInventorParams();
@@ -478,15 +482,15 @@ public class UploadPatentBatchService {
     //申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
     private void patentApplicationBusiness(UploadParamsVO uploadParamsVO) {
         // 根据本条数据的名字查询所有的申请人信息
-List<String>  currentName=uploadParamsVO.getPatentApplicantCurrentName();
-List<String>  standardName = uploadParamsVO.getPatentApplicantStandardCurrentName();
+        List<String> currentName = new ArrayList<>(uploadParamsVO.getPatentApplicantCurrentName());
+        List<String> standardName = new ArrayList<>(uploadParamsVO.getPatentApplicantStandardCurrentName());
         currentName.addAll(uploadParamsVO.getPatentApplicantOriginalName());
         standardName.addAll(uploadParamsVO.getPatentApplicantStandardOriginalName());
         List<PatentApplicant> patentApplicantList = patentApplicantService.list(Wrappers.<PatentApplicant>lambdaQuery().in(PatentApplicant::getName, currentName).in(PatentApplicant::getShortName, standardName));
         //权利人
-        patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantCurrentName(), uploadParamsVO.getPatentApplicantStandardCurrentName(), 1, uploadParamsVO.getPatent().getId(),patentApplicantList);
+        patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantCurrentName(), uploadParamsVO.getPatentApplicantStandardCurrentName(), 1, uploadParamsVO.getPatent().getId(), patentApplicantList);
         //申请人
-        patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantOriginalName(), uploadParamsVO.getPatentApplicantStandardOriginalName(), 2, uploadParamsVO.getPatent().getId(),patentApplicantList);
+        patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantOriginalName(), uploadParamsVO.getPatentApplicantStandardOriginalName(), 2, uploadParamsVO.getPatent().getId(), patentApplicantList);
     }
 
     private void patentApplicationAddressBusiness(UploadParamsVO uploadParamsVO) {