UPD

2026-07-21 15:33:30 +03:00
8 changed files with 247 additions and 284 deletions
@@ -6,15 +6,91 @@ namespace DahuaIPCRename
    {
        public static Dictionary<string, string> listIPC = new Dictionary<string, string>
        {
+            {"172.22.10.135","Этаж 2|Пом. 264"},
+{"172.22.10.136","Этаж 2|Эвак.выход лев"},
+{"172.22.10.137","Этаж 2|Ресепшн"},
+{"172.22.10.138","Этаж 2|Пом. 269-1"},
+{"172.22.10.139","Этаж 2|Пом. 268-2"},
+{"172.22.10.140","Этаж 2|Пом. 271"},
+{"172.22.10.141","Этаж 2|Пом. 269-3"},
+{"172.22.10.142","Этаж 2|Пом. 272"},
+{"172.22.10.143","Этаж 2|Пом. 228-1"},
+{"172.22.10.144","Этаж 2|Пом. 269-2"},
+{"172.22.10.145","Этаж 2|Пом. 228-2"},
+{"172.22.10.146","Этаж 2|Пом. 255"},
+{"172.22.10.147","Этаж 2|Пом. 229-3"},
+{"172.22.10.148","Этаж 2|Эвак.выход прав"},
+{"172.22.10.149","Этаж 2|Пом. 229-2"},
+{"172.22.10.150","Этаж 2|Пом. 254"},
+{"172.22.10.151","Этаж 2|Пом. 229-1"},
+{"172.22.10.152","Этаж 2|Пом. 248-7"},
+{"172.22.10.93","Этаж 3|Пом.319-столовая"},
+{"172.22.10.94","Этаж 3|Пом.313-1"},
+{"172.22.10.95","Этаж 3|Пом.321-1"},
+{"172.22.10.96","Этаж 3|Коридор от лифт. холла"},
+{"172.22.10.97","Этаж 3|Пом.321-2"},
+{"172.22.10.98","Этаж 3|Коридор к лифт. холлу"},
+{"172.22.10.99","Этаж 3|Пом.313-2"},
+{"172.22.10.100","Этаж 3|Пом.323-2"},
+{"172.22.10.101","Этаж 3|Пом.323-1"},
+{"172.22.10.102","Этаж 3|Эвак. Выход"},
+{"172.22.10.103","Этаж 3|Кроссовая"},
+{"172.22.10.104","Этаж 3|Пом.304-1"},
+{"172.22.10.105","Этаж 3|Пом.304-2"},
+{"172.22.10.106","Этаж 3|Пом.312"},
+{"172.22.10.107","Этаж 2|Пом.237"},
+{"172.22.10.108","Этаж 5|Пом.519-2"},
+{"172.22.10.109","Этаж 2|Пом.244-1"},
+{"172.22.10.110","Этаж 2|Пом.244-2"},
+{"172.22.10.111","Этаж 2|Пом.245(окно)"},
+{"172.22.10.112","Этаж 2|Пом.245-2"},
+{"172.22.10.113","Этаж 2|Пом.245-1"},
+{"172.22.10.114","Этаж 1|Склад-2"},
+{"172.22.10.115","Этаж 5|Пом.544"},
+{"172.22.10.116","Этаж 1|Пом.ЦОД-1"},
+{"172.22.10.117","Этаж 2|Пом.239-1"},
+{"172.22.10.118","Этаж 1|Пом.ЦОД-2"},
+{"172.22.10.119","Этаж 1|Пом.ИБП"},
+{"172.22.10.120","Этаж 1|Склад-1"},
+{"172.22.10.121","Этаж 2|Пом.239-2"},
 {"172.22.10.122","Этаж 2|Пом. 247"},
 {"172.22.10.123","Этаж 2|Пом. 248-4"},
 {"172.22.10.124","Этаж 2|Пом. 248-5"},
 {"172.22.10.125","Этаж 2|Пом. 248-2"},
 {"172.22.10.126","Этаж 2|Пом. 248-6"},
 {"172.22.10.127","Этаж 2|Пом. 248-3"},
-            {"172.22.10.128","Этаж 2|Пом. 273-1"},
+{"172.22.10.128","Этаж 2|Пом. 237-1"},
 {"172.22.10.129","Этаж 2|Пом. 268-1"},
-            {"172.22.10.130","Этаж 2|Пом. 273-2"}
+{"172.22.10.130","Этаж 2|Пом. 237-2"},
+{"172.22.10.131","Улица-2"},
+{"172.22.10.132","Улица-3"},
+{"172.22.10.133","Улица-1"},
+{"172.22.10.134","Улица-4-PTZ"},
+{"172.22.10.51","Этаж 5|Пом.545-2"},
+{"172.22.10.52","Этаж 5|Пом.519-1"},
+{"172.22.10.53","Этаж 5|Пом.511-1"},
+{"172.22.10.54","Этаж 5|Пом.517-2"},
+{"172.22.10.55","Этаж 5|Эвак. Выход-3"},
+{"172.22.10.56","Этаж 5|Пом.545-коридор"},
+{"172.22.10.57","Этаж 5|Ресепшн-1"},
+{"172.22.10.58","Этаж 5|Пом.545-3"},
+{"172.22.10.59","Этаж 5|Пом.521-3"},
+{"172.22.10.60","Этаж 5|Пом.535 к лифтам"},
+{"172.22.10.61","Этаж 5|Пом.515-2"},
+{"172.22.10.62","Этаж 5|Пом.511-2"},
+{"172.22.10.63","Этаж 5|Пом.517-1"},
+{"172.22.10.64","Этаж 5|Пом.521-1"},
+{"172.22.10.65","Этаж 5|Пом.535-коридор"},
+{"172.22.10.66","Этаж 5|Пом.526-столовая"},
+{"172.22.10.67","Этаж 5|Пом.545-4"},
+{"172.22.10.68","Этаж 5|Пом.532-2"},
+{"172.22.10.69","Этаж 5|Пом.515-1"},
+{"172.22.10.70","Этаж 5|Пом.535-1"},
+{"172.22.10.71","Этаж 5|Эвак. Выход-2"},
+{"172.22.10.72","Этаж 5|Пом.545-1"},
+{"172.22.10.73","Этаж 5|Ресепшн-2"},
+{"172.22.10.74","Этаж 5|Пом.521-2"},
+{"172.22.10.75","Этаж 2|ВРУ"}
        };

        static async Task Main(string[] args)
@@ -12,11 +12,18 @@ internal class Program
        args[2] = "admin";
        args[3] = "4NUDZhJ7";
 #endif
-        string server, login, password;
-        if (args.Length != 4) return;
+        string? server = null, login, password;
+        if (args.Length != 4)
+        {
+            login = args[1];
+            password = args[2];
+        }
+        else
+        {
            server = args[1];
            login = args[2];
            password = args[3];
+        }


        switch (args[0])
@@ -135,8 +142,8 @@ internal class Program
                            $"SNMP.WriteCommon=private";
                            var response2 = await httpClient.GetAsync(requestUrl2);
                            var r2 = await response2.Content.ReadAsStringAsync();
-                            if (r2.StartsWith("OK")) Console.WriteLine("0");
-                            else Console.WriteLine("1");
+                            if (r2.StartsWith("OK")) Console.WriteLine($"{host} - OK");
+                            else Console.WriteLine($"{host} - !!!BAD!!!");
                        }
                        else Console.WriteLine("1");
                    }
