lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240124安全风险取值上报集团接口方法修改

Browse Source
This commit is contained in:
杨红卫
2024-01-24 15:56:52 +08:00
parent ff0cc67d87
commit 6b5fb3a865
7 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs
+19 -19
View File
@@ -29,25 +29,25 @@ namespace BLL
get; get;
set; set;
} }
public static List<Model.InterFaceLog> GetInterFaceLogByModle(Model.InterFaceLog table) public static List<Model.InterFaceLog> GetInterFaceLogByModle(Model.InterFaceLog table)
{ {
var q= from x in db.InterFaceLog var q = from x in db.InterFaceLog
where where
( string.IsNullOrEmpty(table.InterFaceLogId)||x.InterFaceLogId.Contains(table.InterFaceLogId)) && (string.IsNullOrEmpty(table.InterFaceLogId) || x.InterFaceLogId.Contains(table.InterFaceLogId)) &&
( string.IsNullOrEmpty(table.UserId)||x.UserId.Contains(table.UserId)) && (string.IsNullOrEmpty(table.UserId) || x.UserId.Contains(table.UserId)) &&
( string.IsNullOrEmpty(table.UnitId)||x.UnitId.Contains(table.UnitId)) && (string.IsNullOrEmpty(table.UnitId) || x.UnitId.Contains(table.UnitId)) &&
( string.IsNullOrEmpty(table.InterFaceName)||x.InterFaceName.Contains(table.InterFaceName)) && (string.IsNullOrEmpty(table.InterFaceName) || x.InterFaceName.Contains(table.InterFaceName)) &&
( string.IsNullOrEmpty(table.InterFaceUrl)||x.InterFaceUrl.Contains(table.InterFaceUrl)) && (string.IsNullOrEmpty(table.InterFaceUrl) || x.InterFaceUrl.Contains(table.InterFaceUrl)) &&
( string.IsNullOrEmpty(table.InterFaceMehtod)||x.InterFaceMehtod.Contains(table.InterFaceMehtod)) && (string.IsNullOrEmpty(table.InterFaceMehtod) || x.InterFaceMehtod.Contains(table.InterFaceMehtod)) &&
( string.IsNullOrEmpty(table.InterFaceBody)||x.InterFaceBody.Contains(table.InterFaceBody)) && (string.IsNullOrEmpty(table.InterFaceBody) || x.InterFaceBody.Contains(table.InterFaceBody)) &&
( string.IsNullOrEmpty(table.InterFaceReturnData)||x.InterFaceReturnData.Contains(table.InterFaceReturnData)) && (string.IsNullOrEmpty(table.InterFaceReturnData) || x.InterFaceReturnData.Contains(table.InterFaceReturnData)) &&
( string.IsNullOrEmpty(table.InterFaceType)||x.InterFaceType.Contains(table.InterFaceType)) && (string.IsNullOrEmpty(table.InterFaceType) || x.InterFaceType.Contains(table.InterFaceType)) &&
( string.IsNullOrEmpty(table.IP)||x.IP.Contains(table.IP)) (string.IsNullOrEmpty(table.IP) || x.IP.Contains(table.IP))
orderby x.InterFaceLogDate descending orderby x.InterFaceLogDate descending
select x select x
; ;
return q.ToList(); return q.ToList();
} }
/// 获取分页列表 /// 获取分页列表
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+8 -4
View File
@@ -1355,7 +1355,8 @@ namespace BLL
{ {
var result = (from x in Funs.DB.Hazard_HazardSelectedItem var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 2 join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 2 && z.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
return result; return result;
} }
@@ -1368,7 +1369,8 @@ namespace BLL
{ {
var result = (from x in Funs.DB.Hazard_HazardSelectedItem var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 1 join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 1 && z.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
return result; return result;
} }
@@ -1381,7 +1383,8 @@ namespace BLL
{ {
var result = (from x in Funs.DB.Hazard_HazardSelectedItem var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 3 join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 3 && z.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
return result; return result;
} }
@@ -1394,7 +1397,8 @@ namespace BLL
{ {
var result = (from x in Funs.DB.Hazard_HazardSelectedItem var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where x.ProjectId == projectid && y.RiskLevel == 4 join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId
where z.ProjectId == projectid && y.RiskLevel == 4 && z.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
return result; return result;
} }
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+2 -1
View File
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.DataShow
count = (from x in Funs.DB.Hazard_HazardSelectedItem count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2 where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
} }
else else
@@ -243,6 +243,7 @@ namespace FineUIPro.Web.DataShow
count = (from x in Funs.DB.Hazard_HazardSelectedItem count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2 where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
&& y.CompileDate.Value.Year >= 2023
select x).Count(); select x).Count();
} }
return count; return count;
SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx
+15 -13
View File
@@ -24,10 +24,10 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items> <Items>
<f:TextBox ID="txtUserName" runat="server" Label="接口名称" EmptyText="输入查询条件" <f:TextBox ID="txtUserName" runat="server" Label="接口名称" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px"
LabelAlign="Right"> LabelAlign="Right">
</f:TextBox> </f:TextBox>
<%-- <f:DropDownList ID="drpDataType" runat="server" Label="操作类型" EnableEdit="false" ForceSelection="false" <%-- <f:DropDownList ID="drpDataType" runat="server" Label="操作类型" EnableEdit="false" ForceSelection="false"
Required="true" ShowRedStar="true"> Required="true" ShowRedStar="true">
</f:DropDownList>--%> </f:DropDownList>--%>
<%--<f:TextBox ID="txtUnitName" runat="server" Label="单位" EmptyText="输入查询条件" <%--<f:TextBox ID="txtUnitName" runat="server" Label="单位" EmptyText="输入查询条件"
@@ -43,40 +43,42 @@
<f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" <f:DatePicker ID="txtEndDate" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="150px" EmptyText="结束时间"> Width="150px" EmptyText="结束时间">
</f:DatePicker>--%> </f:DatePicker>--%>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" /> <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:TemplateField Width="250px" HeaderText="单位" ColumnID="UnitId" HeaderTextAlign="Center" ExpandUnusedSpace="true" <f:TemplateField Width="200px" HeaderText="单位" ColumnID="UnitId" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# GetUnitName(Eval("UnitId")) %>'></asp:Label> <asp:Label ID="Label1" runat="server" Text='<%# GetUnitName(Eval("UnitId")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField Width="150px" ColumnID="InterFaceName" DataField="InterFaceName" SortField="InterFaceName" <f:RenderField Width="120px" ColumnID="InterFaceName" DataField="InterFaceName" SortField="InterFaceName"
FieldType="String" HeaderText="接口名称" HeaderTextAlign="Center" TextAlign="Center"> FieldType="String" HeaderText="接口名称" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="InterFaceType" DataField="InterFaceType" SortField="InterFaceType" HeaderTextAlign="Center" TextAlign="Left" <f:RenderField Width="100px" ColumnID="InterFaceType" DataField="InterFaceType" SortField="InterFaceType" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="接口类型"> FieldType="String" HeaderText="接口类型">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="InterFaceUrl" DataField="InterFaceUrl" SortField="InterFaceUrl" HeaderTextAlign="Center" TextAlign="Left" <f:RenderField Width="200px" ColumnID="InterFaceUrl" DataField="InterFaceUrl" SortField="InterFaceUrl" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="接口地址"> FieldType="String" HeaderText="接口地址">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="LogSateInterFaceBodyName" DataField="InterFaceBody" SortField="InterFaceBody" HeaderTextAlign="Center" TextAlign="Left" <f:TemplateField Width="500px" HeaderText="接口参数" ColumnID="LogSateInterFaceBodyName" HeaderTextAlign="Center"
FieldType="String" HeaderText="接口参数"> TextAlign="Left">
</f:RenderField> <ItemTemplate>
<f:TemplateField Width="250px" HeaderText="操作日志" ColumnID="InterFaceReturnData" HeaderTextAlign="Center" ExpandUnusedSpace="true" <asp:Label ID="Label2" runat="server" Text='<%# Bind("InterFaceBody") %>' ToolTip='<%# Bind("InterFaceBody") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField Width="500px" HeaderText="操作日志" ColumnID="InterFaceReturnData" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Bind("InterFaceReturnData") %>' ToolTip='<%# Bind("InterFaceReturnData") %>'></asp:Label> <asp:Label ID="Label4" runat="server" Text='<%# Bind("InterFaceReturnData") %>' ToolTip='<%# Bind("InterFaceReturnData") %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField Width="150px" ColumnID="LogSateName" DataField="LogSateName" SortField="LogSateName" HeaderTextAlign="Center" TextAlign="Left" <f:RenderField Width="100px" ColumnID="LogSateName" DataField="LogSateName" SortField="LogSateName" HeaderTextAlign="Center" TextAlign="Left"
FieldType="String" HeaderText="状态"> FieldType="String" HeaderText="状态">
</f:RenderField> </f:RenderField>
<f:RenderField Width="160px" ColumnID="InterFaceLogDate" DataField="InterFaceLogDate" SortField="InterFaceLogDate" <f:RenderField Width="100px" ColumnID="InterFaceLogDate" DataField="InterFaceLogDate" SortField="InterFaceLogDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="操作时间" HeaderTextAlign="Center" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm:ss" HeaderText="操作时间" HeaderTextAlign="Center"
TextAlign="Center"> TextAlign="Center">
</f:RenderField> </f:RenderField>
SGGL/FineUIPro.Web/TaskScheduling/InterFace/IFLogList.aspx.designer.cs
Generated
+9
View File
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.InterFace
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label Label1; protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary> /// <summary>
/// Label4 控件。 /// Label4 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceSet.aspx
+1 -1
View File
@@ -120,7 +120,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="编辑接口配置信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="编辑接口配置信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="380px"> Width="1024px" Height="600px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
SGGL/FineUIPro.Web/TaskScheduling/InterFace/InterFaceTask.aspx
+1 -1
View File
@@ -85,7 +85,7 @@
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="编辑信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="编辑信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="380px"> Width="1024px" Height="600px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"