修改OA对接异构系统标识

This commit is contained in:
梁琦涛
2024-08-01 16:11:32 +08:00
parent a702b3822a
commit 1d811fff84
@@ -6,6 +6,7 @@ import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.PushWorkflowIntegrationAPI; import com.jero.common.api.PushWorkflowIntegrationAPI;
@@ -130,20 +131,31 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
.timeout(3000)//超时,毫秒 .timeout(3000)//超时,毫秒
.execute(); .execute();
if (execute.isOk()) { if (execute.isOk()) {
log.info("统一待办推送成功");
String body = execute.body(); String body = execute.body();
lawsUnifiedTodoLog.setResponseBody(body); List<JSONObject> listJson = JSONArray.parseArray(body,JSONObject.class);
break; if(!CollectionUtils.isEmpty(listJson)) {
String operResult = String.valueOf(listJson.get(0).get("operResult"));
lawsUnifiedTodoLog.setResponseBody(body);
if (Objects.equals(operResult, "0")) {
lawsUnifiedTodoLog.setState(2);
} else {
log.info("统一待办推送成功");
lawsUnifiedTodoLog.setState(1);
break;
}
}
}else { }else {
String body = execute.body(); String body = execute.body();
lawsUnifiedTodoLog.setResponseBody(body); lawsUnifiedTodoLog.setResponseBody(body);
JSONObject jsonObject = JSONObject.parseObject(body); List<JSONObject> listJson = JSONArray.parseArray(body,JSONObject.class);
String operResult = jsonObject.getString("operResult"); if(!CollectionUtils.isEmpty(listJson)){
if ("1".equals(operResult)){ String operResult = String.valueOf(listJson.get(0).get("operResult"));
log.info("统一待办推送成功"); if ("1".equals(operResult)){
break; log.info("统一待办推送成功");
break;
}
} }
log.info("统一待办推送失败{}",jsonObject); log.info("统一待办推送失败{}",body);
retries++; retries++;
} }
} }
@@ -151,11 +163,14 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
lawsUnifiedTodoLog.setJsonStr(jsonString); lawsUnifiedTodoLog.setJsonStr(jsonString);
lawsUnifiedTodoLog.setMessageType(1); lawsUnifiedTodoLog.setMessageType(1);
lawsUnifiedTodoLog.setTitle(title); lawsUnifiedTodoLog.setTitle(title);
if (retries == maxRetries){ if(Objects.isNull(lawsUnifiedTodoLog.getState())){
lawsUnifiedTodoLog.setState(2); if (retries == maxRetries){
}else { lawsUnifiedTodoLog.setState(2);
lawsUnifiedTodoLog.setState(1); }else {
lawsUnifiedTodoLog.setState(1);
}
} }
unifiedTodoLogService.add(lawsUnifiedTodoLog); unifiedTodoLogService.add(lawsUnifiedTodoLog);
} }