消息模版

Ropin.Environmentally.AlarmService/bin/Debug/net5.0/appsettings.json

@@ -8,7 +8,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionSetting": {
-    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
     "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
   },
   "CofingSet": {

Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.MvcApplicationPartsAssemblyInfo.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Reflection;
 
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Ropin.Core.Extensions")]
 [assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
 
 // 由 MSBuild WriteCodeFragment 类生成。

Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-4acbe1369ceb83f5c306b6db350961ec090b3bac
+3b3a948a1ff52fe89e5f8b88660a058742142260

Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.FileListAbsolute.txt

@@ -99,3 +99,28 @@ E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmSer
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\obj\Debug\net5.0\Ropin.Environmentally.AlarmService.pdb
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\obj\Debug\net5.0\Ropin.Environmentally.AlarmService.genruntimeconfig.cache
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\obj\Debug\net5.0\ref\Ropin.Environmentally.AlarmService.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Autofac.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Autofac.Extensions.DependencyInjection.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Autofac.Extras.DynamicProxy.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\AutoMapper.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\AutoMapper.Extensions.Microsoft.DependencyInjection.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Castle.Core.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.Bcl.AsyncInterfaces.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.Bcl.Memory.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.Bcl.TimeProvider.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.IdentityModel.Abstractions.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.IdentityModel.JsonWebTokens.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.IdentityModel.Logging.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Microsoft.IdentityModel.Tokens.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Quartz.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\System.Diagnostics.DiagnosticSource.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\System.IdentityModel.Tokens.Jwt.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\System.Runtime.CompilerServices.Unsafe.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\System.Text.Encodings.Web.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\System.Text.Json.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Core.Extensions.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Inspection.Service.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Inspection.Tasks.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Core.Extensions.pdb
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Inspection.Service.pdb
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.AlarmService\bin\Debug\net5.0\Ropin.Inspection.Tasks.pdb

Ropin.Inspection.Api/Controllers/Base/AIController.cs

@@ -74,9 +74,9 @@ namespace Ropin.Inspection.Api.Controllers.Base
         [AllowAnonymous]
         public async Task<ApiResult> AiAlmSaveMessage()
         {
-            //40124884581189
-            var data = await aIHelper.GetAlmDispose("", 0, 10, 33379713109829);
-            //var data = await aIHelper.GetHistoricAlmrecord("", 1, 10, 33379713109829);
+            //40124884581189；33379713109829
+            var data = await aIHelper.GetAlmDispose("", 1, 100, 40124884581189);
+            //var data = await aIHelper.GetHistoricAlmrecord("", 7, 10, 33379713109829);
             if (data!=null)
             {
                 foreach (var item in data.Items)
@@ -100,19 +100,19 @@ namespace Ropin.Inspection.Api.Controllers.Base
                             C_DevStoreCode = "d705ceb5-7473-4b19-91dd-d3eff223f05b",
                             C_MsgTypeCode = "MSG_TYPE_024",
                             Subject = item.Device_TypeName + "报警",
-                            Msg = item.Event_Name,
+                            Msg = item.Event_Name??item.Event_Code,
                             UserName = "AI",
                             UserMobile = "",
-                            CreateOn = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                            CreateOn = item.StartTime?.ToString("yyyy-MM-dd HH:mm:ss"),
                             GenerationType = 1,
                             msgStatus = 1,
                             FileList=new List<MessageFile> { messageFile }
                         };
                         bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
-                        //if (bol)
-                        //{
-                        //   bool result= await aIHelper.UpdateAlmIsDelete(item.Id);
-                        //}
+                        if (bol)
+                        {
+                            bool result = await aIHelper.UpdateAlmIsDelete(item.Id);
+                        }
                     }
                 }
             }

Ropin.Inspection.Common/Helper/WeChatHelper.cs

@@ -37,6 +37,7 @@ namespace Ropin.Inspection.Common.Helper
                     if (response.IsSuccessStatusCode)
                     {
                         var strReturn = await response.Content.ReadAsStringAsync();
+                        log.Info($"获取微信token数据返回【strReturn={strReturn}】");
                         TencentAccessToken tencentToken = JsonConvert.DeserializeObject<TencentAccessToken>(strReturn);
                         if (tencentToken != null && !string.IsNullOrEmpty(tencentToken.access_token))
                         {