fix bugs

cirs-admin/src/main/resources/application-druid.yml

@@ -58,4 +58,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: trut
+                        multi-statement-allow: true

cirs-biz/pom.xml

@@ -26,7 +26,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty-http</artifactId>
+        </dependency>
 
     </dependencies>
 

cirs-biz/src/main/java/com/cirs/biz/controller/SysTrainController.java

@@ -232,7 +232,7 @@ public class SysTrainController extends BaseController
 
             Map<String, Object> objectMap=new HashMap<>();
             objectMap.put("useScene", recommend_args.getUseScene());
-            objectMap.put("SearchCondition",recommend_args.getSearchCondition());
+            objectMap.put("searchCondition",recommend_args.getSearchCondition());
             objectMap.put("modelPath", model_path);
             objectMap.put("result1Id",recommend_args.getResult1Id());
             objectMap.put("result2Id",recommend_args.getResult2Id());
@@ -241,7 +241,7 @@ public class SysTrainController extends BaseController
             objectMap.put("result5Id",recommend_args.getResult5Id());
             //接下来就传入算法
 //            System.out.println(JSON.toJSONString(objectMap));
-            // todo wangruilin uri 应该是一个全地址+端口，这个地址可以通过数据字典配置和获取
+            logger.info("request payload: {}",JSON.toJSONString(objectMap));
             Mono<String> mono = webClient
                     .post() // POST 请求
                     .uri(recommend_uri)  // 请求路径
@@ -251,8 +251,7 @@ public class SysTrainController extends BaseController
                     .bodyToMono(String.class); //响应数据类型转换
 
                 String res = mono.block();
-                // // todo wangruilin 改成logger
-                logger.info(res);
+            logger.info(res);
             AjaxResult result = new AjaxResult();
             result.put("data",res);
             result.put("code",200);

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationScoretaskDetailController.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.cirs.biz.domain.TVerificationTaskDetail;
 import com.cirs.biz.domain.VerificationData;
+import com.cirs.biz.utils.WebClientUtils;
 import com.cirs.common.utils.DictUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -159,8 +160,9 @@ public class TVerificationScoretaskDetailController extends BaseController
             List<TVerificationScoretaskDetail> dataset = tVerificationScoretaskDetailService.getByscoretaskid(taskid);
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
+            logger.info("request payload: {}", JSON.toJSONString(objectMap));
             // 发送请求
-            Mono<String> mono = webClient
+            Mono<String> mono = WebClientUtils.createWebClient()
                     .post() // POST 请求
                     .uri(verification_uri)  // 请求路径
                     .contentType(MediaType.APPLICATION_JSON_UTF8)
@@ -182,7 +184,7 @@ public class TVerificationScoretaskDetailController extends BaseController
 
 //            return success("任务"+taskid+"验证算法调用成功");
         } catch (Exception e) {
-
+            logger.info("任务"+taskid+"验证算法调用失败",e);
             return error("任务"+taskid+"验证算法调用失败");
         }
     }

cirs-biz/src/main/java/com/cirs/biz/controller/TVerificationTaskDetailController.java

@@ -6,10 +6,10 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.alibaba.fastjson2.JSON;
 import com.cirs.biz.domain.*;
 import com.cirs.biz.service.ITElectronComponentService;
 import com.cirs.common.utils.DictUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.http.MediaType;
@@ -173,25 +173,12 @@ public class TVerificationTaskDetailController extends BaseController
             String model_path = DictUtils.getDictValue("biz_algorithm_config","model_path");
             String verification_uri = DictUtils.getDictValue("biz_algorithm_config","verification_uri");
 
-
-//            logger.info(taskid.toString());
-//            System.out.println(taskid);
-
-//            getComponentIds(taskid);
             Map<String, Object> objectMap=new HashMap<>();
             List<VerificationData> dataset = tVerificationTaskDetailService.getComponentids(taskid);//id就是taskdetail的id，由此更新相应的taskdetail
-//            for(int i=0;i<dataset.size();i++){
-//                dataset.get(i).setId((long)(i+1));
-//            }
 
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
-            // 创建一个 ObjectMapper 实例
-//            ObjectMapper objectMapper = new ObjectMapper();
-
-// 将对象转换为 JSON 字符串
-//            String json = objectMapper.writeValueAsString(objectMap);
-//            logger.info("post json: {}", json);
+            logger.info("request payload: {}", JSON.toJSONString(objectMap));
             // 发送请求
             Mono<String> mono = webClient
                     .post() // POST 请求

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -212,8 +212,8 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
 
     @Override
     public Long setComponentId(String result) {
-        String[] attrs = result.split("-");//切割不同属性
-        return tVerificationTaskDetailMapper.getComponentId(attrs[0], attrs.length >= 2 ? attrs[1] : null, attrs.length >= 3 ? attrs[2] : null);
+//        String[] attrs = result.split("-");//切割不同属性
+        return tVerificationTaskDetailMapper.getComponentId(result, null, null);
     }
 
     @Override

cirs-biz/src/main/java/com/cirs/biz/utils/WebClientUtils.java

@@ -0,0 +1,32 @@
+package com.cirs.biz.utils;
+
+import io.netty.channel.ChannelOption;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.netty.http.client.HttpClient;
+
+public class WebClientUtils {
+
+    // 10m
+    private static final int BUFFER_SIZE = 1024 * 1024 * 10;
+
+    public static WebClient createWebClient(int bufferSize) {
+        HttpClient httpClient = HttpClient.create()
+                .option(ChannelOption.SO_RCVBUF, bufferSize)  // 设置接收缓冲区大小
+                .option(ChannelOption.SO_SNDBUF, bufferSize); // 设置发送缓冲区大小
+
+        return WebClient.builder()
+                .clientConnector(new ReactorClientHttpConnector(httpClient))
+                .build();
+    }
+
+    public static WebClient createWebClient() {
+
+        return WebClient.builder().exchangeStrategies(ExchangeStrategies.builder()
+                        .codecs(configurer -> configurer
+                                .defaultCodecs()
+                                .maxInMemorySize(10 * 1024 * 1024))
+                        .build()).build();
+    }
+}