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

消防msg修订

Browse Source
zw
CZ 5 months ago
parent b560b11d7c
commit c128c63668
6 changed files with 1651 additions and 1817 deletions
Show Stats Download Patch File Download Diff File

4
Service/Cloud/Handler/ServiceableStateHandler.cs
Unescape View File

@ -19,11 +19,11 @@ public class ServiceableStateHandler:IBaseHandler
public void Handle(string t) public void Handle(string t)
{ {
SetServiceRes? req = JsonConvert.DeserializeObject<SetServiceRes>(t); SetService? req = JsonConvert.DeserializeObject<SetService>(t);
if (req != null) if (req != null)
{ {
StaticStationInfo.StationStatus = req.st; StaticStationInfo.StationStatus = req.st;
ServiceableStateResp resp = new ServiceableStateResp(); SetServiceRes resp = new SetServiceRes();
CloudClientMgr.CloudClient?.Publish(resp); CloudClientMgr.CloudClient?.Publish(resp);
} }
} }

8
Service/Cloud/Msg/Host/Resp/SetServiceRes.cs
Unescape View File

@ -10,14 +10,14 @@ namespace Service.Cloud.Msg.Host.Resp
/// <summary> /// <summary>
/// 3.2.5.2 换电站应答后台服务器下发换电站的可服务状态设置 /// 3.2.5.2 换电站应答后台服务器下发换电站的可服务状态设置
/// </summary> /// </summary>
public class ServiceableStateResp : ICmd public class SetServiceRes : ICmd
{ {
/// <summary> /// <summary>
/// 应答结果 /// 服务状态
/// 0:成功 1:失败 /// 1:换电站服务启用 2:换电站服务停用
/// <see cref="Entity.Constant.CloudEnum.ResultInt"/> /// <see cref="Entity.Constant.CloudEnum.ResultInt"/>
/// </summary> /// </summary>
public int re { get; set; } public int st { get; set; }
public string GetCmd() public string GetCmd()
{ {
return CloudConst.setServiceRes; return CloudConst.setServiceRes;

133
Service/FireControl/Client/FireControlClient.cs
Unescape View File

@ -13,7 +13,7 @@ public class FireControlClient: ModbusTcpMaster
public FireControlClient() public FireControlClient()
{ {
ReadAction = BatchRead; ReadAction = BatchRead;
Ip = "172.0.50.101"; Ip = "172.0.50.100";
Port = 502; Port = 502;
Duration = 1000; Duration = 1000;
AutoReConnect = true; AutoReConnect = true;
@ -23,46 +23,129 @@ public class FireControlClient: ModbusTcpMaster
private void BatchRead(ModbusTcpMaster master) private void BatchRead(ModbusTcpMaster master)
{ {
var bytes02 = master.BatchReadHolderRegister(1, 17);//0x01 Log.Info("fire start read");
var bytes03 = master.BatchReadHolderRegister(1, 3);//0x03 var bytes02 = master.ReadCoil("0x0000", 17).Content;//0x01
var bytes04 = master.BatchReadHolderRegister(0x0100, 383);//0x03 var bytes03 = master.BatchReadHolderRegister(1, 3);//0x03 读1 3
var bytes05 = master.BatchReadHolderRegister(1, 115);//0x04 var bytes04 = master.BatchReadHolderRegister(0x0100, 383);//0x03 读256 383
var bytes06 = master.BatchReadHolderRegister(0x0800, 2048);//0x04 var bytes05 = master.BatchReadHolderRegister(1, 115);//0x04 可以
var bytes07 = master.BatchReadHolderRegister(0x1000, 32);//0x04
var bytes08 = master.BatchReadHolderRegister(0x0000, 134);//0x05
var bytes09 = master.BatchReadHolderRegister(0x0100, 64);//0x06
if (bytes02 != null)
List<byte> bytes06=new List<byte>();//= master.BatchReadHolderRegister(0x0800, 2048);//0x04 可以
var bytesAdd1 = master.BatchReadHolderRegister(0x0800, 1000);//0x04 可以
var bytesAdd2 = master.BatchReadHolderRegister(3048, 1048);//0x04 可以
bytes06.AddRange(bytesAdd1);
bytes06.AddRange(bytesAdd2);
var bytes07 = master.BatchReadHolderRegister(0x1000, 32);//0x04 可以
var bytes08 = master.BatchReadHolderRegister(0x0000, 134);//0x05 写
var bytes09 = master.BatchReadHolderRegister(0x0100, 64);//0x06 写
try
{
if (bytes02 != null)
{
Log.Info("fire read bytes02 success");
//ModbusDecoder.Decode<Subzone2>(bytes02, FireControlMgr.Subzone2, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
FireControlMgr.Subzone2.GiveAnAlarm.Value = bytes02[0];
FireControlMgr.Subzone2.NumberOfFailures.Value = bytes02[1];
FireControlMgr.Subzone2.SoundSuppression.Value = bytes02[2];
FireControlMgr.Subzone2.SelfInspection.Value = bytes02[3];
FireControlMgr.Subzone2.MainPower.Value = bytes02[4];
FireControlMgr.Subzone2.PowerSupplyBackup.Value = bytes02[5];
FireControlMgr.Subzone2.BackupPowerUnderpowered.Value = bytes02[6];
FireControlMgr.Subzone2.AutomaticMode.Value = bytes02[7];
FireControlMgr.Subzone2.ManualMode.Value = bytes02[8];
FireControlMgr.Subzone2.ManualStart.Value = bytes02[9];
FireControlMgr.Subzone2.ManualScram.Value = bytes02[10];
FireControlMgr.Subzone2.StartUpControl.Value = bytes02[11];
FireControlMgr.Subzone2.Delay.Value = bytes02[12];
FireControlMgr.Subzone2.PrimingSpray.Value = bytes02[13];
FireControlMgr.Subzone2.Spray.Value = bytes02[14];
FireControlMgr.Subzone2.AudibleVisualAlarmStatus.Value = bytes02[15];
FireControlMgr.Subzone2.DeflatedDoNotEnter.Value = bytes02[16];
}
}
catch (Exception e)
{
Log.Info($"fire read bytes02 erroe{e}");
}
try
{
if (bytes03 != null)
{
ModbusDecoder.Decode<Subzone3>(bytes03, FireControlMgr.Subzone3, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
}
catch (Exception e)
{
Log.Info($"fire read bytes03 erroe{e}");
}
try
{
if (bytes04 != null)
{
ModbusDecoder.Decode<Subzone4>(bytes04, FireControlMgr.Subzone4, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
}
catch (Exception e)
{
Log.Info($"fire read bytes04 erroe{e}");
}
try
{ {
ModbusDecoder.Decode<Subzone2>(bytes02, FireControlMgr.Subzone2, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); if (bytes05 != null)
{
ModbusDecoder.Decode<Subzone5>(bytes05, FireControlMgr.Subzone5, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
} }
if (bytes03 != null) catch (Exception e)
{ {
ModbusDecoder.Decode<Subzone3>(bytes03, FireControlMgr.Subzone3, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); Log.Info($"fire read bytes05 erroe{e}");
} }
if (bytes04 != null) try
{ {
ModbusDecoder.Decode<Subzone4>(bytes04, FireControlMgr.Subzone4, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); if (bytes06 != null)
{
ModbusDecoder.Decode<Subzone6>(bytes06.ToArray(), FireControlMgr.Subzone6, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
}
catch (Exception e)
{
Log.Info($"fire read bytes06 erroe{e}");
}
try
{
if (bytes07 != null)
{
ModbusDecoder.Decode<Subzone7>(bytes07, FireControlMgr.Subzone7, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
} }
if (bytes05 != null) catch (Exception e)
{ {
ModbusDecoder.Decode<Subzone5>(bytes05, FireControlMgr.Subzone5, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); Log.Info($"fire read bytes07 erroe{e}");
} }
if (bytes06 != null) try
{ {
ModbusDecoder.Decode<Subzone6>(bytes06, FireControlMgr.Subzone6, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); if (bytes08 != null)
{
ModbusDecoder.Decode<Subzone8>(bytes08, FireControlMgr.Subzone8, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
} }
if (bytes07 != null) catch (Exception e)
{ {
ModbusDecoder.Decode<Subzone7>(bytes07, FireControlMgr.Subzone7, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); Log.Info($"fire read bytes08 erroe{e}");
} }
if (bytes08 != null) try
{ {
ModbusDecoder.Decode<Subzone8>(bytes08, FireControlMgr.Subzone8, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); if (bytes09 != null)
{
ModbusDecoder.Decode<Subzone9>(bytes09, FireControlMgr.Subzone9, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC);
}
} }
if (bytes09 != null) catch (Exception e)
{ {
ModbusDecoder.Decode<Subzone9>(bytes09, FireControlMgr.Subzone9, EndingConst.ByteSeq.AB, EndingConst.WordSeq.DC); Log.Info($"fire read bytes02 erroe{e}");
} }
} }
} }

1280
Service/FireControl/Msg/Subzone4.cs
View File

File diff suppressed because it is too large Load Diff

2036
Service/FireControl/Msg/Subzone5.cs
View File

File diff suppressed because it is too large Load Diff

1
Service/Service.csproj
Unescape View File

@ -59,6 +59,7 @@
<Compile Remove="Cloud\Msg\Host\Req\ChargerDataReport.cs" /> <Compile Remove="Cloud\Msg\Host\Req\ChargerDataReport.cs" />
<Compile Remove="Cloud\Msg\Host\Req\EndLogMessage.cs" /> <Compile Remove="Cloud\Msg\Host\Req\EndLogMessage.cs" />
<Compile Remove="Cloud\Msg\Cloud\Resp\EndLogMessageResp.cs" /> <Compile Remove="Cloud\Msg\Cloud\Resp\EndLogMessageResp.cs" />
<Compile Remove="Cloud\Msg\Cloud\Req\SetServiceRes.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Write Preview
Loading…
Cancel
Save