新增对接E10

bpm-client-http/pom.xml

@@ -26,5 +26,10 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.76</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
     </dependencies>
+
 </project>

bpm-client-http/src/main/java/com/srm/bpm/facde/RestTemplateUtil.java

@@ -4,6 +4,7 @@ package com.srm.bpm.facde;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.srm.bpm.facde.dto.BillItemDTO;
 import com.srm.common.data.rest.R;
 
 import org.springframework.http.HttpEntity;

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/OfsTodoDataWebService.java

@@ -0,0 +1,87 @@
+package com.srm.bpm.facde.oa;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * This class was generated by Apache CXF 3.3.5
+ * 2023-11-08
+ * Generated source version: 3.3.5
+ *
+ */
+@WebServiceClient(name = "OfsTodoDataWebService",
+        wsdlLocation = WebServiceRequestInfo.oaRequestAddress+"/services/OfsTodoDataWebService?wsdl",
+        targetNamespace = "webservices.ofs.weaver.com.cn")
+public class OfsTodoDataWebService extends Service {
+
+    public final static URL WSDL_LOCATION;
+
+    public final static QName SERVICE = new QName("webservices.ofs.weaver.com.cn", "OfsTodoDataWebService");
+    public final static QName OfsTodoDataWebServiceHttpPort = new QName("webservices.ofs.weaver.com.cn", "OfsTodoDataWebServiceHttpPort");
+    static {
+        URL url = null;
+        try {
+            url = new URL(WebServiceRequestInfo.oaRequestAddress+"/services/OfsTodoDataWebService?wsdl");
+        } catch (MalformedURLException e) {
+            java.util.logging.Logger.getLogger(OfsTodoDataWebService.class.getName())
+                    .log(java.util.logging.Level.INFO,
+                            "Can not initialize the default wsdl from {0}", WebServiceRequestInfo.oaRequestAddress+"/services/OfsTodoDataWebService?wsdl");
+        }
+        WSDL_LOCATION = url;
+    }
+
+    public OfsTodoDataWebService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
+    }
+
+    public OfsTodoDataWebService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public OfsTodoDataWebService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+
+    public OfsTodoDataWebService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    public OfsTodoDataWebService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    public OfsTodoDataWebService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }
+
+
+
+
+    /**
+     *
+     * @return
+     *     returns OfsTodoDataWebServicePortType
+     */
+    @WebEndpoint(name = "OfsTodoDataWebServiceHttpPort")
+    public OfsTodoDataWebServicePortType getOfsTodoDataWebServiceHttpPort() {
+        return super.getPort(OfsTodoDataWebServiceHttpPort, OfsTodoDataWebServicePortType.class);
+    }
+
+    /**
+     *
+     * @param features
+     *     A list of {@link WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns OfsTodoDataWebServicePortType
+     */
+    @WebEndpoint(name = "OfsTodoDataWebServiceHttpPort")
+    public OfsTodoDataWebServicePortType getOfsTodoDataWebServiceHttpPort(WebServiceFeature... features) {
+        return super.getPort(OfsTodoDataWebServiceHttpPort, OfsTodoDataWebServicePortType.class, features);
+    }
+
+}

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/OfsTodoDataWebServicePortType.java

@@ -0,0 +1,28 @@
+package com.srm.bpm.facde.oa;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 3.3.5
+ * 2020-11-09T08:21:10.273+08:00
+ * Generated source version: 3.3.5
+ *
+ */
+@WebService(targetNamespace = "webservices.ofs.weaver.com.cn", name = "OfsTodoDataWebServicePortType")
+
+public interface OfsTodoDataWebServicePortType {
+
+    @WebMethod
+    @WebResult(name = "out", targetNamespace = "webservices.ofs.weaver.com.cn")
+    public String receiveRequestInfoByJson(
+
+            @WebParam(name = "requestdata", targetNamespace = "webservices.ofs.weaver.com.cn")
+                    String requestdata
+    );
+}

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client.java

