修改 南通控制柜接口

ningshuxia

2022-10-27 891ebeb29dbeb6871aa8d5249bedaf0bef7cfd1e

修改 南通控制柜接口

 Application/IStation.Application.Eta/IStation.Application.Eta.csproj

@@ -23,6 +23,7 @@
    <ProjectReference Include="..\..\Service\IStation.Service.Main\IStation.Service.Main.csproj" />
    <ProjectReference Include="..\..\Service\IStation.Service.Product\IStation.Service.Product.csproj" />
    <ProjectReference Include="..\IStation.Application.Core\IStation.Application.Core.csproj" />
    <ProjectReference Include="..\IStation.Application.Epanet\IStation.Application.Epanet.csproj" />
  </ItemGroup>

</Project>

 Application/IStation.Application.Monitor/monitor_control/MonitorControlNTConfigure_Controller.cs

@@ -7,7 +7,7 @@
using Furion.DynamicApiController;
using System.ComponentModel.DataAnnotations;
using Mapster;

using Furion.FriendlyException;

namespace IStation.Application
{
@@ -18,17 +18,22 @@
    [ApiDescriptionSettings("Monitor", Name = "监测南通控制", Order = 400)]
    public class MonitorControlNT_Controller : IDynamicApiController 
    {

        /// <summary>
        /// æµ‹è¯•å¯åŠ¨
        /// </summary>
        [Route("TestStart@V1.0")]
        [HttpPost]
        public string TestStart()
        public string TestStart([Required] NTStartInput input)
        {
            if (input.Password != Settings.Operating.NT.Password)
            {
                throw Oops.Oh("密码错误!");
            } 
            var context = new Model.MonitorTestControlParas.StartContext(input.HZ, input.OperatingMode, input.OperatingValue);

            var paras = new Model.MonitorTestControlParas();
            paras.Type = 1;
            paras.Paras = string.Empty;
            paras.ControlType = Model.MonitorTestControlParas.eControlType.Start;
            paras.Context = context.ToJson();

            var runQueue = new RabbitMqExChangeHelper();
            runQueue.Push("NTTEST", paras);
@@ -40,17 +45,19 @@
        /// </summary>
        [Route("TestStop@V1.0")]
        [HttpPost]
        public string TestStop()
        public string TestStop([Required] NTStopInput input)
        {
            var paras = new Model.MonitorTestControlParas();
            paras.Type = 0;
            paras.Paras = string.Empty;
            paras.ControlType = Model.MonitorTestControlParas.eControlType.Stop;
            paras.Context = string.Empty;

            var runQueue = new RabbitMqExChangeHelper();
            runQueue.Push("NTTEST", paras);
            return "OK";
        }


/*
        /// <summary>
        /// æµ‹è¯•å˜é¢‘
        /// </summary>
@@ -59,14 +66,14 @@
        public string TestChange(NTTestChangeInput input)
        {
            var paras = new Model.MonitorTestControlParas();
            paras.Type = -1;
            paras.Paras = input.HZ.ToString();
            paras.ControlType = -1;
            paras.Context = input.HZ.ToString();

            var runQueue = new RabbitMqExChangeHelper();
            runQueue.Push("NTTEST", paras);
            return "OK";
        }

*/




 Application/IStation.Application.Monitor/monitor_control/dto/NTStartInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using IStation.Model.Control;

namespace IStation.Application
{
    /// <summary>
    /// å—通泵启动入参
    /// </summary>
    public class NTStartInput
    {
        /// <summary>
        /// å¯†ç 
        /// </summary>
        [Required]
        public string Password { get;set; }

        /// <summary>
        /// é¢‘率
        /// </summary> 
        [Required, Range(0, 50, ErrorMessage = "频率必须在合理范围内(0-50)")]
        public double HZ { get; set; }

        /// <summary>
        /// æ³µè‡ªåŠ¨è¿è¡Œæ¨¡å¼
        /// </summary>
        [Required]
        public Model.MonitorTestControlParas.eOperatingMode OperatingMode { get; set; }

        /// <summary>
        /// æ³µè‡ªåŠ¨è¿è¡Œå€¼
        /// </summary>
        [Required]
        public double OperatingValue { get; set; }
    }
}

 Application/IStation.Application.Monitor/monitor_control/dto/NTStopInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.Application
{
    /// <summary>
    /// å—通泵关闭入参
    /// </summary>
    public class NTStopInput
    {
        /// <summary>
        /// å¯†ç 
        /// </summary>
        [Required]
        public string Password { get;set; }
  
    }
}

 Model/IStation.Model.Monitor/Control/MonitorTestControlParas_Enum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.Model
{

    /// <summary>
    /// ç›‘测测试控制参数
    /// </summary>
    public partial class MonitorTestControlParas
    {
        /// <summary>
        /// æŽ§åˆ¶ç±»åž‹ 
        /// </summary>
        public enum eControlType
        {
            /// <summary>
            /// åœæ­¢
            /// </summary>
            Stop = 0,

            /// <summary>
            /// å¯åŠ¨
            /// </summary>
            Start = 1,
        }

        /// <summary>
        /// æ³µè‡ªåŠ¨è¿è¡Œæ¨¡å¼
        /// </summary>
        public enum eOperatingMode
        {
            /// <summary>
            /// å®šæ—¶
            /// </summary>
            Timing = 1,

            /// <summary>
            /// å®šæµé‡
            /// </summary>
            ConstantFlow = 2,
        }

    }


}

 Model/IStation.Model.Monitor/Control/MonitorTestControlParas_Model.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.Model
{
    /// <summary>
    ///  
    /// </summary>
    public partial class MonitorTestControlParas
    {
        /// <summary>
        /// å¼€æœºå‚æ•°
        /// </summary>
        public class StartContext : JsonList<StartContext>
        { 
            /// <summary>
            /// 
            /// </summary>
            public StartContext() { }


            /// <summary>
            /// 
            /// </summary>
            public StartContext(double hz, eOperatingMode operatingMode, double operatingValue)
            {
                this.HZ = hz;
                this.OperatingMode = operatingMode;
                this.OperatingValue = operatingValue;
            }

            /// <summary>
            /// é¢‘率
            /// </summary>  
            public double HZ { get; set; }

            /// <summary>
            /// è¿è¡Œæ¨¡å¼
            /// </summary> 
            public eOperatingMode OperatingMode { get; set; }

            /// <summary>
            /// è¿è¡Œå€¼
            /// </summary> 
            public double OperatingValue { get; set; }
        }


    }
}

 Model/IStation.Model.Monitor/control/MonitorTestControlParas.cs

@@ -9,17 +9,17 @@
    /// <summary>
    /// ç›‘测测试控制参数
    /// </summary>
    public class MonitorTestControlParas 
    public partial class MonitorTestControlParas
    {
        /// <summary>
        /// 0代表关机 1代表开机 -1代表变频
        /// æŽ§åˆ¶ç±»åž‹
        /// </summary>
        public int Type { get; set; }
        public eControlType ControlType { get; set; }

        /// <summary>
        /// å‚æ•°
        /// å¯¹æŽ¥ä¸Šä¸‹æ–‡
        /// </summary>
        public string Paras { get; set; }
        public string Context { get; set; }

    }
}

