wenjy
/
Sln.Imm.Daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 设备参数缓存逻辑实现

Browse Source
master
WenJY 3 months ago
parent e854ea5fd5
commit 375575826f
9 changed files with 422 additions and 432 deletions
Show Stats Download Patch File Download Diff File

10
Sln.Imm.Daemon.Cache/BaseDeviceInfoCacheService.cs
Unescape Escape View File

@ -55,15 +55,15 @@ public class BaseDeviceInfoCacheService
var cachedValue = await _fusionCache.GetOrDefaultAsync<List<BaseDeviceInfo>>(key).ConfigureAwait(false);
if (cachedValue != null)
{
_logger.Info($"通过Cache获取数据:{cachedValue.Count};条");
_logger.Info($"通过Cache获取设备数据:{cachedValue.Count};条");
return cachedValue;
}
else
{
var value = _service.Query();
var value = _service.GetDeviceInfosByNavigate();
//将值存入缓存，设置过期时间等
await _fusionCache.SetAsync(key, value, TimeSpan.FromSeconds(5)).ConfigureAwait(false);
_logger.Info($"通过ORM获取数据:{value.Count};条");
await _fusionCache.SetAsync(key, value, TimeSpan.FromMinutes(5)).ConfigureAwait(false);
_logger.Info($"通过ORM获取设备数据:{value.Count};条");
return value;
}
}
@ -74,7 +74,7 @@ public class BaseDeviceInfoCacheService
if (isRes)
{
var value = _service.Query();
var value = _service.GetDeviceInfosByNavigate();
await _fusionCache.SetAsync(key, value, TimeSpan.FromSeconds(5)).ConfigureAwait(false);
}

61
Sln.Imm.Daemon.Common/StringChange.cs
Unescape Escape View File

@ -1,25 +1,25 @@
#region << 版 本 注 释 >>
/*--------------------------------------------------------------------
* 版权所有 (c) 2025 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000
* 机器名称：Mr.Wen's MacBook Pro
* 命名空间：Sln.Imm.Daemon.Common
* 唯一标识：CE4BD2CC-E101-4CF0-BB9C-C3325F54C8FE
*
* 创建者：WenJY
* 电子邮箱：
* 创建时间：2025-09-05 11:10:34
* 版本：V1.0.0
* 描述：
*
*--------------------------------------------------------------------
* 修改人：
* 时间：
* 修改说明：
*
* 版本：V1.0.0
*--------------------------------------------------------------------*/
* 版权所有 (c) 2025 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000
* 机器名称：Mr.Wen's MacBook Pro
* 命名空间：Sln.Imm.Daemon.Common
* 唯一标识：CE4BD2CC-E101-4CF0-BB9C-C3325F54C8FE
*
* 创建者：WenJY
* 电子邮箱：
* 创建时间：2025-09-05 11:10:34
* 版本：V1.0.0
* 描述：
*
*--------------------------------------------------------------------
* 修改人：
* 时间：
* 修改说明：
*
* 版本：V1.0.0
*--------------------------------------------------------------------*/
#endregion << 版 本 注 释 >>
@ -28,7 +28,7 @@ using System.Text;
namespace Sln.Imm.Daemon.Common;
public class StringChange
{
{
/// <summary>
/// 将字符串强制转换成int，转换失败则返回0
/// </summary>
@ -41,6 +41,7 @@ public class StringChange
{
return returnInt;
}
if (int.TryParse(str, out returnInt))
{
return returnInt;
@ -69,8 +70,7 @@ public class StringChange
}
public byte[] HexStrTorbytes(string strHex)//e.g. " 01 01" ---> { 0x01, 0x01}
public byte[] HexStrTorbytes(string strHex) //e.g. " 01 01" ---> { 0x01, 0x01}
{
strHex = strHex.Replace(" ", "");
if ((strHex.Length % 2) != 0)
@ -89,6 +89,7 @@ public class StringChange
{
result += "%" + Convert.ToString(b[i], 16);
}
return result;
}
@ -102,6 +103,7 @@ public class StringChange
{
b[i] = Convert.ToByte(chars[i], 16);
}
//按照指定编码将字节数组变为字符串
return encode.GetString(b);
}
@ -131,6 +133,7 @@ public class StringChange
{
intBytes[i] = floatBytes[i * 2];
}
return intBytes;
}
@ -145,12 +148,12 @@ public class StringChange
{
iVerify = (byte)(iVerify ^ pMessage[i]);
}
return iVerify;
}
public int HexStringToNegative(string strNumber)
{
int iNegate = 0;
int iNumber = Convert.ToInt32(strNumber, 16);
if (iNumber > 127)
@ -169,8 +172,10 @@ public class StringChange
strNegate += "0";
}
}
iNegate = -Convert.ToInt32(strNegate, 2);
}
return iNegate;
}
@ -181,7 +186,7 @@ public class StringChange
/// <param name="buffer"></param>
/// <param name="falg"></param>
/// <exception cref="ArgumentException"></exception>
public void ConvertBytesToUInt16(byte[] buffer,out uint falg)
public void ConvertBytesToUInt16(byte[] buffer, out uint falg)
{
if (buffer == null || buffer.Length < 2)
{
@ -190,7 +195,7 @@ public class StringChange
var input = buffer.Reverse().ToArray();
falg = (uint) ((input[1] << 8) | input[0]);
falg = (uint)((input[1] << 8) | input[0]);
}
/// <summary>
@ -213,6 +218,7 @@ public class StringChange
result[j] = (byte)(swapped >> 8);
result[j + 1] = (byte)swapped;
}
input = result;
}
@ -236,6 +242,7 @@ public class StringChange
stb.Append("0" + Convert.ToString(data[i], 16).ToUpper());
}
}
str = stb.ToString();
return str;
}
@ -256,6 +263,7 @@ public class StringChange
sb.Append(bytes[i].ToString("X2"));
}
}
return sb.ToString();
}
@ -275,6 +283,7 @@ public class StringChange
{
iVerify = iVerify + pMessage[i + 1];
}
return BitConverter.GetBytes(Convert.ToUInt16(iVerify));
}
}
}

