|
@@ -137,7 +137,7 @@ public class AttendanceAssessmentSdk {
|
|
|
} catch (cn.hutool.core.io.IORuntimeException ioRuntimeException) {
|
|
|
logger.error("请求超时");
|
|
|
} catch (CustomException e) {
|
|
|
- logger.error("自定义异常:{}",e.getMessage());
|
|
|
+ logger.error("自定义异常:{}", e.getMessage());
|
|
|
apiResult = e.getMessage();
|
|
|
} catch (Exception exception) {
|
|
|
logger.error("接口调用异常:{}", exception.getMessage());
|
|
@@ -163,19 +163,20 @@ public class AttendanceAssessmentSdk {
|
|
|
|
|
|
String apiResult = null;
|
|
|
String fileId = "";
|
|
|
-
|
|
|
+ String jsonStr = "";
|
|
|
/**********************组装请求参数**************************************/
|
|
|
- MultiValueMap<String, Object> postData = new LinkedMultiValueMap<>();
|
|
|
- Map<String, Object> requestData = getRequestData();
|
|
|
- requestData.put("TOKEN", getToken());
|
|
|
- postData.set("STANDARD_DATA", requestData);
|
|
|
- FileSystemResource resource = new FileSystemResource((File) paramVo.getData());
|
|
|
- postData.set("UPLOAD_FILE", resource);
|
|
|
- JSONConfig config = new JSONConfig();
|
|
|
- config.setIgnoreNullValue(false);
|
|
|
- String jsonStr = JSONUtil.toJsonStr(postData, config);
|
|
|
- logger.info("入参:{}", jsonStr);
|
|
|
try {
|
|
|
+ MultiValueMap<String, Object> postData = new LinkedMultiValueMap<>();
|
|
|
+ Map<String, Object> requestData = getRequestData();
|
|
|
+ requestData.put("TOKEN", getToken());
|
|
|
+ postData.set("STANDARD_DATA", requestData);
|
|
|
+ FileSystemResource resource = new FileSystemResource((File) paramVo.getData());
|
|
|
+ postData.set("UPLOAD_FILE", resource);
|
|
|
+ JSONConfig config = new JSONConfig();
|
|
|
+ config.setIgnoreNullValue(false);
|
|
|
+ jsonStr = JSONUtil.toJsonStr(postData, config);
|
|
|
+ logger.info("入参:{}", jsonStr);
|
|
|
+
|
|
|
RestTemplate rest = new RestTemplate();
|
|
|
url = "http://localhost:9689/synchronization/file";
|
|
|
apiResult = rest.postForObject(url, postData, String.class);
|
|
@@ -190,7 +191,8 @@ public class AttendanceAssessmentSdk {
|
|
|
} finally {
|
|
|
// 接口调用结束后续逻辑处理
|
|
|
String finalApiResult = apiResult;
|
|
|
- Thread td = new Thread(() -> afterAll(paramVo, jsonStr, finalApiResult));
|
|
|
+ String finalJsonStr = jsonStr;
|
|
|
+ Thread td = new Thread(() -> afterAll(paramVo, finalJsonStr, finalApiResult));
|
|
|
td.start();
|
|
|
}
|
|
|
return fileId;
|