添加分配任务（带筛选） 2022/12/12

RMS/src/main/java/cn/cslg/report/common/model/PASPatentVO.java

@@ -0,0 +1,113 @@
+package cn.cslg.report.common.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PASPatentVO extends BaseVO {
+    private Integer patentId;
+    private Boolean selectId;
+    private Integer projectId;
+    private String read;
+    private String folder;
+    private String name;
+    private String nameSql;
+    private String abstractStr;
+    private String abstractStrSql;
+    private String publicNo;
+    private String publicNoSql;
+    private String applicationNo;
+    private String applicationNoSql;
+    private String rightContent;
+    private String rightContentSql;
+    private List<Field> field;
+    private List<Integer> selected;
+    private Integer startNumber;
+    private Integer endNumber;
+    private Boolean queryApplicantCurrent;
+    private List<String> whereApplicantCurrent;
+    private Boolean queryApplicantCurrentMerge;
+    private List<String> whereApplicantCurrentMerge;
+    private Boolean queryApplicantCurrentStandard;
+    private List<String> whereApplicantCurrentStandard;
+    private Boolean queryApplicantOriginal;
+    private List<String> whereApplicantOriginal;
+    private Boolean queryApplicantOriginalMerge;
+    private List<String> whereApplicantOriginalMerge;
+    private Boolean queryApplicantOriginalStandard;
+    private List<String> whereApplicantOriginalStandard;
+    private Boolean queryApplicantAddress;
+    private Boolean queryClassNumberIpc;
+    private Integer queryClassNumberIpcMethod;
+    private List<String> whereClassNumberIpc;
+    private Boolean queryClassNumberCpc;
+    private Integer queryClassNumberCpcMethod;
+    private List<String> whereClassNumberCpc;
+    private Boolean queryClassNumberUpc;
+    private Integer queryClassNumberUpcMethod;
+    private List<String> whereClassNumberUpc;
+    private Boolean queryClassNumberLoc;
+    private Integer queryClassNumberLocMethod;
+    private List<String> whereClassNumberLoc;
+    private Boolean queryLabel;
+    private List<String> whereLabel;
+    private Boolean queryInventor;
+    private Boolean queryInventorMerge;
+    private List<String> whereInventor;
+    private List<String> whereInventorMerge;
+    private Boolean queryAffair;
+    private String whereAffair;
+    private Boolean queryFieldMultiple;
+    private List<String> whereFieldMultiple;
+    private Boolean whereFieldMultipleNull;
+    private Boolean queryFieldText;
+    private List<String> whereFieldText;
+    private Boolean whereFieldTextNull;
+    private List<String> customIds;
+    private Boolean queryTreeType0;
+    private Boolean queryTreeType1;
+    private List<String> whereTreeType0;
+    private List<String> whereTreeType1;
+    private Boolean queryBureau;
+    private List<String> whereBureau;
+    private Boolean queryType;
+    private List<String> whereType;
+    private Boolean queryStatus;
+    private List<String> whereStatus;
+    private Boolean queryAppDate;
+    private List<String> whereAppDate;
+    private Boolean queryPublicDate;
+    private List<String> wherePublicDate;
+    private Boolean queryCountry;
+    private List<String> whereCountry;
+    private Boolean queryApplicantProvince;
+    private List<String> whereApplicantProvince;
+    private Sort sort;
+    private Integer family;
+    private Boolean querySimpleFamily;
+    private Boolean queryInpadocFamily;
+    private Boolean queryPatSnapFamily;
+    private List<Integer> importTaskId;
+    private List<String> patentNos;
+    private List<String> notInPatentNos;
+    @Data
+    public static class Sort {
+        private String order;
+        private String prop;
+    }
+
+    @Data
+    public static class Field {
+        private List<String> value;
+        private String key;
+        private String type;
+        private Integer classId;
+    }
+
+    @Data
+    public static class Tree {
+        private String key;
+        private List<String> node;
+    }
+}

RMS/src/main/java/cn/cslg/report/controller/BaseController.java

@@ -1,13 +1,17 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.PASPatentVO;
+import cn.cslg.report.common.model.ProjectSourceVO;
 import cn.cslg.report.common.model.delete.Patents;
 import cn.cslg.report.common.model.vo.LoginVO;
 import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
 import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.service.BaseService;
 import cn.cslg.report.service.OutInterfaceService;
