Skip to content

Commit

Permalink
访问统计增加最大耗时字段
Browse files Browse the repository at this point in the history
  • Loading branch information
@nnhy
nnhy committed Dec 11, 2017
1 parent c767c1d commit 6286851
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 47 deletions.
2 changes: 1 addition & 1 deletion Doc
Submodule Doc updated from 52676a to fc04dd
4 changes: 3 additions & 1 deletion NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Users"))">用户</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("IPs"))">IP</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Error"))">错误</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Cost"))">耗时</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Cost"))">平均耗时</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("MaxCost"))">最大耗时</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("CreateTime"))">创建时间</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("UpdateTime"))">更新时间</a></th>
@if (ManageProvider.User.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
Expand Down Expand Up @@ -61,6 +62,7 @@
<td class="text-right">@entity.IPs.ToString("n0")</td>
<td class="text-right">@entity.Error.ToString("n0")</td>
<td class="text-right">@entity.Cost.ToString("n0") ms</td>
<td class="text-right">@entity.MaxCost.ToString("n0") ms</td>
<td>@entity.CreateTime.ToFullString("")</td>
<td>@entity.UpdateTime.ToFullString("")</td>
@if (ManageProvider.User.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
Expand Down
101 changes: 65 additions & 36 deletions NewLife.Cube/Areas/Admin/Views/VisitStat/_List_Data.generated.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,48 +283,64 @@ public override void Execute()
, 1612), false)
);

WriteLiteral(">耗时</a></th>\r\n <th");
WriteLiteral(">平均耗时</a></th>\r\n <th");

WriteLiteral(" class=\"text-center\"");

WriteLiteral("><a");

WriteAttribute("href", Tuple.Create(" href=\"", 1699), Tuple.Create("\"", 1746)
WriteAttribute("href", Tuple.Create(" href=\"", 1701), Tuple.Create("\"", 1745)

#line 34 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
, Tuple.Create(Tuple.Create("", 1706), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateTime"))
, Tuple.Create(Tuple.Create("", 1708), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("MaxCost"))

#line default
#line hidden
, 1706), false)
, 1708), false)
);

WriteLiteral(">创建时间</a></th>\r\n <th");
WriteLiteral(">最大耗时</a></th>\r\n <th");

WriteLiteral(" class=\"text-center\"");

WriteLiteral("><a");

WriteAttribute("href", Tuple.Create(" href=\"", 1801), Tuple.Create("\"", 1848)
WriteAttribute("href", Tuple.Create(" href=\"", 1800), Tuple.Create("\"", 1847)

#line 35 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
, Tuple.Create(Tuple.Create("", 1808), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))
, Tuple.Create(Tuple.Create("", 1807), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("CreateTime"))

#line default
#line hidden
, 1808), false)
, 1807), false)
);

WriteLiteral(">更新时间</a></th>\r\n");
WriteLiteral(">创建时间</a></th>\r\n <th");

WriteLiteral(" class=\"text-center\"");

WriteLiteral("><a");

WriteAttribute("href", Tuple.Create(" href=\"", 1902), Tuple.Create("\"", 1949)

#line 36 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
, Tuple.Create(Tuple.Create("", 1909), Tuple.Create<System.Object, System.Int32>(Html.Raw(page.GetSortUrl("UpdateTime"))

#line default
#line hidden
, 1909), false)
);

WriteLiteral(">更新时间</a></th>\r\n");


#line 37 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"


#line default
#line hidden

