From 3648692781e2e625d7523eebba29dd01eb6b0bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com> Date: Fri, 28 Apr 2023 14:56:19 +0800 Subject: [PATCH] --- Epost.BLL/CommandBLL.cs | 78 +++++++++---------- Epost.BLL/OrderControlBLL.cs | 2 +- .../PublishProfiles/Toolsweb.pubxml.user | 24 +++--- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs index d25784d..9d39e56 100644 --- a/Epost.BLL/CommandBLL.cs +++ b/Epost.BLL/CommandBLL.cs @@ -23,8 +23,8 @@ namespace Epost.BLL AddressstorageBLL addrBLL = new AddressstorageBLL(); public static DataTable Controls = new DataTable(); public static DataTable Labels = new DataTable(); - JobDownCacheDAL JobCache = new JobDownCacheDAL(); - OrdersDAL orderDal = new OrdersDAL(); + JobDownCacheDAL JobCache = new JobDownCacheDAL(); + OrdersDAL orderDal = new OrdersDAL(); ConfigurationOperator txtbll = new ConfigurationOperator(); string IP = ConfigurationManager.AppSettings["WebAPIUrl"]; @@ -127,7 +127,7 @@ namespace Epost.BLL lablemodel.Mode = "10"; list.Add(lablemodel); } - + //result= combll.DISPLAY_JOB(model); } @@ -154,9 +154,9 @@ namespace Epost.BLL #endregion #region 获取参数中文 - public string GETDISPLAYJOBPAR_CN(string no,string Lightcolor,string IsTwinkle,string Title,string BigQuantity, string BigUnit,string Quantity, string Unit,string Content,string Rfcode) + public string GETDISPLAYJOBPAR_CN(string no, string Lightcolor, string IsTwinkle, string Title, string BigQuantity, string BigUnit, string Quantity, string Unit, string Content, string Rfcode) { - string parar = no+"00" + Lightcolor + IsTwinkle+"30CQ" + Title + "\n\n" + BigQuantity + "\n" + BigUnit + "\n" + Quantity + "\n" + Unit + "\n" + Content + "\n00\n\n" + Rfcode + "\n"; ; + string parar = no + "00" + Lightcolor + IsTwinkle + "30CQ" + Title + "\n\n" + BigQuantity + "\n" + BigUnit + "\n" + Quantity + "\n" + Unit + "\n" + Content + "\n00\n\n" + Rfcode + "\n"; ; return parar; } #endregion @@ -246,7 +246,7 @@ namespace Epost.BLL #endregion #region 任务指令(传参地址) - public void DISPLAY_JOB_M(LabelParamModel model, bool clear = false, bool islock = false ) + public void DISPLAY_JOB_M(LabelParamModel model, bool clear = false, bool islock = false) { List list = new List(); if (clear) @@ -259,14 +259,14 @@ namespace Epost.BLL clearModel.Command = "REMOVE_JOB"; clearModel.Timeout = "0.5"; clearModel.Type = model.Type; - // dal.REMOVE_JOB(clearModel); + // dal.REMOVE_JOB(clearModel); list.Add(clearModel); } LabelParamModel DisplayModel = new LabelParamModel(); DisplayModel.Address = model.Address; DisplayModel.ControlIP = model.ControlIP; - DisplayModel.Content =model.Content; - DisplayModel.Title =model.Title; + DisplayModel.Content = model.Content; + DisplayModel.Title = model.Title; DisplayModel.Loc = model.Loc; DisplayModel.Quantity = model.Quantity; DisplayModel.Uid = model.Uid; @@ -362,9 +362,9 @@ namespace Epost.BLL LabelParamModel clearModel = new LabelParamModel(); clearModel.Address = model.Address; clearModel.ControlIP = model.ControlIP; - + clearModel.Command = "LED_OFF"; - clearModel.Timeout = "0.5"; + clearModel.Timeout = "0.5"; sendlist.Add(clearModel); } dal.DISPLAY_JOBALL(sendlist); @@ -401,14 +401,14 @@ namespace Epost.BLL clearModel.Timeout = "0.5"; list.Add(clearModel); } - + } - + dal.SendALL(list); } #endregion - + #region 任务指令(传参地址) public bool DISPLAY_JOB(LabelParamModel model) { @@ -431,7 +431,7 @@ namespace Epost.BLL return dal.SendALL_Init(model); } #endregion - + #region 移除任务指令(传参地址) public bool REMOVE_JOB(LabelParamModel model) { @@ -509,7 +509,7 @@ namespace Epost.BLL LabelParamModel model = new LabelParamModel(); model.ControlIP = item["ControlIP"].ToString(); - FORMATE_JOB_DATA(model); + FORMATE_JOB_DATA(model); } @@ -553,7 +553,7 @@ namespace Epost.BLL { // DataTable dt = addrBLL.getAddresslist(block,area,type); - if(offList.Any()) + if (offList.Any()) { List list = new List(); foreach (JobModel item in offList) @@ -570,7 +570,7 @@ namespace Epost.BLL Unlockmodel.ControlIP = item.ControlIP; Unlockmodel.Address = item.Address; Unlockmodel.Command = "UNLOCK"; - + Unlockmodel.Type = "N"; Unlockmodel.Parameter = "11111000"; list.Add(Unlockmodel); @@ -615,25 +615,25 @@ namespace Epost.BLL #region 点亮显示标签 public void ShowBoxMessage_M(ShowMessageModel_M show) { - //获取作业区对应的显示标签地址 - DataTable showaddrDT = addrBLL.GetBoxAddress(show.Block,show.Area,show.Type); + //获取作业区对应的显示标签地址 + DataTable showaddrDT = addrBLL.GetBoxAddress(show.Block, show.Area, show.Type); if (showaddrDT != null && showaddrDT.Rows.Count > 0) { foreach (DataRow addritem in showaddrDT.Rows) { - + LabelParamModel lablemodel = new LabelParamModel(); lablemodel.Address = addritem["address"].ToString(); lablemodel.ControlIP = addritem["controlip"].ToString(); lablemodel.Command = "DISPLAY_JOB"; - lablemodel.Uid =show.Uid; + lablemodel.Uid = show.Uid; if (string.IsNullOrEmpty(show.Uid)) - { lablemodel.Uid = addritem["address"].ToString(); } - + { lablemodel.Uid = show.No + addritem["address"].ToString(); } + lablemodel.Mode = show.Color + "0"; if (addritem["addresstype"].ToString() == "2") - { - + { + lablemodel.Type = "C"; lablemodel.Loc = show.Location; lablemodel.Title = show.Title; @@ -646,13 +646,13 @@ namespace Epost.BLL } else - { + { lablemodel.Type = "N"; - lablemodel.Quantity = show.Qty; + lablemodel.Quantity = show.Qty; lablemodel.Loc = show.Location; - - } - + + } + DISPLAY_JOB_M(lablemodel, true, show.Islock); LogHelper.WriteLogInfo("点亮显示标签" + addritem["address"].ToString()); @@ -691,7 +691,7 @@ namespace Epost.BLL model.Type = "T"; model.Address = item["address"].ToString(); model.ControlIP = item["ControlIP"].ToString(); - model.Parameter = ConvertHexHelper.ConvertString(item["addresstype"].ToString(), 10, 16).ToString().PadLeft(2,'0')+ isoff; + model.Parameter = ConvertHexHelper.ConvertString(item["addresstype"].ToString(), 10, 16).ToString().PadLeft(2, '0') + isoff; list.Add(model); } @@ -711,16 +711,16 @@ namespace Epost.BLL List list = new List(); foreach (DataRow addritem in showaddrDT.Rows) { - + LabelParamModel model = new LabelParamModel(); model.Address = addritem["address"].ToString(); model.ControlIP = addritem["controlip"].ToString(); - model.Parameter =show.No; + model.Parameter = show.No; model.Command = "REMOVE_JOB"; model.Timeout = "0.5"; list.Add(model); - } - + } + if (list != null && list.Count > 0) { LogHelper.WriteLogInfo("熄灭点亮的list———————：" + list.Count); @@ -728,16 +728,16 @@ namespace Epost.BLL } } - } + } + - #endregion #endregion - + } } diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index 2799b06..4f36780 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -473,7 +473,7 @@ namespace Epost.BLL showmodel.Color = color; showmodel.Islock = true; showmodel.Title = model.Matchid; - showmodel.No = "06"; + showmodel.No = "01"; showmodel.IsTwinkle = 0; showmodel.Contents = content; showmodel.Type = 2; diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index cffdd6c..13a29d8 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台 - True|2023-04-20T08:36:34.8353434Z;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00; + True|2023-04-27T12:14:15.0331014Z;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00; @@ -33,19 +33,19 @@ 04/16/2023 15:06:26 - 04/20/2023 16:36:19 + 04/27/2023 20:13:39 - 04/20/2023 16:36:18 + 04/27/2023 20:13:39 02/24/2020 15:29:24 - 04/18/2023 14:56:12 + 04/27/2023 20:13:07 - 04/18/2023 14:56:12 + 04/27/2023 20:13:07 04/16/2023 15:06:26 @@ -63,25 +63,25 @@ 10/23/2017 13:15:20 - 04/20/2023 16:35:54 + 04/27/2023 20:13:09 - 04/20/2023 16:35:54 + 04/27/2023 20:13:09 08/26/2020 18:09:48 - 04/20/2023 16:35:51 + 04/27/2023 20:13:08 - 04/20/2023 16:35:51 + 04/27/2023 20:13:08 - 04/20/2023 16:36:01 + 04/27/2023 20:13:16 - 04/20/2023 16:36:01 + 04/27/2023 20:13:16 04/16/2023 17:10:57 @@ -5652,7 +5652,7 @@ 04/16/2023 15:06:27 - 04/20/2023 16:36:06 + 04/27/2023 20:13:23 04/04/2018 15:45:12