专利号大批量导入

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/common/model/cronModel/Records.java

@@ -11,4 +11,5 @@ public class Records {
     Long total;
     Long current;
     Long size;
+    Integer retrieveRecordId;
 }

src/main/java/cn/cslg/pas/common/utils/ResponseEnum.java

@@ -11,7 +11,8 @@ public enum ResponseEnum {
     NO_PERMISSION(201,"无权限"),
     PARAMS_ERROR(202,"参数错误"),
     CONDITION_ERROR(203, "检索式错误"),
-    PATENT_IMPORT_TASK_SUCCESS(903, "WebSocket请求成功")
+    PATENT_IMPORT_TASK_SUCCESS(903, "导入任务完成"),
+    PATENT_IMPORT_PATENT_PART_SUCCESS(900, "专利信息部分上传成功");
     ;
 
     private Integer code;

src/main/java/cn/cslg/pas/common/vo/TaskWebSocketDTO.java

@@ -28,4 +28,8 @@ public class TaskWebSocketDTO {
     private Integer taskType;
     private Long percentage;
     private String oldName;
+    /**
+     * 0专利信息 1图片
+     */
+    private Integer doneType;
 }

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -139,7 +139,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         } else if (importTaskDTO.getImportToType().equals(2)) {
             importTaskCondition.setProductId(importTaskDTO.getImportToId());
         }
-    importTaskDTO.setImportContent(MathUtils.BinaryToDecimal (importTaskDTO.getImportContent()));
+        if (!importTaskDTO.getType().equals(1)) {
+            importTaskDTO.setImportContent(MathUtils.BinaryToDecimal(importTaskDTO.getImportContent()));
+        }
         importTaskCondition.setImportContent(importTaskDTO.getImportContent());
         importTaskCondition.setCrons(importTaskDTO.getCrons());
         importTaskCondition.setIfUpdate(importTaskDTO.getIfUpdate());
@@ -182,7 +184,8 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             } catch (Exception e) {
                 throw new XiaoShiException("文件错误");
             }
