对接协会部件报警接口、对接协会部件接口

IMES-Middleware-Platform/src/hosts/IMES-Middleware-Platform.Host/.config/dotnet-tools.json

@@ -1,5 +1,12 @@
 {
   "version": 1,
   "isRoot": true,
-  "tools": {}
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
 }

IMES-Middleware-Platform/src/hosts/IMES-Middleware-Platform.Host/IMES_Middleware_Platform.Host.csproj

@@ -17,6 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="FreeSql.Provider.MySql" Version="$(PackageFreeSqlVersion)" />
+		<PackageReference Include="GZY.Quartz.MUI" Version="2.7.0" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
 	</ItemGroup>
 	

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Core/Utility/HmacSm3Util.cs

@@ -0,0 +1,49 @@
+using Org.BouncyCastle.Crypto.Digests;
+using Org.BouncyCastle.Crypto.Macs;
+using Org.BouncyCastle.Crypto.Parameters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IMES_Middleware_Platform.Api.Core.Utility
+{
+    public class HmacSm3Util
+    {
+        public static byte[] ComputeHmacSm3(byte[] key, byte[] data)
+        {
+            const int blockSize = 64; // SM3 的块大小为 64 字节
+
+            // 处理密钥长度
+            if (key.Length > blockSize)
+            {
+                // 密钥过长时先进行 SM3 哈希
+                SM3Digest digest = new SM3Digest();
+                digest.BlockUpdate(key, 0, key.Length);
+                byte[] hashedKey = new byte[digest.GetDigestSize()];
+                digest.DoFinal(hashedKey, 0);
+                key = hashedKey;
+            }
+
+            // 密钥长度不足时填充零
+            if (key.Length < blockSize)
+            {
+                byte[] paddedKey = new byte[blockSize];
+                Array.Copy(key, 0, paddedKey, 0, key.Length);
+                key = paddedKey;
+            }
+
+            // 创建 HMAC 实例并初始化
+            HMac hmac = new HMac(new SM3Digest());
+            hmac.Init(new KeyParameter(key));
+
+            // 计算 HMAC
+            hmac.BlockUpdate(data, 0, data.Length);
+            byte[] result = new byte[hmac.GetMacSize()];
+            hmac.DoFinal(result, 0);
+
+            return result;
+        }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/AlarmHistoryEntity.cs

@@ -19,7 +19,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 油机ID
         /// </summary>
-        public int FuelId { get; set; }
+        public int? FuelId { get; set; }
         
         public DateTime? CreatedDate { get; set; }
         /// <summary>
@@ -45,6 +45,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 报警描述
         /// </summary>
+        [Column(DbType = "TEXT")]
         public string AlarmDescription { get; set; }
         public int AlarmHistoryID { get; set; }
         /// <summary>
@@ -66,6 +67,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 详细描述
         /// </summary>
+        [Column(DbType = "TEXT")]
         public string Description { get; set; }
         /// <summary>
         /// 油站ID

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/BlackBoxEntity.cs

@@ -83,6 +83,10 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         ///
         /// </summary>
         public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int BlackBoxId { get; set; }
 
         /// <summary>
         /// 
@@ -179,6 +183,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 扩展属性 
         /// </summary>
+        [Column(DbType = "TEXT")] // 明确指定数据库类型
         public string Xattrs { get; set; }
         /// <summary>
         /// 机型配置

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/CalculatorMainboardEntity.cs

@@ -50,15 +50,15 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 供应商id
         /// </summary>
-        public int SupplierID { get; set; }
+        public int? SupplierID { get; set; }
         /// <summary>
         ///安全装置ID
         /// </summary>
-        public int BlackBoxID { get; set; }
+        public int? BlackBoxID { get; set; }
         /// <summary>
         /// 站点
         /// </summary>
-        public int StationID { get; set; }
+        public int? StationID { get; set; }
         /// <summary>
         /// 加油机ID
         /// </summary>

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/CompanyEntity.cs

@@ -39,7 +39,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 创建日期。
         /// </summary>
-        public long CreatedDate { get; set; }
+        public DateTime? CreatedDate { get; set; }
 
         /// <summary>
         /// 用户 ID。
@@ -64,7 +64,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 修改日期。
         /// </summary>
-        public long ModifiedDate { get; set; }
+        public DateTime? ModifiedDate { get; set; }
 
         /// <summary>
         /// 用户 ID。

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/ComponentAlarmCodeEntity.cs

@@ -0,0 +1,133 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Entities;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
+{
+    /// <summary>
+    /// 部件报警状代码
+    /// </summary>
+    [Table(Name = "ComponentAlarmCode")]
+    public class ComponentAlarmCodeEntity : EntityAdd
+    {
+        /// <summary>
+        /// 油机ID
+        /// </summary>
+        public int? FuelId { get; set; }
+
+        public DateTime? CreatedDate { get; set; }
+        /// <summary>
+        /// 加油站名称
+        /// </summary>
+        public string GasStation { get; set; }
+        /// <summary>
+        /// 油机号
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 报警来源
+        /// </summary>
+        public string AlarmSource { get; set; }
+        /// <summary>
+        /// 报警类型
+        /// </summary>
+        public string AlarmType { get; set; }
+        /// <summary>
+        /// 报警描述
+        /// </summary>
+        [Column(DbType = "TEXT")]
+        public string AlarmDescription { get; set; }
+        public int AlarmHistoryID { get; set; }
+        /// <summary>
+        /// 报警设备id
+        /// </summary>
+        public int AlarmDeviceId { get; set; }
+        /// <summary>
+        /// 报警设备 
+        /// 告警域[dispenser
+        ///blackBox
+        ///valveControl
+        ///taxControl
+        ///displayControl
+        ///encoderControl
+        ///nozzleControl 
+        ///meter]
+        /// </summary>
+        public string AlarmDevice { get; set; }
+        /// <summary>
+        /// 报警设备uuid
+        /// </summary>
+        public string AlarmDeviceUuid { get; set; }
+        /// <summary>
+        /// 详细描述
+        /// </summary>
+        [Column(DbType = "TEXT")]
+        public string Description { get; set; }
+        /// <summary>
+        /// 油站ID
+        /// </summary>
+        public int? StationID { get; set; }
+        /// <summary>
+        /// 油站公司
+        /// </summary>
+        public int? CompanyID { get; set; }
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
+        public int? SupplierID { get; set; }
+        /// <summary>
+        /// 石油公司
+        /// </summary>
+        public string CompanyName { get; set; }
+        /// <summary>
+        /// 报警等级
+        /// </summary>
+        public int? AlarmLevel { get; set; }
+        /// <summary>
+        ///IOT告警序列号
+        /// </summary>
+        public long GenSeq { get; set; }
+        /// <summary>
+        /// 安全装置ID
+        /// </summary>
+        public int? BlackBoxId { get; set; }
+        /// <summary>
+        /// 油枪ID
+        /// </summary>
+        public int NozzleControlID { get; set; }
+        /// <summary>
+        /// 故障报警代码
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 故障模块代码
+        /// </summary>
+        public int module { get; set; }
+        /// <summary>
+        /// 报警部件记录流水号
+        /// </summary>
+        public int seq { get; set; }
+        /// <summary>
+        /// 装置二维码
+        /// </summary>
+        public string qrCode { get; set; }
+
+        public string alarm { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? time { get; set; }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/ComponentAlarmStateEntity.cs

@@ -0,0 +1,125 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Entities;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
+{
+    /// <summary>
+    /// 部件报警状态
+    /// </summary>
+    [Table(Name = "ComponentAlarmState")]
+    public class ComponentAlarmStateEntity : EntityAdd
+    {
+        /// <summary>
+        /// 油机ID
+        /// </summary>
+        public int? FuelId { get; set; }
+
+        public DateTime? CreatedDate { get; set; }
+        /// <summary>
+        /// 加油站名称
+        /// </summary>
+        public string GasStation { get; set; }
+        /// <summary>
+        /// 油机号
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 序列号
+        /// </summary>
+        public string SerialNumber { get; set; }
+        /// <summary>
+        /// 报警来源
+        /// </summary>
+        public string AlarmSource { get; set; }
+        /// <summary>
+        /// 报警类型
+        /// </summary>
+        public string AlarmType { get; set; }
+        /// <summary>
+        /// 报警描述
+        /// </summary>
+        [Column(DbType = "TEXT")]
+        public string AlarmDescription { get; set; }
+        public int AlarmHistoryID { get; set; }
+        /// <summary>
+        /// 报警设备id
+        /// </summary>
+        public int AlarmDeviceId { get; set; }
+        /// <summary>
+        /// 报警设备 
+        /// 告警域[dispenser
+        ///blackBox
+        ///valveControl
+        ///taxControl
+        ///displayControl
+        ///encoderControl
+        ///nozzleControl 
+        ///meter]
+        /// </summary>
+        public string AlarmDevice { get; set; }
+        /// <summary>
+        /// 报警设备uuid
+        /// </summary>
+        public string AlarmDeviceUuid { get; set; }
+        /// <summary>
+        /// 详细描述
+        /// </summary>
+        [Column(DbType = "TEXT")]
+        public string Description { get; set; }
+        /// <summary>
+        /// 油站ID
+        /// </summary>
+        public int? StationID { get; set; }
+        /// <summary>
+        /// 油站公司
+        /// </summary>
+        public int? CompanyID { get; set; }
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+        /// <summary>
+        /// 供应商ID
+        /// </summary>
+        public int? SupplierID { get; set; }
+        /// <summary>
+        /// 石油公司
+        /// </summary>
+        public string CompanyName { get; set; }
+        /// <summary>
+        /// 报警等级
+        /// </summary>
+        public int? AlarmLevel { get; set; }
+        /// <summary>
+        ///IOT告警序列号
+        /// </summary>
+        public long GenSeq { get; set; }
+        /// <summary>
+        /// 安全装置ID
+        /// </summary>
+        public int? BlackBoxId { get; set; }
+        /// <summary>
+        /// 油枪ID
+        /// </summary>
+        public int NozzleControlID { get; set; }
+        /// <summary>
+        /// 报警部件状态
+        /// </summary>
+        public string state { get; set; }
+        /// <summary>
+        /// 装置二维码
+        /// </summary>
+        public string qrCode { get; set; }
+
+        public string alarm { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? time { get; set; }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/DisplayControlEntity.cs

@@ -120,5 +120,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 法制软件标识
         /// </summary>
         public string LawSwi { get; set; }
+        public int? DisplayControlId { get; set; }
+        public int? Id { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/AlarmHistoryDto.cs

@@ -11,10 +11,14 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         /// <summary>
         /// 油机ID
         /// </summary>
-        public int FuelId { get; set; }
+        public int? FuelId { get; set; }
 
         public DateTime? CreatedDate { get; set; }
         /// <summary>
+        /// 报警时间
+        /// </summary>
+        public DateTime? AlarmTime { get; set; }
+        /// <summary>
         /// 加油站
         /// </summary>
         public string GasStation { get; set; }
@@ -78,6 +82,39 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         /// 报警等级
         /// </summary>
         public int? AlarmLevel { get; set; }
+        /// <summary>
+        /// 故障报警代码
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 故障模块代码
+        /// </summary>
+        public int module { get; set; }
+        /// <summary>
+        /// 报警部件记录流水号
+        /// </summary>
+        public int seq { get; set; }
+        /// <summary>
+        /// 装置二维码
+        /// </summary>
+        public string qrCode { get; set; }
+        /// <summary>
+        /// 报警部件状态
+        /// </summary>
+        public string state { get; set; }
+        /// <summary>
+        /// 报警设备uuid
+        /// </summary>
+        public string AlarmDeviceUuid { get; set; }
+        /// <summary>
+        /// 安全装置ID
+        /// </summary>
+        public int? BlackBoxId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? time { get; set; }
+
         public AlarmHistoryEntity ToFuelDispenser(AlarmHistoryDto gasPump)
         {
             return new AlarmHistoryEntity()
@@ -93,12 +130,81 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
                 AlarmHistoryID = gasPump.AlarmHistoryID
             };
         }
+        public static List<ComponentAlarmCodeEntity> ToComponentAlarmCode(List<AlarmHistoryDto> gasPump)
+        {
+            List<ComponentAlarmCodeEntity> list = new List<ComponentAlarmCodeEntity>();
+            foreach (var i in gasPump)
+            {
+                list.Add(new ComponentAlarmCodeEntity
+                {
+                    FuelId = i.FuelId,
+                    CreatedDate = i.CreatedDate,
+                    GasStation = i.GasStation,
+                    SerialNumber = i.SerialNumber,
+                    Name = i.Name,
+                    AlarmSource = i.AlarmSource,
+                    AlarmType = i.AlarmType,
+                    AlarmDescription = i.AlarmDescription,
+                    AlarmHistoryID = i.AlarmHistoryID,
+                    AlarmDeviceId = i.AlarmDeviceId,
+                    AlarmDevice = i.AlarmDevice,
+                    Description = i.Description,
+                    StationID = i.StationID,
+                    CompanyID = i.CompanyID,
+                    SupplierName = i.SupplierName,
+                    SupplierID = i.SupplierID,
+                    CompanyName = i.CompanyName,
+                    AlarmLevel = i.AlarmLevel,
+                    seq = i.seq,
+                    module = i.module,
+                    code = i.code,
+                    AlarmDeviceUuid = i.AlarmDeviceUuid,
+                    BlackBoxId = i.BlackBoxId,
+                    time = i.time,
+                });
+            }
+            return list;
+        }
+        public static List<ComponentAlarmStateEntity> ComponentAlarmStateEntity(List<AlarmHistoryDto> gasPump)
+        {
+            List<ComponentAlarmStateEntity> list = new List<ComponentAlarmStateEntity>();
+            foreach (var i in gasPump)
+            {
+                list.Add(new ComponentAlarmStateEntity
+                {
+                    FuelId = i.FuelId,
+                    CreatedDate = i.CreatedDate,
+                    GasStation = i.GasStation,
+                    SerialNumber = i.SerialNumber,
+                    Name = i.Name,
+                    AlarmSource = i.AlarmSource,
+                    AlarmType = i.AlarmType,
+                    AlarmDescription = i.AlarmDescription,
+                    AlarmHistoryID = i.AlarmHistoryID,
+                    AlarmDeviceId = i.AlarmDeviceId,
+                    AlarmDevice = i.AlarmDevice,
+                    Description = i.Description,
+                    StationID = i.StationID,
+                    CompanyID = i.CompanyID,
+                    SupplierName = i.SupplierName,
+                    SupplierID = i.SupplierID,
+                    CompanyName = i.CompanyName,
+                    AlarmLevel = i.AlarmLevel,
+                    state = i.state,
+                    AlarmDeviceUuid = i.AlarmDeviceUuid,
+                    BlackBoxId = i.BlackBoxId,
+                     time = i.time,
+                });
+            }
+            return list;
+        }
         public static List<AlarmHistoryEntity> ToFuelDispenserList(List<AlarmHistoryDto> gasPump)
         {
             List<AlarmHistoryEntity> list = new List<AlarmHistoryEntity>();
             foreach (var i in gasPump)
             {
-                list.Add(new AlarmHistoryEntity {
+                list.Add(new AlarmHistoryEntity
+                {
                     FuelId = i.FuelId,
                     CreatedDate = i.CreatedDate,
                     GasStation = i.GasStation,
@@ -115,11 +221,12 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
                     CompanyID = i.CompanyID,
                     SupplierName = i.SupplierName,
                     SupplierID = i.SupplierID,
-                    CompanyName  = i.CompanyName,
+                    CompanyName = i.CompanyName,
                     AlarmLevel = i.AlarmLevel,
                 });
             }
             return list;
         }
+
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/ComponentAlarmCodeDto.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
+{
+
+
+    public class ComponentAlarmCodeDto
+    {
+        public ComponentAlarmCodeData data { get; set; }
+        public string message { get; set; }
+        public string requestId { get; set; }
+        public int status { get; set; }
+    }
+
+    public class ComponentAlarmCodeData
+    {
+        public int number { get; set; }
+        public int numberOfElements { get; set; }
+        public int size { get; set; }
+        public int totalPages { get; set; }
+        public Pageable pageable { get; set; }
+        public Sort1 sort { get; set; }
+        public ComponentAlarmCodeDataContent[] content { get; set; }
+        public int totalElements { get; set; }
+    }
+
+
+
+
+    public class ComponentAlarmCodeDataContent
+    {
+        public string supplierName { get; set; }
+        public string serialNum { get; set; }
+        public int code { get; set; }
+        public int module { get; set; }
+        public string alarmDevice { get; set; }
+        public int alarmDeviceId { get; set; }
+        public Dispenser dispenser { get; set; }
+        public Station station { get; set; }
+        public Company company { get; set; }
+        public NozzleBlackbox blackBox { get; set; }
+        public long? createdDate { get; set; }
+        public string qrCode { get; set; }
+        public int alarmDispenserId { get; set; }
+        public int createdBy { get; set; }
+        public string alarmDeviceUuid { get; set; }
+        public long modifiedDate { get; set; }
+        public int modifiedBy { get; set; }
+        public int id { get; set; }
+        public long? time { get; set; }
+        public int seq { get; set; }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/ComponentAlarmStateDto.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
+{
+
+
+    public class ComponentAlarmStateDto
+    {
+        public ComponentAlarmStateDtoData data { get; set; }
+        public string message { get; set; }
+        public string requestId { get; set; }
+        public int status { get; set; }
+    }
+
+    public class ComponentAlarmStateDtoData
+    {
+        public int number { get; set; }
+        public int numberOfElements { get; set; }
+        public int size { get; set; }
+        public int totalPages { get; set; }
+        public Pageable pageable { get; set; }
+        public Sort1 sort { get; set; }
+        public ComponentAlarmStateDtoContent[] content { get; set; }
+        public int totalElements { get; set; }
+    }
+
+    public class ComponentAlarmStateDtoContent
+    {
+        public string supplierName { get; set; }
+        public string serialNum { get; set; }
+        public string companyName { get; set; }
+        public string alarmDevice { get; set; }
+        public int alarmDeviceId { get; set; }
+        public Dispenser dispenser { get; set; }
+        public Station station { get; set; }
+        public Company company { get; set; }
+        public long? createdDate { get; set; }
+        public string qrCode { get; set; }
+        public int alarmDispenserId { get; set; }
+        public string alarmDeviceUuid { get; set; }
+        public long modifiedDate { get; set; }
+        public int id { get; set; }
+        public string state { get; set; }
+        public long? time { get; set; }
+        public NozzleBlackbox blackBox { get; set; }
+    }
+
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/FuelDispenserDto.cs

@@ -116,6 +116,10 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         /// 验证码
         /// </summary>
         public string VerificationCode { get; set; }
+        /// <summary>
+        /// 油站id
+        /// </summary>
+        public int? StationId { get; set; }
 
         public FuelDispenserEntity ToFuelDispenser(FuelDispenserDto gasPump)
         {
@@ -145,7 +149,8 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
                 Contact = gasPump.Contact,
                 SealNo = gasPump.SealNo,
                 photoIds = gasPump.photoIds,
-                VerificationCode = gasPump.VerificationCode
+                VerificationCode = gasPump.VerificationCode,
+                StationId = gasPump.StationId
             };
         }
     }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/MaintenanceDto.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
+{
+
+    public class MaintenanceDto
+    {
+        public MaintenanceData data { get; set; }
+        public string message { get; set; }
+        public string requestId { get; set; }
+        public int status { get; set; }
+    }
+
+    public class MaintenanceData
+    {
+        public int number { get; set; }
+        public int numberOfElements { get; set; }
+        public int size { get; set; }
+        public int totalPages { get; set; }
+        public Pageable pageable { get; set; }
+        public Sort1 sort { get; set; }
+        public MaintenanceContent[] content { get; set; }
+        public int totalElements { get; set; }
+    }
+
+
+
+    public class MaintenanceContent
+    {
+        public Dispenser dispenser { get; set; }
+        public long? createdDate { get; set; }
+        public int createdBy { get; set; }
+        public object[] changeInfo { get; set; }
+        public Station station { get; set; }
+        public long modifiedDate { get; set; }
+        public int modifiedBy { get; set; }
+        public object[] attachmentIds { get; set; }
+        public int id { get; set; }
+        public string status { get; set; }
+        public string description { get; set; }
+        public string type { get; set; }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/NozzleDetails.cs

@@ -54,9 +54,42 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         public string cheatStatus { get; set; }
         public object[] valveControls { get; set; }
     }
+    public class NozzleCalculatormainboard
+    {
+        public int deviceAlarmLevel { get; set; }
+        public string onlineStatus { get; set; }
+        public string iotType { get; set; }
+        public string uuid { get; set; }
+        public bool signVerify { get; set; }
+        public string swv { get; set; }
+        public string hdv { get; set; }
+        public int id { get; set; }
+        public string nozzleControlName { get; set; }
+        public long fixTime { get; set; }
+        public int bindMainBoard { get; set; }
+        public string[] alarmDetail { get; set; }
+        public long modifiedDate { get; set; }
+        public int offlineAlarmLevel { get; set; }
+        public int mainBoard { get; set; }
+        public string signature { get; set; }
+        public string deviceStatus { get; set; }
+        public int modifiedBy { get; set; }
+        public long startTime { get; set; }
+        public long productTime { get; set; }
+        public long soldTime { get; set; }
+        public int alarmLevel { get; set; }
+        public bool dirty { get; set; }
+        public object[] alarms { get; set; }
+        public int photoId { get; set; }
+        public long createdDate { get; set; }
+        public string IotType { get; set; }
+        public string lawSwv { get; set; }
+        public string lawSwi { get; set; }
+    }
 
     public class NozzleDetailsTaxcontrol
     {
+        public NozzleCalculatormainboard calculatorMainboard { get; set; }
         public long onlineStatusDate { get; set; }
         public int deviceAlarmLevel { get; set; }
         public string onlineStatus { get; set; }
@@ -93,6 +126,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         public string hdv { get; set; }
     }
 
+
     public class NozzleStation
     {
         public bool alarming { get; set; }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/Dto/supervision.cs

@@ -34,7 +34,12 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto
         public string name { get; set; }
         public long modifiedDate { get; set; }
         public int modifiedBy { get; set; }
+        public string code { get; set; }
         public int id { get; set; }
+        public string registerNo { get; set; }
+        public string description { get; set; }
+        public string phone { get; set; }
+        public string contact { get; set; }
     }
 
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/FuelDispenserEntity.cs

@@ -130,7 +130,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 油站id
         /// </summary>
-        public int StationId { get; set; }
+        public int? StationId { get; set; }
 
         /// <summary>
         /// 供应商 ID。
@@ -179,5 +179,6 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 验证码
         /// </summary>
         public string VerificationCode { get; set; }
+
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/IComponentAlarmCodeRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Repositories;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
+{
+    public interface IComponentAlarmCodeRepository : IRepositoryBase<ComponentAlarmCodeEntity>
+    {
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/IComponentAlarmStateRepository.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Repositories;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
+{
+    public interface IComponentAlarmStateRepository : IRepositoryBase<ComponentAlarmStateEntity>
+    {
+
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/MaintenanceEntity.cs

@@ -15,11 +15,12 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
     [Table(Name = "Maintenance")]
     public class MaintenanceEntity : EntityAdd
     {
+        public int id { get; set; }
         /// <summary>
         /// 维修时间（Unix时间戳）
         /// <remarks>精确到毫秒</remarks>
         /// </summary>
-        public long CreatedDate { get; set; }
+        public DateTime? CreatedDate { get; set; }
 
         /// <summary>
         /// 维修人员唯一标识
@@ -56,6 +57,6 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 站点id
         /// <seealso cref="Station"/>
         /// </summary>
-        public int  StationID { get; set; }
+        public int?  StationID { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/NozzlecontrolEntity.cs

@@ -120,7 +120,7 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
 
 
         /// <summary>
-        /// 修复时间。
+        /// 安装时间。
         /// </summary>
         public DateTime? FixTime { get; set; }
 
@@ -128,6 +128,10 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 油气回收ID
         /// </summary>
         public int? VaporRecoveryControlID { get; set; }
+        /// <summary>
+        /// 油气回收编号
+        /// </summary>
+        public string VaporRecoveryControlNo { get; set; }
 
         /// <summary>
         /// 销售时间
@@ -143,6 +147,10 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 安全监督装置ID
         /// </summary>
         public int? BlackBoxID { get; set; }
+        /// <summary>
+        /// 安装装置编号
+        /// </summary>
+        public string BlackBoxNo { get; set; }
 
         /// <summary>
         /// 创建人ID
@@ -194,18 +202,38 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// <summary>
         /// 厂商ID
         /// </summary>
-        public int SupplierID { get; set; }
+        public int? SupplierID { get; set; }
         /// <summary>
         /// 计量器ID
         /// </summary>
-        public int MetersID { get; set; }
+        public int? MetersID { get; set; }
+        /// <summary>
+        /// 计量器编号
+        /// </summary>
+        public string MetersNo { get; set; }
         /// <summary>
         /// 智能控制阀ID
         /// </summary>
-        public int ValveControlsID { get; set; }
+        public int? ValveControlsID { get; set; }
+        /// <summary>
+        /// 智能控制阀编号
+        /// </summary>
+        public string ValveControlsNo { get; set; }
         /// <summary>
         /// 监控微处理器ID
         /// </summary>
-        public int TaxControlID { get; set; }
+        public int? TaxControlID { get; set; }
+        /// <summary>
+        /// 监控微处理器编号
+        /// </summary>
+        public string TaxControlNo { get; set; }
+        /// <summary>
+        /// 计控主板id
+        /// </summary>
+        public int? calculatorMainboardID { get; set; }
+        /// <summary>
+        /// 计控主板编号
+        /// </summary>
+        public string calculatorMainboardNo { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/SendingRecord.cs

@@ -0,0 +1,50 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Entities;
+
+namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
+{
+    /// <summary>
+    /// 发送记录
+    /// </summary>
+    [Table(Name = "SendingRecord")]
+    public class SendingRecord : EntityAdd
+    {
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Phone { get; set; }
+        /// <summary>
+        /// 站点id
+        /// </summary>
+        public string BUID { get; set; }
+        /// <summary>
+        /// 发送类型  1-账户充值,2-账户撤销充值,3-圈存,4-圈提,5-卡充值,6-撤销卡充值,7-预充值,8-撤销预充值,9-扣款,
+        /// </summary>
+        public string SendType { get; set; }
+        /// <summary>
+        /// 卡号
+        /// </summary>
+        public string cardNo { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        public DateTime? time { get; set; }
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public string amount { get; set; }
+        /// <summary>
+        /// 余额
+        /// </summary>
+        public string balance {  get; set; }
+        /// <summary>
+        /// 发送时间
+        /// </summary>
+        public DateTime? SendTime { get; set; }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/FuelDispenser/VaporRecoveryControlEntity.cs

@@ -129,5 +129,6 @@ namespace IMES_Middleware_Platform.Api.Domain.FuelDispenser
         /// 法制软件标识
         /// </summary>
         public string LawSwi { get; set; }
+        public int? Id { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/Push/PushEntity.cs

@@ -46,5 +46,14 @@ namespace IMES_Middleware_Platform.Api.Domain.Push
         /// 推送用户
         /// </summary>
         public string PushUser { get; set; }
+        /// <summary>
+        /// 模板id
+        /// </summary>
+        public string templateId { get; set; }
+        public string GasStation { get; set; }
+        /// <summary>
+        /// 报警时间
+        /// </summary>
+        public string AlarmhistoryDate { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/Push/PushRuleEntity.cs

@@ -39,10 +39,14 @@ namespace IMES_Middleware_Platform.Api.Domain.Push
         /// </summary>
         public string TriggerMethod { get; set; }
         /// <summary>
-        ///  规则条件
+        ///  报警规则条件
         /// </summary>
         public string ConditionsJson { get; set; }
         /// <summary>
+        /// 维修规则条件
+        /// </summary>
+        public string MaintenanceJson {  get; set; }
+        /// <summary>
         /// 是否启用
         /// </summary>
         public bool IsActive { get; set; }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Domain/Push/UserEntity.cs

@@ -11,5 +11,6 @@ namespace IMES_Middleware_Platform.Api.Domain.Push
     [Table(Name = "ad_user")]
     public class UserEntity : EntityAdd
     {
+        public string UserName { get; set; }
     }
 }

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/IMES_Middleware_Platform.Api.csproj

@@ -9,6 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
 		<PackageReference Include="DFS.Infrastructure" Version="1.0.1" />
 		<PackageReference Include="RestSharp" Version="112.1.0" />
 		<PackageReference Include="ZhonTai.Admin" Version="$(PackageZhonTaiVersion)">

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/IMES_Middleware_Platform.Api.xml

@@ -495,6 +495,11 @@
             
              </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.BlackBoxEntity.BlackBoxId">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.BlackBoxEntity.Filtering">
             <summary>
             
@@ -830,6 +835,272 @@
             
             </summary>
         </member>
+        <member name="T:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity">
+            <summary>
+            部件报警状代码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.FuelId">
+            <summary>
+            油机ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.GasStation">
+            <summary>
+            加油站名称
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.Name">
+            <summary>
+            油机号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.SerialNumber">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmSource">
+            <summary>
+            报警来源
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmType">
+            <summary>
+            报警类型
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmDescription">
+            <summary>
+            报警描述
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmDeviceId">
+            <summary>
+            报警设备id
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmDevice">
+             <summary>
+             报警设备 
+             告警域[dispenser
+            blackBox
+            valveControl
+            taxControl
+            displayControl
+            encoderControl
+            nozzleControl 
+            meter]
+             </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmDeviceUuid">
+            <summary>
+            报警设备uuid
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.Description">
+            <summary>
+            详细描述
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.StationID">
+            <summary>
+            油站ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.CompanyID">
+            <summary>
+            油站公司
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.SupplierName">
+            <summary>
+            供应商名称
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.SupplierID">
+            <summary>
+            供应商ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.CompanyName">
+            <summary>
+            石油公司
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.AlarmLevel">
+            <summary>
+            报警等级
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.GenSeq">
+             <summary>
+            IOT告警序列号
+             </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.BlackBoxId">
+            <summary>
+            安全装置ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.NozzleControlID">
+            <summary>
+            油枪ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.code">
+            <summary>
+            故障报警代码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.module">
+            <summary>
+            故障模块代码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.seq">
+            <summary>
+            报警部件记录流水号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.qrCode">
+            <summary>
+            装置二维码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmCodeEntity.time">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity">
+            <summary>
+            部件报警状态
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.FuelId">
+            <summary>
+            油机ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.GasStation">
+            <summary>
+            加油站名称
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.Name">
+            <summary>
+            油机号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.SerialNumber">
+            <summary>
+            序列号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmSource">
+            <summary>
+            报警来源
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmType">
+            <summary>
+            报警类型
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmDescription">
+            <summary>
+            报警描述
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmDeviceId">
+            <summary>
+            报警设备id
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmDevice">
+             <summary>
+             报警设备 
+             告警域[dispenser
+            blackBox
+            valveControl
+            taxControl
+            displayControl
+            encoderControl
+            nozzleControl 
+            meter]
+             </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmDeviceUuid">
+            <summary>
+            报警设备uuid
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.Description">
+            <summary>
+            详细描述
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.StationID">
+            <summary>
+            油站ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.CompanyID">
+            <summary>
+            油站公司
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.SupplierName">
+            <summary>
+            供应商名称
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.SupplierID">
+            <summary>
+            供应商ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.CompanyName">
+            <summary>
+            石油公司
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.AlarmLevel">
+            <summary>
+            报警等级
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.GenSeq">
+             <summary>
+            IOT告警序列号
+             </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.BlackBoxId">
+            <summary>
+            安全装置ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.NozzleControlID">
+            <summary>
+            油枪ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.state">
+            <summary>
+            报警部件状态
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.qrCode">
+            <summary>
+            装置二维码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.ComponentAlarmStateEntity.time">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:IMES_Middleware_Platform.Api.Domain.FuelDispenser.DisplayControlEntity">
             <summary>
             显示屏
@@ -944,6 +1215,11 @@
             油机ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.AlarmTime">
+            <summary>
+            报警时间
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.GasStation">
             <summary>
             加油站
@@ -1024,6 +1300,46 @@
             报警等级
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.code">
+            <summary>
+            故障报警代码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.module">
+            <summary>
+            故障模块代码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.seq">
+            <summary>
+            报警部件记录流水号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.qrCode">
+            <summary>
+            装置二维码
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.state">
+            <summary>
+            报警部件状态
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.AlarmDeviceUuid">
+            <summary>
+            报警设备uuid
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.BlackBoxId">
+            <summary>
+            安全装置ID
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto.time">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.FuelDispenserDto.Name">
             <summary>
             加油机名称
@@ -1144,6 +1460,11 @@
             验证码
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.FuelDispenserDto.StationId">
+            <summary>
+            油站id
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.LifecycleDto.FuelId">
             <summary>
             油机ID
@@ -1910,7 +2231,7 @@
         </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.FixTime">
             <summary>
-            修复时间。
+            安装时间。
             </summary>
         </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.VaporRecoveryControlID">
@@ -1918,6 +2239,11 @@
             油气回收ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.VaporRecoveryControlNo">
+            <summary>
+            油气回收编号
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.SoldTime">
             <summary>
             销售时间
@@ -1933,6 +2259,11 @@
             安全监督装置ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.BlackBoxNo">
+            <summary>
+            安装装置编号
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.CreatedBy">
             <summary>
             创建人ID
@@ -1998,16 +2329,86 @@
             计量器ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.MetersNo">
+            <summary>
+            计量器编号
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.ValveControlsID">
             <summary>
             智能控制阀ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.ValveControlsNo">
+            <summary>
+            智能控制阀编号
+            </summary>
+        </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.TaxControlID">
             <summary>
             监控微处理器ID
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.TaxControlNo">
+            <summary>
+            监控微处理器编号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.calculatorMainboardID">
+            <summary>
+            计控主板id
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity.calculatorMainboardNo">
+            <summary>
+            计控主板编号
+            </summary>
+        </member>
+        <member name="T:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord">
+            <summary>
+            发送记录
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.Phone">
+            <summary>
+            手机号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.BUID">
+            <summary>
+            站点id
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.SendType">
+            <summary>
+            发送类型  1-账户充值,2-账户撤销充值,3-圈存,4-圈提,5-卡充值,6-撤销卡充值,7-预充值,8-撤销预充值,9-扣款,
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.cardNo">
+            <summary>
+            卡号
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.time">
+            <summary>
+            时间
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.amount">
+            <summary>
+            金额
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.balance">
+            <summary>
+            余额
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.FuelDispenser.SendingRecord.SendTime">
+            <summary>
+            发送时间
+            </summary>
+        </member>
         <member name="T:IMES_Middleware_Platform.Api.Domain.FuelDispenser.StationEntity">
             <summary>
             油站
@@ -2745,6 +3146,16 @@
             推送用户
             </summary>
         </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.Push.PushEntity.templateId">
+            <summary>
+            模板id
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.Push.PushEntity.AlarmhistoryDate">
+            <summary>
+            报警时间
+            </summary>
+        </member>
         <member name="T:IMES_Middleware_Platform.Api.Domain.Push.PushRuleEntity">
             <summary>
             推送规则
@@ -2782,7 +3193,12 @@
         </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.Push.PushRuleEntity.ConditionsJson">
             <summary>
-             规则条件
+             报警规则条件
+            </summary>
+        </member>
+        <member name="P:IMES_Middleware_Platform.Api.Domain.Push.PushRuleEntity.MaintenanceJson">
+            <summary>
+            维修规则条件
             </summary>
         </member>
         <member name="P:IMES_Middleware_Platform.Api.Domain.Push.PushRuleEntity.IsActive">
@@ -2932,14 +3348,14 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetPushRulesList(IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto)">
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetPushRulesList(System.String,System.String,System.String)">
             <summary>
             规则匹配
             </summary>
             <param name="alarmHistoryEntity"></param>
             <returns></returns>
         </member>
-        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.AlarmRule(IMES_Middleware_Platform.Api.Domain.Push.Dto.pushruleDto,IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.AlarmHistoryDto)">
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.AlarmRule(IMES_Middleware_Platform.Api.Domain.Push.Dto.pushruleDto,IMES_Middleware_Platform.Api.Domain.FuelDispenser.AlarmHistoryEntity)">
             <summary>
             满足一次触发
             </summary>
@@ -2955,14 +3371,51 @@
             <param name="Right"></param>
             <returns></returns>
         </member>
-        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetStationList">
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetNoticeList(System.String,System.String)">
             <summary>
-            通过id获取站点信息
+            获取报警历史接口
             </summary>
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetDispenserList">
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.getComponentAlarmStateList(System.String,System.String)">
+            <summary>
+             获取部件报警状态列表 
+            </summary>
+            <param name="stime"></param>
+            <param name="etime"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.getComponentAlarmCodeList(System.String,System.String)">
+            <summary>
+            获取部件报警代码列表
+            </summary>
+            <param name="stime"></param>
+            <param name="etime"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetMaintenanceList(System.String,System.String)">
+            <summary>
+            维修记录
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetStationList(System.String,System.String)">
+            <summary>
+            获取站点信息
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetCompany(IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.StationCompany)">
+            <summary>
+            添加站点公司
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetDispenserList(System.String,System.String)">
             <summary>
             获取油机列表
             </summary>
@@ -2976,7 +3429,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetNozzleInfo(System.Int32,System.Int32,System.Nullable{System.Int32},System.String)">
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.getTax">
+            <summary>
+            通过监控微处理器刷计控主板数据，临时使用
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetNozzleInfo(System.Int32,System.Int32,System.Nullable{System.Int32},System.String,IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity)">
             <summary>
             根据id获取油枪信息
             </summary>
@@ -2986,6 +3445,25 @@
             <param name="fuelName"></param>
             <returns></returns>
         </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.GetTaxNozzleInfo(System.Int32,System.Int32,System.Nullable{System.Int32},System.String,IMES_Middleware_Platform.Api.Domain.FuelDispenser.NozzlecontrolEntity)">
+            <summary>
+            根据id获取油枪信息,获取计控主板，临时使用
+            </summary>
+            <param name="id"></param>
+            <param name="FuelId"></param>
+            <param name="stationid"></param>
+            <param name="fuelName"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.AddcalculatorMainboard(IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.NozzleCalculatormainboard,System.Int32,System.Nullable{System.Int32},System.Nullable{System.Int32},System.String,System.String,System.Int32)">
+            <summary>
+            添加计控主板
+            </summary>
+            <param name="NozzleDetailsTaxcontrol"></param>
+            <param name="fuelId"></param>
+            <param name="stationId"></param>
+            <returns></returns>
+        </member>
         <member name="M:IMES_Middleware_Platform.Api.Services.Association.AssociationService.AddDisplayControls(IMES_Middleware_Platform.Api.Domain.FuelDispenser.Dto.NozzleDisplaycontrol[],System.Int32,System.Nullable{System.Int32},System.Nullable{System.Int32},System.String,System.String)">
             <summary>
             添加显示屏

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Repositories/FuelDispenser/ComponentAlarmCodeRepository.cs

@@ -0,0 +1,19 @@
+using IMES_Middleware_Platform.Api.Core.Repositories;
+using IMES_Middleware_Platform.Api.Domain.FuelDispenser;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Db.Transaction;
+
+namespace IMES_Middleware_Platform.Api.Repositories.FuelDispenser
+{
+    public class ComponentAlarmCodeRepository : AppRepositoryBase<ComponentAlarmCodeEntity>, IComponentAlarmCodeRepository
+    {
+        public ComponentAlarmCodeRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
+        {
+
+        }
+    }
+}

IMES-Middleware-Platform/src/platform/IMES-Middleware-Platform.Api/Repositories/FuelDispenser/ComponentAlarmStateRepository.cs

@@ -0,0 +1,19 @@
+using IMES_Middleware_Platform.Api.Core.Repositories;
+using IMES_Middleware_Platform.Api.Domain.FuelDispenser;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZhonTai.Admin.Core.Db.Transaction;
+
+namespace IMES_Middleware_Platform.Api.Repositories.FuelDispenser
+{
+    public class ComponentAlarmStateRepository : AppRepositoryBase<ComponentAlarmStateEntity>, IComponentAlarmStateRepository
+    {
+        public ComponentAlarmStateRepository(UnitOfWorkManagerCloud uowm) : base(uowm)
+        {
+
+        }
+    }
+}