@IPU_FIXBUG_2022@修复注册接口bug；增加注册中心列表，用于动态管理注册中心配置；增加组织下用户处理逻辑模板

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/service/LogicService.java

@@ -13,7 +13,9 @@ public interface LogicService {
    public Object execute(String logicName, JMap param) throws Exception;
    public String registerFlow(String flowXml) throws Exception;
    public String registerModel(String modelXml) throws Exception;
    public String registerModel(String modelId) throws Exception;
    public void unregisterFlow(String flowId) throws Exception;
    public void unregisterModel(String modelXml) throws Exception;
    public void saveFlowToConfigCenter(String flowName, String flowXml) throws Exception;
    public void saveModelToConfigCenter(String modelName, String modelXml) throws Exception;
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/service/impl/LogicServiceImpl.java

@@ -5,10 +5,13 @@ import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.nacos.INacosService;
import com.github.pagehelper.util.StringUtil;
import com.nuosi.flow.data.BDataDefine;
import com.nuosi.flow.data.BizDataManager;
import com.nuosi.flow.logic.LogicFlowEngine;
import com.nuosi.flow.logic.LogicFlowManager;
import com.nuosi.flow.logic.model.LogicFlow;
import com.nuosi.flow.logic.model.domain.DomainModel;
import com.nuosi.flow.logic.parse.ModelToDataDefineUtil;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
@@ -36,8 +39,14 @@ public class LogicServiceImpl implements LogicService {
	
    @Override
    public Object execute(String logicName, JMap param) throws Exception {
        Object result = LogicFlowEngine.execute(logicName, param);
        return result;
    	if (LogicFlowConfig.getFlowPathMap() != null && 
    			LogicFlowConfig.getFlowPathMap().containsKey(logicName))
        {
    		Object result = LogicFlowEngine.execute(logicName, param);
            return result;
        }
    	else
        	return "{\"IPU_RESULT_INFO\":\"执行异常：服务逻辑对象[" + logicName + "]不存在或未注册\",\"IPU_RESULT_CODE\":\"FLOW_NOT_EXISTS\"}";
    }
	@Override
@@ -77,11 +86,14 @@ public class LogicServiceImpl implements LogicService {
		try {
			xml = new ByteArrayInputStream(modelXml.getBytes(StandardCharsets.UTF_8.name()));
			//先注册到核心流程引擎
			Object result = LogicFlowManager.registerDomainModel(xml);
			if (result!=null)
			DomainModel domainModel = LogicFlowManager.registerDomainModel(xml);
            BDataDefine dataDefine = ModelToDataDefineUtil.parse(domainModel.getId());
            BizDataManager.registerDto(dataDefine, true);
			
			if (domainModel!=null)
			{
				//注册成功后再将配置缓存到本地
				modelName = ((DomainModel)result).getId();
				modelName = domainModel.getId();
				LogicFlowConfig.addModelPathMap(modelName, modelXml);
			}
			else
@@ -119,4 +131,16 @@ public class LogicServiceImpl implements LogicService {
		newConfigInfo.append(modelName).append("==").append(LogicFlowConfig.replaceBlank(modelXml));
		service.pushConfigToServer(LogicFlowConfig.FLOW_MODEL, "DEFAULT_GROUP", newConfigInfo.toString());
	}
	@Override
	public void unregisterFlow(String flowId) throws Exception {
		//缺少注销方法，因此在执行逻辑处增加判断条件。
		LogicFlowConfig.removeFlowPathMap(flowId);
	}
	@Override
	public void unregisterModel(String modelId) throws Exception {
		BizDataManager.unregisterDto(modelId);
		LogicFlowConfig.removeModelPathMap(modelId);	
	}
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/util/LogicFlowConfig.java

@@ -10,6 +10,7 @@ import com.nuosi.flow.util.LogicFlowUtil;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +32,8 @@ public class LogicFlowConfig {
	private static Map<String, String> modelPathMap = new HashMap<String, String>();
	private static Map<String, String> flowPathMap = new HashMap<String, String>();
	/*  保存配置中心配置列表，用于动态维护配置中心的配置  */
	private static Map<String/* 取值：model、flow */, Map<String/* modelPath or flowPath */, Long/* 时间戳，单位为毫秒 */>> configCenterMap = new HashMap<String, Map<String, Long>>();
	public static void init() {
		initModel();
@@ -75,6 +78,14 @@ public class LogicFlowConfig {
	public static void addFlowPathMap(String flowName, String flowXml) {
		flowPathMap.put(flowName, flowXml);
	}
	
	public static void removeModelPathMap(String modelName) {
		modelPathMap.remove(modelName);
	}
	public static void removeFlowPathMap(String flowName) {
		flowPathMap.remove(flowName);
	}
	public static String replaceBlank(String str) {
		String dest = "";
@@ -86,7 +97,10 @@ public class LogicFlowConfig {
		return dest;
	}
	
	//只有配置中心代码才会调用
	public static void registerLogicFlow(String flowConfig) throws Exception {
		Map<String, Long> flowMap = getConfigCenterMap(FLOW_LOGIC);
		Map<String, Long> flowCloneMap = (Map<String, Long>) ((HashMap<String, Long>) flowMap).clone();
		if (!StringUtil.isEmpty(flowConfig)) {
			String[] configs = flowConfig.split("\n");
			int i=0;
@@ -96,25 +110,104 @@ public class LogicFlowConfig {
				{
					LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
					logicService.registerFlow(config[1]);
					addConfigCenterMap(FLOW_LOGIC, config[0]);
					LOG.debug("添加Flow配置成功：" + config[1]);
				}
				flowCloneMap.remove(config[0]);
			}	
		}
		//需要清除配置中心没有的flow数据
		try {
			LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
			flowCloneMap.forEach((k, v) -> {
				flowMap.remove(k);
				try {
					logicService.unregisterFlow(k);
				} catch (Exception e) {
					e.printStackTrace();
				}
				});
		}finally {
			flowCloneMap.clear();
		}
	}
	
	//只有配置中心代码才会调用
	public static void registerLogicModel(String modelConfig) throws Exception {
		Map<String, Long> modelMap = getConfigCenterMap(FLOW_MODEL);
		Map<String, Long> modelCloneMap = (Map<String, Long>) ((HashMap<String, Long>) modelMap).clone();
		if (!StringUtil.isEmpty(modelConfig)) {
			String[] configs = modelConfig.split("\n");
			
			int i=0;
			for (;i<configs.length;i++) {
				String[] config = configs[i].split("==");
				if (!LogicFlowConfig.getFlowPathMap().containsKey(config[0]))
				if (!LogicFlowConfig.getModelPathMap().containsKey(config[0]))
				{
					LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
					logicService.registerModel(config[1]);
					addConfigCenterMap(FLOW_MODEL, config[0]);
					LOG.debug("添加Model配置成功：" + config[1]);
				}
				modelCloneMap.remove(config[0]);
			}	
		}
		
		//需要清除配置中心没有的model数据
		try {
			LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
			modelCloneMap.forEach((k, v) -> {
				modelMap.remove(k);
				try {
					logicService.unregisterModel(k);
				} catch (Exception e) {
					e.printStackTrace();
				}
				});
		}finally {			
			modelCloneMap.clear();
		}
		
	}
	
	private static HashMap<String, Long> getConfigCenterMap(String configType) {
		if (!configCenterMap.containsKey(configType))
			configCenterMap.put(configType, new HashMap<String, Long>());
		return (HashMap<String, Long>) configCenterMap.get(configType);
	}
	
	private static void addConfigCenterMap(String configType, String configId) {
		Map<String, Long> configsMap = getConfigCenterMap(configType);
		if (getConfigIdOptional(configType, configId).isPresent())
			configsMap.put(configId, getTimeStamp());
		else
		{
			Map<String, Long> value = new HashMap<String, Long>();
			value.put(configId, getTimeStamp());
			configCenterMap.put(configType, value);
		}
	}
	
	private static boolean removeConfigCenterMap(String configType, String configId) {
		Map<String, Long> configsMap = getConfigCenterMap(configType);
		if (getConfigIdOptional(configType, configId).isPresent())
			return configsMap.remove(configId) == null?true:false;
		return false;
	}
	
	private static boolean existConfigCenterMap(String configType, String configId) {
		return getConfigIdOptional(configType, configId).isPresent();
	}
	
	private static Optional<Object> getConfigIdOptional(String configType, String configId) {
		Map<String, Long> configsMap = getConfigCenterMap(configType);
		Optional<Map<String, Long>> configOptional = Optional.ofNullable(configsMap);
		return configOptional.map(configMap ->Optional.ofNullable(configMap.get(configId)));
	}
	
	private static long getTimeStamp() {
		return System.currentTimeMillis();
	}
}

qb-auth-server/src/main/resources/flow/org/model/sec_org_user_rel.xml

@@ -1,75 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<model id="sec_org_user_rel" name="用户组织信息模型">
    <attr id="org_user_rel_id" type="int" name="角色关联用户标识"/>
    <attr id="user_id" type="int" name="用户标识"/>
    <attr id="organize_id" type="int" name="角色标识"/>
    <attr id="valid_date" type="datetime" name="生效日期" exists="false"/>
    <attr id="expire_date" type="datetime" name="失效日期" exists="false"/>
    <attr id="data_status" type="string" name="数据状态"/>
    <attr id="create_date" type="datetime" name="创建日期"/>
    <attr id="create_op_id" type="string" name="创建人员" exists="false"/>
    <attr id="create_org_id" type="string" name="创建组织" exists="false"/>
    <attr id="done_code" type="datetime" name="事务编号" exists="false"/>
    <attr id="done_date" type="datetime" name="操作日期" exists="false"/>
    <attr id="op_id" type="string" name="操作人员"/>
    <attr id="org_id" type="string" name="操作组织" exists="false" />
    <attr id="mgmt_district" type="string" name="管理地区" exists="false"/>
    <attr id="mgmt_county" type="string" name="管理国家" exists="false"/>
    <attr id="region_id" type="string" name="区域ID" exists="false"/>
    <attr id="tenant_code" type="string" name="租户编码" exists="false"/>
    <behavior id="insertOrgUserRel" name="新增用户组织信息">
        <function domain="DB" name="insert">
            <param value="auth" type="string"/>
            <param value="sec_org_user_rel" type="string"/>
            <param key="org_user_rel" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="selectOrgUserRel" name="查询用户组织信息">
        <function domain="DB" name="select">
            <param value="auth" type="string"/>
            <param value="sec_org_user_rel" type="string"/>
            <param key="org_user_rel" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="updateOrgUserRel" name="修改用户组织信息">
        <function domain="DB" name="update">
            <param value="auth" type="string"/>
            <param value="sec_org_user_rel" type="string"/>
            <param key="org_user_rel" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    <behavior id="deletetOrgUserRel" name="删除用户组织信息">
        <function domain="DB" name="delete">
            <param value="auth" type="string"/>
            <param value="sec_org_user_rel" type="string"/>
            <param key="org_user_rel" type="map"/>
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    
    <behavior id="selectOrgUserRelByUserId" name="根据组织下用户信息列表">
        <sql conn="auth">
            <![CDATA[
            select ORG_USER_REL_ID, ORGANIZE_ID, USER_ID, VALID_DATE, EXPIRE_DATE, DATA_STATUS, CREATE_DATE, CREATE_OP_ID, CREATE_ORG_ID, DONE_CODE, DONE_DATE, OP_ID, ORG_ID, MGMT_DISTRICT, MGMT_COUNTY, REGION_ID, TENANT_CODE
            from sec_org_user_rel
            WHERE USER_ID = #{user_id} and ORGANIZE_ID = #{organize_id} ;
	<attr id="org_user_rel_id" type="int" name="角色关联用户标识" />
	<attr id="user_id" type="int" name="用户标识" />
	<attr id="organize_id" type="int" name="角色标识" />
	<attr id="valid_date" type="datetime" name="生效日期" exists="false" />
	<attr id="expire_date" type="datetime" name="失效日期" exists="false" />
	<attr id="data_status" type="string" name="数据状态" />
	<attr id="create_date" type="datetime" name="创建日期" />
	<attr id="create_op_id" type="string" name="创建人员" exists="false" />
	<attr id="create_org_id" type="string" name="创建组织" exists="false" />
	<attr id="done_code" type="datetime" name="事务编号" exists="false" />
	<attr id="done_date" type="datetime" name="操作日期" exists="false" />
	<attr id="op_id" type="string" name="操作人员" />
	<attr id="org_id" type="string" name="操作组织" exists="false" />
	<attr id="mgmt_district" type="string" name="管理地区" exists="false" />
	<attr id="mgmt_county" type="string" name="管理国家" exists="false" />
	<attr id="region_id" type="string" name="区域ID" exists="false" />
	<attr id="tenant_code" type="string" name="租户编码" exists="false" />
	<behavior id="insertOrgUserRel" name="新增用户组织信息">
		<function domain="DB" name="insert">
			<param value="auth" type="string" />
			<param value="sec_org_user_rel" type="string" />
			<param key="org_user_rel" type="map" />
			<param value="uppercase" type="string" />
		</function>
	</behavior>
	<behavior id="selectOrgUserRel" name="查询用户组织信息">
		<function domain="DB" name="select">
			<param value="auth" type="string" />
			<param value="sec_org_user_rel" type="string" />
			<param key="org_user_rel" type="map" />
			<param value="uppercase" type="string" />
		</function>
	</behavior>
	<behavior id="updateOrgUserRel" name="修改用户组织信息">
		<function domain="DB" name="update">
			<param value="auth" type="string" />
			<param value="sec_org_user_rel" type="string" />
			<param key="org_user_rel" type="map" />
			<param value="uppercase" type="string" />
		</function>
	</behavior>
	<behavior id="deleteOrgUserRel" name="删除用户组织信息">
		<function domain="DB" name="delete">
			<param value="auth" type="string" />
			<param value="sec_org_user_rel" type="string" />
			<param key="org_user_rel" type="map" />
			<param value="uppercase" type="string" />
		</function>
	</behavior>
	<behavior id="selectOrgUserRelByUserId" name="根据组织下用户信息列表">
		<sql conn="auth">            
		<![CDATA[            
		select ORG_USER_REL_ID, ORGANIZE_ID, USER_ID, VALID_DATE, EXPIRE_DATE, DATA_STATUS, CREATE_DATE, CREATE_OP_ID, CREATE_ORG_ID, DONE_CODE, DONE_DATE, OP_ID, ORG_ID, MGMT_DISTRICT, MGMT_COUNTY, REGION_ID, TENANT_CODE            
		from sec_org_user_rel            
		WHERE USER_ID = #{user_id} and ORGANIZE_ID = #{organize_id} ;
		]]>
		</sql>
	</behavior>
	<behavior id="deleteOrgUserRelByUserId" name="根据组织下用户信息列表">
		<sql conn="auth">
		<![CDATA[            
		delete from sec_org_user_rel            
		WHERE USER_ID = #{user_id} and ORGANIZE_ID = #{organize_id} ;
        ]]>
 from sec_org_user_rel            </sql>
    </behavior>
    
    <behavior id="deleteOrgUserRelByUserId" name="根据组织下用户信息列表">
        <sql conn="auth">
            <![CDATA[
            delete from sec_org_user_rel
            WHERE USER_ID = #{user_id} and ORGANIZE_ID = #{organize_id} ;
        ]]>
        </sql>
    </behavior>
		</sql>
	</behavior>
</model>

qb-auth-server/src/main/resources/flow/org/model/sec_organize.xml

@@ -53,4 +53,6 @@
            <param value="uppercase" type="string"/>
        </function>
    </behavior>
    
</model>

qb-auth-server/src/main/resources/flow/org/org_user_rel_combine_select.xml

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_combine_select"
            name="用户详情（用户基本信息，用户组织信息）"
            desc="用户详情（用户基本信息，用户组织信息）">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_user"/>
        <import model="sec_organize"/>
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="selectOrgUserRel">
        <var key="user_id" model="sec_org_user_rel" attr="user_id"/>
        <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>
    </start>
    <action id="selectOrgUserRel" name="查询组织信息" next="aggregateUser">
        <input>
            <var key="user_id" model="sec_org_user_rel" attr="user_id"/>
            <var key="organize_id" model="sec_org_user_rel" attr="organize_id"/>
        </input>
        <behavior model="sec_org_user_rel" id="selectUserOrganizeByUserId"/>
        <output>
            <var key="org_info"/>
        </output>
    </action>
    <action id="aggregateUser" name="聚合用户信息" next="selectUser">
        <input>
            <var key="user_id" />
        </input>
        <aggregate />
        <output>
            <var key="user"/>
        </output>
    </action>
    <action id="selectUser" name="查询用户" next="end">
        <input>
            <var key="user" model="sec_user" attrExists="false"/>
        </input>
        <behavior model="sec_user" id="selectUser"/>
        <output>
            <var key="user_info"/>
        </output>
    </action>
    
    <end id="end" name="结束节点">
        <var key="org_info"/>
        <var key="user_info"/>
    </end>
</logic-flow>

qb-auth-server/src/main/resources/flow/org/org_user_rel_delete.xml

@@ -7,13 +7,13 @@
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="deletetOrgUserRel">
        <var key="org_user_rel_cond" model="sec_org_user_rel" attrExists="false"/>
    <start id="start" name="开始节点" next="deleteOrgUserRel">
        <var key="org_user_rel" model="sec_org_user_rel" attrExists="false"/>
    </start>
    <action id="deletetOrgUserRel" name="删除组织下人员信息" next="end">
    <action id="deleteOrgUserRel" name="删除组织下人员信息" next="end">
        <input>
            <var key="org_user_rel_cond" model="sec_org_user_rel"/>
            <var key="org_user_rel" model="sec_org_user_rel" attrExists="false"/>
        </input>
        <behavior model="sec_org_user_rel" id="deleteOrgUserRel"/>
        <output>

qb-auth-server/src/main/resources/flow/org/organize_update.xml

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="organize_update"
            name="组织修改"
            desc="组织修改">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_organize"/>
    </declare>
    <start id="start" name="开始节点" next="updateOrganize">
        <var key="organize" model="sec_organize" attrExists="false"/>
        <var key="organize_cond" model="sec_organize" attrExists="false"/>
    </start>
    <action id="updateOrganize" name="修改组织" next="end">
        <input>
            <var key="organize" model="sec_organize" attrExists="false"/>
            <var key="organize_cond" model="sec_organize" attrExists="false"/>
        </input>
        <behavior model="sec_organize" id="updateOrganize"/>
        <output>
            <var key="update_num"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="update_num"/>
    </end>
</logic-flow>

qb-auth-server/src/main/resources/flow/user/user_update.xml

@@ -17,7 +17,7 @@
            <var key="user" model="sec_user" attrExists="false"/>
            <var key="user_cond" model="sec_user" attrExists="false"/>
        </input>
        <behavior model="sec_user" id="updateUserByCond"/>
        <behavior model="sec_user" id="updateUser"/>
        <output>
            <var key="update_num"/>
        </output>

qb-auth-server/src/main/resources/flow/user/user_update_by_cond.xml

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="user_update_by_cond"
            name="用户启用"
            desc="用户启用">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_user"/>
    </declare>
    <start id="start" name="开始节点" next="updateUser">
        <var key="user" model="sec_user" attrExists="false"/>
        <var key="user_cond" model="sec_user" attrExists="false"/>
    </start>
    <action id="updateUser" name="启用用户" next="end">
        <input>
            <var key="user" model="sec_user" attrExists="false"/>
            <var key="user_cond" model="sec_user" attrExists="false"/>
        </input>
        <behavior model="sec_user" id="updateUserByCond"/>
        <output>
            <var key="update_num"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="update_num"/>
    </end>
</logic-flow>

qb-auth-server/src/test/java/com/ipu/logicflow/server/OrgUserRelTest.java

@@ -69,6 +69,23 @@ public class OrgUserRelTest {
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testSelectUserOrganizeByUserId() {
        JMap param = new JsonMap();
        param.put("organize_id", 33);
        param.put("user_id", 308075);
        try{
            JMap result = LogicFlowEngine.execute("org_user_rel_combine_select", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    @Test
    public void testDeleteOrgUserRelByUserId(){
@@ -89,11 +106,11 @@ public class OrgUserRelTest {
    
    @Test
    public void testDeleteOrgUserRel(){
    	String org_user_rel_id = "2";
    	int org_user_rel_id = 3;
        JSONObject org_user_rel_cond = new JSONObject();
        org_user_rel_cond.put("org_user_rel_id", org_user_rel_id);
        JMap param = new JsonMap();
        param.put("org_user_rel_cond", org_user_rel_cond);
        param.put("org_user_rel", org_user_rel_cond);
        JMap result = null;
        try {
            
@@ -121,6 +138,7 @@ public class OrgUserRelTest {
                "flow/org/org_user_rel_delete_by_cond.xml",
                "flow/org/org_user_rel_select.xml",
                "flow/org/org_user_rel_select_by_cond.xml",
                "flow/org/org_user_rel_combine_select.xml",
                "flow/user/user_select_by_id.xml",
                "flow/org/organize_select.xml"
        };

qb-auth-server/src/test/java/com/ipu/logicflow/server/OrganizeTest.java

@@ -2,6 +2,7 @@ package com.ipu.logicflow.server;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.nuosi.flow.logic.LogicFlowEngine;
import com.nuosi.flow.logic.inject.initial.InitialMethod;
@@ -52,6 +53,38 @@ public class OrganizeTest {
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testUpdateOrganize(){
    	JSONObject organize_cond = new JSONObject();
    	organize_cond.put("organize_id", "33");        
        JMap param = new JsonMap();
        param.put("organize", organize_cond);
        try{
        	JMap selectResult = LogicFlowEngine.execute("organize_select", param);
        	
            JSONObject organize = JSON.parseObject(JSONObject.toJSONString(selectResult.get("organize_info")));       		
            
            organize.put("dept_full_id", "2");
            organize.put("dept_leader", 2);
            organize.put("done_date", new InitialMethod().getDatetime());
            organize.put("op_id", "1");
            
            param.put("organize", organize);
            param.put("organize_cond", organize_cond);
            
            JMap result = LogicFlowEngine.execute("organize_update", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    @Before
    public void before() throws IOException {
@@ -62,7 +95,8 @@ public class OrganizeTest {
        String[] flows = {
                "flow/org/organize_insert.xml",
                "flow/org/organize_select.xml"
                "flow/org/organize_select.xml",
                "flow/org/organize_update.xml"
        };
        LogicFlowUtil.loadLogicFlows(flows);
@@ -70,24 +104,24 @@ public class OrganizeTest {
    private JMap createOrganize() throws Exception {
        String organize_id = String.valueOf(System.currentTimeMillis()).substring(7);
        JMap userParam = new JsonMap();
        userParam.put("organize_id", organize_id);
        userParam.put("organize_type", "0");
        userParam.put("organize_name", "亚信科技有限责任公司");
        userParam.put("parent_organize_id", "0");
        userParam.put("short_name", "亚信科技");
        userParam.put("english_name", "asiainfo");
        userParam.put("dept_full_id", "1");
        userParam.put("dept_full_name", "亚信科技");
        userParam.put("level", 1);
        userParam.put("dept_leader", 1);
        userParam.put("org_level", "1");
        userParam.put("remark", "NULL");
        userParam.put("data_status", "1");
        userParam.put("create_date", "2022-1-10 16:09:12");
        userParam.put("create_op_id", "1");
        userParam.put("done_date", new InitialMethod().getDatetime());
        userParam.put("op_id", new InitialMethod().getDatetime());
        return userParam;
        JMap organizeParam = new JsonMap();
        organizeParam.put("organize_id", organize_id);
        organizeParam.put("organize_type", "0");
        organizeParam.put("organize_name", "亚信科技有限责任公司");
        organizeParam.put("parent_organize_id", "0");
        organizeParam.put("short_name", "亚信科技");
        organizeParam.put("english_name", "asiainfo");
        organizeParam.put("dept_full_id", "1");
        organizeParam.put("dept_full_name", "亚信科技");
        organizeParam.put("level", 1);
        organizeParam.put("dept_leader", 1);
        organizeParam.put("org_level", "1");
        organizeParam.put("remark", "NULL");
        organizeParam.put("data_status", "1");
        organizeParam.put("create_date", "2022-1-10 16:09:12");
        organizeParam.put("create_op_id", "1");
        organizeParam.put("done_date", new InitialMethod().getDatetime());
        organizeParam.put("op_id", new InitialMethod().getDatetime());
        return organizeParam;
    }
}

qb-auth-server/src/test/java/com/ipu/logicflow/server/UserTest.java

@@ -98,7 +98,7 @@ public class UserTest {
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update", param);
            JMap result = LogicFlowEngine.execute("user_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
@@ -106,7 +106,7 @@ public class UserTest {
            user.put("enabled_flag", "1");
            user.put("op_id", user_id);
            param.put("user", user);
            LogicFlowEngine.execute("user_update", param);
            LogicFlowEngine.execute("user_update_by_cond", param);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
@@ -134,7 +134,7 @@ public class UserTest {
            user_cond.put("user_id", user_id);
            param.put("user_cond", user_cond);
            LogicFlowEngine.execute("user_update", param);
            LogicFlowEngine.execute("user_update_by_cond", param);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
@@ -157,7 +157,7 @@ public class UserTest {
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update", param);
            JMap result = LogicFlowEngine.execute("user_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
@@ -165,7 +165,7 @@ public class UserTest {
            user.put("enabled_flag", "0");
            user.put("op_id", user_id);
            param.put("user", user);
            LogicFlowEngine.execute("user_update", param);
            LogicFlowEngine.execute("user_update_by_cond", param);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
@@ -174,12 +174,48 @@ public class UserTest {
    }
    
    @Test
    public void testUpdateUserByCond(){
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
        JSONObject user = new JSONObject();
        user.put("user_id", user_id);
        user.put("NICK_NAME", "嘉信立恒管理员");
        user.put("USER_ACCOUNT", "admin");
        user.put("GENDER", "1");
        user.put("AVATAR_NAME", "head.jpg");
        user.put("SURNAME", "刘恒");
        user.put("EMAIL", "tls@163.com");
        user.put("SEC_LEVEL", "2");
        user.put("LINK_PHONE", "18935548888");
        user.put("PASSWORD", "qawsx");       
        user.put("done_date", new InitialMethod().getDatetime());
        user.put("op_id", "1");
        JMap param = new JsonMap();
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    @Test
    public void testUpdateUser(){
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
        JSONObject user = new JSONObject();       		
        JSONObject user = new JSONObject();
        user.put("user_id", user_id);
        user.put("NICK_NAME", "嘉信立恒管理员");
        user.put("USER_ACCOUNT", "admin");
        user.put("GENDER", "1");
@@ -222,7 +258,7 @@ public class UserTest {
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update", param);
            JMap result = LogicFlowEngine.execute("user_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
@@ -230,7 +266,7 @@ public class UserTest {
            user.put("DATA_STATUS", "1");
            user.put("op_id", user_id);
            param.put("user", user);
            LogicFlowEngine.execute("user_update", param);
            LogicFlowEngine.execute("user_update_by_cond", param);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
@@ -253,7 +289,7 @@ public class UserTest {
        param.put("user_cond", user_cond);
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_update", param);
            JMap result = LogicFlowEngine.execute("user_update_by_cond", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
@@ -276,6 +312,7 @@ public class UserTest {
                "flow/user/user_select.xml",
                "flow/user/user_select_by_id.xml",
                "flow/user/user_select_by_name.xml",
                "flow/user/user_update_by_cond.xml",
                "flow/user/user_update.xml",
                "flow/user/user_disable_with_aggregate.xml"
        };