-        } else if (importTaskCondition.getType().equals(4)) {
+        }
+        else if (importTaskCondition.getType().equals(4)) {
             try {
                 PatentStarListDTO patentStarListDto = new PatentStarListDTO()
                         .setCurrentQuery(importTaskCondition.getSearchCondition())
@@ -191,6 +194,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                         .setPageNum(0)
                         .setRowCount(50)
                         .setDBType(importTaskCondition.getDbType());
+
                 //调用一般接口返回一批专利著录相关数据
                 Map<String, Object> resultMap = patentStarApiService.patentStarSearchApi(patentStarListDto);
                 if (resultMap == null || (Integer) resultMap.get("total") == 0) {

src/main/java/cn/cslg/pas/service/business/PatentNoSplitterService.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.dto.PatentStarListDTO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -11,37 +12,4 @@ import java.util.List;
  */
 @Service
 public class PatentNoSplitterService {
-
-    public List<List<String>> splitPatentNoByType(List<String> originalList) {
-        List<String> cnStrings = new ArrayList<>();
-        List<String> wdStrings = new ArrayList<>();
-        List<List<String>> result = new ArrayList<>();
-        result.add(cnStrings);
-        result.add(wdStrings);
-        // 记录CN类型的字符串数量
-        int cnCount = 0;
-        // 记录WD类型的字符串数量
-        int wdCount = 0;
-        //遍历初始集合
-        for (String str : originalList) {
-            if (str.startsWith("CN")) {
-                cnStrings.add(str);
-                cnCount++;
-                if (cnCount >= 1000) {
-                    cnStrings = new ArrayList<>();
-                    result.add(cnStrings);
-                    cnCount = 0;
-                }
-            } else if (str.startsWith("WD")) {
-                wdStrings.add(str);
-                wdCount++;
-                if (wdCount >= 1000) {
-                    wdStrings = new ArrayList<>();
-                    result.add(wdStrings);
-                    wdCount = 0;
-                }
-            }
-        }
-        return result;
-    }
 }

src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -3,7 +3,7 @@ package cn.cslg.pas.service.business.es;
 import cn.cslg.pas.common.core.base.IfConstant;
 import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.PatentDTO;
-import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
+//import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
 import cn.cslg.pas.common.model.request.MapRequest;
 import cn.cslg.pas.common.model.request.OrderDTO;
 import cn.cslg.pas.common.model.request.QueryRequest;

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

@@ -27,8 +27,19 @@ public class MessageService {
      *
 
      */
-    public void sendWebsocketMessage(ImportTaskAMVO importTaskAMVO) {
-        long percentage = (long) Math.floor((importTaskAMVO.getDoneNum() + 0D) / importTaskAMVO.getAllNum() * 100D);
+    public void sendWebsocketMessage(ImportTaskAMVO importTaskAMVO,Integer type) {
+        Integer doneNum=0;
+ if(type.equals(0)){
+            doneNum = importTaskAMVO.getDoneNum();
+        }
+        else if(type.equals(1)){
+                doneNum = importTaskAMVO.getMessageDoneNum();
+            }
+            else if(type.equals(2)){
+
+                doneNum= importTaskAMVO.getPictureDoneNum();
+        }
+        long percentage = (long) Math.floor((doneNum + 0D) / importTaskAMVO.getAllNum() * 100D);
         //通过WebSocket 在每一次循环结束后 向前端发送完成进度
         //当任务状态为完成时，flag为true
         boolean flag = importTaskAMVO.getState().equals(2);
@@ -42,12 +53,28 @@ public class MessageService {
                 .setFileName(importTaskAMVO.getFileGuid())
                 .setOldName("")
                 .setUrl("")
-                .setTotal(importTaskAMVO.getAllNum()), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), importTaskAMVO.getCreateId());
+                .setDoneType(type)
+                .setTotal(importTaskAMVO.getAllNum()), ResponseEnum.PATENT_IMPORT_PATENT_PART_SUCCESS),null);
     }
-    public void sendAllDoneMessage(ImportTaskAMVO importTaskAMVO) {
 
+
+    public void sendAllDoneMessage(ImportTaskAMVO importTaskAMVO) {
         //通过WebSocket 在每一次循环结束后 向前端发送完成进度
         //当任务状态为完成时，flag为true
-        WebSocketServer.sendInfo("任务已完成", importTaskAMVO.getCreateId());
+        long percentage = (long) Math.floor((importTaskAMVO.getAllNum() + 0D) / importTaskAMVO.getAllNum() * 100D);
+        boolean flag = importTaskAMVO.getState().equals(2);
+        WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
+                .setTaskId(importTaskAMVO.getId())
+                .setTaskStatus(importTaskAMVO.getState())
+                .setComplete(flag)
+                .setIndex(importTaskAMVO.getDoneNum())
+                .setTaskType(importTaskAMVO.getType())
+                .setPercentage(percentage)
+                .setFileName(importTaskAMVO.getFileGuid())
+                .setOldName("")
+                .setUrl("")
+                .setTotal(importTaskAMVO.getAllNum()), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS),null);
     }
+
+
 }

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

