lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-08-23 13:06:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

可以正常发起一个流程

Browse Source
This commit is contained in:
yubaolee 2018-03-23 17:47:44 +08:00
parent ce9f67c396
commit 0a42c651aa
8 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenAuth.App/Flow/FlowNode.cs
View File

@ -21,6 +21,11 @@
/// </summary> /// </summary>
/// <value>The set information.</value> /// <value>The set information.</value>
public Setinfo setInfo { get; set; } public Setinfo setInfo { get; set; }
public FlowNode()
{
setInfo = new Setinfo();
}
} }
public class Setinfo public class Setinfo
@ -28,6 +33,11 @@
public Nodedesignatedata NodeDesignateData { get; set; } public Nodedesignatedata NodeDesignateData { get; set; }
public string NodeCode { get; set; } public string NodeCode { get; set; }
public string NodeName { get; set; } public string NodeName { get; set; }
public Setinfo()
{
NodeDesignateData = new Nodedesignatedata();
}
} }
/// <summary> /// <summary>

10
OpenAuth.App/Flow/FlowRuntime.cs
View File

@ -444,14 +444,14 @@ namespace OpenAuth.App.Flow
public void MakeTagNode(string nodeId, int flag, string userId, string description = "") public void MakeTagNode(string nodeId, int flag, string userId, string description = "")
{ {
int i = 0; int i = 0;
foreach (var item in _runtimeModel.schemeContentJson.Flow.nodes) foreach (var item in _runtimeModel.schemeContentJson.nodes)
{ {
if (item.id.Value == nodeId) if (item.id.Value == nodeId)
{ {
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.Taged = flag; _runtimeModel.schemeContentJson.nodes[i].setInfo.Taged = flag;
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.UserId = userId; _runtimeModel.schemeContentJson.nodes[i].setInfo.UserId = userId;
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.description = description; _runtimeModel.schemeContentJson.nodes[i].setInfo.description = description;
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.TagedTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm"); _runtimeModel.schemeContentJson.nodes[i].setInfo.TagedTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
break; break;
} }
i++; i++;

2
OpenAuth.App/Flow/FlowRuntimeModel.cs
View File

@ -24,7 +24,7 @@ namespace OpenAuth.App.Flow
/// <summary> /// <summary>
/// 当前节点的对象 /// 当前节点的对象
/// </summary> /// </summary>
public dynamic currentNode { get { return nodes[currentNodeId]; } } public FlowNode currentNode { get { return nodes[currentNodeId]; } }
/// <summary> /// <summary>
/// 下一个节点 /// 下一个节点
/// </summary> /// </summary>

103
OpenAuth.App/FlowInstanceApp.cs
View File

@ -14,7 +14,7 @@ namespace OpenAuth.App
/// <summary> /// <summary>
/// 工作流实例表操作 /// 工作流实例表操作
/// </summary> /// </summary>
public class FlowInstanceApp :BaseApp<FlowInstance> public class FlowInstanceApp : BaseApp<FlowInstance>
{ {
#region 提交数据 #region 提交数据
@ -26,12 +26,12 @@ namespace OpenAuth.App
/// <param name="processOperationHistoryEntity"></param> /// <param name="processOperationHistoryEntity"></param>
/// <param name="processTransitionHistoryEntity"></param> /// <param name="processTransitionHistoryEntity"></param>
/// <returns></returns> /// <returns></returns>
public int SaveProcess(FlowInstance processInstanceEntity, public int SaveProcess(FlowInstance processInstanceEntity,
FlowInstanceOperationHistory processOperationHistoryEntity, FlowInstanceTransitionHistory processTransitionHistoryEntity = null) FlowInstanceOperationHistory processOperationHistoryEntity, FlowInstanceTransitionHistory processTransitionHistoryEntity = null)
{ {
try try
{ {
processInstanceEntity.Id=(processInstanceEntity.Id); processInstanceEntity.Id = (processInstanceEntity.Id);
UnitWork.Update(processInstanceEntity); UnitWork.Update(processInstanceEntity);
processOperationHistoryEntity.InstanceId = processInstanceEntity.Id; processOperationHistoryEntity.InstanceId = processInstanceEntity.Id;
@ -42,7 +42,7 @@ namespace OpenAuth.App
processTransitionHistoryEntity.InstanceId = processInstanceEntity.Id; processTransitionHistoryEntity.InstanceId = processInstanceEntity.Id;
UnitWork.Add(processTransitionHistoryEntity); UnitWork.Add(processTransitionHistoryEntity);
} }
UnitWork.Save(); UnitWork.Save();
return 1; return 1;
} }
@ -62,11 +62,11 @@ namespace OpenAuth.App
/// <param name="delegateRecordEntityList"></param> /// <param name="delegateRecordEntityList"></param>
/// <param name="processTransitionHistoryEntity"></param> /// <param name="processTransitionHistoryEntity"></param>
/// <returns></returns> /// <returns></returns>
public int SaveProcess(string sql,string dbbaseId, FlowInstance processInstanceEntity, FlowInstanceOperationHistory processOperationHistoryEntity, FlowInstanceTransitionHistory processTransitionHistoryEntity = null) public int SaveProcess(string sql, string dbbaseId, FlowInstance processInstanceEntity, FlowInstanceOperationHistory processOperationHistoryEntity, FlowInstanceTransitionHistory processTransitionHistoryEntity = null)
{ {
try try
{ {
processInstanceEntity.Id=(processInstanceEntity.Id); processInstanceEntity.Id = (processInstanceEntity.Id);
UnitWork.Update(processInstanceEntity); UnitWork.Update(processInstanceEntity);
processOperationHistoryEntity.InstanceId = processInstanceEntity.Id; processOperationHistoryEntity.InstanceId = processInstanceEntity.Id;
@ -77,7 +77,7 @@ namespace OpenAuth.App
processTransitionHistoryEntity.InstanceId = processInstanceEntity.Id; processTransitionHistoryEntity.InstanceId = processInstanceEntity.Id;
UnitWork.Add(processTransitionHistoryEntity); UnitWork.Add(processTransitionHistoryEntity);
} }
//if (!string.IsNullOrEmpty(dbbaseId) && !string.IsNullOrEmpty(sql))//测试环境不允许执行sql语句 //if (!string.IsNullOrEmpty(dbbaseId) && !string.IsNullOrEmpty(sql))//测试环境不允许执行sql语句
//{ //{
// DataBaseLinkEntity dataBaseLinkEntity = dataBaseLinkService.GetEntity(dbbaseId);//获取 // DataBaseLinkEntity dataBaseLinkEntity = dataBaseLinkService.GetEntity(dbbaseId);//获取
@ -94,7 +94,7 @@ namespace OpenAuth.App
#endregion #endregion
#region 流程处理API #region 流程处理API
/// <summary> /// <summary>
/// 创建一个实例 /// 创建一个实例
@ -146,7 +146,7 @@ namespace OpenAuth.App
{ {
InstanceId = flowInstance.Id, InstanceId = flowInstance.Id,
FromNodeId = wfruntime.runtimeModel.currentNodeId, FromNodeId = wfruntime.runtimeModel.currentNodeId,
FromNodeName = wfruntime.runtimeModel.currentNode.name.Value, FromNodeName = wfruntime.runtimeModel.currentNode.name,
FromNodeType = wfruntime.runtimeModel.currentNodeType, FromNodeType = wfruntime.runtimeModel.currentNodeType,
ToNodeId = wfruntime.runtimeModel.nextNodeId, ToNodeId = wfruntime.runtimeModel.nextNodeId,
ToNodeName = wfruntime.runtimeModel.nextNode.name, ToNodeName = wfruntime.runtimeModel.nextNode.name,
@ -155,7 +155,7 @@ namespace OpenAuth.App
}; };
processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0); processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0);
#endregion #endregion
UnitWork.Add(flowInstance); UnitWork.Add(flowInstance);
UnitWork.Add(processOperationHistoryEntity); UnitWork.Add(processOperationHistoryEntity);
UnitWork.Add(processTransitionHistoryEntity); UnitWork.Add(processTransitionHistoryEntity);
@ -220,7 +220,8 @@ namespace OpenAuth.App
string _Confluenceres = wfruntime.NodeConfluence(_VerificationNodeId, flag, AuthUtil.GetCurrentUser().User.Id, description); string _Confluenceres = wfruntime.NodeConfluence(_VerificationNodeId, flag, AuthUtil.GetCurrentUser().User.Id, description);
var _data = new var _data = new
{ {
SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(), wfruntime.runtimeModel.frmData SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(),
wfruntime.runtimeModel.frmData
}; };
switch (_Confluenceres) switch (_Confluenceres)
{ {
@ -235,12 +236,12 @@ namespace OpenAuth.App
FlowInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束 FlowInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束
FlowInstance.ActivityName = wfruntime.runtimeModel.nextNode.name; FlowInstance.ActivityName = wfruntime.runtimeModel.nextNode.name;
FlowInstance.IsFinish = (wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0); FlowInstance.IsFinish = (wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0);
FlowInstance.MakerList = (wfruntime.runtimeModel.nextNodeType == 4 ?"": GetMakerList(wfruntime) );//当前节点可执行的人信息 FlowInstance.MakerList = (wfruntime.runtimeModel.nextNodeType == 4 ? "" : GetMakerList(wfruntime));//当前节点可执行的人信息
#region 流转记录 #region 流转记录
processTransitionHistoryEntity = new FlowInstanceTransitionHistory(); processTransitionHistoryEntity = new FlowInstanceTransitionHistory();
processTransitionHistoryEntity.FromNodeId = wfruntime.runtimeModel.currentNodeId; processTransitionHistoryEntity.FromNodeId = wfruntime.runtimeModel.currentNodeId;
processTransitionHistoryEntity.FromNodeName = wfruntime.runtimeModel.currentNode.name.Value; processTransitionHistoryEntity.FromNodeName = wfruntime.runtimeModel.currentNode.name;
processTransitionHistoryEntity.FromNodeType = wfruntime.runtimeModel.currentNodeType; processTransitionHistoryEntity.FromNodeType = wfruntime.runtimeModel.currentNodeType;
processTransitionHistoryEntity.ToNodeId = wfruntime.runtimeModel.nextNodeId; processTransitionHistoryEntity.ToNodeId = wfruntime.runtimeModel.nextNodeId;
processTransitionHistoryEntity.ToNodeName = wfruntime.runtimeModel.nextNode.name; processTransitionHistoryEntity.ToNodeName = wfruntime.runtimeModel.nextNode.name;
@ -248,14 +249,7 @@ namespace OpenAuth.App
processTransitionHistoryEntity.TransitionSate = 0; processTransitionHistoryEntity.TransitionSate = 0;
processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0); processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0);
#endregion #endregion
if (wfruntime.runtimeModel.currentNode.setInfo != null && wfruntime.runtimeModel.currentNode.setInfo.NodeSQL != null)
{
_sqlstr = wfruntime.runtimeModel.currentNode.setInfo.NodeSQL.Value;
_dbbaseId = wfruntime.runtimeModel.currentNode.setInfo.NodeDataBaseToSQL.Value;
}
break; break;
} }
} }
@ -283,7 +277,7 @@ namespace OpenAuth.App
processTransitionHistoryEntity = new FlowInstanceTransitionHistory processTransitionHistoryEntity = new FlowInstanceTransitionHistory
{ {
FromNodeId = wfruntime.runtimeModel.currentNodeId, FromNodeId = wfruntime.runtimeModel.currentNodeId,
FromNodeName = wfruntime.runtimeModel.currentNode.name.Value, FromNodeName = wfruntime.runtimeModel.currentNode.name,
FromNodeType = wfruntime.runtimeModel.currentNodeType, FromNodeType = wfruntime.runtimeModel.currentNodeType,
ToNodeId = wfruntime.runtimeModel.nextNodeId, ToNodeId = wfruntime.runtimeModel.nextNodeId,
ToNodeName = wfruntime.runtimeModel.nextNode.name, ToNodeName = wfruntime.runtimeModel.nextNode.name,
@ -293,14 +287,7 @@ namespace OpenAuth.App
processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0); processTransitionHistoryEntity.IsFinish = (processTransitionHistoryEntity.ToNodeType == 4 ? 1 : 0);
#endregion #endregion
if (wfruntime.runtimeModel.currentNode.setInfo != null && wfruntime.runtimeModel.currentNode.setInfo.NodeSQL != null)
{
_sqlstr = wfruntime.runtimeModel.currentNode.setInfo.NodeSQL.Value;
_dbbaseId = wfruntime.runtimeModel.currentNode.setInfo.NodeDataBaseToSQL.Value;
}
FlowInstanceOperationHistory.Content = "【" + "todo name" + "】【" + wfruntime.runtimeModel.currentNode.name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】同意,备注：" + description; FlowInstanceOperationHistory.Content = "【" + "todo name" + "】【" + wfruntime.runtimeModel.currentNode.name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】同意,备注：" + description;
} }
else else
@ -312,7 +299,8 @@ namespace OpenAuth.App
} }
var data = new var data = new
{ {
SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(), wfruntime.runtimeModel.frmData SchemeContent = wfruntime.runtimeModel.schemeContentJson.ToString(),
wfruntime.runtimeModel.frmData
}; };
} }
#endregion #endregion
@ -340,7 +328,7 @@ namespace OpenAuth.App
FlowInstance flowInstance = Get(processId); FlowInstance flowInstance = Get(processId);
FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory(); FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory();
FlowInstanceTransitionHistory processTransitionHistoryEntity = null; FlowInstanceTransitionHistory processTransitionHistoryEntity = null;
FlowRuntime wfruntime = new FlowRuntime(flowInstance); FlowRuntime wfruntime = new FlowRuntime(flowInstance);
@ -365,7 +353,7 @@ namespace OpenAuth.App
#region 流转记录 #region 流转记录
processTransitionHistoryEntity = new FlowInstanceTransitionHistory(); processTransitionHistoryEntity = new FlowInstanceTransitionHistory();
processTransitionHistoryEntity.FromNodeId = wfruntime.runtimeModel.currentNodeId; processTransitionHistoryEntity.FromNodeId = wfruntime.runtimeModel.currentNodeId;
processTransitionHistoryEntity.FromNodeName = wfruntime.runtimeModel.currentNode.name.Value; processTransitionHistoryEntity.FromNodeName = wfruntime.runtimeModel.currentNode.name;
processTransitionHistoryEntity.FromNodeType = wfruntime.runtimeModel.currentNodeType; processTransitionHistoryEntity.FromNodeType = wfruntime.runtimeModel.currentNodeType;
processTransitionHistoryEntity.ToNodeId = wfruntime.runtimeModel.nextNodeId; processTransitionHistoryEntity.ToNodeId = wfruntime.runtimeModel.nextNodeId;
processTransitionHistoryEntity.ToNodeName = wfruntime.runtimeModel.nextNode.name; processTransitionHistoryEntity.ToNodeName = wfruntime.runtimeModel.nextNode.name;
@ -448,7 +436,7 @@ namespace OpenAuth.App
/// </summary> /// </summary>
/// <param name="node"></param> /// <param name="node"></param>
/// <returns></returns> /// <returns></returns>
private string GetMakerList(dynamic node, string processId) private string GetMakerList(FlowNode node, string processId)
{ {
try try
{ {
@ -460,22 +448,22 @@ namespace OpenAuth.App
} }
else else
{ {
if (node.setInfo.NodeDesignate.Value == "NodeDesignateType1")//所有成员 //if (node.setInfo.NodeDesignate.Value == "NodeDesignateType1")//所有成员
{ //{
makerlsit = "1"; // makerlsit = "1";
} //}
else if (node.setInfo.NodeDesignate.Value == "NodeDesignateType2")//指定成员 //else if (node.setInfo.NodeDesignate.Value == "NodeDesignateType2")//指定成员
{ //{
makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.role, makerlsit); makerlsit = ArrayToString(node.setInfo.NodeDesignateData.role, makerlsit);
makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.post, makerlsit); // makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.post, makerlsit);
makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.usergroup, makerlsit); // makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.usergroup, makerlsit);
makerlsit = ArrwyToString(node.setInfo.NodeDesignateData.user, makerlsit); makerlsit = ArrayToString(node.setInfo.NodeDesignateData.users, makerlsit);
if (makerlsit == "") if (makerlsit == "")
{ {
makerlsit = "-1"; makerlsit = "-1";
}
} }
// }
//else if (node.setInfo.NodeDesignate.Value == "NodeDesignateType3")//发起者领导 //else if (node.setInfo.NodeDesignate.Value == "NodeDesignateType3")//发起者领导
//{ //{
// UserEntity userEntity = userService.GetEntity(OperatorProvider.Provider.Current().UserId); // UserEntity userEntity = userService.GetEntity(OperatorProvider.Provider.Current().UserId);
@ -543,7 +531,7 @@ namespace OpenAuth.App
/// <param name="data"></param> /// <param name="data"></param>
/// <param name="Str"></param> /// <param name="Str"></param>
/// <returns></returns> /// <returns></returns>
private string ArrwyToString(dynamic data, string Str) private string ArrayToString(dynamic data, string Str)
{ {
string resStr = Str; string resStr = Str;
foreach (var item in data) foreach (var item in data)
@ -552,7 +540,16 @@ namespace OpenAuth.App
{ {
resStr += ","; resStr += ",";
} }
resStr += item.Value;
if (item is string)
{
resStr += item;
}
else
{
resStr += item.Value;
}
} }
return resStr; return resStr;
} }
@ -594,11 +591,11 @@ namespace OpenAuth.App
throw; throw;
} }
} }
public void Update(FlowInstance flowScheme) public void Update(FlowInstance flowScheme)
{ {
Repository.Update(u => u.Id == flowScheme.Id, u => new FlowInstance()); Repository.Update(u => u.Id == flowScheme.Id, u => new FlowInstance());
} }
public TableData Load(QueryFlowInstanceListReq request) public TableData Load(QueryFlowInstanceListReq request)

