diff --git a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java index d4f5fba..45794bb 100644 --- a/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/AlgorithmServiceImpl.java @@ -214,7 +214,7 @@ public class AlgorithmServiceImpl implements AlgorithmService { analyseResItems.add(analyseResItem); analyseResult.setResultList(analyseResItems); - log.info("返回值打印: 是否成功(0成功;1失败)"+analyseResPoint.getValue()+ + log.info(Color.GREEN+"返回值打印: 是否成功(0成功;1失败)"+analyseResPoint.getValue()+ ",最高温度值"+analyseResPoint.getConf()+",返回图片路径:"+analyseResPoint.getResImageUrl()); try { // String analyseResultOutJson = JSONObject.toJSONString(analyseResult); diff --git a/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java b/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java index 47e6bda..45f8b7e 100644 --- a/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java +++ b/src/main/java/com/inspect/simulator/service/impl/HikVisionServiceImpl.java @@ -55,6 +55,7 @@ import java.nio.file.Paths; import java.text.SimpleDateFormat; import java.util.*; import java.util.List; +import java.util.concurrent.TimeUnit; /** * 海康威视测试服务类 @@ -816,7 +817,15 @@ public class HikVisionServiceImpl implements HikVisionService { public float[][] UploadFtpImage(String url, String type, String image) { type = "ftp"; - OkHttpClient client = new OkHttpClient(); +// OkHttpClient client = new OkHttpClient(); + + OkHttpClient client = new OkHttpClient.Builder() + .connectTimeout(5, TimeUnit.SECONDS) // 连接超时5秒 + .readTimeout(10, TimeUnit.SECONDS) // 读取超时10秒 + .writeTimeout(5, TimeUnit.SECONDS) // 写入超时5秒 + .retryOnConnectionFailure(false) // 禁用自动重试 + .build(); + float[][] floats = new float[0][]; try { // 构建 multipart 请求体 @@ -1133,7 +1142,6 @@ public class HikVisionServiceImpl implements HikVisionService { ",最高温度值"+analyseResPoint.getConf()+",返回图片路径:"+analyseResPoint.getResImageUrl()); try { String analyseResultOutJson = JSONObject.toJSONString(analyseResult); - System.out.println("打印json返回:" + analyseResultOutJson); log.info("[INFRARED] irPicAnalyse: feedbackUrl={}, analyseResultOutJson={}", feedbackUrl, analyseResultOutJson); // String result = HttpClientUtils.sendPostAgain(feedbackUrl, analyseResultOutJson); // log.info("[INFRARED] irPicAnalyse: feedbackUrl={}, result: {}", feedbackUrl, result);