huanneng
/
hn_zw_back_main
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

电池信息上传

Browse Source
zw
rszn 5 months ago
parent 397f38845e
commit 7b47ffad98
8 changed files with 241 additions and 156 deletions
Show Stats Download Patch File Download Diff File

9
Service/Cloud/Client/CloudClient.cs
Unescape View File

@ -76,6 +76,7 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
/// ///
/// </summary> /// </summary>
public MsgPair<VehicleCertification, VehicleCertificationResp> CarAuth { get; set; } = new(); public MsgPair<VehicleCertification, VehicleCertificationResp> CarAuth { get; set; } = new();
public MsgPair<BatDataInfo, BatDataInfoRes> BatData { get; set; } = new();
public MsgPair<ChannelStatusReporting, ChannelStatusReportingResp> ChannelStatus { get; set; } = new(); public MsgPair<ChannelStatusReporting, ChannelStatusReportingResp> ChannelStatus { get; set; } = new();
public MsgPair<AirConditioningData, AirConditioningDataResp> AirConditioning { get; set; } = new(); public MsgPair<AirConditioningData, AirConditioningDataResp> AirConditioning { get; set; } = new();
public MsgPair<ChargeRecordReporting, ChargeRecordReportingResp> ChargeRecord { get; set; } = new(); public MsgPair<ChargeRecordReporting, ChargeRecordReportingResp> ChargeRecord { get; set; } = new();
@ -404,6 +405,14 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
return CarAuth.GetResp(timeSpan); return CarAuth.GetResp(timeSpan);
} }
public BatDataInfoRes? SendBatDataInfo(BatDataInfo batDataInfo,
TimeSpan? timeSpan = null)
{
this.BatData.Req = batDataInfo;
this.Publish(batDataInfo);
return BatData.GetResp(timeSpan);
}
/// <summary> /// <summary>
/// 换电站通道状态上报 /// 换电站通道状态上报
/// </summary> /// </summary>

87
Service/Cloud/Client/CloudClientMgr.cs
Unescape View File

@ -19,6 +19,7 @@ public class CloudClientMgr
public static CloudClient? CloudClient { get; set; } public static CloudClient? CloudClient { get; set; }
private static DateTime _dateTime = DateTime.Now.AddSeconds(-30); private static DateTime _dateTime = DateTime.Now.AddSeconds(-30);
public static void Init() public static void Init()
{ {
CloudClient = AppInfo.Container.Resolve<CloudClient>(); CloudClient = AppInfo.Container.Resolve<CloudClient>();
@ -53,45 +54,65 @@ public class CloudClientMgr
{ {
BinInfo? binInfo = binInfoRepository.QueryByClause(it => it.ChargerNo == data.ChargerNo); BinInfo? binInfo = binInfoRepository.QueryByClause(it => it.ChargerNo == data.ChargerNo);
ChargeDevDataInfo req = new ChargeDevDataInfo(); ChargeDevDataInfo req = new ChargeDevDataInfo();
req.sn = StaticStationInfo.StationNo; req.sn = StaticStationInfo.StationNo;
req.en = StaticStationInfo.StationNo + data.ChargerNo; req.en = StaticStationInfo.StationNo + data.ChargerNo;
req.sd = "A"+int.Parse(binInfo.No); req.sd = "A" + int.Parse(binInfo.No);
req.mtp = StaticStationInfo.ChargePower; req.mtp = StaticStationInfo.ChargePower;
req.mcr = 1; req.mcr = 1;
req.hb = binInfo?.Exists??0; req.hb = binInfo?.Exists ?? 0;
req.el = 0; req.el = 0;
req.cno = int.Parse(binInfo.No); req.cno = int.Parse(binInfo.No);
req.cs = binInfo.ChargeStatus??0; req.cs = binInfo.ChargeStatus ?? 0;
req.fs = 0; req.fs = 0;
req.@as = 0; req.@as = 0;
//fc = data., //fc = data.,
//st = data., //st = data.,
req.ct = data.ChargingTime; req.ct = data.ChargingTime;
//ssoc = data., //ssoc = data.,
req.csoc = data.CurrentSoc; req.csoc = data.CurrentSoc;
//ssoe = data., //ssoe = data.,
//csoe = data., //csoe = data.,
req.cvot = data.BmsChargingVoltage; req.cvot = data.BmsChargingVoltage;
req.ccur = data.BmsChargingCurrent; req.ccur = data.BmsChargingCurrent;
req.nvot = data.BmsNeedVoltage; req.nvot = data.BmsNeedVoltage;
req.ncur = data.BmsNeedCurrent; req.ncur = data.BmsNeedCurrent;
req.lsv = data.SingleBatteryMinVoltage; req.lsv = data.SingleBatteryMinVoltage;
req.hsv = data.SingleBatteryMaxVoltage; req.hsv = data.SingleBatteryMaxVoltage;
req.lst = data.MinBatteryTemp; req.lst = data.MinBatteryTemp;
req.hst = data.MaxBatteryTemp; req.hst = data.MaxBatteryTemp;
req.ws = 0xFF; req.ws = 0xFF;
req.it = 0xFF; req.it = 0xFF;
req.ot = 0xFF; req.ot = 0xFF;
req.bt = DateTime.Now; req.bt = DateTime.Now;
if ((DateTime.Now - _dateTime).TotalSeconds <= 30) if ((DateTime.Now - _dateTime).TotalSeconds <= 30)
{ {
return; return;
} }
_dateTime = DateTime.Now; _dateTime = DateTime.Now;
CloudClient?.SendChargeDevDataInfo(req); CloudClient?.SendChargeDevDataInfo(req);
}
}
}
catch (Exception e)
{
Log.Info("error", e);
}
});
redisHelper?.GetSubscriber().Subscribe("BatteryInfoUploadTask", (channel, value) =>
{
try
{
Log.Info($"receive BatteryInfoUploadTask={value}");
if (value.HasValue)
{
BatDataInfo? data = JsonConvert.DeserializeObject<BatDataInfo>(value.ToString());
if (data != null)
{
CloudClient?.SendBatDataInfo(data);
} }
} }
} }

