From 75afa55e2c962e0aad11b3c95155eeacd7aa5539 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 31 Mar 2024 13:56:18 +0800 Subject: [PATCH] =?UTF-8?q?BUG:=20=E4=BB=A3=E4=B8=BB=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81OA=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WebServiceOAController.java | 10 +++++++++ .../service/WebServiceOAService.java | 4 ++-- .../service/impl/WebServiceOAServiceImpl.java | 6 ++++++ .../webService/todoContent/SendOAContent.java | 21 +++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoContent/SendOAContent.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java index d138b8c0..7410a96d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java @@ -24,6 +24,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService; import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext; +import com.ydw.bat.wkflow.business_oa.webService.todoContent.SendOAContent; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult; import com.ydw.bat.wkflow.business_wkflow.form.dto.FormSubmitDto; import com.ydw.bat.wkflow.business_wkflow.form.service.FormValsService; @@ -73,4 +74,13 @@ public class WebServiceOAController extends BaseAction { return webServiceOAService.sendTodo(new BusProcessNew()); } + @ApiOperation("代主服务发送OA请求") + @PostMapping("/replaceSendOA") + public Wrapper replaceSendOA(@RequestBody SendOAContent sendOAContent) { + logger.info("收到主服务请求------------------------------------"); + logger.info("请求参数：{}", JSON.toJSONString(sendOAContent)); + String result = webServiceOAService.replaceSendOA(sendOAContent); + return WrapMapper.ok(result); + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java index cbf6e246..51baaf70 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java @@ -2,12 +2,11 @@ package com.ydw.bat.wkflow.business_oa.webService.service; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext; +import com.ydw.bat.wkflow.business_oa.webService.todoContent.SendOAContent; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppDeleteResult; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult; import org.activiti.engine.task.Task; -import java.util.List; - public interface WebServiceOAService { void deleteOAByPid(String pId); @@ -26,4 +25,5 @@ public interface WebServiceOAService { NotifyTodoAppResult sendToBeRead(BusProcessNew busProcessNew) throws Exception; + String replaceSendOA(SendOAContent sendOAContent); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index f1f788a8..d5277f7f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -16,6 +16,7 @@ import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService; import com.ydw.bat.wkflow.business_oa.webService.todoContent.HEAD; import com.ydw.bat.wkflow.business_oa.webService.todoContent.JsonSend; import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext; +import com.ydw.bat.wkflow.business_oa.webService.todoContent.SendOAContent; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppDeleteResult; import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult; import com.ydw.bat.wkflow.util.SpringContextUtil; @@ -560,5 +561,10 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { } return notifyTodoAppResult; } + + @Override + public String replaceSendOA(SendOAContent sendOAContent) { + return okHttpUtil.postForJson(sendOAContent.getUrl(), sendOAContent.getJson(), sendOAContent.getHeaderParams()); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoContent/SendOAContent.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoContent/SendOAContent.java new file mode 100644 index 00000000..05973e11 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoContent/SendOAContent.java @@ -0,0 +1,21 @@ +package com.ydw.bat.wkflow.business_oa.webService.todoContent; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * @author wxyclub + * @description + * @date 2024-03-31 + */ +@Data +public class SendOAContent implements Serializable { + + String url; + + String json; + + Map headerParams; +}