@@ -0,0 +1,126 @@
+
+package com.srm.bpm.facde.oa;
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+import com.alibaba.fastjson.JSONObject;
+import com.srm.bpm.facde.oa.common.HttpClient;
+
+
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class was generated by Apache CXF 3.3.5
+ * 2020-11-09T08:21:10.187+08:00
+ * Generated source version: 3.3.5
+ *
+ */
+public final class OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client {
+
+    private static final QName SERVICE_NAME = new QName("webservices.ofs.weaver.com.cn", "OfsTodoDataWebService");
+
+    public OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client() {
+    }
+
+    public static void main(String args[]) throws Exception {
+//        URL wsdlURL = OfsTodoDataWebService.WSDL_LOCATION;
+//        if (args.length > 0 && args[0] != null && !"".equals(args[0])) {
+//            File wsdlFile = new File(args[0]);
+//            try {
+//                if (wsdlFile.exists()) {
+//                    wsdlURL = wsdlFile.toURI().toURL();
+//                } else {
+//                    wsdlURL = new URL(args[0]);
+//                }
+//            } catch (MalformedURLException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        OfsTodoDataWebService ss = new OfsTodoDataWebService(wsdlURL, SERVICE_NAME);
+//        OfsTodoDataWebServicePortType port = ss.getOfsTodoDataWebServiceHttpPort();
+//        {
+//        System.out.println("Invoking getOfsTodoDataWebService...");
+        String requestData = "{syscode:\"SRM\",flowid:\"11081626\",requestname:\"11081626-SRM-idea\",workflowcode:\"1234\",workflowname:\"系列报价审批流程-新\",nodename:\"节点名称\",pcurl:\"/login\",appurl:\"\",isremark:\"0\",viewtype:\"0\",creator:\"2204653\",createdatetime:\"2023-11-08 11:37:23\",receiver:\"1234\",receivedatetime:\"2023-09-09 19:43:43\"}";
+//        String _getOfsTodoDataWebService__return = OfsTodoDataWebService(requestData);
+//        //System.out.println("getOfsTodoDataWebService.result=" + _getOfsTodoDataWebService__return);
+//        }
+//        System.exit(0);
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client s1 = new OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+        String result= s1.ofsTodoDatabyEten(requestData,"c519566af47405039201b672939626bd");
+        System.out.println("result="+result);
+
+    }
+    //E8统一待办
+    public  String OfsTodoDataWebService(String requestData) {
+        URL wsdlURL = OfsTodoDataWebService.WSDL_LOCATION;
+        OfsTodoDataWebService ss = new OfsTodoDataWebService(wsdlURL, SERVICE_NAME);
+        OfsTodoDataWebServicePortType port = ss.getOfsTodoDataWebServiceHttpPort();
+        String _OfsTodoDataWebService__return = port.receiveRequestInfoByJson(requestData);
+        System.out.println("getOfsTodoDataWebService.result=" + _OfsTodoDataWebService__return);
+        return _OfsTodoDataWebService__return;
+
+    }
+    //E10统一待办
+    public String ofsTodoDatabyEten(String EtenRequestData,String token){
+        Map<String, String> headMap = new HashMap<String, String>();
+        headMap.put("content-Type", "application/json");
+        String result="";
+        try {
+            result=HttpClient.post(WebServiceRequestInfo.oaEtenAddress+"/papi/openapi/sapi/open_intunifytodo/server_engine/receiveRequestInfoByJson?access_token="+token,EtenRequestData,headMap);
+            System.out.println("result="+result);
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            String message = jsonObject.getString("message");
+            JSONObject s1 = JSONObject.parseObject(message);
+            String errcode = s1.getString("errcode");
+            String errmsg = s1.getString("errmsg");
+            if (!"200".equals(errcode)){
+                result=jsonObject.toJSONString();
+            }else{
+                result=errmsg;
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    public  String getRequestData (ReceiveRequestInfoByJsonDto receiveRequestInfoByJsonDto,String isremark){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        JSONObject json = new JSONObject();
+        json.put("syscode", receiveRequestInfoByJsonDto.getSyscode());
+        json.put("flowid", receiveRequestInfoByJsonDto.getFlowid());
+        json.put("requestname", receiveRequestInfoByJsonDto.getRequestname());
+        json.put("workflowcode",receiveRequestInfoByJsonDto.getWorkflowcode());
+        json.put("workflowname", receiveRequestInfoByJsonDto.getWorkflowname());
+        json.put("nodename", receiveRequestInfoByJsonDto.getNodename());
+        json.put("pcurl", "/interOAingleLogin?accountName="+receiveRequestInfoByJsonDto.getReceiver()+"&bill_id="+receiveRequestInfoByJsonDto.getFlowid()+"&is_oa="+isremark);
+        json.put("appurl", "/interOAingleLogin?accountName="+receiveRequestInfoByJsonDto.getReceiver()+"&bill_id="+receiveRequestInfoByJsonDto.getFlowid()+"&is_oa="+isremark);
+        json.put("isremark", isremark);
+        if (isremark.equals("0")){
+            json.put("viewtype", "0");
+        }else{
+            json.put("viewtype", "1");
+        }
+        json.put("creator", receiveRequestInfoByJsonDto.getCreator());
+        json.put("createdatetime", receiveRequestInfoByJsonDto.getCreatedatetime()+" 00:00:00");
+        json.put("receiver", receiveRequestInfoByJsonDto.getReceiver());
+        json.put("receivedatetime", receiveRequestInfoByJsonDto.getReceivedatetime()+" 00:00:00");
+        json.put("receivets",System.currentTimeMillis());
+        System.out.println("RequestData="+json.toJSONString());
+        return json.toJSONString();
+    }
+
+
+}

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/ReceiveRequestInfoByJsonDto.java

@@ -0,0 +1,33 @@
+package com.srm.bpm.facde.oa;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p></p>
+ *
+ * @author yuhai
+ * @version 1.0
+ * @since JDK 1.8
+ */
+@Data
+public class ReceiveRequestInfoByJsonDto implements Serializable {
+
+    private String syscode;
+    private String flowid;
+    private String requestname;
+    private String workflowcode;
+    private String workflowname;
+    private String nodename;
+    private String pcurl;
+    private String appurl;
+    private String isremark; //0 待办 2 已办 4办结 8：抄送（待阅）-1：删除
+    private String viewtype;  //0 未读 1 已读
+    private String creator; //创建人
+    private String createdatetime; //创建日期
+    private String receiver; //接收人
+    private String receivedatetime;//接收日期时间
+    private String receivets;//毫秒级时间戳
+}

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/WebServiceRequestInfo.java

@@ -0,0 +1,9 @@
+package com.srm.bpm.facde.oa;
+
+public class WebServiceRequestInfo {
+
+public static final String oaRequestAddress = "http://172.16.0.36"; //正式环境
+// public static final String oaRequestAddress = "http://172.16.0.37:8081"; //测试环境
+
+public static final String oaEtenAddress="http://uoa.jqh.cc:20600";
+}

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/common/HttpClient.java

@@ -0,0 +1,51 @@
+package com.srm.bpm.facde.oa.common;
+
+import java.util.Map;
+
+/**
+ *
+ *<p>Title:SdkClient</p>
+ *<p>Description:客户端调用工具类</p>
+ *<p>Company:京泉华技术股份有限公司</p>
+ * @author zhangzhe
+ * @date 2021年04月23日
+ */
+public class HttpClient {
+
+
+	/**
+	 *
+	 * @Title:get
+	 * @Description:get请求
+	 * @param:@param url
+	 * @param:@param headMap
+	 * @param:@return
+	 * @param:@throws Exception
+	 * @return:String
+	 * @throws
+	 *
+	 */
+	public static String get(String url,Map<String, String> headMap) throws Exception{
+		return HttpClientPoolUtil.get(url, headMap);
+	}
+
+	/**
+	 *
+	 * @Title:post
+	 * @Description:post请求
+	 * @param:@param url
+	 * @param:@param data JSON序列化后的参数 JSON.toJSONString(xxx)
+	 * @param:@param headMap
+	 * @param:@return
+	 * @param:@throws Exception
+	 * @return:String
+	 * @throws
+	 *
+	 */
+	public static String post(String url,String data,Map<String, String> headMap) throws Exception{
+		return HttpClientPoolUtil.post(url, data, headMap);
+	}
+
+
+}
+

bpm-client-http/src/main/java/com/srm/bpm/facde/oa/common/HttpClientPoolUtil.java

@@ -0,0 +1,327 @@
+package com.srm.bpm.facde.oa.common;
+
+import org.apache.http.HeaderElement;
+import org.apache.http.HeaderElementIterator;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.*;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.ConnectionKeepAliveStrategy;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicHeaderElementIterator;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.nio.charset.Charset;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ *
+ *<p>Title:HttpClientPoolUtil</p>
+ *<p>Description:客户端调用工具类</p>
+ *<p>Description:httpClient线程池工具类</p>
+ * @author zhangzhe
+ * @date 2021年04月23日
+ */
+public class HttpClientPoolUtil {
+
+	private static Class mc = HttpClientPoolUtil.class;
+	public static CloseableHttpClient httpClient = null;
+
+	/**
+	 * 初始化连接池
+	 * @throws NoSuchAlgorithmException
+	 * @throws KeyManagementException
+	 */
+	public static synchronized void initPools() throws KeyManagementException, NoSuchAlgorithmException {
+
+		if (httpClient == null) {
+			//采用绕过验证的方式处理https请求
+			SSLContext sslcontext = createIgnoreVerifySSL();
+			//设置协议http和https对应的处理socket链接工厂的对象
+			Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
+					.register("http", PlainConnectionSocketFactory.INSTANCE)
+					.register("https", new SSLConnectionSocketFactory(sslcontext,SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER))
+					.build();
+			PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+			cm.setDefaultMaxPerRoute(20);
+			cm.setMaxTotal(500);
+			httpClient = HttpClients.custom().setKeepAliveStrategy(defaultStrategy).setConnectionManager(cm).build();
+		}
+	}
+
+	/**
+	 * Http connection keepAlive 设置
+	 */
+	public static ConnectionKeepAliveStrategy defaultStrategy = new ConnectionKeepAliveStrategy() {
+		public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
+			HeaderElementIterator it = new BasicHeaderElementIterator(response.headerIterator(HTTP.CONN_KEEP_ALIVE));
+			int keepTime = 30;
+			while (it.hasNext()) {
+				HeaderElement he = it.nextElement();
+				String param = he.getName();
+				String value = he.getValue();
+				if (value != null && param.equalsIgnoreCase("timeout")) {
+					try {
+						return Long.parseLong(value) * 1000;
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			}
+			return keepTime * 1000;
+		}
+	};
+
+	/**
+	 * 绕过验证
+	 *
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws KeyManagementException
+	 */
+	public static SSLContext createIgnoreVerifySSL() throws NoSuchAlgorithmException, KeyManagementException {
+		SSLContext sc = SSLContext.getInstance("SSLv3");
+
+		// 实现一个X509TrustManager接口，用于绕过验证，不用修改里面的方法
+		X509TrustManager trustManager = new X509TrustManager() {
+
+			public void checkClientTrusted(
+					java.security.cert.X509Certificate[] paramArrayOfX509Certificate,
+					String paramString) {
+			}
+
+
+			public void checkServerTrusted(
+					java.security.cert.X509Certificate[] paramArrayOfX509Certificate,
+					String paramString) {
+			}
+
+
+			public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+				return null;
+			}
+		};
+
+		sc.init(null, new TrustManager[] { trustManager }, null);
+		return sc;
+	}
+
+	/**
+	 * 创建请求
+	 *
+	 * @param url 请求url
+	 * @param methodName 请求的方法类型
+	 * @param headMap 请求头
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws KeyManagementException
+	 */
+	public static HttpRequestBase getRequest(String url, String methodName,Map<String, String> headMap)
+			throws KeyManagementException, NoSuchAlgorithmException {
+		if (httpClient == null) {
+			initPools();
+		}
+		HttpRequestBase method = null;
+		RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(30 * 1000).setConnectTimeout(30 * 1000)
+				.setConnectionRequestTimeout(30 * 1000).setExpectContinueEnabled(false).build();
+
+		if (HttpPut.METHOD_NAME.equalsIgnoreCase(methodName)) {
+			method = new HttpPut(url);
+		} else if (HttpPost.METHOD_NAME.equalsIgnoreCase(methodName)) {
+			method = new HttpPost(url);
+		} else if (HttpGet.METHOD_NAME.equalsIgnoreCase(methodName)) {
+			method = new HttpGet(url);
+		} else if (HttpDelete.METHOD_NAME.equalsIgnoreCase(methodName)) {
+			method = new HttpDelete(url);
+		} else {
+			method = new HttpPost(url);
+		}
+		if(!headMap.isEmpty()){
+			for(Entry<String, String> value:headMap.entrySet()){
+				method.addHeader(value.getKey(), value.getValue());
+			}
+		}
+		method.setConfig(requestConfig);
+		return method;
+	}
+
+
+	/**
+	 * 执行GET 请求
+	 *
+	 * @param url
+	 * @return
+	 */
+	public static String get(String url,Map<String, String> headMap) throws Exception{
+		HttpEntity httpEntity = null;
+		HttpRequestBase method = null;
+		String responseBody = "";
+		try {
+			if (httpClient == null) {
+				initPools();
+			}
+			method = getRequest(url, HttpGet.METHOD_NAME,headMap);
+			HttpContext context = HttpClientContext.create();
+			CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+			httpEntity = httpResponse.getEntity();
+			if (httpEntity != null) {
+				responseBody = EntityUtils.toString(httpEntity, "UTF-8");
+			}
+		} catch (Exception e) {
+			if(method != null){
+				method.abort();
+			}
+			throw e;
+		} finally {
+			if (httpEntity != null) {
+				try {
+					EntityUtils.consumeQuietly(httpEntity);
+				} catch (Exception e) {
+					throw e;
+				}
+			}
+		}
+		return responseBody;
+	}
+
+	/**
+	 * 执行http post请求 默认采用Content-Type：application/json，Accept：application/json
+	 *
+	 * @param url 请求地址
+	 * @param data  请求数据
+	 * @param data  请求头
+	 * @return
+	 */
+	public static String post(String url, String data,Map<String, String> headMap) throws Exception{
+		HttpEntity httpEntity = null;
+		HttpEntityEnclosingRequestBase method = null;
+		String responseBody = "";
+		try {
+			if (httpClient == null) {
+				initPools();
+			}
+			method = (HttpEntityEnclosingRequestBase) getRequest(url, HttpPost.METHOD_NAME,headMap);
+			method.setEntity(new StringEntity(data,Charset.forName("UTF-8")));
+			HttpContext context = HttpClientContext.create();
+			CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+//			ZcLogs.WriteLog(mc, "httpResponse:"+httpResponse.toString());
+			httpEntity = httpResponse.getEntity();
+			if (httpEntity != null) {
+				responseBody = EntityUtils.toString(httpEntity, "UTF-8");
+			}
+
+		} catch (Exception e) {
+			if(method != null){
+				method.abort();
+			}
+			throw e;
+		} finally {
+			if (httpEntity != null) {
+				try {
+					EntityUtils.consumeQuietly(httpEntity);
+				} catch (Exception e) {
+					throw e;
+				}
+			}
+		}
+		return responseBody;
+	}
+
+	/**
+	 * 执行http put请求 默认采用Content-Type：application/json，Accept：application/json
+	 *
+	 * @param url 请求地址
+	 * @param data  请求数据
+	 * @param data  请求头
+	 * @return
+	 */
+	public static String put(String url, String data,Map<String, String> headMap) throws Exception{
+		HttpEntity httpEntity = null;
+		HttpEntityEnclosingRequestBase method = null;
+		String responseBody = "";
+		try {
+			if (httpClient == null) {
+				initPools();
+			}
+			method = (HttpEntityEnclosingRequestBase) getRequest(url, HttpPut.METHOD_NAME,headMap);
+			method.setEntity(new StringEntity(data,Charset.forName("UTF-8")));
+			HttpContext context = HttpClientContext.create();
+			CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+			httpEntity = httpResponse.getEntity();
+			if (httpEntity != null) {
+				responseBody = EntityUtils.toString(httpEntity, "UTF-8");
+			}
+
+		} catch (Exception e) {
+			if(method != null){
+				method.abort();
+			}
+			throw e;
+		} finally {
+			if (httpEntity != null) {
+				try {
+					EntityUtils.consumeQuietly(httpEntity);
+				} catch (Exception e) {
+					throw e;
+				}
+			}
+		}
+		return responseBody;
+	}
+
+	/**
+	 * 执行DELETE 请求
+	 *
+	 * @param url
+	 * @return
+	 */
+	public static String delete(String url,Map<String, String> headMap) throws Exception{
+		HttpEntity httpEntity = null;
+		HttpRequestBase method = null;
+		String responseBody = "";
+		try {
+			if (httpClient == null) {
+				initPools();
+			}
+			method = getRequest(url, HttpDelete.METHOD_NAME,headMap);
+			HttpContext context = HttpClientContext.create();
+			CloseableHttpResponse httpResponse = httpClient.execute(method, context);
+			httpEntity = httpResponse.getEntity();
+			if (httpEntity != null) {
+				responseBody = EntityUtils.toString(httpEntity, "UTF-8");
+			}
+		} catch (Exception e) {
+			if(method != null){
+				method.abort();
+			}
+			throw e;
+		} finally {
+			if (httpEntity != null) {
+				try {
+					EntityUtils.consumeQuietly(httpEntity);
+				} catch (Exception e) {
+					throw e;
+				}
+			}
+		}
+		return responseBody;
+	}
+
+}

bpm-core/src/main/java/com/srm/bpm/facade/rest/BillFlowRestController.java

@@ -4,7 +4,9 @@ package com.srm.bpm.facade.rest;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
-
+import com.srm.bpm.logic.vo.BillItemVO;
+import com.srm.bpm.facde.oa.OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.logic.dto.BillActionParamDTO;
 import com.srm.bpm.logic.dto.ValidationResultDTO;
 import com.srm.bpm.logic.service.BillLogic;
@@ -12,7 +14,6 @@ import com.srm.bpm.logic.service.BillNextNodeLogic;
 import com.srm.bpm.logic.service.BillPrintLogic;
 import com.srm.bpm.logic.service.LoginUserHolder;
 import com.srm.bpm.logic.vo.BillApprovalHistoryVO;
-import com.srm.bpm.logic.vo.BillItemVO;
 import com.srm.common.data.exception.RbException;
 import com.srm.common.data.rest.R;
 
@@ -129,6 +130,35 @@ public class BillFlowRestController {
                 .nextApprover(nextApproverStr)
                 .build();
         this.billLogic.agreeFlow(actionParam);
+        /*
+         * 链接OA统一待办审批
+         * Author ： yuhai
+         * date ： 2023-11-08
+         * */
+        BillItemVO billItemVO = new BillItemVO();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+        billItemVO.setId(billId);
+        //发送已办
+        billItemVO.setStatus(2);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
+//        String token =billLogic.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
+//            o1.ofsTodoDatabyEten(requestdata,token);
+            o1.OfsTodoDataWebService(requestdata);
+        }
+//        //发送待办
+        billItemVO.setStatus(1);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos1 = billLogic.findrequestInfo(billItemVO);
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
+//           o1.ofsTodoDatabyEten(requestdata,token);
+           o1.OfsTodoDataWebService(requestdata);
+        }
+
+
         return R.empty();
     }
 
@@ -197,6 +227,25 @@ public class BillFlowRestController {
                 .taskId(taskId).opinion(opinion).formData(formData)
                 .build();
         this.billLogic.refuseFlow(actionParam);
+        /*
+         * 链接OA统一待办拒收
+         * Author ： yuhai
+         * date ： 2023-11-08
+         * */
+        BillItemVO billItemVO = new BillItemVO();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+
+        billItemVO.setId(billId);
+//        //发送已办
+       billItemVO.setStatus(3);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
+//        String token=billLogic.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
+//            System.out.println("拒绝requestData:"+requestdata);
+            o1.OfsTodoDataWebService(requestdata);
+//            o1.ofsTodoDatabyEten(requestdata,token);
+        }
         return R.empty();
     }
 