15
Service/Cloud/Common/CloudConst.cs
Unescape View File

@ -59,24 +59,25 @@ public class CloudConst
public static readonly string eqmStateEndLogInfoRes = "eqmStateEndLogInfoRes"; public static readonly string eqmStateEndLogInfoRes = "eqmStateEndLogInfoRes";
public static readonly string chargeDevDataInfo = "chargeDevDataInfo"; public static readonly string chargeDevDataInfo = "chargeDevDataInfo";
public static readonly string chargeDevDataInfoRes = "chargeDevDataInfoRes"; public static readonly string chargeDevDataInfoRes = "chargeDevDataInfoRes";
public static readonly string batDataInfo = "batDataInfo";
/// <summary> /// <summary>
/// 站外 /// 站外
/// </summary> /// </summary>
public static readonly string pileStartCharge = "pileStartCharge"; public static readonly string pileStartCharge = "pileStartCharge";
public static readonly string pileStartChargeRes = "pileStartChargeRes"; public static readonly string pileStartChargeRes = "pileStartChargeRes";
public static readonly string pileStopCharge = "pileStopCharge"; public static readonly string pileStopCharge = "pileStopCharge";
public static readonly string pileRealtimeRes = "pileRealtimeRes"; public static readonly string pileRealtimeRes = "pileRealtimeRes";
public static readonly string pileEndCharge = "pileEndCharge"; public static readonly string pileEndCharge = "pileEndCharge";
public static readonly string pileEndChargeRes = "pileEndChargeRes"; public static readonly string pileEndChargeRes = "pileEndChargeRes";
public static readonly string pileChargeRealtime = "pileChargeRealtime"; public static readonly string pileChargeRealtime = "pileChargeRealtime";
public static readonly string pileChargeRealtimeRes = "pileChargeRealtimeRes"; public static readonly string pileChargeRealtimeRes = "pileChargeRealtimeRes";
public static readonly string pileRealtime = "pileRealtime"; public static readonly string pileRealtime = "pileRealtime";
#endregion #endregion
} }

81
Service/Cloud/Msg/Cloud/Resp/BatDataInfo.cs
Unescape View File