2
OpenAuth.Mvc/Web.config
View File

@ -60,7 +60,7 @@
<system.web> <system.web>
<authentication mode="Forms" /> <authentication mode="Forms" />
<compilation debug="true" targetFramework="4.5" /> <compilation debug="true" targetFramework="4.5" />
<httpRuntime targetFramework="4.5" /> <httpRuntime targetFramework="4.5" requestValidationMode="2.0" />
<sessionState mode="InProc" timeout="60" /> <sessionState mode="InProc" timeout="60" />
</system.web> </system.web>
<system.webServer> <system.webServer>

1
OpenAuth.Mvc/js/flow/GooFlow.js
View File

@ -1991,6 +1991,7 @@ GooFlow.prototype={
else this.$lineData[id].type="sl";//默认为直线 else this.$lineData[id].type="sl";//默认为直线
this.$lineData[id].from=json.from; this.$lineData[id].from=json.from;
this.$lineData[id].to = json.to; this.$lineData[id].to = json.to;
this.$lineData[id].id = json.id; //赋值ID
this.$lineData[id].setInfo = json.setInfo; this.$lineData[id].setInfo = json.setInfo;
this.$lineData[id].name=json.name; this.$lineData[id].name=json.name;
if(json.marked) this.$lineData[id].marked=json.marked; if(json.marked) this.$lineData[id].marked=json.marked;

6
OpenAuth.Mvc/js/flowlayout.js
View File

@ -330,13 +330,13 @@
} }
_rowstr = ""; _rowstr = "";
for (var i in item.setInfo.NodeDesignateData.user) { for (var i in item.setInfo.NodeDesignateData.users) {
var _postitem = item.setInfo.NodeDesignateData.user[i]; var _postitem = item.setInfo.NodeDesignateData.users[i];
var _one = clientuserData[_postitem]; var _one = clientuserData[_postitem];
_rowstr += ' <span class="label label-danger">' + _rowstr += ' <span class="label label-danger">' +
(_one == undefined ? _postitem : _one.RealName) + (_one == undefined ? _postitem : _one.RealName) +
'</span>'; '</span>';
if (i == item.setInfo.NodeDesignateData.user.length - 1) { if (i == item.setInfo.NodeDesignateData.users.length - 1) {
_popoverhtml += '<li>用户:' + _rowstr + '</li>'; _popoverhtml += '<li>用户:' + _rowstr + '</li>';
} }
} }

BIN
建表&初始化数据.sql
View File

Binary file not shown.