添加接口

src/JiShe.CollectBus.Application.Contracts/BaseResultDto.cs

@@ -30,3 +30,22 @@ public class BaseResultDto<T> where T : class
     /// </value>
     public T Data { get; set; }
 }
+
+public class BaseResultDto
+{
+    /// <summary>
+    ///     Gets or sets a value indicating whether this <see cref="BaseResultDto{T}" /> is status.
+    /// </summary>
+    /// <value>
+    ///     <c>true</c> if status; otherwise, <c>false</c>.
+    /// </value>
+    public bool Status { get; set; }
+
+    /// <summary>
+    ///     Gets or sets the MSG.
+    /// </summary>
+    /// <value>
+    ///     The MSG.
+    /// </value>
+    public string Msg { get; set; }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AddConrOnlineRecordInput.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 更新集中器在线记录
+    /// </summary>
+    public class AddConrOnlineRecordInput
+    {
+        /// <summary>
+        /// 区域编号
+        /// </summary>
+        public string AreaCode { get; set; }
+
+        /// <summary>
+        /// 区域地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 是否在线
+        /// </summary>
+        public bool State { get; set; }
+
+        /// <summary>
+        /// 在/离线时间
+        /// </summary>
+        public DateTime LastTime { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AdjustMeterTimingInput.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 校准电表时间
+    /// </summary>
+    public class AdjustMeterTimingInput:BaseInput
+    {
+        /// <summary>
+        /// 波特率
+        /// </summary>
+        public int BaudRate { get; set; }
+
+        /// <summary>
+        /// 端口号
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string MeterAddress { get; set; }
+
+        /// <summary>
+        /// 电表密码
+        /// </summary>
+        public string Password { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownInput.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Scriban.Syntax;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 电表档案下发输入
+    /// </summary>
+    public class AmmeterArchivesDownInput:BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 电表：1
+        /// </summary>
+        public int MeterType { get; set; }
+
+        public AmmeterArchivesDownDetailsInput Details { get; set; }
+    }   
+
+    public class AmmeterArchivesDownDetailsInput
+    {
+        public int SetDeviceCount { get; set; }
+
+        public List<AmmeterArchivesDownDetailsDataInput> Data { get; set; }
+
+    }
+
+    public class AmmeterArchivesDownDetailsDataInput
+    {
+        /// <summary>
+        /// 电表ID
+        /// </summary>
+        public string AmmeterId { get; set; }
+
+        /// <summary>
+        /// 电能表/交流采样装置序号
+        /// </summary>
+        public int SerialNumber { get; set; }
+
+        /// <summary>
+        /// 所属测量点号
+        /// </summary>
+        public int Pn { get; set; }
+
+        /// <summary>
+        /// 波特率
+        /// </summary>
+        public int Rate { get; set; }
+
+        /// <summary>
+        /// 端口号
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// 规约
+        /// </summary>
+        public string AgreementType { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string Addrress { get; set; }
+
+        /// <summary>
+        /// 电表密码
+        /// </summary>
+        public int Password { get; set; }
+
+        /// <summary>
+        /// 单费率:1, 复费率:4
+        /// </summary>
+        public int RatesCount { get; set; }
+
+        /// <summary>
+        /// 电能示值整数位个数
+        /// </summary>
+        public int IntegerCount { get; set; }
+
+        /// <summary>
+        /// 电能示值小数位个数
+        /// </summary>
+        public int DecimalCount { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string GatherAddress { get; set; }
+
+        /// <summary>
+        /// 用户大类号
+        /// </summary>
+        public string UserBigNumber { get; set; }
+
+        /// <summary>
+        /// 用户小类号
+        /// </summary>
+        public string UserSmallNumber { get; set; }
+
+        /// <summary>
+        /// 电表：1
+        /// </summary>
+        public int MeterType { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesDownOutput.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 电表档案下发输出
+    /// </summary>
+    public class AmmeterArchivesDownOutput
+    {
+        /// <summary>
+        /// true: 成功，false：失败
+        /// </summary>
+        public bool ValidData { get; set; }
+        /// <summary>
+        /// 备注（业务系统未使用）
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AmmeterArchivesMatchInput.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 电表档案一键匹配输入
+    /// </summary>
+    public class AmmeterArchivesMatchInput
+    {
+        public string AreaCode { get; set; }
+
+        public string Address { get; set; }
+
+        public string GatherCode { get; set; }
+
+        public AmmeterArchivesMatchDetailsInput Details { get; set; }
+    }
+
+    public class AmmeterArchivesMatchDetailsInput
+    {
+        public List<AmmeterArchivesMatchDetailsDataInput> Data { get; set; }
+    }
+
+    public class AmmeterArchivesMatchDetailsDataInput
+    {
+        /// <summary>
+        /// 波特率
+        /// </summary>
+        public int BaudRate { get; set; }
+
+        /// <summary>
+        /// 端口号
+        /// </summary>
+        public int Port { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string MeterAddress { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportCollectionItemsSetInput.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 设置自动上报采集项输入
+    /// </summary>
+    public class AutoReportCollectionItemsSetInput
+    {
+        public List<AutoReportCollectionItemsSetCodeInput> Codes { get; set; }
+
+        public int MeterType { get; set; }
+
+        public string GatherCode { get; set; }
+
+        public AutoReportCollectionItemsSetDetailsInput Details { get; set; }
+    }
+
+    public class AutoReportCollectionItemsSetCodeInput
+    {
+        public string AreaCode { get; set; }    
+
+        public string Address { get; set; }
+    }
+
+    public class AutoReportCollectionItemsSetDetailsInput
+    {
+        public int Cycle { get; set; }
+
+        public int Unit { get; set; }   
+
+        public DateTime BaseTime { get; set; }
+
+        public int CurveRatio { get; set; }
+
+        public int Pn { get; set; }
+
+        public List<AutoReportCollectionItemsSetDetailsPnFnInput> Details { get; set; }  
+
+    }
+
+    public class AutoReportCollectionItemsSetDetailsPnFnInput
+    {
+        public int Pn { get; set; }
+
+        public int Fn { get; set; }
+    }
+
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/AutoReportSetInput.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 设置自动上报输入
+    /// </summary>
+    public class AutoReportSetInput
+    {
+        public List<AutoReportSetCodeInput> Codes { get; set; }
+
+        public int MeterType { get; set; }
+
+        public string GatherCode { get; set; }
+
+        public AutoReportSetDetailsInput Details { get; set; }
+    }
+
+    public class AutoReportSetCodeInput
+    {
+        public string AreaCode { get; set; }    
+
+        public string Address { get; set; }
+    }
+
+    public class AutoReportSetDetailsInput
+    {
+        /// <summary>
+        /// 是否开启自动上报
+        /// </summary>
+        public bool IsOpen { get; set; }
+
+        /// <summary>
+        /// 任务号
+        /// </summary>
+        public int Pn { get; set; }
+
+    }
+
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BaseInput.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    public class BaseInput
+    {
+        /// <summary>
+        /// 集中器区位码
+        /// </summary>
+        public string AreaCode { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 采集端端口号
+        /// </summary>
+        public string GatherCode { get; set; }
+
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionInput.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 批量抄读版本输入
+    /// </summary>
+    public class BatchReadVersionInput
+    {
+        public List<BatchReadVersionDataInput> Data {get; set; }
+
+        public string GatherCode { get; set; }
+    }
+
+    public class BatchReadVersionDataInput
+    {
+        public string AreaCode { get; set; }
+
+        public string Address { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/BatchReadVersionOutput.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    public class BatchReadVersionOutput
+    {
+        public BatchReadVersionReamrkOutput Remark { get; set; }
+    }
+
+    public class BatchReadVersionReamrkOutput
+    {
+        public string AreaCode { get; set; }    
+
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 厂商代号
+        /// </summary>
+        public string MakerNo { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNo { get; set; }
+
+        /// <summary>
+        /// 终端软件版本号
+        /// </summary>
+        public string SoftwareVersion { get; set; }
+
+        /// <summary>
+        /// 终端软件发布日期：日月年 如 20240123
+        /// </summary>
+        public string SoftwareReleaseDate { get; set; }
+
+        /// <summary>
+        /// 添加时间 如：20240123
+        /// </summary>
+        public string AddDate { get; set; }
+
+        /// <summary>
+        /// 集中器ID
+        /// </summary>
+        public int FocusID { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CallTimeTestingInput.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 召测时间
+    /// </summary>
+    public class CallTimeTestingInput:BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get;set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string FocusID { get; set; }
+
+        /// <summary>
+        /// 电表：1 
+        /// </summary>
+        public string MeterType { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/CommunicationParametersSetInput.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 通讯参数设置
+    /// </summary>
+    public class CommunicationParametersSetInput:BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 集中器ID
+        /// </summary>
+        public string FocusID { get; set; }
+
+        /// <summary>
+        /// 电表：1
+        /// </summary>
+        public string MeterType { get; set; }
+
+        public CommunicationParametersSetDataInput Data { get; set; }
+    }
+
+    public class CommunicationParametersSetDataInput
+    {
+        /// <summary>
+        /// 主站IP和端口 如 119.23.59.186:10976
+        /// </summary>
+        public string MasterIPandPort { get; set; }
+
+        /// <summary>
+        /// 备用IP和端口
+        /// </summary>
+        public string BackupIPandPort { get; set; }
+
+        /// <summary>
+        /// APN 如 CMNET
+        /// </summary>
+        public string APN { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryAutoReportOpenStatusInput.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 查询自动上报开启状态输入
+    /// </summary>
+    public class QueryAutoReportOpenStatusInput:BaseInput
+    {
+        /// <summary>
+        /// 电表：1
+        /// </summary>
+        public string MeterType { get; set; }
+
+        public QueryAutoReportOpenStatusDetailInput Detail { get; set; }
+
+    }
+
+    public class QueryAutoReportOpenStatusDetailInput
+    {
+        /// <summary>
+        /// 任务号
+        /// </summary>
+        public int Pn { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogInput.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 查询采集日志输入
+    /// </summary>
+    public class QueryRecordLogInput
+    {
+        /// <summary>
+        /// 集中器编号
+        /// </summary>
+        public string FocusCode { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string MeterAddress { get; set; }
+
+        /// <summary>
+        /// 采集频率（5、15）
+        /// </summary>
+        public int TimeDensity { get; set; }
+
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        public DateTime StartTime { get; set; }
+
+        public DateTime EndTime { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/QueryRecordLogOutput.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    public class QueryRecordLogOutput
+    {
+    }
+
+    public class QueryRecordLogRemarkOutput
+    {
+        /// <summary>
+        /// 集中器编号
+        /// </summary>
+        public string FocusCode { get; set; }
+
+        /// <summary>
+        /// 电表ID
+        /// </summary>
+        public int MeterId { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string MeterAddress { get; set; }
+
+        /// <summary>
+        /// 1, --电表
+        /// </summary>
+        public int MeterType { get; set; }
+
+        /// <summary>
+        /// 时间跨度
+        /// </summary>
+        public int TimeSpan { get; set; }
+
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 发送报文
+        /// </summary>
+        public string IssueData { get; set; }
+
+        /// <summary>
+        /// 接收报文
+        /// </summary>
+        public string ReceiveData { get; set; }
+
+        /// <summary>
+        ///  0手动采集，1自动采集
+        /// </summary>
+        public int IsUpload { get; set; }
+
+        /// <summary>
+        /// 0正常数据，1超时数据
+        /// </summary>
+        public int IsTimeout { get; set; }
+
+        /// <summary>
+        /// 是否为补抄
+        /// </summary>
+        public bool IsRepair { get; set; }
+
+        public DateTime AddTime { get; set; }
+
+        /// <summary>
+        /// 过期字段 年月日时
+        /// </summary>
+        public DateTime ExpireTime { get; set; }
+
+        /// <summary>
+        /// 异常错误信息
+        /// </summary>
+        public string Remark { get; set; }
+    }
+
+
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumInput.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 读取表号
+    /// </summary>
+    public class ReadMeterNumInput:BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string FocusID { get; set; }
+
+        /// <summary>
+        /// 电表：1 
+        /// </summary>
+        public string MeterType { get; set; }
+
+        /// <summary>
+        /// 计量点号 如"1,2,3,4"
+        /// </summary>
+        public string Data { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadMeterNumOutput.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 读取表号输出
+    /// </summary>
+    public class ReadMeterNumOutput
+    {
+        public List<ReadMeterNumRemarkOutput> Remark { get; set; }
+    }
+
+    public class ReadMeterNumRemarkOutput
+    {
+        public string ComNum { get; set; }
+
+        public string BerComPass { get; set; }
+
+        public string RuleType { get; set; }
+
+        /// <summary>
+        /// 波特率
+        /// </summary>
+        public int BaudRate { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string CollectorAddress { get; set; }
+
+        /// <summary>
+        /// 端口
+        /// </summary>
+        public int Port { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeInput.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 读取时段输入
+    /// </summary>
+    public class ReadTimeInput: BaseInput
+    {
+        public int AmmeterId { get; set; }
+
+        public string AmmeterAddress { get; set; }
+
+        /// <summary>
+        /// 电表：1
+        /// </summary>
+        public int MeterType { get; set; }
+
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadTimeOutput.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 读取时段输出
+    /// </summary>
+    public class ReadTimeOutput
+    {
+        /// <summary>
+        /// 电表ID
+        /// </summary>
+        public int AmmeterID { get; set; }
+
+        /// <summary>
+        /// J (尖)，F (峰)，P (平)，G (谷)
+        /// </summary>
+        public string RateType { get; set; }
+
+        /// <summary>
+        /// 起始时间(如尖时段起始时间 HH:mm)
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间(如尖时段结束时间 HH:mm)
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 月份 格式  1,2,3,4,5,6,7,8,9,10,11,12
+        /// </summary>
+        public string RateMonth { get; set; }
+
+        /// <summary>
+        /// 状态 0：有效  -1：删除
+        /// </summary>
+        public int State { get; set; }
+
+        /// <summary>
+        /// 时段类型  用数字表示 一时段用1  二时段用2
+        /// </summary>
+        public int TimesType { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingInput.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 抄读输入
+    /// </summary>
+    public class ReadingInput:BaseInput
+    {
+        /// <summary>
+        /// 电表ID
+        /// </summary>
+        public string AmmeterId { get; set; }
+
+        /// <summary>
+        ///采集编码 {"0C_129", "0C_131"}, 采集编码.0C_129:正向有功；C_131:反向有功
+        /// </summary>
+        public string ItemCodes { get; set; }
+
+        /// <summary>
+        /// 集中器ID
+        /// </summary>
+        public int Point { get; set; }
+
+        /// <summary>
+        /// 冻结密度，-1:采集项本身无密度位，0:无，1:15分钟，2:30分钟，3:60分钟，245:5分钟，255:1分钟 
+        /// </summary>
+        public int Density { get; set; }
+
+        /// <summary>
+        /// 电表：1 
+        /// </summary>
+        public int MeterType { get; set; }
+
+        /// <summary>
+        /// 数据时标起始时间:当前时间减1天
+        /// </summary>
+        public DateTime DataTime { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ReadingOutput.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    public class ReadingOutput
+    {
+        /// <summary>
+        /// true:成功，false：失败
+        /// </summary>
+        public bool ValidData { get; set; }
+
+        /// <summary>
+        ///0C_129_1 数据类型 总示值
+        /// </summary>
+        public string DataType { get; set; }
+
+        /// <summary>
+        /// 示值
+        /// </summary>
+        public decimal ReadValue { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TerminalRestartInput.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 终端重启
+    /// </summary>
+    public class TerminalRestartInput:BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string FocusID { get; set; }
+
+        /// <summary>
+        /// 电表：1 
+        /// </summary>
+        public string MeterType { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeAdjustInput.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 时间校准
+    /// </summary>
+    public class TimeAdjustInput : BaseInput
+    {
+        /// <summary>
+        /// 采集编码
+        /// </summary>
+        public string ItemCode { get; set; }
+
+        /// <summary>
+        /// 集中器地址
+        /// </summary>
+        public string FocusID { get; set; }
+
+        /// <summary>
+        /// 电表：1 
+        /// </summary>
+        public string MeterType { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetInput.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    /// <summary>
+    /// 时段设置输入
+    /// </summary>
+    public class TimeSetInput
+    {
+        /// <summary>
+        /// 集中器号
+        /// </summary>
+        public string FocusCode { get; set; }
+
+        /// <summary>
+        /// 电表地址
+        /// </summary>
+        public string MeterAddress { get; set; }
+
+        /// <summary>
+        /// 电表ID
+        /// </summary>
+        public int MeterID { get; set; }
+
+        /// <summary>
+        /// 采集端端口号
+        /// </summary>
+        public string GatherCode { get; set; }  
+
+        public List<TimeSetDataInput> Data { get; set; }
+    }
+
+    public class TimeSetDataInput
+    {
+        /// <summary>
+        /// 1,2,3
+        /// </summary>
+        public string Month { get; set; }
+
+        public List<TimeSetDataDataInput> Data { get; set; }
+    }
+
+    public class TimeSetDataDataInput
+    {
+       
+       public string Rate { get; set; }
+
+       public List<TimeSetDataDataTimeInput> Times { get; set; }
+    }
+
+    public class TimeSetDataDataTimeInput
+    {
+
+        public string StartTime { get; set; }
+
+        public string EndTime { get; set; }
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/TimeSetOutput.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JiShe.CollectBus.EnergySystem.Dto
+{
+    public class TimeSetOutput
+    {
+    }
+}

src/JiShe.CollectBus.Application.Contracts/EnergySystem/Dto/ValveControlInput.cs

@@ -9,16 +9,8 @@ namespace JiShe.CollectBus.EnergySystem.Dto
     /// <summary>
     /// 阀控输入
     /// </summary>
-    public class ValveControlInput
+    public class ValveControlInput:BaseInput
     {
-        /// <summary>
-        /// 集中器区位码
-        /// </summary>
-        public string AreaCode { get; set; }
-        /// <summary>
-        /// 集中器地址
-        /// </summary>
-        public string Address { get; set; }
         /// <summary>
         /// 表号
         /// </summary>
@@ -27,14 +19,12 @@ namespace JiShe.CollectBus.EnergySystem.Dto
         /// 0 合闸，开阀, 1 断开、跳闸，关阀
         /// </summary>
         public int TripState { get; set; }
+
         /// <summary>
-        /// 采集端端口号
+        /// 电表：1，水表：2，燃气表：3，热能表：4 水表流量计：5，燃气表流量计：6，特殊电表：7
-        /// </summary>
-        public string GatherCode { get; set; }
-        /// <summary>
-        /// 表：1，水表：2，燃气表：3，热能表：4 水表流量计：5，燃气表流量计：6，特殊电表：7
         /// </summary>
         public int MeterType { get; set; }
+
     }
 
 }

src/JiShe.CollectBus.Application.Contracts/EnergySystem/IEnergySystemAppService.cs

@@ -12,4 +12,116 @@ public interface IEnergySystemAppService : IApplicationService
     /// <param name="input">The input.</param>
     /// <returns></returns>
     Task<BaseResultDto<ValveControlOutput>> ValveControl(ValveControlInput input);
+
+    /// <summary>
+    /// 批量抄读时段
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<ReadTimeOutput>> ReadTime(ReadTimeInput input);
+
+    /// <summary>
+    /// 电表档案下发
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<AmmeterArchivesDownOutput>> AmmeterArchivesDown(AmmeterArchivesDownInput input);
+
+    /// <summary>
+    /// 电表档案一键匹配
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> AmmeterArchivesMatch(AmmeterArchivesMatchInput input);
+
+    /// <summary>
+    /// 通讯参数设置
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> CommunicationParametersSet(CommunicationParametersSetInput  input);
+
+    /// <summary>
+    /// 召测时间
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> CallTimeTesting(CallTimeTestingInput input);
+
+    /// <summary>
+    /// 时间校准
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> TimeAdjust(TimeAdjustInput input);
+
+    /// <summary>
+    /// 重启终端
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> TerminalRestart(TerminalRestartInput input);
+
+    /// <summary>
+    /// 读取表号
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<ReadMeterNumOutput>> ReadMeterNum(ReadMeterNumInput input);
+
+    /// <summary>
+    /// 抄读
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<ReadingOutput>> Reading(ReadingInput input);
+
+    /// <summary>
+    /// 设置时间段
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> TimeSet(TimeSetInput input);
+
+    /// <summary>
+    /// 设置自动上报采集项
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> AutoReportCollectionItemsSet(AutoReportCollectionItemsSetInput input);
+
+    /// <summary>
+    /// 设置自动上报
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> AutoReportSet(AutoReportSetInput input);
+
+    /// <summary>
+    /// 查询自动上报开启状态
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> QueryAutoReportOpenStatus(QueryAutoReportOpenStatusInput input);
+
+    /// <summary>
+    /// 批量抄读版本
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<BatchReadVersionOutput>> BatchReadVersion(BatchReadVersionInput input);
+
+    /// <summary>
+    /// 查询采集日志
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto<QueryRecordLogOutput>> QueryRecordLog(QueryRecordLogInput input);
+
+    /// <summary>
+    /// 校准电表时间
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    Task<BaseResultDto> AdjustMeterTiming(AdjustMeterTimingInput input);
 }

src/JiShe.CollectBus.Application/EnergySystem/EnergySystemAppService.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JiShe.CollectBus.EnergySystem.Dto;
+
+namespace JiShe.CollectBus.EnergySystem
+{
+    public class EnergySystemAppService: CollectBusAppService,IEnergySystemAppService
+    {
+        public Task<BaseResultDto<ValveControlOutput>> ValveControl(ValveControlInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<ReadTimeOutput>> ReadTime(ReadTimeInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<AmmeterArchivesDownOutput>> AmmeterArchivesDown(AmmeterArchivesDownInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> AmmeterArchivesMatch(AmmeterArchivesMatchInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> CommunicationParametersSet(CommunicationParametersSetInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> CallTimeTesting(CallTimeTestingInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> TimeAdjust(TimeAdjustInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> TerminalRestart(TerminalRestartInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<ReadMeterNumOutput>> ReadMeterNum(ReadMeterNumInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<ReadingOutput>> Reading(ReadingInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> TimeSet(TimeSetInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> AutoReportCollectionItemsSet(AutoReportCollectionItemsSetInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> AutoReportSet(AutoReportSetInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> QueryAutoReportOpenStatus(QueryAutoReportOpenStatusInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<BatchReadVersionOutput>> BatchReadVersion(BatchReadVersionInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto<QueryRecordLogOutput>> QueryRecordLog(QueryRecordLogInput input)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<BaseResultDto> AdjustMeterTiming(AdjustMeterTimingInput input)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs

@@ -77,6 +77,7 @@ namespace JiShe.CollectBus.Subscribers
             if (device!=null)
             {
                 await _tcpService.SendAsync(device.ClientId, issuedEventMessage.Message);
+
             }
         }