@ -1,81 +0,0 @@
namespace Service.Cloud.Msg.Cloud.Resp;
/// <summary>
/// 4.2.11.1 换电站电池包数据信息
/// </summary>
public class BatDataInfo
{
/// <summary>
/// 场站编码 换电站唯一码
/// </summary>
public string sn { get; set; }
/// <summary>
/// 换电站电池包总 数量
/// </summary>
public int batn { get; set; }
/// <summary>
/// 电池序列号
/// </summary>
public string bn { get; set; }
/// <summary>
/// 充电架 ID 按电池架的编号 A1，A2…
/// </summary>
public string sd { get; set; }
/// <summary>
/// 所在充电机序号 从 1 开始递增
/// </summary>
public int cno { get; set; }
/// <summary>
/// 是否在充电 0：未知 1：正在充电 2：未电池
/// </summary>
public int hc { get; set; }
/// <summary>
/// 电接头连接状态 0：未知 1：已经连接 2：未连接
/// </summary>
public int el { get; set; }
/// <summary>
/// 剩余能量 单位 0.1 kwh
/// </summary>
public float soe { get; set; }
/// <summary>
/// 当前 SOC 0-100 单位 0.1 ，没有充电填 0
/// </summary>
public float soc { get; set; }
/// <summary>
/// 当前 SOH 0-100 单位 0.1 ，没有充电填 0
/// </summary>
public float soh { get; set; }
/// <summary>
/// 最低单体电压 单位 0.01V
/// </summary>
public float lsv { get; set; }
/// <summary>
/// 最高单体电压 单位 0.01V
/// </summary>
public float hsv { get; set; }
/// <summary>
/// 最低单体温度 单位 0.1℃
/// </summary>
public float lst { get; set; }
/// <summary>
/// 最高单体温度 单位 0.1℃
/// </summary>
public float hst { get; set; }
/// <summary>
/// 单体电池号 从 1 开始递增
/// </summary>
public int sl { get; set; }
/// <summary>
/// 单体电压 每一节电芯的单体电压 单位 0.1V ，如果没有该节电芯的数据，填65535.0 无效值
/// </summary>
public float sv { get; set; }
/// <summary>
/// 单体温度 每一节电芯的单体温度 单位 0.1℃ ,如果没有该节电芯的数据，填65535.0 无效值
/// </summary>
public float st { get; set; }
/// <summary>
/// 更新时间 格式 ”yyyy-MM-dd HH:mm:ss ”
/// </summary>
public DateTime bt { get; set; }
}

26
Service/Cloud/Msg/Host/Req/BatDataInfo.cs
Unescape View File

@ -1,16 +1,30 @@
using System; using Service.Cloud.Common;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Service.Cloud.Msg.Host.Req namespace Service.Cloud.Msg.Host.Req
{ {
/// <summary> /// <summary>
/// 4.2.11.1 换电站电池包数据信息 /// 4.2.11.1 换电站电池包数据信息
/// </summary> /// </summary>
public class BatDataInfo public class BatDataInfo : ICmd
{ {
/// <summary>
/// 场站编码 换电站唯一码
/// </summary>
public string sn { get; set; }
/// <summary>
/// 换电站电池包总 数量
/// </summary>
public int batn { get; set; }
/// <summary>
/// 电池信息
/// </summary>
public List<SingleBatInfo> datainfo { get; set; }
public string GetCmd()
{
return CloudConst.batDataInfo;
}
} }
} }

84
Service/Cloud/Msg/Host/Req/SingleBatInfo.cs
Unescape View File

