FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: 代主服务发送OA消息修改

Browse Source
This commit is contained in:
wxyclub
2024-03-31 13:56:18 +08:00
parent 361d0eee2f
commit 75afa55e2c
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_oa/webService/controller/WebServiceOAController.java
+10
View File
@@ -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<String> replaceSendOA(@RequestBody SendOAContent sendOAContent) {
logger.info("收到主服务请求------------------------------------");
logger.info("请求参数：{}", JSON.toJSONString(sendOAContent));
String result = webServiceOAService.replaceSendOA(sendOAContent);
return WrapMapper.ok(result);
}
}
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java
+2 -2
View File
@@ -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);
}
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+6
View File
@@ -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());
}
}
src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoContent/SendOAContent.java
+21
View File
@@ -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<String, String> headerParams;
}