 Settings/IStation.Settings/models/Paras.cs

@@ -1,4 +1,5 @@
using System;
using IStation.models.operating;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -160,6 +161,11 @@
        public Paras_LinuxTest LinuxTest { get; set; }

        /// <summary>
        /// Operating参数
        /// </summary>
        public Paras_Operating Operating { get; set; }

        /// <summary>
        /// DataFile参数
        /// </summary>
        public Paras_DataFile DataFile { get; set; }

 Settings/IStation.Settings/models/monitor/Paras_Monitor.cs

@@ -21,6 +21,5 @@
        /// </summary>
        public string Flag { get; set; }


    }
}

 Settings/IStation.Settings/models/operating/Paras_Operating.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation.models.operating
{
    /// <summary>
    /// Operating å‚æ•°
    /// </summary>
    public class Paras_Operating
    {
        /// <summary>
        /// å—通
        /// </summary>
        public Paras_Operating_NT NT { get; set; } 

    }
}

 Settings/IStation.Settings/models/operating/Paras_Operating_NT.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace IStation
{
    /// <summary>
    /// Operating å‚æ•° å—通
    /// </summary>
    public class Paras_Operating_NT
    {
        /// <summary>
        ///  å¯†ç 
        /// </summary>
        public string Password { get; set; }
    }

}

 Settings/IStation.Settings/paras/Settings.cs

