Commit 4384e118 by Seniorious

1

parent 10b4ecba
...@@ -37,6 +37,12 @@ ...@@ -37,6 +37,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Update="Properties\launchSettings.json"> <None Update="Properties\launchSettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"Launch": "http://*:5233;http://*:5243", "Launch": "http://*:5233;http://*:5243",
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"MySQL": "server=127.0.0.1;port=3306;Database=xuzhou_new;Uid=root;Pwd=123456;" "MySQL": "server=192.168.3.128;port=3306;Database=xuzhou;Uid=root;Pwd=123456;"
//RabbitMQ配置 //RabbitMQ配置
}, },
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
//密码 //密码
"Password": "123456", "Password": "123456",
//ip地址,多个时以英文“,”分割 //ip地址,多个时以英文“,”分割
"HostName": "127.0.0.1", "HostName": "192.168.3.188",
//端口 //端口
"Port": 5672, "Port": 5672,
//虚拟队列名称 //虚拟队列名称
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
//虚拟交换机名称 //虚拟交换机名称
"ExchangeName": "uploadRecords" "ExchangeName": "uploadRecords"
}, },
"RabbitMQConfigCreate": {//生产者消息队列,后期可以建设多个队列名称 "RabbitMQConfigCreate": { //生产者消息队列,后期可以建设多个队列名称
//用户名 //用户名
"UserName": "root", "UserName": "root",
//密码 //密码
"Password": "123456", "Password": "123456",
//ip地址,多个时以英文“,”分割 //ip地址,多个时以英文“,”分割
"HostName": "127.0.0.1", "HostName": "192.168.3.188",
//端口 //端口
"Port": 5672, "Port": 5672,
//虚拟队列名称 //虚拟队列名称
......
...@@ -31,8 +31,6 @@ namespace Common.Utility.RabbitMQ ...@@ -31,8 +31,6 @@ namespace Common.Utility.RabbitMQ
{ {
try try
{ {
//创建连接对象工厂 //创建连接对象工厂
factory = new ConnectionFactory() factory = new ConnectionFactory()
{ {
......
...@@ -30,7 +30,7 @@ namespace Common.Utility.Model ...@@ -30,7 +30,7 @@ namespace Common.Utility.Model
public String? equipmentSize { get; set; } public String? equipmentSize { get; set; }
public int? outInState { get; set; } public int? outInState { get; set; }
public int? errorState { get; set; } public int? errorState { get; set; }
public string? errorMsg { get; set; }
} }
public class CarList public class CarList
...@@ -41,6 +41,7 @@ namespace Common.Utility.Model ...@@ -41,6 +41,7 @@ namespace Common.Utility.Model
public int? outInState { get; set; } public int? outInState { get; set; }
public String? errorState { get; set; } public String? errorState { get; set; }
public string? errorMsg { get; set; }
} }
} }
...@@ -19,7 +19,6 @@ namespace Models.Table ...@@ -19,7 +19,6 @@ namespace Models.Table
[SugarColumn(ColumnName = "summary_id")] [SugarColumn(ColumnName = "summary_id")]
public int summaryId { get; set; } public int summaryId { get; set; }
public String epc { get; set; } public String epc { get; set; }
[SugarColumn(ColumnName = "equipment_name")] [SugarColumn(ColumnName = "equipment_name")]
public String? equipmentName { get; set; } public String? equipmentName { get; set; }
...@@ -31,7 +30,7 @@ namespace Models.Table ...@@ -31,7 +30,7 @@ namespace Models.Table
public int? state { get; set; } public int? state { get; set; }
[SugarColumn(ColumnName = "car_id")] [SugarColumn(ColumnName = "car_id")]
public int? carid { get; set; } public int? carid { get; set; }
[SugarColumn(ColumnName = "error_msg")]
public string? errorMsg { get; set; }
} }
} }
...@@ -42,6 +42,7 @@ namespace Services ...@@ -42,6 +42,7 @@ namespace Services
logdetail.createTime = DateTime.Now; logdetail.createTime = DateTime.Now;
logdetail.updateTime = DateTime.Now; logdetail.updateTime = DateTime.Now;
logdetail.state = item.outInState; logdetail.state = item.outInState;
logdetail.errorMsg = item.errorMsg;
log.DetailList.Add(logdetail); log.DetailList.Add(logdetail);
} }
} }
...@@ -55,6 +56,7 @@ namespace Services ...@@ -55,6 +56,7 @@ namespace Services
logdetail.equipmentName = item.carName; logdetail.equipmentName = item.carName;
logdetail.equipmentSize = item.carNumber; logdetail.equipmentSize = item.carNumber;
logdetail.state = item.outInState; logdetail.state = item.outInState;
logdetail.errorMsg = item.errorMsg;
log.DetailList.Add(logdetail); log.DetailList.Add(logdetail);
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论