From 6dae2517aa69e7a81e87b8cc2bcb63f401fa77dd Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 21 八月 2025 13:46:51 +0800
Subject: [PATCH] 1.AGV调用新增日志。
---
util/LogUtil.cs | 5
Controllers/AGV/AgvApiController.cs | 182 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 185 insertions(+), 2 deletions(-)
diff --git a/Controllers/AGV/AgvApiController.cs b/Controllers/AGV/AgvApiController.cs
index f979be1..e0e813b 100644
--- a/Controllers/AGV/AgvApiController.cs
+++ b/Controllers/AGV/AgvApiController.cs
@@ -8,6 +8,8 @@
using System.ServiceModel;
using System.IO;
using NewPdaSqlServer.Dto.Warehouse;
+using NewPdaSqlServer.DB;
+using Newtonsoft.Json;
namespace NewPdaSqlServer.Controllers.AGV;
@@ -60,6 +62,12 @@
[HttpPost("DefineTask_001")]
public ResponseResult DefineTask_001(DefineTask001Dto dto)
{
+ string _requestJson = string.Empty;
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ int sendStatus = 0;
+ string _logMessage = "銆怉GV銆戠珛搴撻�佹";
+
try
{
var binding = new BasicHttpBinding
@@ -69,6 +77,7 @@
};
var endpoint = new EndpointAddress("http://192.168.35.251:8000/MesGet");
+ //var endpoint = new EndpointAddress("http://192.168.32.17:8000/MesGet");
var factory = new ChannelFactory<IImesInterface>(binding, endpoint);
var channel = factory.CreateChannel();
@@ -84,6 +93,28 @@
((IClientChannel)channel).Close();
+ // 璁板綍璇锋眰鎶ユ枃
+ _requestJson = JsonConvert.SerializeObject(dto);
+
+ _responseData = result;
+ sendStatus = 1;
+
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage,
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: sendStatus,
+ executeTime: _executeTimestamp
+ );
+
return new ResponseResult
{
status = 0,
@@ -93,6 +124,21 @@
}
catch (Exception ex)
{
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage + $"绯荤粺寮傚父锛歿ex.Message}",
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: 0,
+ executeTime: _executeTimestamp
+ );
return ResponseResult.ResponseError(ex);
}
}
@@ -101,6 +147,12 @@
[HttpPost("DefineTask_002")]
public ResponseResult DefineTask_002(DefineTask002Dto dto)
{
+ string _requestJson = string.Empty;
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ int sendStatus = 0;
+ string _logMessage = "銆怉GV銆戠珛搴撴楠�";
+
try
{
var binding = new BasicHttpBinding
@@ -110,6 +162,7 @@
};
var endpoint = new EndpointAddress("http://192.168.35.251:8000/MesGet");
+ //var endpoint = new EndpointAddress("http://192.168.32.17:8000/MesGet");
var factory = new ChannelFactory<IImesInterface>(binding, endpoint);
var channel = factory.CreateChannel();
@@ -120,6 +173,28 @@
((IClientChannel)channel).Close();
+ // 璁板綍璇锋眰鎶ユ枃
+ _requestJson = JsonConvert.SerializeObject(dto);
+
+ _responseData = result;
+ sendStatus = 1;
+
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage,
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: sendStatus,
+ executeTime: _executeTimestamp
+ );
+
return new ResponseResult
{
status = 0,
@@ -129,6 +204,22 @@
}
catch (Exception ex)
{
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage + $"绯荤粺寮傚父锛歿ex.Message}",
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: 0,
+ executeTime: _executeTimestamp
+ );
+
return ResponseResult.ResponseError(ex);
}
}
@@ -137,6 +228,11 @@
[HttpPost("DefineTask_005")]
public ResponseResult DefineTask_005(DefineTask005Dto dto)
{
+ string _requestJson = string.Empty;
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ int sendStatus = 0;
+ string _logMessage = "銆怉GV銆戠珛搴撳懠鍙�";
try
{
var binding = new BasicHttpBinding
@@ -146,6 +242,7 @@
};
var endpoint = new EndpointAddress("http://192.168.35.251:8000/MesGet");
+ //var endpoint = new EndpointAddress("http://192.168.32.17:8000/MesGet");
var factory = new ChannelFactory<IImesInterface>(binding, endpoint);
var channel = factory.CreateChannel();
@@ -153,6 +250,29 @@
string result = channel.DefineTask_005(
dto.Postition);
((IClientChannel)channel).Close();
+
+ // 璁板綍璇锋眰鎶ユ枃
+ _requestJson = JsonConvert.SerializeObject(dto);
+
+ _responseData = result;
+ sendStatus = 1;
+
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage,
+ orderNo: "",
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: sendStatus,
+ executeTime: _executeTimestamp
+ );
+
return new ResponseResult
{
@@ -163,6 +283,22 @@
}
catch (Exception ex)
{
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage + $"绯荤粺寮傚父锛歿ex.Message}",
+ orderNo: "",
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: 0,
+ executeTime: _executeTimestamp
+ );
+
return ResponseResult.ResponseError(ex);
}
}
@@ -172,6 +308,12 @@
[HttpPost("DefineTask_006")]
public ResponseResult DefineTask_006(DefineTask006Dto dto)
{
+ string _requestJson = string.Empty;
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ int sendStatus = 0;
+ string _logMessage = "銆怉GV銆戠珛搴撳叆搴�";
+
try
{
var binding = new BasicHttpBinding
@@ -181,6 +323,7 @@
};
var endpoint = new EndpointAddress("http://192.168.35.251:8000/MesGet");
+ //var endpoint = new EndpointAddress("http://192.168.32.17:8000/MesGet");
var factory = new ChannelFactory<IImesInterface>(binding, endpoint);
var channel = factory.CreateChannel();
@@ -195,6 +338,29 @@
dto.Postition);
((IClientChannel)channel).Close();
+ // 璁板綍璇锋眰鎶ユ枃
+ _requestJson = JsonConvert.SerializeObject(dto);
+
+ _responseData = result;
+ sendStatus = 1;
+
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage,
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: sendStatus,
+ executeTime: _executeTimestamp
+ );
+
+
return new ResponseResult
{
status = 0,
@@ -204,6 +370,22 @@
}
catch (Exception ex)
{
+
+ var logService = new LogService();
+ logService.CreateLogI(
+ db: null,
+ edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
+ abtGuid: null,
+ abtTable: "AGV_TASK",
+ detail: _logMessage + $"绯荤粺寮傚父锛歿ex.Message}",
+ orderNo: dto.MesId,
+ sendJson: _requestJson,
+ rtnJson: JsonConvert.SerializeObject(_responseData),
+ xkyBeginTime: null,
+ xkyEndTime: null,
+ sendStatus: 0,
+ executeTime: _executeTimestamp
+ );
return ResponseResult.ResponseError(ex);
}
}
diff --git a/util/LogUtil.cs b/util/LogUtil.cs
index 7c96c8c..8c88150 100644
--- a/util/LogUtil.cs
+++ b/util/LogUtil.cs
@@ -1,10 +1,11 @@
锘縩amespace NewPdaSqlServer.util
{
+ using NewPdaSqlServer.DB;
using NewPdaSqlServer.entity;
using SqlSugar;
using System;
- public class LogService
+ public class LogService : RepositoryNoEntity
{
/// <summary>
/// 鍒涘缓鏃ュ織璁板綍
@@ -52,7 +53,7 @@
int sendStatus,
string executeTime)
{
- db.Ado.ExecuteCommand(
+ Db.Ado.ExecuteCommand(
"exec prc_log_create @edtUserGuid, @abtGuid, @abtTable, @detail, @hNo,@RtnLogGuid, @SendJson, @RtnJson, @xkyBeginTime, @xkyEndTime, @sendStatus, @executeTime",
new {
edtUserGuid,
--
Gitblit v1.9.3