From 08adc9d5e01d7505a76bef4b35163c72096ca9ae Mon Sep 17 00:00:00 2001 From: wenjy Date: Tue, 3 Dec 2024 15:20:08 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E5=AE=9A?= =?UTF-8?q?=E7=82=B9=E5=B7=A1=E6=A3=80=E5=8F=96=E6=B6=88=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.Business/FixedPointBusiness.cs | 41 ++++++++++- SlnMesnac.Config/AppConfig.cs | 5 ++ SlnMesnac.WPF/MainWindow.xaml | 6 +- SlnMesnac.WPF/Page/IndexControl.xaml.cs | 2 + SlnMesnac.WPF/SlnMesnac.WPF.csproj | 2 + SlnMesnac.WPF/Templates/image/logo.png | Bin 0 -> 13958 bytes .../ViewModel/IndexControlViewModel.cs | 64 ++---------------- .../ViewModel/MainWindowViewModel.cs | 16 +++-- SlnMesnac.WPF/appsettings.json | 59 ++++++++-------- 9 files changed, 98 insertions(+), 97 deletions(-) create mode 100644 SlnMesnac.WPF/Templates/image/logo.png diff --git a/SlnMesnac.Business/FixedPointBusiness.cs b/SlnMesnac.Business/FixedPointBusiness.cs index e14cec9..719635e 100644 --- a/SlnMesnac.Business/FixedPointBusiness.cs +++ b/SlnMesnac.Business/FixedPointBusiness.cs @@ -51,10 +51,19 @@ namespace SlnMesnac.Business { Task.Run(() => { + isFlag = true; + Task.Delay(1000).Wait(); base.InitEquip(2); //判断PLC状态，下发工作模式 + if (!isFlag) + { + _log.Info($"定点巡检取消"); + return; + } + + if (!_plc.writeInt32ByAddress("VD1516", 1)) //下发轨道电机启动信号 { throw new ArgumentException($"定点巡检模式启动信号写入PLC失败；VD1516写1"); @@ -63,6 +72,10 @@ namespace SlnMesnac.Business _log.Info($"定点巡检模式启动信号写入PLC成功；VD1516写1"); SendTrackMotorAddress(busbarInfo); + + isFlag = false; + + _log.Info($"定点巡检结束"); }); } catch (Exception ex) @@ -71,8 +84,16 @@ namespace SlnMesnac.Business } } - public void EndFixedPoint(base_busbar_info busbarInfo) + public void EndFixedPoint(base_busbar_info busbarInfo,bool isClose = false) { + + if (isClose) + { + _log.Info($"定点巡检取消"); + isFlag = false; + return; + } + if (busbarInfo.isRotate == 1) { GimbaRotationControlEvent?.Invoke("20", "4", "10"); @@ -83,7 +104,7 @@ namespace SlnMesnac.Business throw new ArgumentException($"定点巡检模式下发检测完成信号写入失败；VD1512写1"); } _log.Info($"定点巡检模式下发检测完成信号写入PLC成功；VD1512写1"); - _log.Info($"定点巡检结束"); + //_log.Info($"定点巡检结束"); } @@ -103,6 +124,11 @@ namespace SlnMesnac.Business this.AwaitArriveSignal("VD1528"); //等待轨道相机到位信号 + if (!isFlag) + { + return; + } + this.SendLiftMotorDict(busbarInfo); } @@ -119,6 +145,11 @@ namespace SlnMesnac.Business bool is_arrive = true; while (is_arrive) { + if (!isFlag) + { + break; + } + int is_arrive_flag = _plc.readInt32ByAddress(signal); //读取PLC轨道电机到位信号 if (is_arrive_flag == 1) { @@ -155,7 +186,6 @@ namespace SlnMesnac.Business private void SendLiftMotorDict(base_busbar_info busbar) { - if (!_plc.writeFloatByAddress("VD1524", ((float)busbar.busbarDist))) //下发母排距离，升降电机升降的距离 { throw new ArgumentException($"下发母排升降距离写入失败；VD1524写{busbar.cabinetCode}"); @@ -164,6 +194,11 @@ namespace SlnMesnac.Business this.AwaitArriveSignal("VD1504"); //等待升降电机到位信号 + if (!isFlag) + { + return; + } + //控制云台旋转 if (busbar.isRotate == 1) { diff --git a/SlnMesnac.Config/AppConfig.cs b/SlnMesnac.Config/AppConfig.cs index 17a4228..6452eb5 100644 --- a/SlnMesnac.Config/AppConfig.cs +++ b/SlnMesnac.Config/AppConfig.cs @@ -36,6 +36,11 @@ namespace SlnMesnac.Config /// 日志文件路径 /// public string logPath { get; set; } + + /// + /// 系统标题 + /// + public string SystemTitleStr { get; set; } /// /// 可见光图像保存路径 diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml index d6454cb..eda76a8 100644 --- a/SlnMesnac.WPF/MainWindow.xaml +++ b/SlnMesnac.WPF/MainWindow.xaml @@ -20,7 +20,11 @@ - + + + + + diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml.cs b/SlnMesnac.WPF/Page/IndexControl.xaml.cs index ff59bd0..0f65452 100644 --- a/SlnMesnac.WPF/Page/IndexControl.xaml.cs +++ b/SlnMesnac.WPF/Page/IndexControl.xaml.cs @@ -242,8 +242,10 @@ namespace SlnMesnac.WPF.Page else { btn_fixedmode.Background = new SolidColorBrush(Colors.Transparent); + is_fixed_model = false; + indexControlViewModel.Stop_PointMode(); } } diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj index 7e04033..b83cec5 100644 --- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj +++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj @@ -15,6 +15,7 @@ + @@ -58,6 +59,7 @@ + diff --git a/SlnMesnac.WPF/Templates/image/logo.png b/SlnMesnac.WPF/Templates/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..706588acbdec236acd72a1925efce5420bffd401 GIT binary patch literal 13958 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 z - //{ - // var url = $"{_appConfig.videoFilePath}\\可见光\\{fileName}"; - // CHCNetSDK.NET_DVR_MakeKeyFrame(m_lUserID, 1); - // if (!CHCNetSDK.NET_DVR_SaveRealData(Scenery_RealHandle, url)) - // { - // var str = "可见光通道开启巡检录像失败, error code= " + NET_DVR_GetLastError(); - // _log.Info(str); - // return; - // } - // else - // { - // _log.Info($"可见光通道开启巡检录像成功"); - // } - //}); - - //Task.Run(() => - //{ - // var url = $"{_appConfig.videoFilePath}\\热成像\\{fileName}"; - // CHCNetSDK.NET_DVR_MakeKeyFrame(m_lUserID, 2); - // if (!CHCNetSDK.NET_DVR_SaveRealData(Thermal_RealHandle, url)) - // { - // var str = "热成像通道开启巡检录像失败, error code= " + NET_DVR_GetLastError(); - // _log.Info(str); - // return; - // } - // else - // { - // _log.Info($"热成像通道开启巡检录像成功"); - // } - //}); inspModeBusiness.Start(taskCode, fileName); } @@ -654,37 +623,14 @@ namespace SlnMesnac.WPF.ViewModel /// public void Stop_InspMode() { - //Task.Run(() => - //{ - // if (!CHCNetSDK.NET_DVR_StopSaveRealData(Scenery_RealHandle)) - // { - // var str = "可见光通道关闭巡检录像失败, error code= " + NET_DVR_GetLastError(); - // _log.Info(str); - // return; - // } - // else - // { - // _log.Info($"可见光通道关闭巡检录像成功"); - // } - //}); - - //Task.Run(() => - //{ - // if (!CHCNetSDK.NET_DVR_StopSaveRealData(Thermal_RealHandle)) - // { - // var str = "热成像通道关闭巡检录像失败, error code= " + NET_DVR_GetLastError(); - // _log.Info(str); - // return; - // } - // else - // { - // _log.Info($"热成像通道关闭巡检录像成功"); - // } - //}); - inspModeBusiness.Stop(); } + public void Stop_PointMode() + { + fixedPointBusiness.EndFixedPoint(null,true); + } + private int lastTrackMotorAddress = 0; private void RefreshTrackMotorAddress() { diff --git a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs index e55eb58..1a5f881 100644 --- a/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs @@ -2,6 +2,7 @@ using GalaSoft.MvvmLight.Command; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using SlnMesnac.Config; using SlnMesnac.Plc; using SlnMesnac.WPF.Page; using SlnMesnac.WPF.Page.CabinetInfo; @@ -15,6 +16,8 @@ namespace SlnMesnac.WPF.ViewModel { private readonly ILogger _logger; + private readonly AppConfig _appConfig; + //代码生成 private readonly GenerateControl generateControl = new GenerateControl(); @@ -33,13 +36,13 @@ namespace SlnMesnac.WPF.ViewModel set { _PlcStatus = value; RaisePropertyChanged(nameof(PlcStatus)); } } /// - /// 箱壳扫码器状态 + /// 系统标题 /// - private int _ShellScannerStatus = 0; - public int ShellScannerStatus + private string _SystemTitleStr = "智能巡检控制系统"; + public string SystemTitleStr { - get { return _ShellScannerStatus; } - set { _ShellScannerStatus = value; RaisePropertyChanged(nameof(ShellScannerStatus)); } + get { return _SystemTitleStr; } + set { _SystemTitleStr = value; RaisePropertyChanged(nameof(SystemTitleStr)); } } /// @@ -88,6 +91,9 @@ namespace SlnMesnac.WPF.ViewModel _logger = App.ServiceProvider.GetService>(); + _appConfig = App.ServiceProvider.GetService(); + SystemTitleStr = _appConfig.SystemTitleStr; + ControlOnClickCommand = new RelayCommand(obj => ControlOnClick(obj)); FormControlCommand = new RelayCommand(x => FormControl(x)); RefreshPlcStatus(); diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json index b3eb2e0..6b88f47 100644 --- a/SlnMesnac.WPF/appsettings.json +++ b/SlnMesnac.WPF/appsettings.json @@ -7,33 +7,34 @@ } }, "AllowedHosts": "*", - "AppConfig": { - "logPath": "D:\\巡检机器人控制系统\\日志信息", - "visibleRangePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\可见光图像", - "infraredImagePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\红外热成像", - "videoFilePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\巡检录像", - "cameraIp": "192.168.2.64", - "cameraPort": 8000, - "cameraUserName": "admin", - "cameraPassword": "haiwei@2024", - "checkCycle": 5, - "SqlConfig": [ - { - "configId": "iot", - "dbType": 0, - "connStr": "Data Source=192.168.2.165;Port=3306;Initial Catalog=iot_smarthotspot;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none" - } - ], - "PlcConfig": [ - { - "configId": 1, - "plcType": "SiemensPlc", - //"plcIp": "127.0.0.1", - "plcIp": "192.168.2.1", - "plcPort": 102, - "plcKey": "iot", - "isFlage": "true" - } - ] - } + "AppConfig": { + "SystemTitleStr": "赛轮热电智能巡检控制系统", + "logPath": "D:\\巡检机器人控制系统\\日志信息", + "visibleRangePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\可见光图像", + "infraredImagePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\红外热成像", + "videoFilePath": "D:\\智慧热电监控平台\\uploadPath\\日志信息\\巡检录像", + "cameraIp": "192.168.2.64", + "cameraPort": 8000, + "cameraUserName": "admin", + "cameraPassword": "haiwei@2024", + "checkCycle": 5, + "SqlConfig": [ + { + "configId": "iot", + "dbType": 0, + "connStr": "Data Source=192.168.2.165;Port=3306;Initial Catalog=iot_smarthotspot;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none" + } + ], + "PlcConfig": [ + { + "configId": 1, + "plcType": "SiemensPlc", + "plcIp": "127.0.0.1", + //"plcIp": "192.168.2.1", + "plcPort": 102, + "plcKey": "iot", + "isFlage": "true" + } + ] + } }