@@ -1,4 +1,5 @@
using System;
using IStation.models.operating;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -252,6 +253,14 @@
            get { return SettingsHelper.Get().LinuxTest; }
        }

        /// <summary>
        /// Operating å‚æ•°
        /// </summary>
        public static Paras_Operating Operating
        {
            get { return SettingsHelper.Get().Operating; }
        }
        

        /// <summary>
        /// DataFile å‚æ•°
@@ -262,6 +271,8 @@
        }
         



        /// <summary>
        /// ä¿å­˜
        /// </summary>

 Settings/IStation.Settings/paras_settings.json

@@ -272,9 +272,17 @@

  },

  "Operating": { 
    "NT": {
      "Password": "666666", 
    }
  },

   "DataFile": { 
      "SaveFileUrl": "http://101.133.133.173:9019/",
      "PdfFolder":"Report" 
   }



}

 Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs

@@ -49,7 +49,7 @@
                            return true;
                        }
                        byte[] bts = null;
                        switch (paras.Type)
                        switch (paras.ControlType)
                        {
                            case 0: 
                                bts = MsgDataHelper.GetControlMsg关机(); 
@@ -61,19 +61,19 @@
                                break;//从辅助类中获取 å¼€å¯
                            case -1:
                                {
                                    if (string.IsNullOrEmpty(paras.Paras))
                                    if (string.IsNullOrEmpty(paras.Context))
                                    {
                                        NtLogHelper.Error($"[调频]参数: null");
                                        return false;
                                    }
                                    if (!double.TryParse(paras.Paras, out double value))
                                    if (!double.TryParse(paras.Context, out double value))
                                    {
                                        NtLogHelper.Error($"[调频]参数异常:{paras.Paras}");
                                        NtLogHelper.Error($"[调频]参数异常:{paras.Context}");
                                        return false;
                                    }
                                   
                                     bts = MsgDataHelper.GetControlMsg调频(value);
                                     NtLogHelper.Info($"[调频]参数:{paras.Paras}"); 
                                     NtLogHelper.Info($"[调频]参数:{paras.Context}"); 
                                }
                                break;//从辅助类中获取 å˜é¢‘
                            default:

 TopShelf/IStation.TopShelf.DataDocking4Socket/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2022-10-26T02:50:57.8305616Z;True|2022-10-26T10:41:24.0512951+08:00;True|2022-10-26T10:36:18.9669938+08:00;True|2022-10-26T10:23:42.5700603+08:00;True|2022-10-26T09:49:18.1242267+08:00;True|2022-10-24T17:44:25.5039390+08:00;True|2022-07-02T00:06:16.6338790+08:00;True|2022-07-02T00:02:49.1000053+08:00;True|2022-07-01T23:23:53.1924783+08:00;True|2022-07-01T14:02:38.1190102+08:00;True|2022-07-01T13:55:33.4591108+08:00;</History>
    <History>True|2022-10-26T06:21:13.7358061Z;True|2022-10-26T13:58:17.8518712+08:00;True|2022-10-26T10:50:57.8305616+08:00;True|2022-10-26T10:41:24.0512951+08:00;True|2022-10-26T10:36:18.9669938+08:00;True|2022-10-26T10:23:42.5700603+08:00;True|2022-10-26T09:49:18.1242267+08:00;True|2022-10-24T17:44:25.5039390+08:00;True|2022-07-02T00:06:16.6338790+08:00;True|2022-07-02T00:02:49.1000053+08:00;True|2022-07-01T23:23:53.1924783+08:00;True|2022-07-01T14:02:38.1190102+08:00;True|2022-07-01T13:55:33.4591108+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>