QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:修改oa待办推送

Browse Source
This commit is contained in:
sunzheng
2024-07-29 11:08:18 +08:00
parent f77b7b2971
commit 424035f2c8
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java
+2 -2
View File
@@ -53,9 +53,9 @@ public class LawsUnifiedTodoLog {
private Integer state; private Integer state;
/** /**
* 消息类型1：OA消息 2：飞书 * 消息类型1：OA消息 2：飞书-待办 3: 飞书-消息
*/ */
@ApiModelProperty(value="消息类型1：OA消息 2：飞书") @ApiModelProperty(value="消息类型1：OA消息 2：飞书-待办 3: 飞书-消息")
@Dict(dicCode = "message_type") @Dict(dicCode = "message_type")
private Integer messageType; private Integer messageType;
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java
+8 -2
View File
@@ -1,11 +1,14 @@
package com.jero.modules.docking.hiwork.service.impl; package com.jero.modules.docking.hiwork.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.PushWorkflowIntegrationAPI; import com.jero.common.api.PushWorkflowIntegrationAPI;
import com.jero.common.api.dto.message.UnifiedTodoVO;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog; import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog;
@@ -68,8 +71,11 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl<LawsUnifiedTodoLo
if(Objects.isNull(lawsUnifiedTodoLogObj)){ if(Objects.isNull(lawsUnifiedTodoLogObj)){
return Result.error("数据不存在"); return Result.error("数据不存在");
} }
// todo 重新发送代办 根据类型发送
// pushWorkflowIntegrationAPI.sendTodoTask(); String jsonStr = lawsUnifiedTodoLogObj.getJsonStr();
// 转换为List<HiworkTodo>
List<UnifiedTodoVO> unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference<List<UnifiedTodoVO>>() {});
pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList);
LambdaUpdateWrapper<LawsUnifiedTodoLog> queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<LawsUnifiedTodoLog> queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>();
queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getId,lawsUnifiedTodoLog.getId()); queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getId,lawsUnifiedTodoLog.getId());
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
+5 -3
View File
@@ -102,15 +102,16 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
} }
try { try {
List<UnifiedTodo> unifiedTodoList = getHiworkTodos(unifiedTodoVOList); List<UnifiedTodo> unifiedTodoList = getHiworkTodos(unifiedTodoVOList);
String reqJsonString = JSONObject.toJSONString(unifiedTodoVOList);
String jsonString = JSONObject.toJSONString(unifiedTodoList); String jsonString = JSONObject.toJSONString(unifiedTodoList);
log.info("统一待办推送入参" + jsonString); log.info("统一待办推送入参" + jsonString);
push(ip + todoUrl,jsonString); push(ip + todoUrl,jsonString, reqJsonString);
}catch (Exception e){ }catch (Exception e){
log.error("统一待办推送异常",e); log.error("统一待办推送异常",e);
} }
} }
private void push(String url, String jsonString) { private void push(String url, String jsonString, String reqJsonString) {
// 设置最大重试次数 // 设置最大重试次数
int maxRetries = 3; int maxRetries = 3;
// 当前重试次数 // 当前重试次数
@@ -142,7 +143,8 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
} }
} }
lawsUnifiedTodoLog.setUrl(url); lawsUnifiedTodoLog.setUrl(url);
lawsUnifiedTodoLog.setJsonStr(jsonString); lawsUnifiedTodoLog.setJsonStr(reqJsonString);
lawsUnifiedTodoLog.setMessageType(1);
if (retries == maxRetries){ if (retries == maxRetries){
lawsUnifiedTodoLog.setState(2); lawsUnifiedTodoLog.setState(2);
}else { }else {