#line 36 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 37 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
if (ManageProvider.User.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
{

Expand All @@ -338,7 +354,7 @@ public override void Execute()
WriteLiteral(">操作</th>\r\n");


#line 39 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 40 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
}


Expand All @@ -347,13 +363,13 @@ public override void Execute()
WriteLiteral(" </tr>\r\n </thead>\r\n <tbody>\r\n");


#line 43 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 44 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"


#line default
#line hidden

#line 43 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 44 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
foreach (var entity in Model)
{
var st = new VisitStatModel
Expand All @@ -368,13 +384,13 @@ public override void Execute()
WriteLiteral(" <tr>\r\n");


#line 51 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 52 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"


#line default
#line hidden

#line 51 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 52 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
if (enableSelect)
{

Expand All @@ -391,20 +407,20 @@ public override void Execute()

WriteLiteral(" name=\"keys\"");

WriteAttribute("value", Tuple.Create(" value=\"", 2443), Tuple.Create("\"", 2461)
WriteAttribute("value", Tuple.Create(" value=\"", 2544), Tuple.Create("\"", 2562)

#line 53 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
, Tuple.Create(Tuple.Create("", 2451), Tuple.Create<System.Object, System.Int32>(entity.ID
#line 54 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
, Tuple.Create(Tuple.Create("", 2552), Tuple.Create<System.Object, System.Int32>(entity.ID

#line default
#line hidden
, 2451), false)
, 2552), false)
);

WriteLiteral(" /></td>\r\n");


#line 54 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 55 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
}


Expand All @@ -417,7 +433,7 @@ public override void Execute()
WriteLiteral(">");


#line 55 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 56 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.ID);


Expand All @@ -430,7 +446,7 @@ public override void Execute()
WriteLiteral(">");


#line 56 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 57 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(st);


Expand All @@ -439,7 +455,7 @@ public override void Execute()
WriteLiteral("</td>\r\n <td>");


#line 57 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 58 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Page);


Expand All @@ -448,7 +464,7 @@ public override void Execute()
WriteLiteral("</td>\r\n <td>");


#line 58 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 59 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Title);


Expand All @@ -461,7 +477,7 @@ public override void Execute()
WriteLiteral(">");


#line 59 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 60 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Times.ToString("n0"));


Expand All @@ -474,7 +490,7 @@ public override void Execute()
WriteLiteral(">");


#line 60 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 61 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Users.ToString("n0"));


Expand All @@ -487,7 +503,7 @@ public override void Execute()
WriteLiteral(">");


#line 61 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 62 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.IPs.ToString("n0"));


Expand All @@ -500,7 +516,7 @@ public override void Execute()
WriteLiteral(">");


#line 62 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 63 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Error.ToString("n0"));


Expand All @@ -513,16 +529,29 @@ public override void Execute()
WriteLiteral(">");


#line 63 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 64 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.Cost.ToString("n0"));


#line default
#line hidden
WriteLiteral(" ms</td>\r\n <td");

WriteLiteral(" class=\"text-right\"");

WriteLiteral(">");


#line 65 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.MaxCost.ToString("n0"));


#line default
#line hidden
WriteLiteral(" ms</td>\r\n <td>");


#line 64 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 66 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.CreateTime.ToFullString(""));


Expand All @@ -531,7 +560,7 @@ public override void Execute()
WriteLiteral("</td>\r\n <td>");


#line 65 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 67 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(entity.UpdateTime.ToFullString(""));


Expand All @@ -540,13 +569,13 @@ public override void Execute()
WriteLiteral("</td>\r\n");


#line 66 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 68 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"


#line default
#line hidden

#line 66 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 68 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
if (ManageProvider.User.Has(PermissionFlags.Detail, PermissionFlags.Update, PermissionFlags.Delete))
{

Expand All @@ -562,7 +591,7 @@ public override void Execute()
WriteLiteral(" ");


#line 69 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 71 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
Write(Html.Partial("_List_Data_Action", (Object)entity));


Expand All @@ -571,7 +600,7 @@ public override void Execute()
WriteLiteral("\r\n </td>\r\n");


#line 71 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 73 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
}


Expand All @@ -580,7 +609,7 @@ public override void Execute()
WriteLiteral(" </tr>\r\n");


#line 73 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
#line 75 "..\..\Areas\Admin\Views\VisitStat\_List_Data.cshtml"
}


Expand Down
4 changes: 2 additions & 2 deletions Test/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ static void Test1()

static void Test2()
{
var m1 = new StatModel();
var m2 = new StatModel();
var m1 = new StatModel { Level = StatLevels.Day, Time = DateTime.Now.Date };
var m2 = new StatModel { Level = StatLevels.Day, Time = DateTime.Now.Date };

Console.WriteLine(m1.Equals(m2));
Console.WriteLine(m1 == m2);
Expand Down
3 changes: 2 additions & 1 deletion XCode/Membership/Member.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Tables Version="9.6.6553.28584" NameSpace="XCode.Membership" ConnName="Membership" Output="" BaseClass="Entity">
<Tables Version="9.6.6554.15458" NameSpace="XCode.Membership" ConnName="Membership" Output="" BaseClass="Entity">
<Table Name="User" Description="用户" DbType="SqlServer" RenderGenEntity="true">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
Expand Down Expand Up @@ -110,6 +110,7 @@
<Column Name="IPs" DataType="Int32" Description="IP" />
<Column Name="Error" DataType="Int32" Description="错误" />
<Column Name="Cost" DataType="Int32" Description="耗时。毫秒" />
<Column Name="MaxCost" DataType="Int32" Description="最大耗时。毫秒" />
<Column Name="CreateTime" DataType="DateTime" Description="创建时间" />
<Column Name="UpdateTime" DataType="DateTime" Description="更新时间" />
<Column Name="Remark" DataType="String" Length="500" Description="详细信息" />
Expand Down
7 changes: 3 additions & 4 deletions XCode/Membership/访问统计.Biz.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,9 @@ private static VisitStat ProcessItem(VisitStatModel model)
});
if (st == null) return null;

if (st.Cost == 0)
st.Cost = model.Cost;
else
st.Cost = (st.Cost * 3 + model.Cost) / 4;
// 历史平均
st.Cost = (Int32)(((Int64)st.Cost * st.Times + model.Cost) / (st.Times + 1));
if (model.Cost > st.MaxCost) st.MaxCost = model.Cost;

if (!model.Title.IsNullOrEmpty()) st.Title = model.Title;
st.Times++;
Expand Down
Loading

0 comments on commit 6286851

Please sign in to comment.