@IPU_REQ_2022@添加组织下人员信息管理、查询；添加http注册flow、model；添加flow保存到nacos配置中心；添加从nacos自动更新flow配置。

qb-auth-server/pom.xml

@@ -75,13 +75,17 @@
        <dependency>
            <groupId>com.ai.ipu.server</groupId>
            <artifactId>ipu-restful</artifactId>
            <version>${ipu-rest}</version>
        </dependency>
        <dependency>
            <groupId>com.ipu.flow</groupId>
            <artifactId>ipu-logicflow</artifactId>
            <version>${nuosi-logicflow}</version>
        </dependency>
        <!--nacos -->
        <dependency>
            <groupId>com.ai.ipu</groupId>
            <artifactId>ipu-spring-nacos</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>io.github.reynolds2019</groupId>

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

@@ -1,7 +1,12 @@
package com.ipu.logicflow.server;
import com.ai.ipu.basic.util.IpuBaseException;
import com.ai.ipu.nacos.INacosService;
import com.ai.ipu.restful.boot.IpuRestApplication;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.ipu.logicflow.server.biz.logic.listener.FlowLogicListener;
import com.ipu.logicflow.server.biz.logic.listener.FlowModelListener;
import com.ipu.logicflow.server.util.LogicFlowConfig;
/**
@@ -12,7 +17,7 @@ import com.ipu.logicflow.server.util.LogicFlowConfig;
 * @version v1.0.0
 */
public class LogicflowServerStart {
	