165
Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs
Unescape Escape View File

@ -30,7 +30,7 @@ namespace Sln.Imm.Daemon.Model.dao;
/// <summary>
/// 设备信息
/// </summary>
[SugarTable("ems_base_monitor_info"), TenantAttribute("mes")]
[SugarTable("BASE_DEVICELEDGER"), TenantAttribute("mes")]
public class BaseDeviceInfo
{
/// <summary>
@ -38,166 +38,53 @@ public class BaseDeviceInfo
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "obj_id")]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "OBJ_ID")]
public int objid { get; set; }
/// <summary>
/// Desc:父级编号
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "parent_id")]
public int? parentId { get; set; }
/// <summary>
/// Desc:计量设备编号
/// Desc:设备编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true, ColumnName = "monitor_code")]
public string monitorId { get; set; }
[SugarColumn(ColumnName = "DEVICE_CODE")]
public string deviceCode { get; set; }
/// <summary>
/// Desc:计量设备名称
/// Desc:设备名称
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "DEVICE_NAME")]
public string deviceName { get; set; }
/// <summary>
/// Desc:设备型号
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "monitor_name")]
public string monitorName { get; set; }
[SugarColumn(ColumnName = "DEVICE_MODEL")]
public string deviceModel { get; set; }
/// <summary>
/// Desc:计量设备位置
/// Desc:网络地址
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "monitor_addr")]
public string monitorAddr { get; set; }
[SugarColumn(ColumnName = "DEVICE_ADDRESS")]
public string networkAddress { get; set; }
/// <summary>
/// Desc:计量设备类型
/// Desc:设备状态
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "monitor_type")]
public int? monitorType { get; set; }
[SugarColumn(ColumnName = "DEVICE_STATUS")]
public int? deviceStatus { get; set; }
/// <summary>
/// Desc:计量设备状态
/// Default:0
/// Nullable:True
/// 设备参数集合
/// </summary>
[SugarColumn(ColumnName = "monitor_status")]
public int? monitorStatus { get; set; }
/// <summary>
/// Desc:采集设备编号
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "collect_device_id")]
public string collectDeviceId { get; set; }
/// <summary>
/// Desc:祖级列表
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "ancestors")]
public string ancestors { get; set; }
/// <summary>
/// Desc:等级
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "grade")]
public int? grade { get; set; }
/// <summary>
/// Desc:传感器仪表
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "meter_type_id")]
public string meterTypeId { get; set; }
/// <summary>
/// Desc:修正值
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "correct_value")]
public decimal? correctValue { get; set; }
/// <summary>
/// Desc:PT值
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "pt")]
public int? pt { get; set; }
/// <summary>
/// Desc:CT值
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "ct")]
public int? ct { get; set; }
/// <summary>
/// Desc:是否虚拟
/// Default:false
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "is_ammeter")]
public string isAmmeter { get; set; }
/// <summary>
/// Desc:通断复位
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "is_key_monitor")]
public int? isKeyMonitor { get; set; }
/// <summary>
/// Desc:是否断路
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "is_circuit")]
public int? isCircuit { get; set; }
/// <summary>
/// Desc:创建人
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "create_by")]
public string createBy { get; set; }
/// <summary>
/// Desc:创建时间
/// Default:CURRENT_TIMESTAMP
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "create_time")]
public DateTime? createTime { get; set; }
/// <summary>
/// Desc:更新人
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "update_by")]
public string updateBy { get; set; }
/// <summary>
/// Desc:更新时间
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public DateTime? updateTime { get; set; }
///[SugarColumn(IsIgnore = true)]
[Navigate(NavigateType.OneToMany, nameof(BaseDeviceParam.deviceCode), nameof(deviceCode))]
public List<BaseDeviceParam> deviceParams { get; set; }
}