@@ -46,10 +46,10 @@ import java.util.regex.Pattern;
 @Service
 
 public class PatentStarApiService {
-   @Autowired
-    private  RetrieveRecordService retrieveRecordService;
     @Autowired
-    private  CacheUtils cacheUtils;
+    private RetrieveRecordService retrieveRecordService;
+    @Autowired
+    private CacheUtils cacheUtils;
     @Autowired
     private LoginUtils loginUtils;
     @Autowired
@@ -224,6 +224,8 @@ public class PatentStarApiService {
 //            retrieveRecord.updateById();
 //        }
         map.put("retrieveRecordId", retrieveRecord.getId());
+        //TODO 根据map内容填充数据到Records
+
         return map;
 
     }
@@ -233,7 +235,7 @@ public class PatentStarApiService {
         try {
             if (PatentStarListDTO.getFormed() == null || PatentStarListDTO.getFormed() == false) {
                 String formQuery = PatentStarListDTO.getCurrentQuery();
-               PatentStarListDTO.setCurrentQuery(formatQueryService.reQuery(formQuery,"webSearchConfig"));
+                PatentStarListDTO.setCurrentQuery(formatQueryService.reQuery(formQuery, "webSearchConfig"));
                 if (PatentStarListDTO.getDBType().equals("WD")) {
                     StringBuilder stringBuilder = new StringBuilder(PatentStarListDTO.getCurrentQuery());
                     stringBuilder.insert(PatentStarListDTO.getCurrentQuery().length() - 1, "-CN/GJ");
@@ -792,4 +794,58 @@ public class PatentStarApiService {
         return jsonObject;
     }
 
+    public List<PatentStarListDTO> splitPatentNoByType(List<String> originalList, PatentStarListDTO patentStarListDTO) {
+        List<String> cnStrings = new ArrayList<>();
+        List<String> wdStrings = new ArrayList<>();
+        List<List<String>> result = new ArrayList<>();
+        result.add(cnStrings);
+        result.add(wdStrings);
+        // 记录CN类型的字符串数量
+        int cnCount = 0;
+        // 记录WD类型的字符串数量
+        int wdCount = 0;
+
+        List<PatentStarListDTO> patentStarListDTOS = new ArrayList<>();
+        //遍历初始集合
+        for (String str : originalList) {
+            if (str.startsWith("CN")) {
+                cnStrings.add(str);
+                cnCount++;
+                if (cnCount >= 100) {
+                    cnStrings = new ArrayList<>();
+                    result.add(cnStrings);
+                    cnCount = 0;
+                }
+            } else {
+                wdStrings.add(str);
+                wdCount++;
+                if (wdCount >= 100) {
+                    wdStrings = new ArrayList<>();
+                    result.add(wdStrings);
+                    wdCount = 0;
+                }
+            }
+        }
+
+        result.forEach(item -> {
+            String dbType = "CN";
+            String patentNo = item.get(0);
+            if (!patentNo.startsWith("CN")) {
+                dbType = "WD";
+            }
+            String join = StringUtils.join(item, " OR ");
+            String conditions = "AN=(" + join + ") OR PN=(" + join + ") OR GN=(" + join + ")";
+            PatentStarListDTO patentStarListDTO1 = new PatentStarListDTO();
+            patentStarListDTO1.setOrderByType(patentStarListDTO.getOrderByType());
+            patentStarListDTO1.setCurrentQuery(conditions);
+            patentStarListDTO1.setPageNum(patentStarListDTO.getPageNum());
+            patentStarListDTO1.setDBType(dbType);
+            patentStarListDTO1.setCurrentQuery(conditions);
+            patentStarListDTO1.setRowCount(patentStarListDTO.getRowCount());
+            patentStarListDTO1.setTotal(item.size());
+            patentStarListDTOS.add(patentStarListDTO1);
+        });
+
+        return patentStarListDTOS;
+    }
 }

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

@@ -34,7 +34,6 @@ public class GetPatentFromExcelThread extends Thread {
     public void run() {
         try {
             FileManagerService fileManagerService = applicationContext.getBean(FileManagerService.class);
-
             String res = fileManagerService.getSystemFileFromFMS(Arrays.asList(importTaskAMVO.getFileGuid()));
             List<SystemFile> systemFiles = JSONArray.parseArray(res, SystemFile.class);
             SystemFile systemFile = systemFiles.get(0);
@@ -73,6 +72,8 @@ public class GetPatentFromExcelThread extends Thread {
                 UploadPatentWebDTO uploadPatentWebDTO =new UploadPatentWebDTO();
                 uploadPatentWebDTO.setIfAddPatent(false);
                 uploadPatentWebDTO.setIfAddPicture(false);
+                uploadPatentWebDTO.setHaveSaveCounter(0);
+                uploadPatentWebDTO.setTotalCounter(importTaskAMVO.getShouldSaveCounter());
                 uploadPatentWebDTO.setPictureData(uploadParamsVO.getPictureData());
                 uploadPatentWebDTO.setPatent(uploadParamsVO.getPatent());
                 //专利丢入消费者队列，并唤醒消费者线程

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

@@ -14,6 +14,7 @@ import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.service.common.ExcuteDataToVOService;
 import cn.cslg.pas.service.common.ExcuteUploadSettingService;
 import cn.cslg.pas.service.common.FileManagerService;
+import cn.cslg.pas.service.common.MessageService;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.compress.utils.IOUtils;
@@ -56,7 +57,7 @@ public class GetPatentPictureFromExcelThread extends Thread {
                     taskCondition.await();
                 }
                 UploadPatentWebDTO uploadPatentWebDTO = uploadPatentWebDTOS.remove(0);
-                String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getRowApplicationNo());
+                String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getPatent().getAppNo());
                 PictureData pictureData = uploadPatentWebDTO.getPictureData();
                 if(pictureData!=null){
                     String ext = pictureData.suggestFileExtension();
@@ -67,11 +68,11 @@ public class GetPatentPictureFromExcelThread extends Thread {
                     fileManagerService.uploadFileWithGuid(file, guid);
                 }
                 taskThread.ifPatentDone(uploadPatentWebDTO);
+                MessageService messageService = applicationContext.getBean(MessageService.class);
+                messageService.sendWebsocketMessage(importTaskAMVO,2);
             }
-            importTaskAMVO.setIfAddPictureDone(true);
             taskThread.awakeTaskThread();
         } catch (Exception e) {
-            importTaskAMVO.setIfAddPictureDone(true);
             taskThread.awakeTaskThread();
             e.printStackTrace();
         }

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

@@ -11,6 +11,8 @@ public class ImportFromExcelToEsService implements PatentImportImp {
 private TaskThread taskThread;
     @Override
     public void startPatentThread() {
+        taskThread.getImportTaskAMVO().setShouldSaveCounter(2);
+        taskThread.getImportTaskAMVO().setHaveSaveCounter(0);
         GetPatentPictureFromExcelThread getPatentPictureFromExcelThread =new GetPatentPictureFromExcelThread(taskThread);
         SavePatentToEsThread savePatentToEsThread = new SavePatentToEsThread(taskThread,taskThread.getApplicationContext());
         GetPatentFromExcelThread getPatentFromExcelThread = new GetPatentFromExcelThread(taskThread, savePatentToEsThread,getPatentPictureFromExcelThread);
@@ -18,6 +20,7 @@ private TaskThread taskThread;
         getPatentFromExcelThread.start();
         getPatentPictureFromExcelThread.start();
     }
+
     @Override
     public void setTaskThread(TaskThread taskThread) {
         this.taskThread = taskThread;

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

@@ -24,6 +24,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -114,8 +115,11 @@ public class ImportFromWebToEsService implements PatentImportImp {
             //检索式
             String conditions = importTaskAMVO.getSearchCondition();
 
+            List<PatentStarListDTO> patentStarListDtos =new ArrayList<>();
+
             //获得返回的的多个检索式 patentStarListDtos
-            List<PatentStarListDTO> patentStarListDtos = patentStarApiService.getSplitedConditions(new PatentStarListDTO()
+
+           patentStarListDtos = patentStarApiService.getSplitedConditions(new PatentStarListDTO()
                     .setCurrentQuery(conditions)
                     .setOrderBy(orderBy)
                     .setOrderByType(orderByType)

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

@@ -80,14 +80,13 @@ public class SavePatentToEsThread extends Thread {
                 }
                 //导入完成，通知前台
                 MessageService messageService = applicationContext.getBean(MessageService.class);
-                messageService.sendWebsocketMessage(importTaskAMVO);
+                messageService.sendWebsocketMessage(importTaskAMVO,1);
                 importTaskAMVO.setMessageDoneNum(importTaskAMVO.getMessageDoneNum()+1);
                 taskThread.ifPatentDone(uploadPatentWebDTO);
             } catch (Exception e) {
                 System.out.println(e);
             }
         }
-        importTaskAMVO.setIfAddPatentDone(true);
         taskThread.awakeTaskThread();
     }
 

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

@@ -56,17 +56,17 @@ public class SchedulingTaskService {
                     importTaskList.get(i).setState(1);
                     importTaskList.get(i).updateById();
                     importTaskAMVOS.get(i).setState(1);
+                    importTaskAMVOS.get(i).setHaveSaveCounter(0);
+                    importTaskAMVOS.get(i).setMessageDoneNum(0);
                     TaskThread taskThread = new TaskThread(importTaskAMVOS.get(i), applicationContext);
                     executor.execute(taskThread);
                 }
 
-
             }
 
         }
     }
 
-
     public List<ImportTaskAMVO> loadTaskAMVOS(List<ImportTask> importTaskList) {
         List<ImportTaskAMVO> importTaskAMVOS = new ArrayList<>();
         List<Integer> taskConditionIds = new ArrayList<>();
@@ -92,6 +92,7 @@ public class SchedulingTaskService {
                 importTaskAMVO.setDbType(importTaskCondition.getDbType());
                 importTaskAMVO.setOrderBy(importTaskCondition.getOrderBy());
                 importTaskAMVO.setOrderByType(importTaskCondition.getOrderByType());
+
             }
             ProgressVO progressVO = new ProgressVO();
             progressVO.setState(0);
@@ -104,7 +105,7 @@ public class SchedulingTaskService {
 
     }
 
-    public void pauseTask(Integer taskId,Integer state) {
+    public void pauseTask(Integer taskId, Integer state) {
         //根据id获得
         ImportTaskAMVO importTaskAMVO = importTaskAMVOS.stream().filter(item -> item.getId().equals(taskId)).findFirst().orElse(null);
         importTaskAMVO.setState(state);

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

@@ -10,6 +10,7 @@ import cn.cslg.pas.factorys.PatentImportFactory.PatentImportFactory;
 import cn.cslg.pas.factorys.PatentImportFactory.PatentImportImp;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.business.ImportTaskService;
+import cn.cslg.pas.service.common.MessageService;
 import com.alibaba.fastjson.JSON;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
@@ -63,34 +64,50 @@ public class TaskThread extends Thread {
         ImportTask task = importTaskService.getById(importTaskAMVO.getId());
         if (importTaskAMVO.getState().equals(1)) {
             task.setState(2);
+            importTaskAMVO.setState(2);
 
         } else {
             task.setState(importTaskAMVO.getState());
         }
         task.setDoneNum(importTaskAMVO.getDoneNum());
         task.updateById();
-        System.out.println("任务结束");
+
+        MessageService messageService = applicationContext.getBean(MessageService.class);
+        messageService.sendAllDoneMessage(importTaskAMVO);
     }
 
 
+    /**
+     * 任务是否完成代码块
+     */
     public void awakeTaskThread() {
-        importTaskAMVO.setHaveSaveCounter(importTaskAMVO.getHaveSaveCounter() + 1);
-        if (importTaskAMVO.getShouldSaveCounter().equals(importTaskAMVO.getShouldSaveCounter())) {
-            if (taskThreadLock.tryLock()) {
-                //taskLock.lock();
-                taskThreadCondition.signalAll();
-                taskThreadLock.unlock();
+        synchronized("导入任务是否完成") {
+            importTaskAMVO.setHaveSaveCounter(importTaskAMVO.getHaveSaveCounter() + 1);
+            if (importTaskAMVO.getShouldSaveCounter().equals(importTaskAMVO.getHaveSaveCounter())) {
+                if (taskThreadLock.tryLock()) {
+                    //taskLock.lock();
+                    taskThreadCondition.signalAll();
+                    taskThreadLock.unlock();
+                }
+                MessageService messageService = applicationContext.getBean(MessageService.class);
+                messageService.sendWebsocketMessage(importTaskAMVO,0);
             }
         }
     }
 
-
+    /**
+     * 专利是否导入完成代码块
+     * @param uploadPatentWebDTO
+     */
     public void ifPatentDone(UploadPatentWebDTO uploadPatentWebDTO) {
-        uploadPatentWebDTO.setHaveSaveCounter(uploadPatentWebDTO.getHaveSaveCounter() + 1);
-        if (importTaskAMVO.getShouldSaveCounter().equals(uploadPatentWebDTO.getHaveSaveCounter())) {
-            importTaskAMVO.setDoneNum(importTaskAMVO.getDoneNum() + 1);
+        synchronized("专利完成") {
+            uploadPatentWebDTO.setHaveSaveCounter(uploadPatentWebDTO.getHaveSaveCounter() + 1);
+            if (importTaskAMVO.getShouldSaveCounter().equals(uploadPatentWebDTO.getHaveSaveCounter())) {
+                importTaskAMVO.setDoneNum(importTaskAMVO.getDoneNum() + 1);
+                MessageService messageService = applicationContext.getBean(MessageService.class);
+                messageService.sendWebsocketMessage(importTaskAMVO,0);
+            }
         }
-
     }
 
 

src/main/resources/jsons/importTask.json

@@ -147,6 +147,21 @@
     "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true"
+  },
+  {
+    "name": "专利数据库id",
+    "type": "Integer",
+    "value": "projectId",
+    "field": "projectId",
+    "sqlField": "itc.project_id",
+    "sqlClass": "getComSql",
+    "orderClass": "",
+    "groupClass": "",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "false",
+    "ifAsCondition": "true"
   }
 
+
 ]

src/main/resources/mapper/ImportTaskMapper.xml

@@ -4,7 +4,7 @@
     <select id="getImportTask" resultType="cn.cslg.pas.common.vo.business.ImportTaskVO">
         select it.name as name, it.id,it.search_condition as searchCondition,it.all_num as allNum,it.success_num as successNum,
                it.default_num as defaultNum,it.type as type,it.create_id as
-        createId,it.create_time as createTime ,it.state as  state,it.done_num as doneNum from import_task it left join import_task_condition itc on
+        createId,it.create_time as createTime ,it.state as  state,it.done_num as doneNum ,itc.file_guid as fileGuid from import_task it left join import_task_condition itc on
         it.import_task_condition_id=itc.id
         <if test="sql1!=''">
 

src/test/java/cn/cslg/pas/service/ProjectTaskServiceTests.java

@@ -75,9 +75,9 @@ public class ProjectTaskServiceTests {
             strings.add("CN123456789");
             strings.add("WD987654321");
         }
-        List<List<String>> results = patentNoSplitterService.splitPatentNoByType(strings);
+//        List<List<String>> results = patentNoSplitterService.splitPatentNoByType(strings);
 
-        System.out.println(results);
+//        System.out.println(results);
     }