@@ -1,255 +1,60 @@
-172.16.54.1
-172.16.54.2
-172.16.54.3
-172.16.54.4
-172.16.54.5
-172.16.54.6
-172.16.54.7
-172.16.54.8
-172.16.54.9
-172.16.54.10
-172.16.54.11
-172.16.54.12
-172.16.54.13
-172.16.54.14
-172.16.54.15
-172.16.54.16
-172.16.54.17
-172.16.54.18
-172.16.54.19
-172.16.54.20
-172.16.54.21
-172.16.54.22
-172.16.54.23
-172.16.54.24
-172.16.54.25
-172.16.54.26
-172.16.54.27
-172.16.54.28
-172.16.54.29
-172.16.54.30
-172.16.54.31
-172.16.54.32
-172.16.54.33
-172.16.54.34
-172.16.54.35
-172.16.54.36
-172.16.54.37
-172.16.54.38
-172.16.54.39
-172.16.54.40
-172.16.54.41
-172.16.54.42
-172.16.54.43
-172.16.54.44
-172.16.54.45
-172.16.54.46
-172.16.54.47
-172.16.54.48
-172.16.54.49
-172.16.54.50
-172.16.54.51
-172.16.53.52
-172.16.53.53
-172.16.53.54
-172.16.53.55
-172.16.53.56
-172.16.53.57
-172.16.53.58
-172.16.53.59
-172.16.53.60
-172.16.53.61
-172.16.53.62
-172.16.53.63
-172.16.53.64
-172.16.53.65
-172.16.53.66
-172.16.53.67
-172.16.53.68
-172.16.53.69
-172.16.53.70
-172.16.53.71
-172.16.53.72
-172.16.53.73
-172.16.53.74
-172.16.53.75
-172.16.53.76
-172.16.53.77
-172.16.53.78
-172.16.53.79
-172.16.53.80
-172.16.53.81
-172.16.53.82
-172.16.53.83
-172.16.53.84
-172.16.53.85
-172.16.53.86
-172.16.53.87
-172.16.53.88
-172.16.53.89
-172.16.53.90
-172.16.53.91
-172.16.53.92
-172.16.53.93
-172.16.53.94
-172.16.53.95
-172.16.53.96
-172.16.53.97
-172.16.53.98
-172.16.53.99
-172.16.53.100
-172.16.53.101
-172.16.53.102
-172.16.53.103
-172.16.53.104
-172.16.53.105
-172.16.53.106
-172.16.53.107
-172.16.53.108
-172.16.53.109
-172.16.53.110
-172.16.53.111
-172.16.53.112
-172.16.53.113
-172.16.53.114
-172.16.53.115
-172.16.53.116
-172.16.53.117
-172.16.53.118
-172.16.53.119
-172.16.53.120
-172.16.53.121
-172.16.53.122
-172.16.53.123
-172.16.53.124
-172.16.53.125
-172.16.53.126
-172.16.53.127
-172.16.53.128
-172.16.53.129
-172.16.53.130
-172.16.53.131
-172.16.53.132
-172.16.53.133
-172.16.53.134
-172.16.53.135
-172.16.53.136
-172.16.53.137
-172.16.53.138
-172.16.53.139
-172.16.53.140
-172.16.53.141
-172.16.53.142
-172.16.53.143
-172.16.53.144
-172.16.53.145
-172.16.53.146
-172.16.53.147
-172.16.53.148
-172.16.53.149
-172.16.53.150
-172.16.53.151
-172.16.53.152
-172.16.53.153
-172.16.53.154
-172.16.53.155
-172.16.53.156
-172.16.53.157
-172.16.53.158
-172.16.53.159
-172.16.53.160
-172.16.53.161
-172.16.53.162
-172.16.53.163
-172.16.53.164
-172.16.53.165
-172.16.53.166
-172.16.53.167
-172.16.53.168
-172.16.53.169
-172.16.53.170
-172.16.53.171
-172.16.53.172
-172.16.53.173
-172.16.53.174
-172.16.53.175
-172.16.53.176
-172.16.53.177
-172.16.53.178
-172.16.53.179
-172.16.53.180
-172.16.53.181
-172.16.53.182
-172.16.53.183
-172.16.53.184
-172.16.53.185
-172.16.53.186
-172.16.53.187
-172.16.53.188
-172.16.53.189
-172.16.53.190
-172.16.53.191
-172.16.53.192
-172.16.53.193
-172.16.53.194
-172.16.53.195
-172.16.53.196
-172.16.53.197
-172.16.53.198
-172.16.53.199
-172.16.53.200
-172.16.53.201
-172.16.53.202
-172.16.53.203
-172.16.53.204
-172.16.53.205
-172.16.53.206
-172.16.53.207
-172.16.53.208
-172.16.53.209
-172.16.53.210
-172.16.53.211
-172.16.53.212
-172.16.53.213
-172.16.53.214
-172.16.53.215
-172.16.53.216
-172.16.53.217
-172.16.53.218
-172.16.53.219
-172.16.53.220
-172.16.53.221
-172.16.53.222
-172.16.53.223
-172.16.53.224
-172.16.53.225
-172.16.53.226
-172.16.53.227
-172.16.53.228
-172.16.53.229
-172.16.53.230
-172.16.53.231
-172.16.53.232
-172.16.53.233
-172.16.53.234
-172.16.53.235
-172.16.53.236
-172.16.53.237
-172.16.53.238
-172.16.53.239
-172.16.53.240
-172.16.53.241
-172.16.53.242
-172.16.53.243
-172.16.53.244
-172.16.53.245
-172.16.53.246
-172.16.53.247
-172.16.53.248
-172.16.53.249
-172.16.53.250
-172.16.53.251
-172.16.53.252
-172.16.53.253
-172.16.53.254
-172.16.53.255
+172.22.10.93
+172.22.10.94
+172.22.10.95
+172.22.10.96
+172.22.10.97
+172.22.10.98
+172.22.10.99
+172.22.10.100
+172.22.10.101
+172.22.10.102
+172.22.10.103
+172.22.10.104
+172.22.10.105
+172.22.10.106
+172.22.10.107
+172.22.10.108
+172.22.10.109
+172.22.10.110
+172.22.10.111
+172.22.10.112
+172.22.10.113
+172.22.10.114
+172.22.10.115
+172.22.10.116
+172.22.10.117
+172.22.10.118
+172.22.10.119
+172.22.10.120
+172.22.10.121
+172.22.10.122
+172.22.10.123
+172.22.10.124
+172.22.10.125
+172.22.10.126
+172.22.10.127
+172.22.10.128
+172.22.10.129
+172.22.10.130
+172.22.10.131
+172.22.10.132
+172.22.10.133
+172.22.10.134
+172.22.10.135
+172.22.10.136
+172.22.10.137
+172.22.10.138
+172.22.10.139
+172.22.10.140
+172.22.10.141
+172.22.10.142
+172.22.10.143
+172.22.10.144
+172.22.10.145
+172.22.10.146
+172.22.10.147
+172.22.10.148
+172.22.10.149
+172.22.10.150
+172.22.10.151
+172.22.10.152
@@ -17,6 +17,8 @@
                    Дашборд
                </BarLink>
            </BarItem>
