hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
帅凯 贾
2023-04-28 14:56:19 +08:00
parent e2c1d127a0
commit 3648692781
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Epost.BLL/CommandBLL.cs
View File

@ -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<LabelParamModel> list = new List<LabelParamModel>();
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<LabelParamModel> list = new List<LabelParamModel>();
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<LabelParamModel> list = new List<LabelParamModel>();
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
}
}

2
Epost.BLL/OrderControlBLL.cs
View File

@ -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;