修复导入模块

src/main/java/cn/cslg/pas/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

src/main/java/cn/cslg/pas/domain/business/AssoGroupFeature.java

@@ -127,4 +127,5 @@ public class AssoGroupFeature  extends BaseEntity<AssoGroupFeature> {
      */
     @TableField(value = "court_opinions2")
     private String courtOpinions2;
+
 }

src/main/java/cn/cslg/pas/service/business/invalidReport/EvidenceReasonService.java

@@ -240,6 +240,7 @@ public class EvidenceReasonService extends ServiceImpl<EvidenceReasonMapper, Evi
                         queryEvidenceReasonVO.setFeInvalidReasonDetail2(item.getInvalidReasonDetail2());
                         queryEvidenceReasonVO.setFeRbDecisionKey(item.getRbDecisionKey());
                         queryEvidenceReasonVO.setFeRbOpinions(item.getRbOpinions());
+                        queryEvidenceReasonVO.setFeRbSummary(item.getRbSummary());
 
                         queryEvidenceReasonVO.setFeCourtOpinions1(item.getCourtOpinions1());
                         queryEvidenceReasonVO.setFeCourtOpinions2(item.getCourtOpinions2());

src/main/java/cn/cslg/pas/service/common/MessageService.java

@@ -34,7 +34,6 @@ public class MessageService {
         } else if (type.equals(1)) {
             doneNum = patentProcess.getPatentMessageDoneNum();
         } else if (type.equals(2)) {
-
             doneNum = patentProcess.getPictureDoneNum();
         }
         long percentage = (long) Math.floor((doneNum + 0D) / importTaskAMVO.getAllNum() * 100D);

src/main/java/cn/cslg/pas/service/importPatent/GetRightAndFullTextFromWebThread.java

@@ -86,7 +86,6 @@ public class GetRightAndFullTextFromWebThread extends Thread {
         UploadPatentWebDTO uploadPatentWebDTO1=new UploadPatentWebDTO();
         BeanUtils.copyProperties(uploadPatentWebDTO,uploadPatentWebDTO1);
         uploadPatentWebDTOs.add(uploadPatentWebDTO1);
-        uploadPatentWebDTOs.add(uploadPatentWebDTO);
         if (taskLock.tryLock()) {
             taskCondition.signalAll();
             taskLock.unlock();

src/main/java/cn/cslg/pas/service/importPatent/ImportFromWebToEsService.java

@@ -167,7 +167,7 @@ public class ImportFromWebToEsService implements PatentImportImp {
                 Integer startPage = calculate.getStartPage();
                 Integer endPage = calculate.getEndPage();
 
-                for (int i = startPage; i <= endPage; i++) {
+                for (int i = startPage; i < endPage; i++) {
                     PatentStarListDTO patentStarListDTOTemp = new PatentStarListDTO();
                     BeanUtils.copyProperties(patentStarListDto, patentStarListDTOTemp);
                     patentStarListDTOTemp.setPageNum(i + 1);
@@ -260,7 +260,7 @@ public class ImportFromWebToEsService implements PatentImportImp {
                     BeanUtils.copyProperties(patent, orgPatent, FormatUtil.getNullPropertyNames(patent));
                     Patent patent1 = new Patent();
                     BeanUtils.copyProperties(orgPatent, patent1);
-                    dtos.removeIf(i->i.getIndex().equals(uploadPatentWebDTO.getIndex()));
+                    uploadPatentWebDTOS.removeIf(i->i.getIndex().equals(uploadPatentWebDTO.getIndex()));
                     savePatentToEsThread.awakeTask(patent1);
                 }
                 else {