@ -0,0 +1,84 @@
namespace Service.Cloud.Msg.Host.Req;
public class SingleBatInfo
{
/// <summary>
/// 电池序列号
/// </summary>
public string bn { get; set; }
/// <summary>
/// 充电架 ID 按电池架的编号 A1，A2…
/// </summary>
public string sd { get; set; }
/// <summary>
/// 所在充电机序号 从 1 开始递增
/// </summary>
public int cno { get; set; }
/// <summary>
/// 是否在充电 0：未知 1：正在充电 2：未电池
/// </summary>
public int hc { get; set; }
/// <summary>
/// 电接头连接状态 0：未知 1：已经连接 2：未连接
/// </summary>
public int el { get; set; }
/// <summary>
/// 剩余能量 单位 0.1 kwh
/// </summary>
public float soe { get; set; }
/// <summary>
/// 当前 SOC 0-100 单位 0.1 ，没有充电填 0
/// </summary>
public float soc { get; set; }
/// <summary>
/// 当前 SOH 0-100 单位 0.1 ，没有充电填 0
/// </summary>
public float soh { get; set; }
/// <summary>
/// 最低单体电压 单位 0.01V
/// </summary>
public float lsv { get; set; }
/// <summary>
/// 最高单体电压 单位 0.01V
/// </summary>
public float hsv { get; set; }
/// <summary>
/// 最低单体温度 单位 0.1℃
/// </summary>
public float lst { get; set; }
/// <summary>
/// 最高单体温度 单位 0.1℃
/// </summary>
public float hst { get; set; }
/// <summary>
/// 单体电池号 从 1 开始递增
/// </summary>
public int sl { get; set; }
/// <summary>
/// 单体电压 每一节电芯的单体电压 单位 0.1V ，如果没有该节电芯的数据，填65535.0 无效值
/// </summary>
public float sv { get; set; }
/// <summary>
/// 单体温度 每一节电芯的单体温度 单位 0.1℃ ,如果没有该节电芯的数据，填65535.0 无效值
/// </summary>
public float st { get; set; }
/// <summary>
/// 更新时间 格式 ”yyyy-MM-dd HH:mm:ss ”
/// </summary>
public DateTime bt { get; set; }
}

90
WebStarter/appsettings.dev.json
Unescape View File

