增加flowable删除用户关系

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnNoticeServiceImpl.java

@@ -77,7 +77,7 @@ public class OwnNoticeServiceImpl implements IOwnNoticeService
      * @param title         标题
      * @param type          类型 00待办 01消息
      * @param noticeType    消息类型 00:平台欢迎信, 01:发起人审批结果通知, 02:经办人的平台审批结果通知, 03:融资企业经办人融信失效消息通知, 04:融资企业经办人融信生效消息通知, 05:融信即将失效消息通知, 06:还款消息通知
-     * @param workType      待办类型 00:融信审批待审批, 01:审批拒绝待编辑, 02:核心企业待确权, 03:待盖章, 04:待签收, 05:待融资, 06:待还款, 07:平台内部待办
+     * @param workType      待办类型 00:融信审批待审批, 01:审批拒绝待编辑, 02:核心企业待确权, 03:待盖章, 04:待签收, 05:待融资, 06:待还款, 07:平台内部待办, 08:融资审批待审批
      * @param messageSend   是否发送短信 0不发送 1发送
      * @param userIds       收到信息用户id集合
      * @param templateCode  短信模板(aliyun_message_code)

tianhu-system/src/main/java/com/tianhu/system/utils/FlowableService.java

@@ -3,6 +3,8 @@ package com.tianhu.system.utils;
 import com.alibaba.fastjson.JSON;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.system.api.domain.SysDept;
+import com.tianhu.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
@@ -20,17 +22,25 @@ public class FlowableService {
 	public final static String ADD_USER = "api/addUser";
 	// 删除用户
 	public final static String DELETE_USER = "api/deleteUser";
+	// 删除用户与分组关系
+	public final static String DELETE_USER_GROUP = "api/deleteUserGroup";
 	// 新增分组
 	public final static String ADD_GROUP = "api/addGroup";
 	// 删除分组
 	public final static String DELETE_GROUP = "api/deleteGroup";
+	//查询是否配置审批流程
+	public final static String FLOWABLE_URL = "flowable_url";
+	@Autowired
+	private ISysConfigService configService;
+
 
 
 
 	public Map<String, Object> apiPost(String url, Map<String, Object> param) {
 		Map<String, Object> resMap = null;
 		try {
-			resMap = invokeCapp(SysConstant.FLOWABLE_URL + url, param);
+			String flowable_url = configService.selectConfigByKey(FLOWABLE_URL);
+			resMap = invokeCapp(flowable_url + url, param);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -57,6 +67,13 @@ public class FlowableService {
 		m.put("id", id);
 		return apiPost(DELETE_USER, m);
 	}
+
+	public Map<String, Object> deleteFlowableUserGroup(String userId, String groupId) {
+		Map<String, Object> m = new HashMap<>();
+		m.put("userId", userId);
+		m.put("groupId", groupId);
+		return apiPost(DELETE_USER_GROUP, m);
+	}
 	
 	/**
 	 * 新增部门