4/22 查询工单流程，查询工单详情

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

@@ -27,19 +27,19 @@ public class ElasticSearchClientConfig {
     @Configuration
     public class ElasticSearchConfig {
         //注入IOC容器
-        @Bean
-        public ElasticsearchClient elasticsearchClient() throws Exception {
-            RestClientBuilder builder = RestClient.builder(new HttpHost("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("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"));
@@ -64,18 +64,18 @@ public class ElasticSearchClientConfig {
 //            return new ElasticsearchClient(transport);
 //        }
 //
-//        @Bean
-//        public ElasticsearchClient elasticsearchClient() throws Exception {
-//            RestClientBuilder builder = RestClient.builder(new HttpHost("es-cn-em93o8856000ho9e7.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("es-cn-em93o8856000ho9e7.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);
+        }
     }
 }

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

@@ -91,7 +91,6 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
             case 1:
                 vipService.activateVIP(order);
                 break;
-
             case 2:
               ticketService.updateProcess(orderuuid,3);
                 break;

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

@@ -47,19 +47,30 @@ public class TicketFlowService extends ServiceImpl<TicketFlowMapper, TicketFlow>
      * @param description
      * @return
      */
-    public TicketFlow addTicketFlow(Ticket ticket, String description, Boolean ifResult,String remark,Integer progress) {
+    public TicketFlow addTicketFlow(Ticket ticket, String remark, Boolean ifResult,String description,Integer progress) {
         PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
         TicketFlow ticketFlow = new TicketFlow();
         ticketFlow.setTicketId(ticket.getId());
         ticketFlow.setTicketProcess(progress);
         ticketFlow.setCreateId(personnelVO.getUuid());
-        ticketFlow.setDescription(description);
+        ticketFlow.setRemark(description);
         ticketFlow.setRemark(remark);
         ticketFlow.setIfResult(ifResult);
         ticketFlow.insert();
         return ticketFlow;
     }
 
+    public TicketFlow addTicketFlow(Ticket ticket, String remark, Boolean ifResult,String description,Integer progress,String createUuid) {
+        TicketFlow ticketFlow = new TicketFlow();
+        ticketFlow.setTicketId(ticket.getId());
+        ticketFlow.setTicketProcess(progress);
+        ticketFlow.setCreateId(createUuid);
+        ticketFlow.setRemark(description);
+        ticketFlow.setRemark(remark);
+        ticketFlow.setIfResult(ifResult);
+        ticketFlow.insert();
+        return ticketFlow;
+    }
     /**
      * 查询工单结果
      *

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

@@ -279,7 +279,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         Ticket ticket = this.getOne(queryWrapper, false);
         ticket.setTicketProgress(process);
         ticket.updateById();
-        ticketFlowService.addTicketFlow(ticket, "工单支付成功", false, null, 3);
+        ticketFlowService.addTicketFlow(ticket, "工单支付成功", false, null, 3,ticket.getCreateId());
         return ticket.getId();
     }
 
@@ -371,7 +371,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         }
 
         //添加工单流程
-        TicketFlow ticketFlow = ticketFlowService.addTicketFlow(ticket, description, true, "添加工单结果", 3);
+        TicketFlow ticketFlow = ticketFlowService.addTicketFlow(ticket, "添加工单结果", true, description, 3);
 
         //添加结果
         assoTicketFileService.addTicketFile(fileGuids, 1, ticket, ticketFlow.getId());

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsDenseVectorService.java

@@ -255,9 +255,9 @@ public class EsDenseVectorService {
             Date beforeDate = calendar.getTime();
             String agoFormat = format1.format(beforeDate) + "0101";
             String s = agoFormat + "~" + nowFormat;
-            if (StringUtils.isNotEmpty(searchCondition)) {
-                searchCondition = searchCondition + " AND " + "AD = " + "(" + s + ")";
-            }
+//            if (StringUtils.isNotEmpty(searchCondition)) {
+//                searchCondition = searchCondition + " AND " + "AD = " + "(" + s + ")";
+//            }
         }
         if (StringUtils.isNotEmpty(appCountry)) {
             String s = this.appendStr(appCountry);

src/main/java/com/example/xiaoshiweixinback/service/importPatent/GetPatentPictureFromExcelService.java

@@ -93,6 +93,7 @@ public class GetPatentPictureFromExcelService {
         if (patentVectorOrg != null) {
             PatentVector patentVector = patentVectorOrg.getPatentVector();
             patentVector.setRightHolder(patent.getApplicant());
+            patentVector.setAppDate(patent.getAppDate());
             patentVector.setLoc(patent.getIpc());
             esService.updatePatentVector(patentVector, patentVectorOrg.getId());
             return;

src/main/resources/jsons/patentVector.json

@@ -66,8 +66,8 @@
     "type": "Object",
     "value": "title",
     "field": "TI",
-    "esField": "title.text_content",
-    "esClass": "matchPhaseQueryBuilder",
+    "esField": "title.text_content.keyword",
+    "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",

src/test/java/com/example/xiaoshiweixinback/TicketServiceTests.java

@@ -0,0 +1,30 @@
+package com.example.xiaoshiweixinback;
+
+import com.example.xiaoshiweixinback.service.OrderService;
+import com.example.xiaoshiweixinback.service.importPatent.excel.GetPatentFromSzService;
+import com.example.xiaoshiweixinback.service.importPatent.excel.ImportProduct;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Lazy;
+
+
+@SpringBootTest
+class TicketServiceTests {
+
+    @Autowired
+    @Lazy
+    private OrderService orderService;
+
+    @Autowired
+    private GetPatentFromSzService getPatentFromSzService;
+    @Test
+    void contextLoads() {
+        orderService.payBack("ORT20240422135732204254");
+    }
+
+    @Test
+    public void test1() {
+
+    }
+}