+        </BarStart>
+        <BarEnd>
            <BarItem>
                <BarDropdown @bind-Visible="pagesBarVisible">
                    <BarDropdownToggle>
@@ -31,8 +33,6 @@
                    </BarDropdownMenu>
                </BarDropdown>
            </BarItem>
-        </BarStart>
-        <BarEnd>
            <BarItem>
                <BarLink To="/setting/wizard">
                    <BarIcon IconName="IconName.CaretSquareRight" />
@@ -11,13 +11,6 @@
        </LayoutSiderContent>
    </LayoutSider>
    <Layout>
-        @*             <LayoutHeader Fixed>
-                <TopMenu ThemeEnabledChanged="@OnThemeEnabledChanged"
-                     ThemeGradientChanged="@OnThemeGradientChanged"
-                     ThemeRoundedChanged="@OnThemeRoundedChanged"
-                     ThemeColorChanged="@OnThemeColorChanged"
-                     @bind-LayoutType="@layoutType" />
-            </LayoutHeader> *@
        <LayoutContent Padding="Padding.Is4.OnX.Is4.FromTop">
            @Body
        </LayoutContent>
@@ -1,5 +1,61 @@
@page "/"
@using Visor.Models
@inject IVersionProvider VersionProvider
+@inject NavigationManager Navigation
 <Heading Size="HeadingSize.Is1" Margin="Margin.Is3.FromBottom">ДАШБОРД</Heading>

