lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 10:08:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

4.0发布前最后一般脚本；

Browse Source 
优化登陆；
优化流程审批；
This commit is contained in:
yubao
2018-04-07 00:36:26 +08:00
parent d5db368a2f
commit e5f911079f
27 changed files with 286 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.App/AuthoriseService.cs
View File

@@ -105,7 +105,7 @@ namespace OpenAuth.App
{
var elementIds = UnitWork.Find<Relevance>(
u =>
(u.FirstId == _user.Id && u.Key == Define.ROLERESOURCE) ||
(u.FirstId == _user.Id && u.Key == Define.USERELEMENT) ||
(u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
return UnitWork.Find<ModuleElement>(u => elementIds.Contains(u.Id));
}

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

@@ -243,28 +243,28 @@ namespace OpenAuth.App.Flow
public string NodeConfluence(string nodeId, Tag tag)
{
string res = "-1";
string _nextNodeId = GetNextNodeByNodeId(nodeId);//获取下一个节点
if (_nextNodeId != "-1")
string nextNodeId = GetNextNodeByNodeId(nodeId);//获取下一个节点
if (nextNodeId != "-1")
{
Dictionary<string, List<FlowLine>> toLines = GetToLineDictionary(_runtimeModel.schemeContentJson);
int allnum = toLines[_nextNodeId].Count;
int allnum = toLines[nextNodeId].Count;
int i = 0;
foreach (var item in _runtimeModel.schemeContentJson.Flow.nodes)
foreach (var item in _runtimeModel.schemeContentJson.nodes)
{
if (item.id.Value == _nextNodeId)
if (item.id == nextNodeId)
{
if (item.setInfo.NodeConfluenceType.Value == "")//0所有步骤通过 todo:先用空格
if (string.IsNullOrEmpty(item.setInfo.NodeConfluenceType))//0所有步骤通过 todo:先用空格
{
if (tag.Taged == 1)
{
if (item.setInfo.ConfluenceOk == null)
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceOk = 1;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceOk = 1;
res = "1";
}
else if (item.setInfo.ConfluenceOk.Value == (allnum - 1))
else if (item.setInfo.ConfluenceOk == (allnum - 1))
{
res = GetNextNodeByNodeId(_nextNodeId);
res = GetNextNodeByNodeId(nextNodeId);
if (res == "-1")
{
throw (new Exception("会签成功寻找不到下一个节点"));
@@ -272,16 +272,16 @@ namespace OpenAuth.App.Flow
}
else
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceOk++;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceOk++;
res = "1";
}
}
}
else if (item.setInfo.NodeConfluenceType.Value == "1")//1一个步骤通过即可
else if (item.setInfo.NodeConfluenceType == "1")//1一个步骤通过即可
{
if (tag.Taged ==1)
{
res = GetNextNodeByNodeId(_nextNodeId);
res = GetNextNodeByNodeId(nextNodeId);
if (res == "-1")
{
throw (new Exception("会签成功寻找不到下一个节点"));
@@ -291,16 +291,16 @@ namespace OpenAuth.App.Flow
{
if (item.setInfo.ConfluenceNo == null)
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceNo = 1;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceNo = 1;
res = "1";
}
else if (item.setInfo.ConfluenceNo.Value == (allnum - 1))
else if (item.setInfo.ConfluenceNo == (allnum - 1))
{
res = "-1";
}
else
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceNo++;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceNo++;
res = "1";
}
}
@@ -311,33 +311,33 @@ namespace OpenAuth.App.Flow
{
if (item.setInfo.ConfluenceOk == null)
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceOk = 1;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceOk = 1;
}
else
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceOk++;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceOk++;
}
}
else
{
if (item.setInfo.ConfluenceNo == null)
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceNo = 1;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceNo = 1;
}
else
{
_runtimeModel.schemeContentJson.Flow.nodes[i].setInfo.ConfluenceNo++;
_runtimeModel.schemeContentJson.nodes[i].setInfo.ConfluenceNo++;
}
}
if ((item.setInfo.ConfluenceNo.Value + item.setInfo.ConfluenceOk.Value) / allnum * 100 > int.Parse(item.setInfo.NodeConfluenceRate.Value))
if ((item.setInfo.ConfluenceNo + item.setInfo.ConfluenceOk) / allnum * 100 > int.Parse(item.setInfo.NodeConfluenceRate))
{
res = GetNextNodeByNodeId(_nextNodeId);
res = GetNextNodeByNodeId(nextNodeId);
if (res == "-1")
{
throw (new Exception("会签成功寻找不到下一个节点"));
}
}
else if ((item.setInfo.ConfluenceNo.Value + item.setInfo.ConfluenceOk.Value) == allnum)
else if ((item.setInfo.ConfluenceNo + item.setInfo.ConfluenceOk) == allnum)
{
res = "-1";
}
@@ -353,19 +353,19 @@ namespace OpenAuth.App.Flow
if (res == "-1")
{
tag.Taged = -1;
MakeTagNode(_nextNodeId, tag);
MakeTagNode(nextNodeId, tag);
}
else if (res != "1") //则时res是会签结束节点的ID
{
tag.Taged = 1;
MakeTagNode(_nextNodeId,tag);
MakeTagNode(nextNodeId,tag);
_runtimeModel.nextNodeId = res;
_runtimeModel.nextNodeType = GetNodeType(res);
}
else
{
_runtimeModel.nextNodeId = _nextNodeId;
_runtimeModel.nextNodeType = GetNodeType(_nextNodeId);
_runtimeModel.nextNodeId = nextNodeId;
_runtimeModel.nextNodeType = GetNodeType(nextNodeId);
}
return res;
}
@@ -411,7 +411,7 @@ namespace OpenAuth.App.Flow
int i = 0;
foreach (var item in _runtimeModel.schemeContentJson.nodes)
{
if (item.id.Value.ToString() == nodeId)
if (item.id == nodeId)
{
_runtimeModel.schemeContentJson.nodes[i].setInfo.Taged = tag.Taged;
_runtimeModel.schemeContentJson.nodes[i].setInfo.UserId = tag.UserId;

223
OpenAuth.App/FlowInstanceApp.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Infrastructure;
@@ -12,21 +12,21 @@ using OpenAuth.Repository.Domain;
namespace OpenAuth.App
{
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 工作流实例表操作
/// </summary>
public class FlowInstanceApp : BaseApp<FlowInstance>
{
#region <EFBFBD><EFBFBD><EFBFBD>̴<EFBFBD><EFBFBD><EFBFBD>API
#region 流程处理API
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>
/// 创建一个实例
/// </summary>
/// <returns></returns>
public bool CreateInstance(JObject obj)
{
var flowInstance = obj.ToObject<FlowInstance>();
//<EFBFBD><EFBFBD>ȡ<EFBFBD>ύ<EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//获取提交的表单数据
var frmdata = new JObject();
foreach (var property in obj.Properties().Where(U => U.Name.Contains("data_")))
{
@@ -34,37 +34,40 @@ namespace OpenAuth.App
}
flowInstance.FrmData = JsonHelper.Instance.Serialize(frmdata);
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD>
//创建运行实例
var wfruntime = new FlowRuntime(flowInstance);
var user = AuthUtil.GetCurrentUser();
#region <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʵ<EFBFBD><EFBFBD><EFBFBD>ı䵱ǰ<EFBFBD>ڵ<EFBFBD>״̬
#region 根据运行实例改变当前节点状态
flowInstance.ActivityId = wfruntime.runtimeModel.nextNodeId;
flowInstance.ActivityType = wfruntime.GetNextNodeType();//-1<EFBFBD>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0<><30>ǩ<EFBFBD><C7A9>ʼ,1<><31>ǩ<EFBFBD><C7A9><EFBFBD><EFBFBD>,2һ<32><D2BB><EFBFBD>ڵ<EFBFBD>,4<><34><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>
flowInstance.ActivityType = wfruntime.GetNextNodeType();//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束
flowInstance.ActivityName = wfruntime.runtimeModel.nextNode.name;
flowInstance.PreviousId = wfruntime.runtimeModel.currentNodeId;
flowInstance.CreateUserId = user.User.Id;
flowInstance.CreateUserName = user.User.Account;
flowInstance.MakerList = (wfruntime.GetNextNodeType() != 4 ? GetMakerList(wfruntime) : "");//<EFBFBD><EFBFBD>ǰ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
flowInstance.MakerList = (wfruntime.GetNextNodeType() != 4 ? GetMakerList(wfruntime) : "");//当前节点可执行的人信息
flowInstance.IsFinish = (wfruntime.GetNextNodeType() == 4 ? 1 : 0);
UnitWork.Add(flowInstance);
#endregion
#region <EFBFBD><EFBFBD><EFBFBD>̲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼
#region 流程操作记录
FlowInstanceOperationHistory processOperationHistoryEntity = new FlowInstanceOperationHistory
{
InstanceId = flowInstance.Id,
CreateUserId = user.User.Id,
CreateUserName = user.User.Name,
Content = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
CreateDate = DateTime.Now,
Content = "【创建】"
+ user.User.Name
+ "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̽<EFBFBD><EFBFBD>̡<EFBFBD>"
+ "创建了一个流程进程【"
+ flowInstance.Code + "/"
+ flowInstance.CustomName + "<EFBFBD><EFBFBD>"
+ flowInstance.CustomName + "】"
};
UnitWork.Add(processOperationHistoryEntity);
#endregion
#region <EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>¼
#region 流转记录
FlowInstanceTransitionHistory processTransitionHistoryEntity = new FlowInstanceTransitionHistory
{
@@ -82,96 +85,91 @@ namespace OpenAuth.App
};
#endregion
UnitWork.Add(flowInstance);
UnitWork.Add(processOperationHistoryEntity);
UnitWork.Add(processTransitionHistoryEntity);
UnitWork.Save();
return true;
}
/// <summary>
/// <EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 节点审核
/// </summary>
/// <param name="instanceId"></param>
/// <returns></returns>
public bool NodeVerification(string instanceId, bool flag, string description = "")
{
var user = AuthUtil.GetCurrentUser().User;
FlowInstance flowInstance = Get(instanceId);
FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory
{
InstanceId = instanceId
};//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼
FlowInstanceTransitionHistory processTransitionHistoryEntity = null;//<2F><>ת<EFBFBD><D7AA>¼
InstanceId = instanceId,
CreateUserId = user.Id,
CreateUserName = user.Name,
CreateDate = DateTime.Now
};//操作记录
FlowRuntime wfruntime = new FlowRuntime(flowInstance);
var user = AuthUtil.GetCurrentUser().User;
var tag = new Tag
{
UserName = user.Name,
UserId = user.Id,
Description = description
};
#region <EFBFBD><EFBFBD>ǩ
if (flowInstance.ActivityType == 0)//<EFBFBD><EFBFBD>ǩ
#region 会签
if (flowInstance.ActivityType == 0)//会签
{
tag.Taged = 1;
wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, tag);//<EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>ǰ<EFBFBD>ڵ<EFBFBD>ͨ<EFBFBD><EFBFBD>
///Ѱ<><D1B0><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD>˵Ľڵ<C4BD>Id
string _VerificationNodeId = "";
List<string> _nodelist = wfruntime.GetCountersigningNodeIdList(wfruntime.runtimeModel.currentNodeId);
string _makerList = "";
foreach (string item in _nodelist)
wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, tag);//标记当前节点通过
string verificationNodeId = ""; //寻找需要审核的节点Id
List<string> nodelist = wfruntime.GetCountersigningNodeIdList(wfruntime.runtimeModel.currentNodeId);
foreach (string item in nodelist)
{
_makerList = GetMakerList(wfruntime.runtimeModel.nodes[item], wfruntime.runtimeModel.flowInstanceId);
if (_makerList != "-1")
var makerList = GetMakerList(wfruntime.runtimeModel.nodes[item]
, wfruntime.runtimeModel.flowInstanceId);
if (makerList != "-1")
{
var id = AuthUtil.GetCurrentUser().User.Id;
foreach (string one in _makerList.Split(','))
foreach (string one in makerList.Split(','))
{
if (id == one || id.IndexOf(one) != -1)
if (user.Id == one || user.Id.IndexOf(one) != -1)
{
_VerificationNodeId = item;
verificationNodeId = item;
break;
}
}
}
}
if (_VerificationNodeId != "")
if (verificationNodeId != "")
{
if (flag)
{
tag.Taged = 1;
flowInstanceOperationHistory.Content = "<EFBFBD><EFBFBD>" + "todo name" + "<22><><EFBFBD><EFBFBD>" + wfruntime.runtimeModel.nodes[_VerificationNodeId].name + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<2C><>ע<EFBFBD><D7A2>" + description;
flowInstanceOperationHistory.Content = "【" + wfruntime.runtimeModel.nodes[verificationNodeId].name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】同意,备注：" + description;
}
else
{
tag.Taged = -1;
flowInstanceOperationHistory.Content = "<EFBFBD><EFBFBD>" + "todo name" + "<22><><EFBFBD><EFBFBD>" + wfruntime.runtimeModel.nodes[_VerificationNodeId].name + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<2C><>ע<EFBFBD><D7A2>" + description;
flowInstanceOperationHistory.Content = "【" + wfruntime.runtimeModel.nodes[verificationNodeId].name + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】不同意,备注：" + description;
}
string confluenceres = wfruntime.NodeConfluence(_VerificationNodeId, tag);
string confluenceres = wfruntime.NodeConfluence(verificationNodeId, tag);
switch (confluenceres)
{
case "-1"://<EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD>
case "-1"://不通过
flowInstance.IsFinish = 3;
break;
case "1"://<EFBFBD>ȴ<EFBFBD>
case "1"://等待
break;
default://ͨ<EFBFBD><EFBFBD>
default://通过
flowInstance.PreviousId = flowInstance.ActivityId;
flowInstance.ActivityId = wfruntime.runtimeModel.nextNodeId;
flowInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1<EFBFBD>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0<><30>ǩ<EFBFBD><C7A9>ʼ,1<><31>ǩ<EFBFBD><C7A9><EFBFBD><EFBFBD>,2һ<32><D2BB><EFBFBD>ڵ<EFBFBD>,4<><34><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>
flowInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;//-1无法运行,0会签开始,1会签结束,2一般节点,4流程运行结束
flowInstance.ActivityName = wfruntime.runtimeModel.nextNode.name;
flowInstance.IsFinish = (wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0);
flowInstance.MakerList = (wfruntime.runtimeModel.nextNodeType == 4 ? "" : GetMakerList(wfruntime));//<EFBFBD><EFBFBD>ǰ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
flowInstance.MakerList = (wfruntime.runtimeModel.nextNodeType == 4 ? "" : GetMakerList(wfruntime));//当前节点可执行的人信息
#region <EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>¼
processTransitionHistoryEntity = new FlowInstanceTransitionHistory
#region 流转记录
UnitWork.Add(new FlowInstanceTransitionHistory
{
InstanceId = flowInstance.Id,
CreateUserId = user.Id,
@@ -184,7 +182,7 @@ namespace OpenAuth.App
ToNodeType = wfruntime.runtimeModel.nextNodeType,
IsFinish = wfruntime.runtimeModel.nextNodeType ==4?1:0,
TransitionSate = 0
};
});
#endregion
break;
@@ -192,13 +190,13 @@ namespace OpenAuth.App
}
else
{
throw (new Exception("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쳣,<2C>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˽ڵ<CBBD>"));
throw (new Exception("审核异常,找不到审核节点"));
}
}
#endregion
#region һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
else//һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#region 一般审核
else//一般审核
{
if (flag)
{
@@ -208,11 +206,11 @@ namespace OpenAuth.App
flowInstance.ActivityId = wfruntime.runtimeModel.nextNodeId;
flowInstance.ActivityType = wfruntime.runtimeModel.nextNodeType;
flowInstance.ActivityName = wfruntime.runtimeModel.nextNode.name;
flowInstance.MakerList = wfruntime.runtimeModel.nextNodeType == 4 ? "" : GetMakerList(wfruntime);//<EFBFBD><EFBFBD>ǰ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
flowInstance.MakerList = wfruntime.runtimeModel.nextNodeType == 4 ? "" : GetMakerList(wfruntime);//当前节点可执行的人信息
flowInstance.IsFinish = (wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0);
#region <EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>¼
#region 流转记录
processTransitionHistoryEntity = new FlowInstanceTransitionHistory
UnitWork.Add(new FlowInstanceTransitionHistory
{
InstanceId = flowInstance.Id,
CreateUserId = user.Id,
@@ -225,21 +223,21 @@ namespace OpenAuth.App
ToNodeType = wfruntime.runtimeModel.nextNodeType,
IsFinish = wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0,
TransitionSate = 0
};
});
#endregion
flowInstanceOperationHistory.Content = "<22><>" + "todo name" + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" + wfruntime.runtimeModel.currentNode.name
+ "<22><><EFBFBD><EFBFBD>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "<22><>ͬ<EFBFBD><CDAC>,<2C><>ע<EFBFBD><D7A2>" + description;
flowInstanceOperationHistory.Content = "【" + wfruntime.runtimeModel.currentNode.name
+ "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】同意,备注：" + description;
}
else
{
flowInstance.IsFinish = 3; //<EFBFBD><EFBFBD>ʾ<EFBFBD>ýڵ㲻ͬ<EFBFBD><EFBFBD>
flowInstance.IsFinish = 3; //表示该节点不同意
tag.Taged = -1;
wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, tag);
flowInstanceOperationHistory.Content = "<EFBFBD><EFBFBD>" + "todo name" + "<22><><EFBFBD><EFBFBD>"
+ wfruntime.runtimeModel.currentNode.name + "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "<22><><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC>,<2C><>ע<EFBFBD><D7A2>"
flowInstanceOperationHistory.Content = "【"
+ wfruntime.runtimeModel.currentNode.name + "】【"
+ DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】不同意,备注："
+ description;
}
}
@@ -249,12 +247,11 @@ namespace OpenAuth.App
UnitWork.Update(flowInstance);
UnitWork.Add(flowInstanceOperationHistory);
UnitWork.Add(processTransitionHistoryEntity);
UnitWork.Save();
return true;
}
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 驳回
/// </summary>
/// <returns></returns>
public bool NodeReject(VerificationReq reqest)
@@ -262,16 +259,9 @@ namespace OpenAuth.App
var user = AuthUtil.GetCurrentUser().User;
FlowInstance flowInstance = Get(reqest.FlowInstanceId);
FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory
{
InstanceId = reqest.FlowInstanceId,
CreateUserId = user.Id,
CreateUserName = user.Name
};
FlowRuntime wfruntime = new FlowRuntime(flowInstance);
string resnode = "";
if (string.IsNullOrEmpty(reqest.NodeRejectStep))
{
@@ -291,17 +281,17 @@ namespace OpenAuth.App
};
wfruntime.MakeTagNode(wfruntime.runtimeModel.currentNodeId, tag);
flowInstance.IsFinish = 4;//4<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD>أ<EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ύ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
flowInstance.IsFinish = 4;//4表示驳回（需要申请者重新提交表单）
if (resnode != "")
{
flowInstance.PreviousId = flowInstance.ActivityId;
flowInstance.ActivityId = resnode;
flowInstance.ActivityType = wfruntime.GetNodeType(resnode);
flowInstance.ActivityName = wfruntime.runtimeModel.nodes[resnode].name;
flowInstance.MakerList = GetMakerList(wfruntime.runtimeModel.nodes[resnode], flowInstance.PreviousId);//<EFBFBD><EFBFBD>ǰ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
#region <EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>¼
flowInstance.MakerList = GetMakerList(wfruntime.runtimeModel.nodes[resnode], flowInstance.PreviousId);//当前节点可执行的人信息
#region 流转记录
var processTransitionHistoryEntity = new FlowInstanceTransitionHistory
UnitWork.Add(new FlowInstanceTransitionHistory
{
InstanceId = flowInstance.Id,
CreateUserId = user.Id,
@@ -312,21 +302,27 @@ namespace OpenAuth.App
ToNodeId = wfruntime.runtimeModel.nextNodeId,
ToNodeName = wfruntime.runtimeModel.nextNode.name,
ToNodeType = wfruntime.runtimeModel.nextNodeType,
IsFinish = wfruntime.runtimeModel.nextNodeType ==4?1:0,
IsFinish = wfruntime.runtimeModel.nextNodeType == 4 ? 1 : 0,
TransitionSate = 1
};
UnitWork.Add(processTransitionHistoryEntity);
});
#endregion
}
flowInstanceOperationHistory.Content = "<22><>" + "todo name" + "<22><><EFBFBD><EFBFBD>"
+ wfruntime.runtimeModel.currentNode.name
+ "<22><><EFBFBD><EFBFBD>" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>ע<EFBFBD><D7A2>" + reqest.VerificationOpinion;
UnitWork.Update(flowInstance);
UnitWork.Add(flowInstanceOperationHistory);
UnitWork.Add(new FlowInstanceOperationHistory
{
InstanceId = reqest.FlowInstanceId
,CreateUserId = user.Id
,CreateUserName = user.Name
,CreateDate = DateTime.Now
,Content = "【"
+ wfruntime.runtimeModel.currentNode.name
+ "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】驳回,备注："
+ reqest.VerificationOpinion
});
UnitWork.Save();
return true;
@@ -334,7 +330,7 @@ namespace OpenAuth.App
#endregion
/// <summary>
/// Ѱ<EFBFBD>Ҹýڵ<EFBFBD>ִ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 寻找该节点执行人
/// </summary>
/// <param name="wfruntime"></param>
/// <returns></returns>
@@ -343,9 +339,9 @@ namespace OpenAuth.App
string makerList = "";
if (wfruntime.runtimeModel.nextNodeId == "-1")
{
throw (new Exception("<EFBFBD>޷<EFBFBD>Ѱ<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD>"));
throw (new Exception("无法寻找到下一个节点"));
}
if (wfruntime.runtimeModel.nextNodeType == 0)//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǻ<EFBFBD>ǩ<EFBFBD>ڵ<EFBFBD>
if (wfruntime.runtimeModel.nextNodeType == 0)//如果是会签节点
{
List<string> _nodelist = wfruntime.GetCountersigningNodeIdList(wfruntime.runtimeModel.nextNodeId);
string _makerList = "";
@@ -354,11 +350,11 @@ namespace OpenAuth.App
_makerList = GetMakerList(wfruntime.runtimeModel.nodes[item], wfruntime.runtimeModel.flowInstanceId);
if (_makerList == "-1")
{
throw (new Exception("<EFBFBD>޷<EFBFBD>Ѱ<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD>ǩ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>鿴<EFBFBD><E9BFB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"));
throw (new Exception("无法寻找到会签节点的审核者,请查看流程设计是否有问题!"));
}
if (_makerList == "1")
{
throw (new Exception("<EFBFBD><EFBFBD>ǩ<EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߲<EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>鿴<EFBFBD><E9BFB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"));
throw (new Exception("会签节点的审核者不能为所有人,请查看流程设计是否有问题!"));
}
if (makerList != "")
{
@@ -372,14 +368,14 @@ namespace OpenAuth.App
makerList = GetMakerList(wfruntime.runtimeModel.nextNode, wfruntime.runtimeModel.flowInstanceId);
if (makerList == "-1")
{
throw (new Exception("<EFBFBD>޷<EFBFBD>Ѱ<EFBFBD>ҵ<EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD>鿴<EFBFBD><E9BFB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"));
throw (new Exception("无法寻找到节点的审核者,请查看流程设计是否有问题!"));
}
}
return makerList;
}
/// <summary>
/// Ѱ<EFBFBD>Ҹýڵ<EFBFBD>ִ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// 寻找该节点执行人
/// </summary>
/// <param name="node"></param>
/// <returns></returns>
@@ -393,11 +389,11 @@ namespace OpenAuth.App
}
else
{
if (node.setInfo.NodeDesignate == Setinfo.ALL_USER)//<EFBFBD><EFBFBD><EFBFBD>г<EFBFBD>Ա
if (node.setInfo.NodeDesignate == Setinfo.ALL_USER)//所有成员
{
makerList = "1";
}
else if (node.setInfo.NodeDesignate == Setinfo.SPECIAL_USER)//ָ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա
else if (node.setInfo.NodeDesignate == Setinfo.SPECIAL_USER)//指定成员
{
makerList = GenericHelpers.ArrayToString(node.setInfo.NodeDesignateData.users, makerList);
@@ -420,21 +416,21 @@ namespace OpenAuth.App
}
/// <summary>
/// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// <para><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2017-01-20 15:44:45</para>
/// 审核流程
/// <para>李玉宝于2017-01-20 15:44:45</para>
/// </summary>
public void Verification(VerificationReq request)
{
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//驳回
if (request.VerificationFinally == "3")
{
NodeReject(request);
}
else if (request.VerificationFinally == "2")//<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>
else if (request.VerificationFinally == "2")//表示不同意
{
NodeVerification(request.FlowInstanceId, false, request.VerificationOpinion);
}
else if (request.VerificationFinally == "1")//<EFBFBD><EFBFBD>ʾͬ<EFBFBD><EFBFBD>
else if (request.VerificationFinally == "1")//表示同意
{
NodeVerification(request.FlowInstanceId, true, request.VerificationOpinion);
}
@@ -447,11 +443,11 @@ namespace OpenAuth.App
public TableData Load(QueryFlowInstanceListReq request)
{
//todo:<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>Ѱ<EFBFBD>/<2F>ҵ<EFBFBD>
//todo:待办/已办/我的
var result = new TableData();
var user = AuthUtil.GetCurrentUser();
if (request.type == "wait") //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if (request.type == "wait") //待办事项
{
result.count = UnitWork.Find<FlowInstance>(u => u.MakerList =="1" || u.MakerList.Contains(user.User.Id)).Count();
@@ -459,11 +455,22 @@ namespace OpenAuth.App
u => u.MakerList == "1" || u.MakerList.Contains(user.User.Id)).ToList();
}
else if (request.type == "disposed") //<EFBFBD>Ѱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
else if (request.type == "disposed") //已办事项（即我参与过的流程）
{
result.data = UnitWork.Find<FlowInstance>(request.page, request.limit, "CreateDate descending", null).ToList();
var instances = UnitWork.Find<FlowInstanceTransitionHistory>(u => u.CreateUserId == user.User.Id)
.Select(u => u.InstanceId).Distinct();
var query = from ti in instances
join ct in UnitWork.Find<FlowInstance>(null) on ti equals ct.Id
into tmp
from ct in tmp.DefaultIfEmpty()
select ct;
result.data = query.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = instances.Count();
}
else //<EFBFBD>ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
else //我的流程
{
result.count = UnitWork.Find<FlowInstance>(u => u.CreateUserId == user.User.Id).Count();
result.data = UnitWork.Find<FlowInstance>(request.page, request.limit,

2
OpenAuth.App/SSO/AuthUtil.cs
View File

@@ -143,7 +143,7 @@ namespace OpenAuth.App.SSO
var value = _helper.Post(new
{
AppKey = appKey,
UserName = username,
Account = username,
Password = pwd
}, requestUri);

6
OpenAuth.App/SSO/PassportLoginRequest.cs
View File

@@ -5,7 +5,7 @@ namespace OpenAuth.App.SSO
public class PassportLoginRequest
{
public string UserName { get; set; }
public string Account { get; set; }
public string Password { get; set; }
@@ -13,7 +13,7 @@ namespace OpenAuth.App.SSO
public void Trim()
{
if (string.IsNullOrEmpty(UserName))
if (string.IsNullOrEmpty(Account))
{
throw new Exception("用户名不能为空");
}
@@ -22,7 +22,7 @@ namespace OpenAuth.App.SSO
{
throw new Exception("密码不能为空");
}
UserName = UserName.Trim();
Account = Account.Trim();
Password = Password.Trim();
if(!string.IsNullOrEmpty(AppKey)) AppKey = AppKey.Trim();
}

25
OpenAuth.App/SSO/SSOAuthUtil.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Web;
using System.Web.Mvc;
using Infrastructure.Cache;
@@ -15,49 +15,50 @@ namespace OpenAuth.App.SSO
try
{
model.Trim();
//<EFBFBD><EFBFBD>ȡӦ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
//获取应用信息
var appInfo = new AppInfoService().Get(model.AppKey);
if (appInfo == null)
{
throw new Exception("Ӧ<EFBFBD>ò<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
throw new Exception("应用不存在");
}
//<EFBFBD><EFBFBD>ȡ<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>Ϣ
//获取用户信息
User userInfo = null;
if (model.UserName == "System")
if (model.Account == "System")
{
userInfo = new User
{
Id = string.Empty,
Id = Guid.Empty.ToString(), //TODO:可以根据需要调整
Account = "System",
Name ="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա",
Name ="超级管理员",
Password = "123456"
};
}
else
{
var usermanager = (UserManagerApp)DependencyResolver.Current.GetService(typeof(UserManagerApp));
userInfo = usermanager.Get(model.UserName);
userInfo = usermanager.Get(model.Account);
}
if (userInfo == null)
{
throw new Exception("<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
throw new Exception("用户不存在");
}
if (userInfo.Password != model.Password)
{
throw new Exception("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
throw new Exception("密码错误");
}
var currentSession = new UserAuthSession
{
UserName = model.UserName,
Account = model.Account,
Name = userInfo.Name,
Token = Guid.NewGuid().ToString().GetHashCode().ToString("x"),
AppKey = model.AppKey,
CreateTime = DateTime.Now,
IpAddress = HttpContext.Current.Request.UserHostAddress
};
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Session
//创建Session
new ObjCacheProvider<UserAuthSession>().Create(currentSession.Token, currentSession, DateTime.Now.AddDays(10));
result.Code = 200;

10
OpenAuth.App/SSO/UserAuthSession.cs
View File

@@ -9,7 +9,15 @@ namespace OpenAuth.App.SSO
public string AppKey { get; set; }
public string UserName { get; set; }
/// <summary>
/// 用户账号
/// </summary>
public string Account { get; set; }
/// <summary>
/// 用户名
/// </summary>
public string Name { get; set; }
public string IpAddress { get; set; }

11
OpenAuth.App/SystemAuthService.cs
View File

@@ -9,6 +9,7 @@
// File: AuthenService.cs
// ***********************************************************************
using System;
using System.Linq;
using OpenAuth.Repository.Domain;
@@ -17,15 +18,21 @@ namespace OpenAuth.App
/// <summary>
/// 领域服务
/// <para>超级管理员权限</para>
/// <para>todo:超级管理员使用guid.empty为ID，可以根据需要修改</para>
/// </summary>
public class SystemAuthService : AuthoriseService
{
public SystemAuthService()
{
_user = new User { Account = "System", Id = string.Empty };
_user = new User
{
Account = "System",
Name = "超级管理员",
Id = Guid.Empty.ToString()
};
}
public override IQueryable<Org> GetOrgsQuery()
{