@@ -227,6 +276,35 @@ public class BillFlowRestController {
                 .targetTaskId(targetTaskId)
                 .build();
         this.billLogic.repulseFlow(actionParam);
+        /*
+         * 链接OA统一待办打回
+         * Author ： yuhai
+         * date ： 2023-11-08
+         * */
+        BillItemVO billItemVO = new BillItemVO();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+//
+        billItemVO.setId(billId);
+//        //发送已办
+        billItemVO.setStatus(12);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
+//        String token = billLogic.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
+//            System.out.println("打回已办requestdata="+requestdata);
+           o1.OfsTodoDataWebService(requestdata);
+//            o1.ofsTodoDatabyEten(requestdata,token);
+        }
+//        //发送待办
+        billItemVO.setStatus(1);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos1 = billLogic.findrequestInfo(billItemVO);
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
+            System.out.println("打回待办requestdata="+requestdata);
+            o1.OfsTodoDataWebService(requestdata);
+//            o1.ofsTodoDatabyEten(requestdata,token);
+        }
         return R.empty();
     }
 
@@ -250,6 +328,28 @@ public class BillFlowRestController {
                 .taskId(taskId).opinion(opinion)
                 .build();
         this.billLogic.recallFlow(actionParam);
+        /*
+         * 链接OA统一待办撤销
+         * Author ： yuhai
+         * date ： 2023-11-08
+         * */
+        BillItemVO billItemVO = new BillItemVO();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+//
+        billItemVO.setId(billId);
+//        //发送已办
+        billItemVO.setStatus(7);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
+//        String token = billLogic.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
+//            System.out.println("打回已办requestdata="+requestdata);
+            o1.OfsTodoDataWebService(requestdata);
+//            o1.ofsTodoDatabyEten(requestdata,token);
+        }
+
+
         return R.empty();
     }
 

bpm-core/src/main/java/com/srm/bpm/facade/rest/ThirdPartBillController.java

@@ -2,10 +2,14 @@
 
 package com.srm.bpm.facade.rest;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.google.common.base.Strings;
 
 import com.alibaba.fastjson.JSONObject;
 import com.srm.bpm.facde.dto.BillItemDTO;
+import com.srm.bpm.facde.oa.OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.service.FormThirdItemLogic;
 import com.srm.bpm.logic.converts.BillBasicConvert;
 import com.srm.bpm.logic.service.BillLogic;
@@ -20,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 /**
  * <p> </p>
  *
@@ -46,6 +52,28 @@ public class ThirdPartBillController {
         }
         final String toForm = formThirdItemLogic.analysisToForm(jsonObject.getString("data"), processId);
         final BillItemVO billItem = billLogic.startFlow(processId, billId, toForm, nextApprover,billCode);
+        /*
+         * 链接OA统一webservices.ofs.weaver.com.cn
+         * Author ： yuhai
+         * date ： 2023-11-08
+         * */
+        BillItemVO billItemVO = new BillItemVO();
+        billItemVO.setId(billItem.getId());
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = billLogic.findrequestInfo(billItemVO);
+//        String token =billLogic.getToken4();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1= new OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            if ("1".equals(requestInfoByJsonDto.getIsremark())){
+                String  requestData = o1.getRequestData(requestInfoByJsonDto,"0");
+                  o1.OfsTodoDataWebService(requestData);
+       //         o1.ofsTodoDatabyEten(requestData,token);
+            }
+
+        }
+
+
+
+
         return R.ok(billBasicConvert.billItemVOToDTO(billItem));
     }
 

bpm-core/src/main/java/com/srm/bpm/infra/dao/ToaBillDao.java

@@ -3,12 +3,14 @@
 package com.srm.bpm.infra.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.ToaBillEntity;
 import com.srm.bpm.logic.query.list.ApprovedBillQuery;
 import com.srm.bpm.logic.query.list.CcBillQuery;
 import com.srm.bpm.logic.query.list.DraftBillQuery;
 import com.srm.bpm.logic.query.list.MeCreateBillQuery;
 import com.srm.bpm.logic.query.list.TodoBillQuery;
+import com.srm.bpm.logic.vo.BillItemVO;
 import com.srm.common.base.infra.dao.BaseDao;
 import com.srm.bpm.infra.po.BillItemPO;
 import com.srm.bpm.infra.po.ProcessGridPO;
@@ -80,4 +82,9 @@ public interface ToaBillDao extends BaseDao<ToaBillEntity> {
     List<BillItemPO> selectAllByQuery( Page page,@Param("query")DraftBillQuery query);
 
     List<ProcessGridPO> selectTodoCateSiez(@Param("approver") String var1, @Param("statusList") List<Integer> var2);
+
+     List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO);
+
+    //获取token
+    String getToken4();
 }

bpm-core/src/main/java/com/srm/bpm/infra/service/ToaBillService.java

@@ -3,12 +3,14 @@
 package com.srm.bpm.infra.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.ToaBillEntity;
 import com.srm.bpm.logic.query.list.ApprovedBillQuery;
 import com.srm.bpm.logic.query.list.CcBillQuery;
 import com.srm.bpm.logic.query.list.DraftBillQuery;
 import com.srm.bpm.logic.query.list.MeCreateBillQuery;
 import com.srm.bpm.logic.query.list.TodoBillQuery;
+import com.srm.bpm.logic.vo.BillItemVO;
 import com.srm.common.base.infra.service.BaseService;
 import com.srm.bpm.infra.po.BillItemPO;
 import com.srm.bpm.infra.po.ProcessGridPO;
@@ -87,4 +89,9 @@ public interface ToaBillService extends BaseService<ToaBillEntity> {
     List<BillItemPO> findAllByQuery(Page page, DraftBillQuery query);
 
     List<ProcessGridPO> findTodoCateSize(String userCode, List<Integer> statusList);
+
+    public List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO);
+
+    //获取token
+    String getToken4();
 }

bpm-core/src/main/java/com/srm/bpm/infra/service/impl/FormThirdItemLogicImpl.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.FormThirdEntity;
 import com.srm.bpm.infra.entity.FormThirdItemEntity;
 import com.srm.bpm.infra.entity.ToaFormEntity;

bpm-core/src/main/java/com/srm/bpm/infra/service/impl/ToaBillServiceImpl.java

@@ -3,11 +3,13 @@
 package com.srm.bpm.infra.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.logic.query.list.ApprovedBillQuery;
 import com.srm.bpm.logic.query.list.CcBillQuery;
 import com.srm.bpm.logic.query.list.DraftBillQuery;
 import com.srm.bpm.logic.query.list.MeCreateBillQuery;
 import com.srm.bpm.logic.query.list.TodoBillQuery;
+import com.srm.bpm.logic.vo.BillItemVO;
 import com.srm.common.base.infra.service.impl.BaseServiceImpl;
 import com.srm.bpm.infra.dao.ToaBillDao;
 import com.srm.bpm.infra.entity.ToaBillEntity;
@@ -114,4 +116,16 @@ public class ToaBillServiceImpl extends BaseServiceImpl<ToaBillDao, ToaBillEntit
     public List<ProcessGridPO> findTodoCateSize(String userCode, List<Integer> statusList) {
         return this.baseMapper.selectTodoCateSiez(userCode,statusList);
     }
+
+    @Override
+    public List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO) {
+        return this.baseMapper.findrequestInfo(billItemVO);
+    }
+
+    @Override
+    public String getToken4() {
+        return this.baseMapper.getToken4();
+    }
+
+
 }

bpm-core/src/main/java/com/srm/bpm/logic/converts/ProcessBasicConvert.java

@@ -6,6 +6,7 @@ import com.srm.bpm.facde.dto.BaseProcessDTO;
 import com.srm.bpm.facde.dto.ProcessDTO;
 import com.srm.bpm.facde.dto.ProcessGridDTO;
 import com.srm.bpm.facde.dto.ProcessTypeDTO;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.ProcessDesingerEntity;
 import com.srm.bpm.infra.entity.ProcessTypeEntity;
 import com.srm.bpm.infra.entity.ToaProcessEntity;

bpm-core/src/main/java/com/srm/bpm/logic/service/BillLogic.java

@@ -2,6 +2,7 @@
 
 package com.srm.bpm.logic.service;
 
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.BillTaskEntity;
 import com.srm.bpm.infra.entity.ToaBillEntity;
 import com.srm.bpm.infra.po.ProcessDetailPO;
@@ -255,4 +256,9 @@ public interface BillLogic {
     Pair<List<BillItemVO>, Long> findAllByQuery(Integer pageNo, Integer pageSize, DraftBillQuery query);
 
     List<ProcessTypeVO> findTodoCateSize();
+
+    List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO);
+
+    //获取token
+    String getToken4();
 }

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.BillBizDataEntity;
 import com.srm.bpm.infra.entity.BillDataJsonEntity;
 import com.srm.bpm.infra.entity.BillTaskEntity;
@@ -2018,4 +2019,14 @@ public class BillLogicImpl implements BillLogic {
             return Collections.emptyList();
         }
     }
+
+    @Override
+    public List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO) {
+        return billService.findrequestInfo(billItemVO);
+    }
+
+    @Override
+    public String getToken4() {
+        return billService.getToken4();
+    }
 }

bpm-core/src/main/java/com/srm/bpm/logic/vo/BillItemVO.java

@@ -109,6 +109,8 @@ public class BillItemVO implements Serializable {
     private String approveLink;
     private Integer assistant;
 
+    private String taskid;
+
     public static BillItemVO toVO(ToaBillEntity bill, ProcessDetailPO processDetailPO) {
         final BillItemVO billVO = new BillItemVO();
         billVO.setCode(bill.getCode());

bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -284,4 +284,33 @@
         GROUP BY tp.id
     </select>
 
+    <select id="findrequestInfo" resultType="com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto">
+        select DISTINCT 'SRM' syscode,toa.id as flowid,title as requestname,pro.id as workflowcode,pro.name as workflowname,task.node_name as nodename,'/test.jsp' pcurl,'' appurl,task.node_status isremark,'0' viewtype, su1.accountname as creator,from_unixtime(toa.creation_time/1000,'%Y-%m-%d') as createdatetime,
+        su2.accountname receiver,DATE_FORMAT(NOW(),'%Y-%m-%d') as receivedatetime
+        from
+        toa_bill toa
+        inner join bill_task task on  toa.id =task.bill_id
+        inner join bill_task tasknode on task.bill_id = tasknode.bill_id and task.task_id = tasknode.task_id
+        inner join sp_user su1 on su1.id=toa.sender
+        inner join sp_user su2 on su2.id=task.user_code
+        inner join toa_process pro on pro.id = toa.process_id
+        where toa.id=#{id}
+        <if test="status != null and status != ''">
+            AND tasknode.node_status = #{status}
+        </if>
+        <if test="status ==1 and  taskid != ''"  >
+            AND task.task_id != #{taskid} AND task.node_status = #{status} AND task.is_deleted=0
+        </if>
+        <if test="status ==2 and taskid != ''">
+            AND task.task_id = #{taskid}
+        </if>
+        ORDER BY task.id desc
+    </select>
+
+    <select id="getToken4" resultType="java.lang.String">
+        select tokenString
+        from plmtoken where id=4
+    </select>
+
+
 </mapper>

bpm-server/src/main/java/com/BpmApplication.java

@@ -5,6 +5,7 @@ package com;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * <p> </p>
@@ -13,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @version 1.0
  * @since JDK 1.8
  */
-@SpringBootApplication(exclude= {SecurityAutoConfiguration.class})
+@SpringBootApplication(exclude= {SecurityAutoConfiguration.class, DataSourceAutoConfiguration.class})
 public class BpmApplication {
 
     public static void main(String[] args) {

pom.xml

@@ -21,4 +21,6 @@
         <module>bpm-client-base</module>
         <module>bpm-client-http</module>
     </modules>
+
+
 </project>