统一待办集成修改

laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.docking.hiwork.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.PushWorkflowIntegrationAPI;
 import com.jero.common.api.dto.message.HiworkTodoAdd;
@@ -25,6 +26,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -53,7 +55,13 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
     private ProcessNodeService processNodeService;
     @Resource
     private ProcessAllService processAllService;
+    @Resource
+    private RestTemplate restTemplate;
 
+    @Value("${hiwork.ip}")
+    private String ip;
+    @Value("${hiwork.todoUrl}")
+    private String todoUrl;
     @Value("${hiwork.isWorkflow}")
     private boolean isWorkflow;
     @Value("${hiwork.sysCode}")
@@ -82,7 +90,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             List<HiworkTodo> hiworkTodoList = getHiworkTodos(hiworkTodoAddList);
             log.info("统一待办推送入参" + JSON.toJSONString(hiworkTodoList));
             // 远程调用
-            hiworkPostUtil.postTodo(hiworkTodoList);
+            JSONObject json = restTemplate.postForObject(ip + todoUrl,hiworkTodoList, JSONObject.class);
+            if(!Objects.isNull(json) && json.containsKey("success") && Objects.equals("true",json.getString("success"))){
+                log.info("统一待办推送成功");
+            }else{
+                log.info("统一待办推送失败");
+            }
         }catch (Exception e){
             log.error("统一待办推送异常",e);
         }
@@ -98,7 +111,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
             if(Objects.isNull(processApprovalRecord)){
                 continue;
             }
+            getObj(hiworkTodoList, processDefinitionId, processApprovalRecord);
+        }
+        return hiworkTodoList;
+    }
 
+    private void getObj(List<HiworkTodo> hiworkTodoList, String processDefinitionId, ProcessApprovalRecord processApprovalRecord) {
         HiworkTodo hiworkTodo = new HiworkTodo();
         hiworkTodo.setSysCode(hiworkSysCode);
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -134,7 +152,9 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
                 hiworkTodo.setCreateUserCode(sysUser.getUsername());
                 hiworkTodo.setCreateUserName(sysUser.getRealname());
             }
+            if(!Objects.isNull(processAll.getDueTime())){
                 hiworkTodo.setDueTime(processAll.getDueTime().getTime());
+            }
             hiworkTodo.setBid(processAll.getProjectId());
             String url = hiworkFontUrl.replace("{projectId}",processAll.getProjectId())
                     .replace("{taskName}",processApprovalRecord.getTaskName())
@@ -156,6 +176,4 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
         hiworkTodo.setIsTodo(String.valueOf(processApprovalRecord.getFinishFlag()));
         hiworkTodoList.add(hiworkTodo);
     }
-        return hiworkTodoList;
-    }
 }