|
@@ -23,6 +23,7 @@ using Ropin.Inspection.Service.VMC.Interface;
|
|
|
using NPOI.SS.Formula.Functions;
|
|
|
using MySqlX.XDevAPI.Relational;
|
|
|
using Newtonsoft.Json.Linq;
|
|
|
+using System.Xml;
|
|
|
|
|
|
namespace Ropin.Inspection.Api.Controllers.Base
|
|
|
{
|
|
@@ -163,19 +164,50 @@ namespace Ropin.Inspection.Api.Controllers.Base
|
|
|
public async Task<ApiResultModel<object>> AlarmData([FromRoute] string deviceNo, [FromBody] JObject alarmDataModel)
|
|
|
{
|
|
|
Console.WriteLine("进入/device/business/generalApp/pushData/alarmData/JObject" + deviceNo);
|
|
|
- return await Task.FromResult(ApiResultModel<object>.GetSuccess(new object { }));
|
|
|
+ log.Info($"进入AI[/device/business/generalApp/pushData/alarmData/{deviceNo}],参数:【{JsonConvert.SerializeObject(alarmDataModel)}】");
|
|
|
+ AlarmDataModel alarmData= JsonConvert.DeserializeObject<AlarmDataModel>(alarmDataModel.ToString());
|
|
|
+ var devIds = await _vmcCameraService.GetCameraByTDH(alarmData.deviceNo);
|
|
|
+ log.Info($"获取到的设备ID:【{JsonConvert.SerializeObject(devIds)}】");
|
|
|
+ int row = 0;
|
|
|
+ foreach (var x in devIds)
|
|
|
+ {
|
|
|
+ List<MessageFile> messageFiles = new List<MessageFile>();
|
|
|
+ var textJson = new
|
|
|
+ {
|
|
|
+ PanoramaId = alarmData.panoramaId,
|
|
|
+ PanoramaUrl = alarmData.panoramaUrl,
|
|
|
+ RoiJson = alarmData.roiJson,
|
|
|
+ NonRoiJson = alarmData.nonRoiJson,
|
|
|
+ DetectionFrameJson = alarmData.detectionFrameJson
|
|
|
+ };
|
|
|
+ var datas = JsonConvert.SerializeObject(textJson);
|
|
|
+ MessageFile messageFile = new MessageFile();
|
|
|
+ messageFile.Text = datas;
|
|
|
+ messageFile.Type = "FILE_TYP_006";
|
|
|
+ messageFiles.Add(messageFile);
|
|
|
+ TpushMsgModel model = new TpushMsgModel
|
|
|
+ {
|
|
|
+ C_DevStoreCode = x,
|
|
|
+ C_MsgTypeCode = "MSG_TYPE_024",
|
|
|
+ Subject = "AI盒子报警",
|
|
|
+ Msg = alarmData.alarmType,
|
|
|
+ UserName = "AI盒子",
|
|
|
+ UserMobile = "",
|
|
|
+ CreateOn = alarmData.captureTime,
|
|
|
+ GenerationType = 1,
|
|
|
+ msgStatus = 1,
|
|
|
+ FileList = messageFiles
|
|
|
+ };
|
|
|
+ bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
|
|
|
+ log.Info($"执行发送结果=[{bol}]");
|
|
|
+ if (bol) { row++; }
|
|
|
+ }
|
|
|
+ return ApiResultModel<object>.GetSuccess(row);
|
|
|
+ //return await Task.FromResult(ApiResultModel<object>.GetSuccess(new object { }));
|
|
|
}
|
|
|
//[HttpPost]
|
|
|
//[AllowAnonymous]
|
|
|
//[Route("/device/business/generalApp/pushData/alarmData/{deviceNo}")]
|
|
|
- //public async Task<ApiResultModel<object>> AlarmData([FromRoute] string deviceNo)
|
|
|
- //{
|
|
|
- // Console.WriteLine("进入/device/business/generalApp/pushData/alarmData/没有JObject" + deviceNo);
|
|
|
- // return await Task.FromResult(ApiResultModel<object>.GetSuccess(new object { }));
|
|
|
- //}
|
|
|
- //[HttpPost]
|
|
|
- //[AllowAnonymous]
|
|
|
- //[Route("/device/business/generalApp/pushData/alarmData/{deviceNo}")]
|
|
|
//public async Task<ApiResultModel<object>> AlarmData([FromRoute] string deviceNo, AlarmDataModel alarmDataModel)
|
|
|
//{
|
|
|
// Console.WriteLine("进入/device/business/generalApp/pushData/alarmData/" + deviceNo);
|