@ -23,12 +23,18 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"，": null, "，": null,
"Cryptogram": { "Cryptogram": {
"StrongPassword": "false", // 是否开启密码强度验证 "StrongPassword": "false",
"PasswordStrengthValidation": "(?=^.{6,16}$)(?=.*\\d)(?=.*\\W+)(?=.*[A-Z])(?=.*[a-z])(?!.*\\n).*$", // 密码强度验证正则表达式，必须须包含大小写字母、数字和特殊字符的组合，长度在6-16之间 // 是否开启密码强度验证
"PasswordStrengthValidationMsg": "密码必须包含大小写字母、数字和特殊字符的组合，长度在6-16之间", // 密码强度验证消息提示 "PasswordStrengthValidation": "(?=^.{6,16}$)(?=.*\\d)(?=.*\\W+)(?=.*[A-Z])(?=.*[a-z])(?!.*\\n).*$",
"CryptoType": "SM2", // 密码加密算法：MD5、SM2、SM4 // 密码强度验证正则表达式，必须须包含大小写字母、数字和特殊字符的组合，长度在6-16之间
"PublicKey": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312", // 公钥 "PasswordStrengthValidationMsg": "密码必须包含大小写字母、数字和特殊字符的组合，长度在6-16之间",
"PrivateKey": "8EDB615B1D48B8BE188FC0F18EC08A41DF50EA731FA28BF409E6552809E3A111" // 私钥 // 密码强度验证消息提示
"CryptoType": "SM2",
// 密码加密算法：MD5、SM2、SM4
"PublicKey": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
// 公钥
"PrivateKey": "8EDB615B1D48B8BE188FC0F18EC08A41DF50EA731FA28BF409E6552809E3A111"
// 私钥
}, },
//Login //Login
"TokenOptions": { "TokenOptions": {
@ -38,34 +44,62 @@
"Issuer": "jwtIssuer" "Issuer": "jwtIssuer"
}, },
"Upload": { "Upload": {
"Path": "Upload/{yyyy}/{MM}/{dd}", // 文件上传目录 "Path": "Upload/{yyyy}/{MM}/{dd}",
"MaxSize": 20480, // 文件最大限制KB：1024*20 // 文件上传目录
"ContentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif", "image/bmp", "text/plain", "application/pdf", "application/msword", "application/vnd.ms-excel", "application/vnd.ms-powerpoint", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "video/mp4" ], "MaxSize": 20480,
"EnableMd5": false // 启用文件MDF5验证-防止重复上传 // 文件最大限制KB：1024*20
"ContentType": [
"image/jpg",
"image/png",
"image/jpeg",
"image/gif",
"image/bmp",
"text/plain",
"application/pdf",
"application/msword",
"application/vnd.ms-excel",
"application/vnd.ms-powerpoint",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"video/mp4"
],
"EnableMd5": false
// 启用文件MDF5验证-防止重复上传
}, },
//SysLogin //SysLogin
"JWTSettings": { "JWTSettings": {
"ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true "ValidateIssuerSigningKey": true,
"IssuerSigningKey": "3c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16 // 是否验证密钥，bool 类型，默认true
"ValidateIssuer": true, // 是否验证签发方，bool 类型，默认true "IssuerSigningKey": "3c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a",
"ValidIssuer": "Admin.NET", // 签发方，string 类型 // 密钥，string 类型，必须是复杂密钥，长度大于16
"ValidateAudience": true, // 是否验证签收方，bool 类型，默认true "ValidateIssuer": true,
"ValidAudience": "Admin.NET", // 签收方，string 类型 // 是否验证签发方，bool 类型，默认true
"ValidateLifetime": true, // 是否验证过期时间，bool 类型，默认true，建议true "ValidIssuer": "Admin.NET",
// 签发方，string 类型
"ValidateAudience": true,
// 是否验证签收方，bool 类型，默认true
"ValidAudience": "Admin.NET",
// 签收方，string 类型
"ValidateLifetime": true,
// 是否验证过期时间，bool 类型，默认true，建议true
//"ExpiredTime": 20, // 过期时间，long 类型，单位分钟，默认20分钟，最大支持 13 年 //"ExpiredTime": 20, // 过期时间，long 类型，单位分钟，默认20分钟，最大支持 13 年
"ClockSkew": 5, // 过期时间容错值，long 类型，单位秒，默认5秒 "ClockSkew": 5,
"Algorithm": "HS256", // 加密算法，string 类型，默认 HS256 // 过期时间容错值，long 类型，单位秒，默认5秒
"RequireExpirationTime": true // 验证过期时间，设置 false 将永不过期 "Algorithm": "HS256",
// 加密算法，string 类型，默认 HS256
"RequireExpirationTime": true
// 验证过期时间，设置 false 将永不过期
}, },
"SnowId": { "SnowId": {
"WorkerId": 1, // 机器码 全局唯一 "WorkerId": 1,
"WorkerIdBitLength": 6, // 机器码位长 默认值6，取值范围 [1, 19] // 机器码 全局唯一
"SeqBitLength": 6, // 序列数位长 默认值6，取值范围 [3, 21]（建议不小于4，值越大性能越高、Id位数也更长） "WorkerIdBitLength": 6,
"WorkerPrefix": "adminnet_" // 缓存前缀 // 机器码位长 默认值6，取值范围 [1, 19]
"SeqBitLength": 6,
// 序列数位长 默认值6，取值范围 [3, 21]（建议不小于4，值越大性能越高、Id位数也更长）
"WorkerPrefix": "adminnet_"
// 缓存前缀
}, },
"HttpContextRequest": { "HttpContextRequest": {
"Scheme": "" "Scheme": ""
}, },
@ -88,7 +122,7 @@
"task": { "task": {
"enable": false "enable": false
}, },
"Log": { "Log": {
"Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs", "Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs",
"Dest": "D:\\zip", "Dest": "D:\\zip",
"Days": 7 "Days": 7

5
WebStarter/appsettings.prod.json
Unescape View File

@ -122,7 +122,10 @@
"task": { "task": {
"enable": true "enable": true
}, },
"Log": { "Task": {
"Disabled": "ChargeOrderUploadTask"
},
"Log": {
"Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs", "Src": "D:\\RiderProjects\\hn_back_charger\\WebStarter\\bin\\Debug\\net6.0\\logs",
"Dest": "D:\\zip", "Dest": "D:\\zip",
"Days": 7 "Days": 7

Write Preview
Loading…
Cancel
Save