102
Sln.Imm.Daemon.Model/dao/BaseDeviceParam.cs
Unescape Escape View File

@ -1,25 +1,25 @@
#region << 版 本 注 释 >>
/*--------------------------------------------------------------------
* 版权所有 (c) 2025 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000
* 机器名称：Mr.Wen's MacBook Pro
* 命名空间：Sln.Imm.Daemon.Model.dao
* 唯一标识：471106BA-23AA-4923-99A0-EBF103DAD909
*
* 创建者：WenJY
* 电子邮箱：
* 创建时间：2025-09-05 11:15:14
* 版本：V1.0.0
* 描述：
*
*--------------------------------------------------------------------
* 修改人：
* 时间：
* 修改说明：
*
* 版本：V1.0.0
*--------------------------------------------------------------------*/
* 版权所有 (c) 2025 WenJY 保留所有权利。
* CLR版本：4.0.30319.42000
* 机器名称：Mr.Wen's MacBook Pro
* 命名空间：Sln.Imm.Daemon.Model.dao
* 唯一标识：471106BA-23AA-4923-99A0-EBF103DAD909
*
* 创建者：WenJY
* 电子邮箱：
* 创建时间：2025-09-05 11:15:14
* 版本：V1.0.0
* 描述：
*
*--------------------------------------------------------------------
* 修改人：
* 时间：
* 修改说明：
*
* 版本：V1.0.0
*--------------------------------------------------------------------*/
#endregion << 版 本 注 释 >>
@ -30,8 +30,70 @@ namespace Sln.Imm.Daemon.Model.dao;
/// <summary>
/// 设备采集参数
/// </summary>
[SugarTable("ems_base_monitor_info"), TenantAttribute("mes")]
[SugarTable("BASE_DEVICEPARAM"), TenantAttribute("mes")]
public class BaseDeviceParam
{
/// <summary>
/// Desc:自增标识
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "OBJ_ID")]
public int objid { get; set; }
/// <summary>
/// Desc:设备编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "DEVICE_CODE")]
public string deviceCode { get; set; }
/// <summary>
/// Desc:参数编号
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "PARAM_CODE")]
public string paramCode { get; set; }
/// <summary>
/// Desc:参数名称
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "PARAM_NAME")]
public string paramName { get; set; }
/// <summary>
/// Desc:网络地址
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "PARAM_NETWORK")]
public string netWork { get; set; }
/// <summary>
/// Desc: 参数地址
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "PARAM_ADDRESS")]
public string paramAddr { get; set; }
/// <summary>
/// Desc: 参数类型
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "PARAM_TYPE")]
public string paramType { get; set; }
/// <summary>
/// Desc: 是否启用
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int isFlag { get; set; }
}

5
Sln.Imm.Daemon.Repository/service/IBaseDeviceInfoService.cs
Unescape Escape View File

@ -30,4 +30,9 @@ namespace Sln.Imm.Daemon.Repository.service;
public interface IBaseDeviceInfoService : IBaseService<BaseDeviceInfo>
{
/// <summary>
/// 通过导航查询方式获取设备信息及下属参数
/// </summary>
/// <returns></returns>
List<BaseDeviceInfo> GetDeviceInfosByNavigate();
}

19
Sln.Imm.Daemon.Repository/service/Impl/BaseDeviceInfoServiceImpl.cs
Unescape Escape View File

@ -25,6 +25,7 @@
using Sln.Imm.Daemon.Model.dao;
using Sln.Imm.Daemon.Repository.service.@base;
using SqlSugar;
namespace Sln.Imm.Daemon.Repository.service.Impl;
@ -33,4 +34,22 @@ public class BaseDeviceInfoServiceImpl : BaseServiceImpl<BaseDeviceInfo>, IBaseD
public BaseDeviceInfoServiceImpl(Repository<BaseDeviceInfo> rep) : base(rep)
{
}
/// <summary>
/// 通过导航查询方式获取设备信息及下属参数
/// </summary>
/// <returns></returns>
/// <exception cref="InvalidOperationException"></exception>
public List<BaseDeviceInfo> GetDeviceInfosByNavigate()
{
try
{
return _rep.Context.Queryable<BaseDeviceInfo>().Includes(x => x.deviceParams)
.ToList();
}
catch (Exception ex)
{
throw new InvalidOperationException($"通过导航查询方式获取设备信息及下属参数执行异常:{ex.Message}");
}
}
}

13
Sln.Imm.Daemon/Program.cs
Unescape Escape View File

@ -2,6 +2,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using NeoSmart.Caching.Sqlite;
using Sln.Imm.Daemon.Cache;
using Sln.Imm.Daemon.Config;
using Sln.Imm.Daemon.Repository;
using Sln.Imm.Daemon.Serilog;
@ -24,6 +25,12 @@ namespace Sln.Imm.Daemon
var appConfig = ServiceProvider.GetService<AppConfig>();
var log = ServiceProvider.GetService<SerilogHelper>();
log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}");
var baseDeviceInfoCacheService = ServiceProvider.GetService<BaseDeviceInfoCacheService>();
var valueAsync = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
Thread.Sleep(2000);
var valueAsync2 = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
}
private static void ConfigureServices(IServiceCollection services)
@ -40,11 +47,11 @@ namespace Sln.Imm.Daemon
Assembly[] assemblies =
{
Assembly.LoadFrom("Sln.Iot.Common.dll"),
Assembly.LoadFrom("Sln.Iot.Repository.dll"),
Assembly.LoadFrom("Sln.Imm.Daemon.Common.dll"),
Assembly.LoadFrom("Sln.Imm.Daemon.Repository.dll"),
Assembly.LoadFrom("Sln.Imm.Daemon.Cache.dll"),
// Assembly.LoadFrom("Sln.Iot.Socket.dll"),
// Assembly.LoadFrom("Sln.Iot.Business.dll"),
// Assembly.LoadFrom("Sln.Iot.Cache.dll"),
};
services.Scan(scan => scan.FromAssemblies(assemblies)

1
Sln.Imm.Daemon/Sln.Imm.Daemon.csproj
Unescape Escape View File

@ -14,6 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\Sln.Imm.Daemon.Cache\Sln.Imm.Daemon.Cache.csproj"/>
<ProjectReference Include="..\Sln.Imm.Daemon.Common\Sln.Imm.Daemon.Common.csproj"/>
<ProjectReference Include="..\Sln.Imm.Daemon.Config\Sln.Imm.Daemon.Config.csproj"/>
<ProjectReference Include="..\Sln.Imm.Daemon.Repository\Sln.Imm.Daemon.Repository.csproj"/>
<ProjectReference Include="..\Sln.Imm.Daemon.Serilog\Sln.Imm.Daemon.Serilog.csproj"/>

10
Sln.Imm.Daemon/appsettings.json
Unescape Escape View File

@ -3,11 +3,11 @@
"logPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/澳柯玛注塑车间MES项目/日志信息",
"SqlConfig": [
{
"configId": "mes", //imm:注塑设备简称
"dbType": 0, //tidb按照 mysql 去连接
"isFlag": false,
"connStr": "server=127.0.0.1;Port=4000;Database=tao_iot;Uid=root;" //Pwd=haiwei@123;
//"connStr": "server=1.13.177.47;Port=3306;Database=tao_iot;Uid=root;Pwd=Haiwei123456;"
"configId": "mes",
"dbType": 3,
"isFlag": true,
//"connStr": "server=127.0.0.1;Port=4000;Database=tao_iot;Uid=root;"
"connStr": "Data Source=1.13.177.47:1521/helowin;User ID=c##aucma_mes;Password=aucma;"
}
]
}

Write Preview
Loading…
Cancel
Save