diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index b94f6a43..67afb131 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.PushWorkflowIntegrationAPI; @@ -130,20 +131,31 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { .timeout(3000)//超时,毫秒 .execute(); if (execute.isOk()) { - log.info("统一待办推送成功"); String body = execute.body(); - lawsUnifiedTodoLog.setResponseBody(body); - break; + List listJson = JSONArray.parseArray(body,JSONObject.class); + 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 { String body = execute.body(); lawsUnifiedTodoLog.setResponseBody(body); - JSONObject jsonObject = JSONObject.parseObject(body); - String operResult = jsonObject.getString("operResult"); - if ("1".equals(operResult)){ - log.info("统一待办推送成功"); - break; + List listJson = JSONArray.parseArray(body,JSONObject.class); + if(!CollectionUtils.isEmpty(listJson)){ + String operResult = String.valueOf(listJson.get(0).get("operResult")); + if ("1".equals(operResult)){ + log.info("统一待办推送成功"); + break; + } } - log.info("统一待办推送失败{}",jsonObject); + log.info("统一待办推送失败{}",body); retries++; } } @@ -151,11 +163,14 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { lawsUnifiedTodoLog.setJsonStr(jsonString); lawsUnifiedTodoLog.setMessageType(1); lawsUnifiedTodoLog.setTitle(title); - if (retries == maxRetries){ - lawsUnifiedTodoLog.setState(2); - }else { - lawsUnifiedTodoLog.setState(1); + if(Objects.isNull(lawsUnifiedTodoLog.getState())){ + if (retries == maxRetries){ + lawsUnifiedTodoLog.setState(2); + }else { + lawsUnifiedTodoLog.setState(1); + } } + unifiedTodoLogService.add(lawsUnifiedTodoLog); }