4/2 以图搜图检索

pom.xml

@@ -290,7 +290,7 @@
                 <configuration>
                     <includeSystemScope>true</includeSystemScope>
                     <!-- 指定该Main Class为全局的唯一入口 -->
-                    <mainClass>cn.cslg.pas.Application</mainClass>
+                    <mainClass>com.example.xiaoshiweixinback.XiaoshiWeixinbackApplication</mainClass>
                     <layout>ZIP</layout>
                     <excludes>
                         <exclude>

src/main/java/com/example/xiaoshiweixinback/business/config/ElasticSearchClientConfig.java

@@ -0,0 +1,67 @@
+package com.example.xiaoshiweixinback.business.config;
+
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
+import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.rest_client.RestClientTransport;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.net.ssl.SSLContext;
+
+
+@Configuration
+public class ElasticSearchClientConfig {
+    //配置RestHighLevelClient依赖到spring容器中待用
+
+    @Configuration
+    public class ElasticSearchConfig {
+        //注入IOC容器
+        @Bean
+        public ElasticsearchClient elasticsearchClient() throws Exception {
+            RestClientBuilder builder = RestClient.builder(new HttpHost("http://es-cn-em93o8856000ho9e7.public.elasticsearch.aliyuncs.com", 9200, "http"));
+            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "Xiaoshi221101"));
+            SSLContext sslContext = SSLContextBuilder.create()
+                    .loadTrustMaterial(new TrustSelfSignedStrategy())
+                    .build();
+            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext).setSSLHostnameVerifier(new NoopHostnameVerifier()));
+            RestClient client =builder.build();
+            ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
+            return new ElasticsearchClient(transport);
+        }
+//                @Bean
+//                public ElasticsearchClient elasticsearchClient() throws Exception {
+//                    RestClientBuilder builder = RestClient.builder(new HttpHost("47.101.137.223", 9200, "http"));
+//                    RestClient client = builder.build();
+//                    ElasticsearchTransport transport = new RestClientTransport(client, new JacksonJsonpMapper());
+//
+//                    return new ElasticsearchClient(transport);
+//                }
+
+
+//        @Bean
+//        public ElasticsearchClient elasticsearchClient() throws Exception {
+//            RestClientBuilder builder = RestClient.builder(new HttpHost("47.101.137.223", 9200, "http"));
+//            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+//            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("elastic", "xiaoshi221101"));
+//            SSLContext sslContext = SSLContextBuilder.create()
+//                    .loadTrustMaterial(new TrustSelfSignedStrategy())
+//                    .build();
+//            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext).setSSLHostnameVerifier(new NoopHostnameVerifier()));
+//            RestClient client =builder.build();
+//            ElasticsearchTransport transport = new RestClientTransport(client,new JacksonJsonpMapper());
+//            return new ElasticsearchClient(transport);
+//        }
+    }
+}

src/main/java/com/example/xiaoshiweixinback/controller/ProductCategoryController.java