+import cn.cslg.report.service.business.ReportService;
 import cn.cslg.report.service.business.SystemDictItemService;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -38,7 +42,7 @@ public class BaseController {
     private final BaseService baseService;
     private final SystemDictItemService systemDictItemService;
     private final OutInterfaceService outInterfaceService;
-
+    private final ReportService reportService;
     @PostMapping("/login")
     @Operation(summary = "登录")
     public String login(@RequestBody LoginVO loginVO) throws IOException {
@@ -153,8 +157,6 @@ public class BaseController {
         return  outInterfaceService.getDictsFromPAS();
 
     }
-
-
     @PostMapping("/getPatentFromPAS")
     @Operation(summary = "根据报告Id查询对比文件（分页）")
     public String getPatentNos(@RequestBody PatentVO patentVO) throws IOException {
@@ -168,5 +170,29 @@ public class BaseController {
     }
 
 
+    @GetMapping("/getfieldFromPAS")
+    @Operation(summary = "根据报告id获取专题库自定义字段")
+    public String getfieldFromPAS(Integer reportId) throws IOException {
+        Report report =reportService.getById(reportId);
+        return  outInterfaceService.getfieldFromPAS(report.getProjectId());
+    }
+
+    @PostMapping("/getSourceFromPAS")
+    @Operation(summary = "获得自定义字段的选项")
+    public String getSourceFromPAS(@RequestBody ProjectSourceVO params) throws IOException {
+        return  outInterfaceService.getSourceFromPAS(params);
+    }
+
+    @GetMapping("/getPatentQueryTree")
+    @Operation(summary = "获取专题库自定义字段树形结构")
+    public String getPatentQueryTree(Integer projectId) throws IOException {
+        return  outInterfaceService.getPatentQueryTree(projectId);
+    }
+    @PostMapping("/getPatentListPAS")
+    @Operation(summary = "获得自定义字段的选项")
+    public String getPatentListPAS(@RequestBody PASPatentVO params) throws IOException {
+        return  outInterfaceService.getPatentListFromPAS(params);
+    }
+
 
 }

RMS/src/main/java/cn/cslg/report/entity/ReportFieldPatentLink.java

@@ -54,4 +54,10 @@ public class ReportFieldPatentLink extends BaseEntity<ReportFieldPatentLink> {
     @TableField("USER_ID")
     private Integer createBy;
 
+    /**
+     * 节点路径
+     */
+    @TableField("TREE_PATH")
+    private String treePath;
+
 }

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.service;
 
 import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.common.model.PASPatentVO;
 import cn.cslg.report.common.model.ProjectSourceVO;
 import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.CacheUtils;
@@ -515,4 +516,22 @@ public class OutInterfaceService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    /**
+     * @title 获得专题库筛选列表
+     * @description 获得分析系统自定义字段选项
+     * @autor lrj
+     */
+
+    public String getPatentListFromPAS(PASPatentVO params) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        String param = new Gson().toJson(params);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
+        Request request = new Request.Builder()
+                .url(PASUrl + "/api/v2/patent/list")
+//                .addHeader("Cookie", LoginUtils.getToken())
+                .post(requestBody)
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldPatentLinkService.java

@@ -284,7 +284,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
                         reportFieldPatentLink.setCreateBy(loginUtils.getId());
                         reportFieldPatentLink.setPatentNo(params.getPatentNo());
                         reportFieldPatentLink.setReportId(params.getReportId());
-
+                        reportFieldPatentLink.setTreePath(reportFieldText.getId().toString());
                         reportFieldPatentLink.updateById();
                     }else {
                         reportFieldPatentLink=new ReportFieldPatentLink();
@@ -297,6 +297,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
                         reportFieldPatentLink.setCreateBy(loginUtils.getId());
                         reportFieldPatentLink.setPatentNo(params.getPatentNo());
                         reportFieldPatentLink.setReportId(params.getReportId());
+                        reportFieldPatentLink.setTreePath(reportFieldText.getId().toString());
                         reportFieldPatentLink.insert();
                     }