schangxiang@126.com
2024-08-23 087bfb0d37901c3264444909a06b28b20078c216
监控帮助类,测试用,后期要去掉
已添加1个文件
已修改5个文件
109 ■■■■■ 文件已修改
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -171,6 +171,9 @@
                                    }
                                }
                                //监控测试数据,模拟,测试
                                MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
                                //特殊处理OP50 ã€Editby shaocx,2024-08-16】
                                string sideValue = GetSideForOP50(plcService, wplog);
                                wplog.MonitoringPoint += sideValue;
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@

using iWare_SCADA_Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace iWare_SCADA_BusinessLogical.Utils
{
    /// <summary>
    /// ç›‘控帮助类,测试用,后期要去掉
    /// </summary>
    public class MonitorHelper
    {
        /// <summary>
        /// ç›‘控OP3501,测试用,后期要去掉
        /// </summary>
        /// <param name="value"></param>
        /// <returns></returns>
        public static void MonitorTestForOP3501(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
        {
            try
            {
                if (_dataCaptureConfig.DataCapturePointCode == "OP3501")
                {
                    //记录下 è§¦å‘的点位和找到的二维码值
                    var str = "";
                    str = $"OP3501 è§¦å‘的点位 DbNumber:{_dataCaptureConfig.DbNumber},Offset:{_dataCaptureConfig.Offset},值是{value.ToString()}";
                    var col = colConfig.First(o => o.DataCapturePointCode == _dataCaptureConfig.DataCapturePointCode && o.DataCapturePointCname == "二维码");
                    str += $",获取二维码值 DbNumber:{col.DbNumber},Offset:{col.Offset},值是{wplog.WorkPieceID.ToString()}";
                    str += $",整体对象 wplog是{JsonConvert.SerializeObject(wplog)}";
                    Log4NetHelper.WriteInfoLog(LogType.MonitorTest, str);
                }
            }
            catch (Exception ex)
            {
                Log4NetHelper.WriteErrorLog(LogType.MonitorTest, "MonitorTestForOP3501异常", ex);
            }
        }
    }
}
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -156,6 +156,7 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="Utils\MonitorHelper.cs" />
    <Compile Include="Utils\SystemHelper.cs" />
    <Compile Include="Utils\ComboBoxHelper.cs" />
    <Compile Include="Utils\ConfigHelper.cs" />
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - ¸´ÖÆÓÃ.config
@@ -5,9 +5,9 @@
  <appSettings>
  </appSettings>
  <log4net>
    <!--  æ¸…洗机采集数据线程【信息】日志-->
    <appender name="OP7009_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP7009_Info\\" />
    <!--  ç›‘控测试数据线程【信息】日志-->
    <appender name="MonitorTest_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
@@ -17,13 +17,13 @@
        <param name="ConversionPattern" value="%n消息时间:%d [%t] %n消息级别:%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP7009_Info" />
        <loggerToMatch value="MonitorTest_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--清洗机采集数据线程【错误】日志-->
    <appender name="OP7009_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP7009_Error\\" />
    <!--监控测试数据线程【错误】日志-->
    <appender name="MonitorTest_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
@@ -33,14 +33,14 @@
        <param name="ConversionPattern" value="%n异常时间:%d [%t] %n异常级别:%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="OP7009_Error" />
        <loggerToMatch value="MonitorTest_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="OP7009_Info"/>
      <appender-ref ref="OP7009_Error"/>
      <appender-ref ref="MonitorTest_Info"/>
      <appender-ref ref="MonitorTest_Error"/>
    </root>
  </log4net>
</configuration>
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
@@ -5,6 +5,38 @@
  <appSettings>
  </appSettings>
  <log4net>
    <!--  ç›‘控测试数据线程【信息】日志-->
    <appender name="MonitorTest_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Info\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n消息时间:%d [%t] %n消息级别:%-5p %n消 æ¯ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="MonitorTest_Info" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--监控测试数据线程【错误】日志-->
    <appender name="MonitorTest_Error" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\MonitorTest_Error\\" />
      <appendToFile value="true" />
      <rollingStyle value="Date" />
      <staticLogFileName value="false" />
      <datePattern value="yyyy-MM-dd.LOG" />
      <layout type="log4net.Layout.PatternLayout">
        <!--输出格式-->
        <param name="ConversionPattern" value="%n异常时间:%d [%t] %n异常级别:%-5p %n异 å¸¸ ç±»ï¼š%c [%x] %n%m %n "/>
      </layout>
      <filter type="log4net.Filter.LoggerMatchFilter">
        <loggerToMatch value="MonitorTest_Error" />
      </filter>
      <filter type="log4net.Filter.DenyAllFilter" />
    </appender>
    <!--  æ¸…洗机采集数据线程【信息】日志-->
    <appender name="OP7009_Info" type="log4net.Appender.RollingFileAppender">
      <file value="D:\\Log\\SCADALog\\OP7009_Info\\" />
@@ -557,6 +589,8 @@
    </appender>
    <root>
      <level value="ALL"/>
      <appender-ref ref="MonitorTest_Info"/>
      <appender-ref ref="MonitorTest_Error"/>
      <appender-ref ref="OP7009_Info"/>
      <appender-ref ref="OP7009_Error"/>
      <appender-ref ref="DeleteData_Info"/>
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -222,6 +222,11 @@
        /// </summary>
        OP7009 = 503,
        /// <summary>
        /// ç›‘控测试数据
        /// </summary>
        MonitorTest = 504,
    }