@@ -39,6 +39,7 @@ public class ProductCategoryController {
     @Operation(summary = "查询关注的产品类别")
     @PostMapping("/queryConcernedCategory")
     private Response queryConcernedCategory(@RequestBody ProductCategoryDTO productCategoryDTO) {
+        productCategoryDTO.setIfConcern(true);
         Records records = productCategoryService.queryProductCategory(productCategoryDTO);
         return Response.success(records);
     }

src/main/java/com/example/xiaoshiweixinback/controller/VIPController.java

@@ -21,8 +21,8 @@ public class VIPController {
     private final VipService vipService;
 
     @Operation(summary = "查询会员")
-    @PostMapping("/vip")
-    private Response queryProductCategory() {
+    @PostMapping("/queryAllVip")
+    private Response getAllvip() {
         Records records = vipService.getAllVip();
         return Response.success(records);
     }

src/main/java/com/example/xiaoshiweixinback/domain/AssoCategoryFile.java

@@ -23,7 +23,7 @@ public class AssoCategoryFile extends BaseEntity<AssoCategoryFile> {
     /**
      * 
      */
-    private Integer categoryId;
+    private Integer productCategoryId;
 
     /**
      * 

src/main/java/com/example/xiaoshiweixinback/domain/es/ESCustomField.java

@@ -0,0 +1,69 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ESCustomField {
+
+    /**
+     * 专题库或报告id
+     */
+    @JsonProperty("project_id")
+    Integer projectId;
+
+    /**
+     * 任务id
+     */
+    @JsonProperty("task_id")
+    Integer taskId;
+
+
+    /**
+     * 栏位类型
+     */
+    @JsonProperty("field_type")
+    Integer fieldType;
+
+    /**
+     * 栏位
+     */
+    @JsonProperty("field")
+    String field;
+
+    /**
+     * 栏位值
+     */
+    @JsonProperty("field_value")
+    List<String> fieldValue;
+
+    /**
+     * 统计值
+     */
+    @JsonProperty("stats_value")
+    List<String> statsValue;
+
+    /**
+     * 创建人id
+     */
+    @JsonProperty("person_id")
+    String personId;
+
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty("create_time")
+    Date createTime;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/ESCustomFieldHistory.java

@@ -0,0 +1,76 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ESCustomFieldHistory {
+
+    /**
+     * 专题库或报告id
+     */
+    @JsonProperty("project_id")
+    Integer projectId;
+
+    /**
+     * 任务id
+     */
+    @JsonProperty("task_id")
+    Integer taskId;
+
+
+    /**
+     * 栏位类型
+     */
+    @JsonProperty("field_type")
+    Integer fieldType;
+
+    /**
+     * 栏位
+     */
+    @JsonProperty("field")
+    String field;
+
+    /**
+     * 栏位值
+     */
+    @JsonProperty("field_value")
+    List<String> fieldValue;
+
+    @JsonProperty("save_value")
+    List<String> savedValue;
+
+    /**
+     * 创建人id
+     */
+    @JsonProperty("person_id")
+    String personId;
+
+    /**
+     * 创建时间
+     */
+    @JsonProperty("createTime")
+    Date createTime;
+
+    /**
+     * 历史类型 0取消1添加2覆盖3回退
+     */
+    @JsonProperty("history_type")
+    Integer historyType;
+
+    @JsonProperty("back_to_id")
+    String backToId;
+
+    @JsonProperty("custom_field_id")
+    String customFieldId;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/ESImportTask.java

@@ -0,0 +1,21 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 专利和任务关联
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ESImportTask {
+    @JsonProperty("project_id")
+    Integer projectId;
+    @JsonProperty("task_id")
+    Integer taskId;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/EsProjectTask.java

@@ -0,0 +1,21 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 专利和任务关联
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EsProjectTask {
+    @JsonProperty("project_id")
+    Integer projectId;
+    @JsonProperty("task_id")
+    Integer taskId;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/EventMessage.java

@@ -0,0 +1,8 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import lombok.Data;
+
+@Data
+public class EventMessage {
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/FamilyPatent.java

@@ -0,0 +1,23 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class FamilyPatent {
+
+    @JsonProperty("public_no")
+    private String publicNo;
+
+    @JsonProperty("grant_no")
+    private String grantNo;
+
+    /**
+     * 申请号
+     */
+    @JsonProperty("app_no")
+    private String appNo;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/ImageVector.java

@@ -0,0 +1,27 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ImageVector {
+
+
+    @JsonProperty("my_vector")
+    List<String> myVector;
+
+
+    @JsonProperty("guid")
+    String guid;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/LegalEvent.java

@@ -0,0 +1,62 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 法律事务
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LegalEvent {
+
+    /**
+     * code码
+     */
+    @JsonProperty("code")
+    private String code;
+
+    /**
+     * 名称
+     */
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @JsonProperty("description")
+    private String description;
+
+    /**
+     * 发生时间
+     */
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
+    @JsonProperty("event_date")
+    private Date eventDate;
+    /**
+     * 专利号
+     */
+    @JsonProperty("app_no")
+    private String appNo;
+    /**
+     * 公开号
+     */
+    @JsonProperty("public_no")
+    private String publicNo;
+    @JsonProperty("grant_no")
+    private String grantNo;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/Marking.java

@@ -0,0 +1,93 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * 标注
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Marking {
+    /**
+     * 是否公开
+     */
+    @JsonProperty("is_public")
+  private   Boolean isPublic;
+
+    /**
+     * 标注颜色
+     */
+    @JsonProperty("mark_color")
+    private  String markColor;
+
+    /**
+     * 标注备注
+     */
+    @JsonProperty("mark_note_text")
+    private String markNoteText;
+
+    /**
+     * 标注类型
+     */
+    @JsonProperty("mark_type")
+    private  Integer markType;
+
+    /**
+     * 标注栏位
+     */
+    @JsonProperty("mark_select_field")
+    private String markSelectField;
+
+    /**
+     * 标注选择文本
+     */
+    @JsonProperty("mark_select_text")
+    private  String markSelectText;
+
+    @JsonProperty("mark_site")
+    private Integer markSite;
+
+    /**
+     * 标注时间
+     */
+    @JsonProperty("mark_time")
+    private Date markTime;
+
+    /**
+     * 标注人
+     */
+    @JsonProperty("mark_user_id")
+    private String markUserId;
+
+    /**
+     * 标注范围
+     */
+    @JsonProperty("public_scope")
+    private Integer publicScope;
+
+    /**
+     * 标注专利数据库id/报告id/0接口检索/-1本地检索
+     */
+    @JsonProperty("public_project_id")
+    private Integer projectId;
+
+    /**
+     * 标注租户id
+     */
+    @JsonProperty("public_tenant_id")
+    private Integer publicTenantId;
+  @JsonProperty("patent_no")
+  private String patentNo;
+  @JsonProperty("patent_title")
+  private String patentTitle;
+  @JsonProperty("create_from")
+  private Integer createFrom;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/Patent.java

@@ -0,0 +1,423 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Patent {
+
+    /**
+     * 专利号
+     */
+    @JsonProperty("patent_no")
+    private String patentNo;
+
+    /**
+     * 标题
+     */
+    @JsonProperty("title")
+    private List<Text> title;
+
+    /**
+     * 公开说明书文本
+     */
+    @JsonProperty("public_full_text")
+    private List<Text> publicFullText;
+
+    /**
+     * 授权说明书文本
+     */
+    @JsonProperty("grant_full_text")
+    private List<Text> grantFullText;
+
+    /**
+     * 摘要
+     */
+    @JsonProperty("abstract_str")
+    private List<Text> abstractStr;
+
+    /**
+     * 申请人地址
+     */
+    @JsonProperty("applicant_addr")
+    private PersonAddress applicantAddr;
+
+    /**
+     * 权利人地址
+     */
+    @JsonProperty("right_holder_addr")
+    private PersonAddress rightHolderAddr;
+
+    /**
+     * 审查员
+     */
+    @JsonProperty("examiner")
+    private String examiner;
+
+    /**
+     * 助理审查员
+     */
+    @JsonProperty("aid_examiner")
+    private String aidExaminer;
+
+    /**
+     * 实审日
+     */
+    @JsonProperty("examination_date")
+    private Integer examinationDate;
+
+    /**
+     * 公开号
+     */
+    @JsonProperty("public_no")
+    private String publicNo;
+
+    /**
+     * 公开日
+     */
+    @JsonProperty("public_date")
+    private Date publicDate;
+
+    /**
+     * 申请号
+     */
+    @JsonProperty("app_no")
+    private String appNo;
+
+    /**
+     * 申请日
+     */
+    @JsonProperty("app_date")
+    private Date appDate;
+
+    /**
+     * 授权号
+     */
+    @JsonProperty("grant_no")
+    private String grantNo;
+
+    /**
+     * 授权日
+     */
+    @JsonProperty("grant_date")
+    private Date grantDate;
+
+    /**
+     * 优先权
+     */
+    @JsonProperty("priorities")
+    private List<Priorities> priorities;
+
+    /**
+     * 申请国家
+     */
+    @JsonProperty("app_country")
+    private String appCountry;
+
+    /**
+     * IPC分类号(主)
+     */
+    @JsonProperty("mipc")
+    private PatentClassify mipc;
+
+    /**
+     * ipc集合
+     */
+    @JsonProperty("ipc")
+    private List<PatentClassify> ipc;
+
+    /**
+     * CPC分类号(主)
+     */
+    @JsonProperty("mcpc")
+    private PatentClassify mcpc;
+
+    /**
+     * cpc集合
+     */
+    @JsonProperty("cpc")
+    private List<PatentClassify> cpc;
+
+    /**
+     * UPC分类号(主)
+     */
+    @JsonProperty("mupc")
+    private PatentClassify mupc;
+
+
+    /**
+     * UPC集合
+     */
+    @JsonProperty("upc")
+    private List<PatentClassify> upc;
+
+    /**
+     * LOC分类号(主)
+     */
+    @JsonProperty("mloc")
+    private PatentClassify mloc;
+
+
+    /**
+     * UPC集合
+     */
+    @JsonProperty("loc")
+    private List<PatentClassify> loc;
+
+    /**
+     * 专利状态
+     */
+    @JsonProperty("simple_status")
+    private String simpleStatus;
+
+    /**
+     * 专利类型
+     */
+    @JsonProperty("patent_type")
+    private String patentType;
+
+
+    /**
+     * 权利要求
+     */
+    @JsonProperty("claim")
+    private List<Text> claim;
+
+    /**
+     * pct申请日
+     */
+    @JsonProperty("pctappdate")
+    private Date pctAppDate;
+
+    /**
+     * pct申请号
+     */
+    @JsonProperty("pctappno")
+    private String pctAppNo;
+
+    /**
+     * pct进入日期
+     */
+    @JsonProperty("pctenterdate")
+    private Date pctEnterDate;
+
+    /**
+     * pct公开日
+     */
+    @JsonProperty("pctpubdate")
+    private Date pctPubDate;
+
+    /**
+     * pct公开号
+     */
+    @JsonProperty("pctpubno")
+    private String pctPubNo;
+
+    /**
+     * wo指定国
+     */
+    @JsonProperty("wo")
+    private String wo;
+
+    /**
+     * ep申请号
+     */
+    @JsonProperty("ep_no")
+    private String epNo;
+
+    /**
+     * ep申请日
+     */
+    @JsonProperty("ep_date")
+    private Date epDate;
+
+
+    /**
+     * EP指定国状态
+     */
+    @JsonProperty("ep_country")
+    private String epCountry;
+
+    /**
+     * 申请人
+     */
+    @JsonProperty("applicant")
+    private List<PatentPerson> applicant;
+
+    /**
+     * 标准申请人
+     */
+    @JsonProperty("stander_applicant")
+    private List<PatentPerson> standerApplicant;
+
+    /**
+     * 合并申请人
+     */
+    @JsonProperty("merge_applicant")
+    private List<PatentMergePerson> mergeApplicant;
+
+    /**
+     * 申请人数量
+     */
+    @JsonProperty("applicants_num")
+    private Integer applicantsNum;
+
+    /**
+     * 权利人
+     */
+    @JsonProperty("right_holder")
+    private List<PatentPerson> rightHolder;
+    /**
+     * 标准权利人
+     */
+    @JsonProperty("stander_right_holder")
+    private List<PatentPerson> standerRightHolder;
+
+    /**
+     * 合并权利人
+     */
+    @JsonProperty("merge_right_holder")
+    private List<PatentMergePerson> mergeRightHolder;
+
+    /**
+     * 权利人数量
+     */
+    @JsonProperty("right_holder_num")
+    private Integer rightHolderNum;
+
+    /**
+     * 发明人
+     */
+    @JsonProperty("inventor")
+    private List<PatentPerson> inventor;
+    /**
+     * 合并发明人
+     */
+    @JsonProperty("merge_inventor")
+    private List<PatentMergePerson> mergeInventor;
+
+
+    /**
+     * 发明人数量
+     */
+    @JsonProperty("inventor_num")
+    private Integer inventor_num;
+
+    /**
+     * 代理机构
+     */
+    @JsonProperty("agency")
+    private String agency;
+
+    /**
+     * 代理机构编号
+     */
+    @JsonProperty("agency_no")
+    private String agencyNo;
+
+    /**
+     * 代理人
+     */
+    @JsonProperty("agent")
+    private List<String> agent;
+
+    /**
+     * 引用专利数量
+     */
+    @JsonProperty("quote_patent_no_num")
+    private Integer quotePatentNoNum;
+
+    /**
+     * 被引用专利数量
+     */
+    @JsonProperty("quoted_patent_no_num")
+    private Integer quotedPatentNoNum;
+
+
+    /**
+     * 自定义栏位
+     */
+    @JsonProperty("custom_field")
+    ESCustomField ESCustomField;
+    /**
+     * 扩展同族数量
+     */
+    @JsonProperty("patsnap_family_num")
+    private Integer patsnapFamilyNum;
+    /**
+     * 扩展同族id
+     */
+    @JsonProperty("patsnap_family_id")
+    private String patsnapFamilyId;
+
+    /**
+     * INPADOC同族数量
+     */
+    @JsonProperty("inpadoc_family_num")
+    private Integer inpadocFamilyNum;
+    /**
+     * INPADOC同族id
+     */
+    @JsonProperty("inpadoc_family_id")
+    private String inpadocFamilyId;
+
+    /**
+     * 简单同族数量
+     */
+    @JsonProperty("simple_family_num")
+    private Integer simpleFamilyNum;
+    /**
+     * 简单同族id
+     */
+    @JsonProperty("simple_family_id")
+    private String simpleFamilyId;
+
+    /**
+     * 专题库或报告id
+     */
+    @JsonProperty("project_id")
+    private Integer projectId;
+
+    /**
+     * 专题库或报告id
+     */
+    @JsonProperty("product_id")
+    private Integer productId;
+
+    /**
+     * 专题库或报告的任务
+     */
+    @JsonProperty("project_task")
+    EsProjectTask projectTask;
+
+    /**
+     * 导入任务
+     */
+    @JsonProperty("import_task")
+    ESImportTask importTask;
+
+    /**
+     * 法律状态
+     */
+    @JsonProperty("legal_status")
+    List<String> legalStatus;
+
+    @JsonProperty("image_vector")
+    private List<ImageVector> imageVector;
+    @JsonProperty("patent_join")
+    PatentJoin patentJoin;
+
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentClassify.java

@@ -0,0 +1,31 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ *专利分类号
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PatentClassify {
+    @JsonProperty("level1")
+    private String level1;
+
+    @JsonProperty("level2")
+    private String level2;
+
+    @JsonProperty("level3")
+    private String level3;
+
+    @JsonProperty("level4")
+    private String level4;
+
+    @JsonProperty("level5")
+    private String level5;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentFamilyMessage.java

@@ -0,0 +1,28 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 专利引用信息
+ */
+@Component
+@Data
+public class PatentFamilyMessage {
+
+    /**
+     * 专利
+     */
+    @JsonProperty("patent")
+    private List<FamilyPatent> patent;
+
+    /**
+     * 同族类型
+     */
+    @JsonProperty("family_type")
+    private String familyType;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentJoin.java

@@ -0,0 +1,32 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * es关联
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PatentJoin {
+
+    /**
+     * code码
+     */
+    @JsonProperty("parent")
+    private String parent;
+
+    /**
+     * 名称
+     */
+    @JsonProperty("name")
+    private String name;
+
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentMergePerson.java

@@ -0,0 +1,29 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PatentMergePerson {
+    @JsonProperty("name")
+    String name;
+
+    @JsonProperty("order")
+    Integer order;
+
+    @JsonProperty("type")
+    String type;
+
+    /**
+     * 专题库或报告id
+     */
+    @JsonProperty("project_id")
+    String projectId;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentPerson.java

@@ -0,0 +1,23 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PatentPerson {
+    @JsonProperty("name")
+    String name;
+
+    @JsonProperty("order")
+    Integer order;
+
+    @JsonProperty("type")
+    String type;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PatentQuoteMessage.java

@@ -0,0 +1,38 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 专利引用信息
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PatentQuoteMessage {
+
+    /**
+     * 专利
+     */
+    @JsonProperty("patent")
+    private QuotePatent patent;
+
+    /**
+     * 被引用专利
+     */
+    @JsonProperty("quoted_patent")
+    private List<QuotePatent> quotedPatents;
+
+    /**
+     * 引用来源
+     */
+    @JsonProperty("quote_from")
+    private String quoteFrom;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/PersonAddress.java

@@ -0,0 +1,48 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 申请人地址
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PersonAddress {
+    /**
+     * 地址
+     */
+    @JsonProperty("address")
+    String address;
+
+    /**
+     * 市
+     */
+    @JsonProperty("city")
+    String city;
+
+    /**
+     * 国
+     */
+    @JsonProperty("country")
+    String country;
+
+    /**
+     * 区
+     */
+    @JsonProperty("district")
+    String district;
+
+    /**
+     * 省
+     */
+    @JsonProperty("province")
+    String province;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/Priorities.java

@@ -0,0 +1,34 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 公开说明书文本
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Priorities {
+    /**
+     * 优先权国家
+     */
+    @JsonProperty("prioritycountry")
+    private String priorityCountry;
+
+    /**
+     * 优先权日
+     */
+    @JsonProperty("prioritydate")
+    private String priorityDate;
+
+    /**
+     * 优先权号
+     */
+    @JsonProperty("priorityno")
+    private String priorityNo;
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/QuotePatent.java

@@ -0,0 +1,40 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QuotePatent {
+
+    /**
+     * 申请人
+     */
+    @JsonProperty("applicant")
+    private List<PatentPerson> applicant;
+
+    /**
+     * 权利人
+     */
+    @JsonProperty("right_holder")
+    private List<PatentPerson> rightHolder;
+
+    @JsonProperty("app_no")
+    private String appNo;
+    /**
+     * 公开号
+     */
+    @JsonProperty("public_no")
+    private String publicNo;
+    @JsonProperty("grant_no")
+    private String grantNo;
+
+}

src/main/java/com/example/xiaoshiweixinback/domain/es/Text.java

@@ -0,0 +1,34 @@
+package com.example.xiaoshiweixinback.domain.es;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 文本类
+ */
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Text {
+    /**
+     * 文本内容
+     */
+    @JsonProperty("text_content")
+    String textContent;
+
+    /**
+     * 文本语言
+     */
+    @JsonProperty("language")
+    String language;
+
+    /**
+     * 是否是原始
+     */
+    @JsonProperty("if_origin")
+    Boolean ifOrigin;
+}

src/main/java/com/example/xiaoshiweixinback/service/AssoPersonCategoryService.java

@@ -32,10 +32,7 @@ public class AssoPersonCategoryService extends ServiceImpl<AssoPersonCategoryMap
     public List<Integer> getChoosedProductCategoryIds() {
         List<Integer> ids = new ArrayList<>();
         try {
-            //PersonnelVO personnelVO =cacheUtil.getLoginUser(loginUtils.getId());
-            PersonnelVO personnelVO = new PersonnelVO();
-            personnelVO.setId(1);
-            personnelVO.setUuid("123");
+           PersonnelVO personnelVO =cacheUtil.getLoginUser(loginUtils.getId());
         LambdaQueryWrapper<AssoPersonCategory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AssoPersonCategory::getPersonUuid, personnelVO.getUuid());
         List<AssoPersonCategory> assoPersonCategories = this.list(queryWrapper);
@@ -49,11 +46,12 @@ public class AssoPersonCategoryService extends ServiceImpl<AssoPersonCategoryMap
         return ids;
     }
 
+
     @Transactional(rollbackFor = Exception.class)
     public void concernCategory(ConcernCategoryDTO concernCategoryDTO) {
         //PersonnelVO personnelVO =cacheUtil.getLoginUser(loginUtils.getId());
         PersonnelVO personnelVO = new PersonnelVO();
-        personnelVO.setId(1);
+        personnelVO.setId(5);
         personnelVO.setUuid("123");
         List<Integer> ids = concernCategoryDTO.getCategoryIds();
 
@@ -62,7 +60,7 @@ public class AssoPersonCategoryService extends ServiceImpl<AssoPersonCategoryMap
         List<AssoPersonCategory> assoPersonCategories = this.list(queryWrapper);
         List<Integer> oldIds = new ArrayList<>();
         if (assoPersonCategories.size() > 0) {
-            oldIds = assoPersonCategories.stream().map(AssoPersonCategory::getId).collect(Collectors.toList());
+            oldIds = assoPersonCategories.stream().map(AssoPersonCategory::getProductCategoryId).collect(Collectors.toList());
         }
         List<Integer> addIds = new ArrayList<>(ids);
         addIds.removeAll(oldIds);

src/main/java/com/example/xiaoshiweixinback/service/AssoProductFileService.java

@@ -43,7 +43,8 @@ public class AssoProductFileService extends ServiceImpl<AssoProductFileMapper, A
         remGuids.removeAll(guids);
         if (remGuids.size() > 0) {
             LambdaQueryWrapper<AssoProductFile> remWrapper = new LambdaQueryWrapper<>();
-            remWrapper.in(AssoProductFile::getFileGuid, guids);
+            remWrapper.in(AssoProductFile::getFileGuid, remGuids)
+                       .eq(AssoProductFile::getProductId,productId);
             this.remove(remWrapper);
         }
 

src/main/java/com/example/xiaoshiweixinback/service/LoginService.java

@@ -27,7 +27,6 @@ import com.example.xiaoshiweixinback.okhttp.ResponseManager;
 import com.example.xiaoshiweixinback.service.common.SmsService;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -37,12 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class LoginService {
@@ -73,7 +68,6 @@ public class LoginService {
 
     /**
      * 手机号/账号登录
-     *
      * @param dto
      * @return
      */

src/main/java/com/example/xiaoshiweixinback/service/ProductCategoryService.java

@@ -45,7 +45,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
      * @return
      */
     public Records queryProductCategory(ProductCategoryDTO productCategoryDTO) {
-
+        Boolean ifConcern = productCategoryDTO.getIfConcern();
         Records records = new Records();
         Long size = productCategoryDTO.getSize();
         Long current = productCategoryDTO.getCurrent();
@@ -64,6 +64,15 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         } else {
             queryWrapper.eq(ProductCategory::getParentId, parentId);
         }
+        if (ifConcern != null && ifConcern) {
+            //获取关注的
+            List<Integer> ids = assoPersonCategoryService.getChoosedProductCategoryIds();
+            if(ids.size()==0){
+                ids.add(0);
+            }
+            queryWrapper.in(ProductCategory::getId, ids);
+
+        }
         List<ProductCategory> productCategoryList = new ArrayList<>();
         if (size != null && current != null) {
             IPage<ProductCategory> productCategoryIPage = this.page(new Page<>(current, size), queryWrapper);
@@ -92,7 +101,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         if (ids.size() != 0) {
             //根据产品类别id获得产品类别与文件关联表
             LambdaQueryWrapper<AssoCategoryFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(AssoCategoryFile::getCategoryId, ids);
+            queryWrapper.in(AssoCategoryFile::getProductCategoryId, ids);
             assoCategoryFiles = assoCategoryFileService.list(queryWrapper);
             guids = assoCategoryFiles.stream().map(AssoCategoryFile::getFileGuid).collect(Collectors.toList());
 
@@ -126,7 +135,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
                 productCategoryVO.setCreateName(personnel.getName());
             }
             //装载文件信息
-            List<AssoCategoryFile> assoCategoryFilesTemp = assoCategoryFiles.stream().filter(item -> item.getCategoryId().equals(productCategoryVO.getId())).collect(Collectors.toList());
+            List<AssoCategoryFile> assoCategoryFilesTemp = assoCategoryFiles.stream().filter(item -> item.getProductCategoryId().equals(productCategoryVO.getId())).collect(Collectors.toList());
             if (assoCategoryFilesTemp.size() != 0) {
                 List<String> guidTemp = assoCategoryFilesTemp.stream().map(AssoCategoryFile::getFileGuid).collect(Collectors.toList());
                 if (guidTemp.size() != 0) {

src/main/java/com/example/xiaoshiweixinback/service/ProductService.java

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.business.common.base.SystemFile;
-import com.example.xiaoshiweixinback.business.utils.BatchNoUtil;
 import com.example.xiaoshiweixinback.business.utils.CacheUtil;
 import com.example.xiaoshiweixinback.business.utils.LoginUtils;
 import com.example.xiaoshiweixinback.domain.AssoProductFile;
 import com.example.xiaoshiweixinback.domain.Product;
-import com.example.xiaoshiweixinback.domain.Ticket;
 import com.example.xiaoshiweixinback.entity.dto.GetProductDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductAddDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductDTO;
@@ -138,7 +136,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
     public Product addProduct(ProductAddDTO productAddDTO) {
         Product product = new Product();
         BeanUtils.copyProperties(productAddDTO, product);
-        PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
+//        PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
+        PersonnelVO personnelVO =new PersonnelVO();
+        personnelVO.setUuid("1213");
         product.setCreateId(personnelVO.getUuid());
         product.setIfCustomized(true);
         product.insert();

src/main/resources/application-dev1.yml

@@ -1,81 +0,0 @@
-spring:
-  rabbitmq:
-    host: 172.27.247.174
-    port: 5672
-    username: admin
-    password: 123456
-  data:
-   redis:
-     host: 172.27.247.174
-     port: 6379
-     database: 3
-     password: Xx0GWxdWQJxx6Swe
-     lettuce:
-       pool:
-         max-active: 20
-         max-idle: 20
-         min-idle: 0
-         max-wait: -1ms
-     timeout: 2000ms
-  datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas_prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-    username: root
-    password: TU5x6IeBi7rl
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      stat-view-servlet:
-        login-username: admin
-        login-password: Cslg2022+
-      web-stat-filter:
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-  quartz:
-    #相关属性配置
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: DefaultQuartzScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
-            isClustered: false
-            clusterCheckinInterval: 10000
-            useProperties: false
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-          dataSource:
-            default:
-              URL: jdbc:mysql://172.27.247.174:3306:3306/pas-prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
-              user: root
-              password: TU5x6IeBi7rl
-              driver: com.mysql.jdbc.Driver
-
-    #数据库方式
-    job-store-type: jdbc
-    #初始化表结构
-    jdbc:
-      initialize-schema: always
-authorUrl: http://localhost:8871
-PCSUrl: http://localhost:8871
-#OPSUrl: http://192.168.1.24:5001
-OPSUrl: http://139.224.24.90:5001
-PASUrl: http://localhost:8877
-FMSUrl: http://localhost:8801
-FileSource: 3
-
-##################  短信 ####################
-SMS:
-  regionId: cn-shanghai
-  accessKeyId: LTAI5tGyG1Q7fKprgg1nWhXj
-  secret: Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN
-
-##################  微信小程序  ####################
-WeChat:
-  appId: wxaefb842bd0b93ff0
-  appSecret: 89fe0fb96472548d48f63b2f5c956537

src/main/resources/application-prodNetIn.yml

@@ -1,17 +1,24 @@
 spring:
-  redis:
-    port: 6379
-    database: 3
-    password: Xx0GWxdWQJxx6Swe
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 20
-        min-idle: 0
-        max-wait: -1ms
-    timeout: 2000ms
+  rabbitmq:
+    host: 172.27.247.174
+    port: 5672
+    username: admin
+    password: 123456
+  data:
+   redis:
+     host: 172.27.247.174
+     port: 6379
+     database: 3
+     password: Xx0GWxdWQJxx6Swe
+     lettuce:
+       pool:
+         max-active: 20
+         max-idle: 20
+         min-idle: 0
+         max-wait: -1ms
+     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/ecs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -22,16 +29,43 @@ spring:
         login-password: Cslg2022+
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-  data:
-    redis:
-      host: 172.27.247.174
-authorUrl: http://localhost:8871
+  quartz:
+    #相关属性配置
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: DefaultQuartzScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: false
+            clusterCheckinInterval: 10000
+            useProperties: false
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+          dataSource:
+            default:
+              URL: jdbc:mysql://172.27.247.174:3306:3306/pas-prod2?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+              user: root
+              password: TU5x6IeBi7rl
+              driver: com.mysql.jdbc.Driver
 
+    #数据库方式
+    job-store-type: jdbc
+    #初始化表结构
+    jdbc:
+      initialize-schema: always
+authorUrl: http://localhost:8871
 PCSUrl: http://localhost:8871
 #OPSUrl: http://192.168.1.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
-RMSUrl: http://localhost:8872
 FMSUrl: http://localhost:8801
 FileSource: 3
 

src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prodNetIn
   jackson:
     default-property-inclusion: non_null
     serialization: