|
|
|
@ -47,7 +47,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
|
|
|
|
|
String synchronizeUserUrl = PropBean.getUfPropValue("synchronizeUserUrl");
|
|
|
|
|
String accountName = PropBean.getUfPropValue("username");
|
|
|
|
|
String password = PropBean.getUfPropValue("passwd");
|
|
|
|
|
String workflowCreatorTableName = PropBean.getUfPropValue("workflowCreatorTableName");
|
|
|
|
|
// String workflowCreatorTableName = PropBean.getUfPropValue("workflowCreatorTableName");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
@ -133,14 +133,17 @@ public class WorkflowUserCronJob extends BaseCronJob {
|
|
|
|
|
headers.put("Authorization", "Basic " + Base64.getUrlEncoder().encodeToString((accountName + ":" + password).getBytes()));
|
|
|
|
|
|
|
|
|
|
Set<String> updateSet = new HashSet<>(baseWorkflowIdSet);
|
|
|
|
|
//交集
|
|
|
|
|
updateSet.retainAll(modelWorkflowIdSet);
|
|
|
|
|
Set<String> deleteSet = new HashSet<>(modelWorkflowIdSet);
|
|
|
|
|
//差集
|
|
|
|
|
deleteSet.removeAll(updateSet);
|
|
|
|
|
Set<String> addSet = new HashSet<>(baseWorkflowIdSet);
|
|
|
|
|
addSet.removeAll(updateSet);
|
|
|
|
|
//人员权限新增同步
|
|
|
|
|
if (addSet.size() != 0) {
|
|
|
|
|
addWorkflow(bb, addSet, baseWorkflowMap, baseWorkflowName, baseWorkflowCataCode, formModeId);
|
|
|
|
|
// syncWorkflowByHttp(ACTION_TYPE_ADD, center, addSet, baseWorkflowName, baseWorkflowCataCode, headers);
|
|
|
|
|
List<List<Map<String, Object>>> addUserList = new LinkedList<>();
|
|
|
|
|
getUserConditionByWorkflow(center, addSet, baseWorkflowName, baseWorkflowCataCode, addUserList);
|
|
|
|
|
syncUser(synchronizeUserUrl, addUserList, headers);
|
|
|
|
@ -148,7 +151,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
|
|
|
|
|
|
|
|
|
|
//人员权限修改同步
|
|
|
|
|
if (updateSet.size() != 0) {
|
|
|
|
|
HashSet<String> needUpdateSet = updateWorkflow(bb, updateSet, baseWorkflowMap, modeWorkflowMap, baseWorkflowName, baseWorkflowCataCode,formModeId);
|
|
|
|
|
Set<String> needUpdateSet = updateWorkflow(bb, updateSet, baseWorkflowMap, modeWorkflowMap, baseWorkflowName, baseWorkflowCataCode,formModeId);
|
|
|
|
|
needUpdateSet.addAll(needUpdateWorkflowSet);
|
|
|
|
|
logger.info("needUpdateSet-size:" + needUpdateSet.size());
|
|
|
|
|
//先删除流程再重新同步人员权限
|
|
|
|
@ -183,7 +186,7 @@ public class WorkflowUserCronJob extends BaseCronJob {
|
|
|
|
|
* @param modeWorkflowCataCode
|
|
|
|
|
* @param headers
|
|
|
|
|
*/
|
|
|
|
|
private void syncWorkflowByHttp(String action, String center, HashSet<String> needUpdateSet, Map<String, String> modeWorkflowName, Map<String, String> modeWorkflowCataCode, HashMap<String, String> headers) {
|
|
|
|
|
private void syncWorkflowByHttp(String action, String center, Set<String> needUpdateSet, Map<String, String> modeWorkflowName, Map<String, String> modeWorkflowCataCode, HashMap<String, String> headers) {
|
|
|
|
|
String bpm_app_workflowurl = PropBean.getUfPropValue("bpm_app_workflowurl");
|
|
|
|
|
String synchronizeFlowUrl = PropBean.getUfPropValue("synchronizeFlowUrl");
|
|
|
|
|
String mobileJumpUrl = PropBean.getUfPropValue("mobileJumpUrl");
|
|
|
|
|