南通控制命令修改

lixiaojun

2022-10-24 29b9d55e85a1c412d1367335caf3e046aef8afae

南通控制命令修改

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

@@ -24,15 +24,15 @@
        /// </summary>
        [Route("TestStart@V1.0")]
        [HttpPost]
        public bool TestStart()
        public string TestStart()
        {
            var paras = new Model.MonitorTestControlParas();
            paras.Type = 1;
            paras.Instruction = string.Empty;//此处从辅助类中获取指令
            paras.Paras = string.Empty;

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

        /// <summary>
@@ -40,15 +40,15 @@
        /// </summary>
        [Route("TestStop@V1.0")]
        [HttpPost]
        public bool TestStop()
        public string TestStop()
        {
            var paras = new Model.MonitorTestControlParas();
            paras.Type = 0;
            paras.Instruction = string.Empty;//此处从辅助类中获取指令
            paras.Paras = string.Empty;

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

        /// <summary>
@@ -56,15 +56,15 @@
        /// </summary>
        [Route("TestChange@V1.0")]
        [HttpPost]
        public bool TestChange(NTTestChangeInput input)
        public string TestChange(NTTestChangeInput input)
        {
            var paras = new Model.MonitorTestControlParas();
            paras.Type = -1;
            paras.Instruction = string.Empty;//此处从辅助类中获取指令
            paras.Paras = input.HZ.ToString();

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



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

@@ -17,8 +17,9 @@
        public int Type { get; set; }

        /// <summary>
        /// 指令
        /// 参数
        /// </summary>
        public string Instruction { get; set; }
        public string Paras { get; set; }

    }
}

 Socket/IStation.DataDockingSocket4NT/control/SendControlJobHelper.cs

@@ -48,13 +48,23 @@
                            LogHelper.Info("南通控制命令，数据序列化失败");
                            return true;
                        }
                        var bts = BitTransfer.FromString(paras.Instruction);
                        if (session != null)
                        byte[] bts = null;
                        switch (paras.Type)
                        {
                            if (session.IsConnected)
                            case 0:bts = null; break;//从辅助类中获取  关闭
                            case 1: bts = null; break;//从辅助类中获取 开启
                            case -1:bts = null;break;//从辅助类中获取 变频
                            default: break;
                        }
                        if (bts != null)
                        {
                            if (session != null)
                            {
                                session.Send(bts, 0, bts.Length);
                                LogHelper.Info(session.SessionName + ":" +paras.Instruction + ", 发送一条请求控制指令");
                                if (session.IsConnected)
                                {
                                    session.Send(bts, 0, bts.Length);
                                    LogHelper.Info(session.SessionName + ":" + BitTransfer.ToString(bts) + ", 发送一条请求控制指令");
                                }
                            }
                        }
                        return true;