+
+@if (_list_obj is null)
+{
+    <p>Получаю данные...</p>
+}
+else
+{
+    <CardDeck>
+        @foreach (var obj in _list_obj)
+        {
+            <Card>
+                @* <CardImage Source="/img/gallery/2.jpg" Alt="Card image cap 3"></CardImage> *@
+                <CardBody>
+                    <CardTitle TextAlignment="TextAlignment.Center" Size="HeadingSize.Is3">@obj.NameObject (@obj.DescriptionObject)</CardTitle>
+                    <CardText>
+                        <Divider />
+                        <b>Всего устройств: @_list_dev.Where(d => d.DeviceObject == obj.Id).Count()</b><br />
+                        @foreach (var tp in _list_type)
+                        {
+                            <div> ☞ @tp.Name : @_list_dev.Where(d => d.DeviceObject == obj.Id && d.DeviceType == tp.Id).Count() <br /></div>
+                        }
+                        @*                         ˫ Коммутаторы: @_list_dev.Where(d => d.DeviceObject == obj.Id && d.DeviceType == _list_type.First(t => t.Name.Contains("Switch")).Id).Count()<br />
+                        ˫ Камеры: @_list_dev.Where(d => d.DeviceObject == obj.Id && d.DeviceType == _list_type.First(t => t.Name.Contains("Camera")).Id).Count() *@
+                    </CardText>
+                    <Button Color="Color.Primary" Clicked="@(() => GoToObj(obj.Id))">Перейти к объекту</Button>
+                </CardBody>
+            </Card>
+
+        }
+    </CardDeck>
+}
+
+@code
+{
+
+
+    List<ObjectItems> _list_obj;
+    List<DeviceItems> _list_dev;
+    List<DeviceTypeItems> _list_type;
+
+
+    protected override async Task OnInitializedAsync()
+    {
+        await AllPubData.GetAll();
+        _list_obj = AllPubData.ListObjectItems;
+        _list_type = AllPubData.ListDeviceTypeItems;
+        _list_dev = AllPubData.ListDeviceItems;
+    }
+
+    void GoToObj(Guid id)
+    {
+        Navigation.NavigateTo($"/object/{id}");
+    }
+}
+
@@ -0,0 +1,27 @@
+@page "/object/{Id:guid}"
+@using Visor.Models
+<h3>ObjectInfo</h3>
+
+@if (_obj != null)
+{
+    <p>Название: @_obj.NameObject</p>
+    <p>Количество устройств: @_devs.Count</p>
+}
+else
+{
+    <p>Загрузка данных или объект не найден...</p>
+}
+
+@code {
+    [Parameter]
+    public Guid Id { get; set; }
+    
+    private ObjectItems? _obj;
+    private List<DeviceItems> _devs = new();
+
+    protected override void OnInitialized()
+    {
+        _obj = AllPubData.ListObjectItems.FirstOrDefault(o => o.Id == Id);
+        _devs = AllPubData.ListDeviceItems.Where(d => d.DeviceObject == Id).ToList();
+    }
+}
@@ -349,10 +349,9 @@
    protected override async Task OnInitializedAsync()
    {
        visible = true;
-        await AllPubData.GetAll();
-        list_type = AllPubData.ListDeviceTypeItems;
-        list_obj = AllPubData.ListObjectItems;
-        list_dev = AllPubData.ListDeviceItems;
+        _list_type = AllPubData.ListDeviceTypeItems;
+        _list_obj = AllPubData.ListObjectItems;
+        _list_dev = AllPubData.ListDeviceItems;
        visible = false;
    }