    public static void main(String[] args) {
        // 初始化加载服务配置
        LogicFlowConfig.init();
@@ -20,6 +25,9 @@ public class LogicflowServerStart {
        registerExceptionCode();
        // 启动服务
        IpuRestApplication.start(args);
        //注册nacos监听
        registerNacosListener();
    }
    private static void registerExceptionCode(){
@@ -27,4 +35,15 @@ public class LogicflowServerStart {
        String exceptionMessagesConfig = "exception_messages";
        IpuBaseException.registerCode(exceptionMessagesConfig);
    }
    
    private static void registerNacosListener(){
    	try {
    		INacosService service = SpringBeanUtil.getBean(INacosService.class);
			service.addListener(LogicFlowConfig.FLOW_LOGIC,"DEFAULT_GROUP",new FlowLogicListener());
			service.addListener(LogicFlowConfig.FLOW_MODEL,"DEFAULT_GROUP",new FlowModelListener());
		} catch (Exception e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
    }
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/control/LogicController.java

@@ -1,11 +1,12 @@
package com.ipu.logicflow.server.biz.logic.control;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.alibaba.fastjson.JSONObject;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
@@ -21,20 +22,45 @@ import org.springframework.web.bind.annotation.ResponseBody;
 * @version v1.0.0
 */
@Controller
@RequestMapping("/logic")
public class LogicController {
    private static final Logger log = LoggerFactory.getLogger(LogicController.class);
    private static final ILogger LOG = IpuLoggerFactory.createLogger(LogicController.class);
    @Autowired
    private LogicService logicService;
    @ResponseBody
    @RequestMapping("/logic/{logicId}")
    public Object logic(@PathVariable("logicId") String logicId, @RequestBody JSONObject input) throws Exception {
    @RequestMapping("/executeLogic/{logicId}")
    public Object executeLogic(@PathVariable("logicId") String logicId, @RequestBody JSONObject input) throws Exception {
        System.out.println("logicId="+logicId);
        System.out.println("input="+input);
        JMap param = new JsonMap(input.toJSONString());
        Object result = logicService.execute(logicId, param);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/registerFlow")
    public Object registerFlow(@RequestBody String flowXml) throws Exception {
        System.out.println("input="+flowXml);    
        Object result = logicService.registerFlow(flowXml);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/registerModel")
    public Object registerModel(@RequestBody String modelXml) throws Exception {
        System.out.println("input="+modelXml);
        Object result = logicService.registerModel(modelXml);
        return result;
    }
    
    @ResponseBody
    @RequestMapping("/saveFlowToConfigCenter/{flowName}")
    public Object saveFlowToConfigCenter(@PathVariable("flowName") String flowName,@RequestBody String flowXml) throws Exception {
        System.out.println("input="+flowXml);    
        logicService.saveFlowToConfigCenter(flowName, flowXml);
        return "ok";
    }
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/control/LogicQueryController.java

@@ -0,0 +1,33 @@
package com.ipu.logicflow.server.biz.logic.control;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ipu.logicflow.server.biz.logic.service.QueryService;
@Controller
@RequestMapping("/query")
public class LogicQueryController {
	@Autowired
    private QueryService queryService;
	
	@ResponseBody
    @RequestMapping("/getFlow")
    public Object getFlow(@RequestBody String flowName) throws Exception {
        System.out.println("input="+flowName);    
        Object result = queryService.getFlowMap(flowName);
        return result;
    }
	
	@ResponseBody
    @RequestMapping("/getModel")
    public Object getModel(@RequestBody String ModelName) throws Exception {
        System.out.println("input="+ModelName);    
        Object result = queryService.getModelMap(ModelName);
        return result;
    }
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/listener/FlowLogicListener.java

@@ -0,0 +1,38 @@
package com.ipu.logicflow.server.biz.logic.listener;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.basic.string.StringUtil;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.alibaba.nacos.api.config.listener.AbstractListener;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
public class FlowLogicListener extends AbstractListener {
	private static final ILogger LOG = IpuLoggerFactory.createLogger(FlowLogicListener.class);
	
	@Override
	public void receiveConfigInfo(String configInfo) {
		try {
			LOG.debug(">>>>>>>>>>>>>>>>>>>new config from nacos:" + configInfo);
			if (!StringUtil.isEmpty(configInfo)) {
				String[] configs = configInfo.split("\n");
				int i=0;
				for (;i<configs.length;i++) {
					String[] config = configs[i].split("==");
					if (!LogicFlowConfig.getFlowPathMap().containsKey(config[0]))
					{
						LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
						logicService.registerFlow(config[1]);
						LOG.debug("添加Flow配置成功：" + config[1]);
					}
				}	
			}
		} catch (Exception e) {
			e.printStackTrace();
			LOG.error("receiveConfigInfo error:", e);
		}
	}
}

qb-auth-server/src/main/java/com/ipu/logicflow/server/biz/logic/listener/FlowModelListener.java

@@ -0,0 +1,27 @@
package com.ipu.logicflow.server.biz.logic.listener;
import com.ai.ipu.basic.log.ILogger;
import com.ai.ipu.basic.log.IpuLoggerFactory;
import com.ai.ipu.restful.spring.SpringBeanUtil;
import com.alibaba.nacos.api.config.listener.AbstractListener;
import com.ipu.logicflow.server.biz.logic.service.LogicService;
public class FlowModelListener extends AbstractListener {
	private static final ILogger LOG = IpuLoggerFactory.createLogger(FlowModelListener.class);
	
	@Override
	public void receiveConfigInfo(String configInfo) {
		try {
			LOG.debug(">>>>>>>>>>>>>>>>>>>new config from nacos:" + configInfo);
			LogicService logicService = SpringBeanUtil.getBean(LogicService.class);
			logicService.registerModel(configInfo);
			LOG.debug("添加Model配置成功");
		} catch (Exception e) {
			LOG.error("receiveConfigInfo error:", e);
		}
	}
}

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

@@ -12,4 +12,8 @@ import com.ai.ipu.data.JMap;
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 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/QueryService.java

@@ -0,0 +1,7 @@
package com.ipu.logicflow.server.biz.logic.service;
public interface QueryService {
	public Object getFlowMap(String logicName) throws Exception;
	public Object getModelMap(String logicName) throws Exception;
}

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

@@ -1,8 +1,22 @@
package com.ipu.logicflow.server.biz.logic.service.impl;
import com.ai.ipu.basic.log.ILogger;
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.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.ipu.logicflow.server.biz.logic.service.LogicService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -15,9 +29,94 @@ import org.springframework.stereotype.Service;
@Service
public class LogicServiceImpl implements LogicService {
	private static final ILogger LOG = IpuLoggerFactory.createLogger(LogicServiceImpl.class);
	
	@Autowired
	private INacosService service;
	
    @Override
    public Object execute(String logicName, JMap param) throws Exception {
        Object result = LogicFlowEngine.execute(logicName, param);
        return result;
    }
	@Override
	public String registerFlow(String flowXml) throws Exception {
		InputStream xml = null;
		String flowName = null;
		try {
			xml = new ByteArrayInputStream(flowXml.getBytes(StandardCharsets.UTF_8.name()));
			//先注册到核心流程引擎
			Object result = LogicFlowManager.registerLogicFlow(xml);
			if (result!=null)
			{
				//注册成功后再将配置缓存到本地
				flowName = ((LogicFlow)result).getId();
				LogicFlowConfig.addFlowPathMap(flowName, flowXml);
			}
			else
				flowName = null;
		}finally {
			if (xml != null)
			{
				try {
					xml.close();
				}catch (Exception e) {
					LOG.error(e.toString());
				}
				    
			}
		}
		return flowName;
	}
	@Override
	public String registerModel(String modelXml) throws Exception {
		InputStream xml = null;
		String modelName = null;
		try {
			xml = new ByteArrayInputStream(modelXml.getBytes(StandardCharsets.UTF_8.name()));
			//先注册到核心流程引擎
			Object result = LogicFlowManager.registerDomainModel(xml);
			if (result!=null)
			{
				//注册成功后再将配置缓存到本地
				modelName = ((DomainModel)result).getId();
				LogicFlowConfig.addModelPathMap(modelName, modelXml);
			}
			else
				modelName = null;
		}finally {
			if (xml != null)
			{
				try {
					xml.close();
				}catch (Exception e) {
					LOG.error(e.toString());
				}
				    
			}
		}
		return modelName;
	}
	@Override
	public void saveFlowToConfigCenter(String flowName, String flowXml) throws Exception {
		String strConfigInfo = service.pullFromServer(LogicFlowConfig.FLOW_LOGIC, null, 0);
		StringBuffer newConfigInfo = new StringBuffer();
		if (!StringUtil.isEmpty(strConfigInfo))
		    newConfigInfo.append(strConfigInfo).append("\n");
		newConfigInfo.append(flowName).append("==").append(LogicFlowConfig.replaceBlank(flowXml));
		service.pushConfigToServer(LogicFlowConfig.FLOW_LOGIC, "DEFAULT_GROUP", newConfigInfo.toString());
	}
	@Override
	public void saveModelToConfigCenter(String modelName, String modelXml) throws Exception {
		String strConfigInfo = service.pullFromServer(LogicFlowConfig.FLOW_LOGIC, null, 0);
		StringBuffer newConfigInfo = new StringBuffer();
		if (!StringUtil.isEmpty(strConfigInfo))
		    newConfigInfo.append(strConfigInfo).append("\n");
		newConfigInfo.append(modelName).append("==").append(LogicFlowConfig.replaceBlank(modelXml));
		service.pushConfigToServer(LogicFlowConfig.FLOW_LOGIC, "DEFAULT_GROUP", newConfigInfo.toString());
	}
}

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

@@ -0,0 +1,22 @@
package com.ipu.logicflow.server.biz.logic.service.impl;
import org.jsoup.helper.StringUtil;
import org.springframework.stereotype.Service;
import com.ipu.logicflow.server.biz.logic.service.QueryService;
import com.ipu.logicflow.server.util.LogicFlowConfig;
@Service
public class QueryServiceImpl implements QueryService {
	@Override
	public Object getFlowMap(String logicName) throws Exception {
		return StringUtil.isBlank(logicName)?LogicFlowConfig.getFlowPathMap():LogicFlowConfig.getFlowPathMap().get(logicName);
	}
	@Override
	public Object getModelMap(String logicName) throws Exception {
		return StringUtil.isBlank(logicName)?LogicFlowConfig.getModelPathMap():LogicFlowConfig.getModelPathMap().get(logicName);
	}
}

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

@@ -5,50 +5,77 @@ import com.nuosi.flow.util.LogicFlowUtil;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
 * <p>desc: LogicFlow配置类 </p>
 * <p>date: 2021/12/30 23:58 </p>
 * <p>
 * desc: LogicFlow配置类
 * </p>
 * <p>
 * date: 2021/12/30 23:58
 * </p>
 *
 * @author nuosi fsofs@163.com
 * @version v1.0.0
 */
public class LogicFlowConfig {
    private static Map<String, String> modelPathMap = new HashMap<String, String>();
    private static Map<String, String> flowPathMap = new HashMap<String, String>();
    public static void init(){
        initModel();
        initFlow();
    }
    public static void initModel(){
        modelPathMap.put("sec_user", "flow/user/model/sec_user.xml");
        modelPathMap.put("sec_organize", "flow/org/model/sec_organize.xml");
        Iterator<String> it = modelPathMap.values().iterator();
        while(it.hasNext()){
            LogicFlowUtil.loadLogicModel(it.next());
        }
    }
    public static void initFlow(){
        flowPathMap.put("user_insert", "flow/user/user_insert.xml");
        flowPathMap.put("user_select", "flow/user/user_select.xml");
        flowPathMap.put("user_select_by_name", "flow/user/user_select_by_name.xml");
        flowPathMap.put("organize_select", "flow/org/organize_select.xml");
        Iterator<String> it = flowPathMap.values().iterator();
        while(it.hasNext()){
            LogicFlowUtil.loadLogicFlow(it.next());
        }
    }
    public static Map<String, String> getModelPathMap() {
        return modelPathMap;
    }
    public static Map<String, String> getFlowPathMap() {
        return flowPathMap;
    }
	public static final String FLOW_LOGIC = "flowLogic.xml";
	public static final String FLOW_MODEL = "flowModel.xml";
	private static Map<String, String> modelPathMap = new HashMap<String, String>();
	private static Map<String, String> flowPathMap = new HashMap<String, String>();
	public static void init() {
		initModel();
		initFlow();
	}
	public static void initModel() {
		modelPathMap.put("sec_user", "flow/user/model/sec_user.xml");
		modelPathMap.put("sec_organize", "flow/org/model/sec_organize.xml");
		Iterator<String> it = modelPathMap.values().iterator();
		while (it.hasNext()) {
			LogicFlowUtil.loadLogicModel(it.next());
		}
	}
	public static void initFlow() {
		flowPathMap.put("user_insert", "flow/user/user_insert.xml");
		flowPathMap.put("user_select", "flow/user/user_select.xml");
		flowPathMap.put("user_select_by_name", "flow/user/user_select_by_name.xml");
		flowPathMap.put("organize_select", "flow/org/organize_select.xml");
		Iterator<String> it = flowPathMap.values().iterator();
		while (it.hasNext()) {
			LogicFlowUtil.loadLogicFlow(it.next());
		}
	}
	public static Map<String, String> getModelPathMap() {
		return (Map<String, String>) ((HashMap<String, String>) modelPathMap).clone();
	}
	public static Map<String, String> getFlowPathMap() {
		return (Map<String, String>) ((HashMap<String, String>) flowPathMap).clone();
	}
	public static void addModelPathMap(String modelName, String modelXml) {
		modelPathMap.put(modelName, modelXml);
	}
	public static void addFlowPathMap(String flowName, String flowXml) {
		flowPathMap.put(flowName, flowXml);
	}
	public static String replaceBlank(String str) {
		String dest = "";
		if (str != null) {
			Pattern p = Pattern.compile("\\\r|\n");
			Matcher m = p.matcher(str);
			dest = m.replaceAll("");
		}
		return dest;
	}
}

qb-auth-server/src/main/resources/dev/application.yml

@@ -41,4 +41,7 @@ logging:
  file: /data/logs/boot.log
define:
  session:
    timeout: 1800
    timeout: 1800
nacos:
  config:
    server-addr: 47.105.160.21:8849

qb-auth-server/src/main/resources/dev/ipu-mybatis-config.xml

@@ -17,9 +17,9 @@
		<environment id="auth">
			<transactionManager type="jdbc" />
			<dataSource type="com.ai.ipu.database.datasource.DruidDataSourceFactory">
				<property name="jdbcUrl" value="jdbc:mysql://127.0.0.1:3307/auth" />
				<property name="username" value="root" />
				<property name="password" value="rootroot" />
				<property name="jdbcUrl" value="jdbc:mysql://82.157.108.247:3306/test?useSSL=false&amp;characterEncoding=utf8" />
				<property name="username" value="ipu" />
				<property name="password" value="ipumysql" />
				<!-- 配置获取连接的等待超时时间 -->
				<property name="maxWait" value="5000" />
			</dataSource>

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

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<model id="sec_org_user_rel" name="用户组织信息模型">
    <attr id="role_user_rel_id" type="int" name="角色关联用户标识"/>
    <attr id="org_user_rel_id" type="int" name="角色关联用户标识"/>
    <attr id="user_id" type="int" name="用户标识"/>
    <attr id="role_id" type="int" name="角色标识"/>
    <attr id="organize_id" type="int" name="角色标识"/>
    <attr id="valid_date" type="datetime" name="生效日期"/>
    <attr id="expire_date" type="datetime" name="失效日期"/>
    <attr id="data_status" type="string" name="数据状态"/>
@@ -53,4 +53,23 @@
            <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} ;
        ]]>
        </sql>
    </behavior>
</model>

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

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_delete"
            name="删除组织下人员信息"
            desc="删除组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="deletetOrgUserRel">
        <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="deletetOrgUserRel" name="删除组织下人员信息" next="end">
        <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="deleteOrgUserRelByUserId"/>
        <output>
            <var key="result"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="result"/>
    </end>
</logic-flow>

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

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_insert"
            name="新增组织下人员信息"
            desc="新增组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="insertOrgUserRel">
        <var key="org_user_rel" model="sec_org_user_rel" attrExists="false"/>
    </start>
    <action id="insertOrgUserRel" name="新增组织下人员信息" next="end">
        <input>
            <var key="org_user_rel"/>
        </input>
        <behavior model="sec_org_user_rel" id="insertOrgUserRel"/>
        <output>
            <var key="insert_num"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="insert_num"/>
    </end>
</logic-flow>

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

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_select"
            name="查询组织下人员信息"
            desc="查询组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <import model="sec_org_user_rel"/>
    </declare>
    <start id="start" name="开始节点" next="selectOrgUserRel">
        <var key="org_user_rel" model="sec_org_user_rel" attrExists="false"/>
    </start>
    <action id="selectOrgUserRel" name="查询组织下人员信息" next="end">
        <input>
            <var key="org_user_rel"/>
        </input>
        <behavior model="sec_org_user_rel" id="selectOrgUserRel"/>
        <output>
            <var key="org_user_rel"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="org_user_rel"/>
    </end>
</logic-flow>

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

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<logic-flow id="org_user_rel_select_by_cond"
            name="查询组织下人员信息"
            desc="查询组织下人员信息">
    <declare>
        <!-- 引入model定义 -->
        <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="end">
        <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="selectOrgUserRelByUserId"/>
        <output>
            <var key="org_user_rel_list"/>
        </output>
    </action>
    <end id="end" name="结束节点">
        <var key="org_user_rel_list"/>
    </end>
</logic-flow>

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

@@ -6,7 +6,7 @@
    <attr id="user_account" type="string" name="用户账号"/>
    <attr id="gender" type="string" name="性别"/>
    <attr id="avatar_name" type="string" name="用户头像"/>
    <attr id="avatar_path" type="string" name="用户头像路径"/>
    <attr id="avatar_path" type="string" name="用户头像路径" exists="false"/>
    <attr id="email" type="string" name="电子邮箱"/>
    <attr id="link_phone" type="string" name="电话号码">
        <validateString equal="11"/>

qb-auth-server/src/main/resources/ipu-spring-mvc.xml

@@ -12,4 +12,5 @@
    <context:component-scan base-package="com.ipu.logicflow.server" />
    <context:component-scan base-package="com.ai.ipu.portal" />
    <context:component-scan base-package="com.ai.ipu.nacos" />
</beans>

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

@@ -0,0 +1,124 @@
package com.ipu.logicflow.server;
import com.ai.ipu.data.JMap;
import com.ai.ipu.data.impl.JsonMap;
import com.alibaba.fastjson.JSONObject;
import com.nuosi.flow.logic.LogicFlowEngine;
import com.nuosi.flow.logic.inject.initial.InitialMethod;
import com.nuosi.flow.util.LogicFlowUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
/**
 * <p>desc: 用户组织信息管理逻辑的测试 </p>
 * <p>date: 2022/3/30 13:44 </p>
 *
 * @author weihf@asiainfo.com
 * @version v1.0.0
 */
public class OrgUserRelTest {
    @Test
    public void testInsertOrgUserRel(){
        JMap result = null;
        try {
            JMap param = new JsonMap();
            param.put("org_user_rel", new JSONObject(createOrgUserRel()));
            result = LogicFlowEngine.execute("org_user_rel_insert", param);
            System.out.println("执行结果：" + result);
            Assert.assertEquals("新增组织下人员信息失败!", result.getInt("insert_num"), 1);
        } catch (Exception e) {
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testSelectOrgUserRel() {
        JMap param = new JsonMap();
        JSONObject org_user_rel = new JSONObject();
        org_user_rel.put("ORG_USER_REL_ID", "1");
        param.put("org_user_rel", org_user_rel);
        try{
            JMap result = LogicFlowEngine.execute("org_user_rel_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 testSelectOrgUserRelByUserId() {
        JMap param = new JsonMap();
        param.put("organize_id", 33);
        param.put("user_id", 308075);
        try{
            JMap result = LogicFlowEngine.execute("org_user_rel_select_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 testDeleteOrgUserRelByUserId(){
    	JMap param = new JsonMap();
        param.put("organize_id", 33);
        param.put("user_id", 308075);
        JMap result = null;
        try {
            
            result = LogicFlowEngine.execute("org_user_rel_delete", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        } catch (Exception e) {
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    @Before
    public void before() throws IOException {
        String[] models = {
                "flow/org/model/sec_org_user_rel.xml",
                "flow/user/model/sec_user.xml",
                "flow/org/model/sec_organize.xml"
        };
        LogicFlowUtil.loadLogicModels(models);
        String[] flows = {
                "flow/org/org_user_rel_insert.xml",
                "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/user/user_select_by_id.xml",
                "flow/org/organize_select.xml"
        };
        LogicFlowUtil.loadLogicFlows(flows);
    }
    private JMap createOrgUserRel() throws Exception {
        //String org_user_rel_id = String.valueOf(System.currentTimeMillis()).substring(7);
        JMap menuParam = new JsonMap();
        //[ORG_USER_REL_ID]字段为自增字段
        //menuParam.put("ORG_USER_REL_ID", org_user_rel_id);
        menuParam.put("ORGANIZE_ID", "33");
        menuParam.put("USER_ID", "308075");
        menuParam.put("DATA_STATUS", "1");      
        menuParam.put("CREATE_DATE", new InitialMethod().getDatetime());
        menuParam.put("CREATE_OP_ID", "1");
        menuParam.put("DONE_DATE", new InitialMethod().getDatetime());
        menuParam.put("OP_ID", "1");
        return menuParam;
    }
}

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

@@ -41,7 +41,7 @@ public class UserTest {
    public void testSelectUser() {
        JMap param = new JsonMap();
        JSONObject user = new JSONObject();
        user.put("user_id", "331843");
        user.put("user_id", "308075");
        param.put("user", user);
        try{
            JMap result = LogicFlowEngine.execute("user_select", param);
@@ -57,7 +57,7 @@ public class UserTest {
    @Test
    public void testSelectUserById() {
        JMap param = new JsonMap();
        param.put("user_id", "331843");
        param.put("user_id", "308075");
        try{
            JMap result = LogicFlowEngine.execute("user_select_by_id", param);
            System.out.println("执行结果：" + result);
@@ -85,7 +85,7 @@ public class UserTest {
    @Test
    public void testDisableUser(){
        String user_id = "331843";
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
@@ -116,7 +116,7 @@ public class UserTest {
    @Test
    public void testDisableUserWithAggregate(){
        String user_id = "331843";
        String user_id = "308075";
        JMap param = new JsonMap();
        param.put("user_id", user_id);
        try{
@@ -144,7 +144,7 @@ public class UserTest {
    @Test
    public void testEnableUser(){
        String user_id = "331843";
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
@@ -172,6 +172,97 @@ public class UserTest {
            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();       		
        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", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    @Test
    public void testDeleteUser(){
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
        JSONObject user = new JSONObject();
        user.put("DATA_STATUS", "0");
        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", param);
            System.out.println("执行结果：" + result);
            Assert.assertTrue(true);
            // 还原数据
            user.put("DATA_STATUS", "1");
            user.put("op_id", user_id);
            param.put("user", user);
            LogicFlowEngine.execute("user_update", param);
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("错误信息：" + e.getMessage());
            Assert.assertTrue(false);
        }
    }
    
    @Test
    public void testResetUserPasswd(){
        String user_id = "308075";
        JSONObject user_cond = new JSONObject();
        user_cond.put("user_id", user_id);
        JSONObject user = new JSONObject();       		
        user.put("PASSWORD", "qwertyu");       
        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", 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 {