小程序跳转

Ropin.Environmentally.WebScada/Work/HostedService.cs

@@ -393,7 +393,7 @@ namespace Ropin.Environmentally.WebScada.Work
                     {
                         _logger.LogInformation("AI报警同步"+ex.Message);
                     }
-                    await Task.Delay(60000);
+                    await Task.Delay(120000);//2分钟
                 }
             });
             #endregion

Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Development.json

@@ -42,7 +42,7 @@
     }
   },
   "APIUrl": {
-    "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
+    "PublicPushMessageAPI": "https://www.dgt.net.cn:1443/api/AI/AiAlmSaveMessage"
   },
   "IniInflux": {
     "infuxUrl": "http://124.71.132.255:8085/",

Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Production.json

@@ -42,7 +42,7 @@
     }
   },
   "APIUrl": {
-    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
+    "PublicPushMessageAPI": "https://www.dgt.net.cn:1443/api/AI/AiAlmSaveMessage"
   },
   "IniInflux": {
     "infuxUrl": "http://60.204.212.71:8085/",

Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Staging.json

@@ -42,7 +42,7 @@
     }
   },
   "APIUrl": {
-    "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
+    "PublicPushMessageAPI": "https://www.dgt.net.cn:1443/api/AI/AiAlmSaveMessage"
   },
   "IniInflux": {
     "infuxUrl": "http://124.71.132.255:8085/",

Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202504/20250416.txt

@@ -0,0 +1,14 @@
+2025-04-16 12:55:30,737  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 12:56:31,923  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 12:56:32,207  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [271] - MESSAGE: Task2-异常：Timeout performing EXISTS webSocket_devStore_186a5ab2-4cea-4d3b-a2ac-b582bef6961a, inst: 1, queue: 14, qu: 0, qs: 8, qc: 6, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 2534 (Please take a look at this article for some common client-side issues that can cause timeouts: http://stackexchange.github.io/StackExchange.Redis/Timeouts)
+ 2025-04-16 12:57:32,230  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 12:58:32,428  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 12:59:32,710  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:00:32,911  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:01:33,294  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:02:33,428  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:03:33,658  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:04:33,896  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:05:35,439  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 2025-04-16 13:18:19,211  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【{"code":0,"message":"操作成功。"}】
+ 

Ropin.Inspection.Api/Controllers/MTN/TmtnAlarmOrderController.cs

@@ -213,11 +213,11 @@ namespace Ropin.Inspection.Api.Controllers.MTN
                         string title = ""; string code = "";
                         switch (updateModel.C_Status)
                         {
-                            case "2": title = "报警确认，"; code = "MSG_TYPE_021"; break;
-                            case "6": title = "报警返工处理，"; code = "MSG_TYPE_021"; break;
-                            case "7": title = "报警完成确认，"; code = "MSG_TYPE_021"; break;
-                            case "4": title = "报警完成，"; code = "MSG_TYPE_022"; break;
-                            case "5": title = "报警取消，"; code = "MSG_TYPE_020"; break;
+                            case "2": title = "报警确认"; code = "MSG_TYPE_021"; break;
+                            case "6": title = "报警返工处理"; code = "MSG_TYPE_021"; break;
+                            case "7": title = "报警完成确认"; code = "MSG_TYPE_021"; break;
+                            case "4": title = "报警完成"; code = "MSG_TYPE_022"; break;
+                            case "5": title = "报警取消"; code = "MSG_TYPE_020"; break;
                         }
                         await _pushMsgService.PushAlarmMsgAsync(new TpushMsgModel
                         {

Ropin.Inspection.Api/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\项目代码\环保\Ropin.Inspection.Api\bin\Release\net5.0\publish\</_PublishTargetUrl>
-    <History>True|2025-04-10T09:20:11.5298934Z||;True|2025-04-10T14:10:10.2705541+08:00||;True|2024-01-23T10:15:27.7778127+08:00||;True|2024-01-23T09:52:10.2543696+08:00||;True|2024-01-16T15:27:33.4623499+08:00||;True|2024-01-16T15:27:08.9602734+08:00||;True|2024-01-15T14:44:47.0043912+08:00||;True|2024-01-12T13:09:14.0340670+08:00||;True|2024-01-11T13:52:07.7642352+08:00||;True|2024-01-10T09:49:03.4374848+08:00||;True|2024-01-03T10:32:42.8629400+08:00||;True|2023-05-09T09:54:34.1189277+08:00||;True|2023-03-28T10:08:24.6390975+08:00||;True|2023-03-17T10:16:39.5872259+08:00||;True|2023-03-13T16:42:56.2217615+08:00||;True|2023-03-08T15:52:33.6033482+08:00||;True|2023-03-02T14:26:37.9095049+08:00||;True|2023-02-02T14:42:26.7916225+08:00||;True|2023-02-02T14:24:25.2237336+08:00||;True|2023-02-02T13:58:55.3934884+08:00||;True|2023-02-01T10:48:45.0791702+08:00||;True|2023-02-01T10:33:21.9072586+08:00||;True|2023-01-31T12:56:14.9073429+08:00||;True|2023-01-30T14:41:28.4692501+08:00||;True|2023-01-12T10:21:11.4927753+08:00||;True|2022-11-23T13:48:41.9082930+08:00||;True|2022-11-22T10:42:32.5556928+08:00||;True|2022-11-18T13:03:45.2732819+08:00||;True|2022-11-18T10:32:57.0310816+08:00||;True|2022-11-18T10:32:33.4960678+08:00||;True|2022-11-18T10:25:08.5214095+08:00||;True|2022-11-17T17:52:42.0969357+08:00||;True|2022-11-07T18:49:23.2583784+08:00||;True|2022-10-31T18:27:45.8083537+08:00||;True|2022-10-23T11:43:53.2906112+08:00||;True|2022-08-22T15:57:17.7096003+08:00||;True|2022-08-19T15:24:03.8948501+08:00||;True|2022-08-18T10:32:15.4408153+08:00||;</History>
+    <History>True|2025-04-11T08:12:56.2183603Z||;True|2025-04-11T14:43:15.7465239+08:00||;True|2025-04-11T09:44:41.5261002+08:00||;True|2025-04-10T17:20:11.5298934+08:00||;True|2025-04-10T14:10:10.2705541+08:00||;True|2024-01-23T10:15:27.7778127+08:00||;True|2024-01-23T09:52:10.2543696+08:00||;True|2024-01-16T15:27:33.4623499+08:00||;True|2024-01-16T15:27:08.9602734+08:00||;True|2024-01-15T14:44:47.0043912+08:00||;True|2024-01-12T13:09:14.0340670+08:00||;True|2024-01-11T13:52:07.7642352+08:00||;True|2024-01-10T09:49:03.4374848+08:00||;True|2024-01-03T10:32:42.8629400+08:00||;True|2023-05-09T09:54:34.1189277+08:00||;True|2023-03-28T10:08:24.6390975+08:00||;True|2023-03-17T10:16:39.5872259+08:00||;True|2023-03-13T16:42:56.2217615+08:00||;True|2023-03-08T15:52:33.6033482+08:00||;True|2023-03-02T14:26:37.9095049+08:00||;True|2023-02-02T14:42:26.7916225+08:00||;True|2023-02-02T14:24:25.2237336+08:00||;True|2023-02-02T13:58:55.3934884+08:00||;True|2023-02-01T10:48:45.0791702+08:00||;True|2023-02-01T10:33:21.9072586+08:00||;True|2023-01-31T12:56:14.9073429+08:00||;True|2023-01-30T14:41:28.4692501+08:00||;True|2023-01-12T10:21:11.4927753+08:00||;True|2022-11-23T13:48:41.9082930+08:00||;True|2022-11-22T10:42:32.5556928+08:00||;True|2022-11-18T13:03:45.2732819+08:00||;True|2022-11-18T10:32:57.0310816+08:00||;True|2022-11-18T10:32:33.4960678+08:00||;True|2022-11-18T10:25:08.5214095+08:00||;True|2022-11-17T17:52:42.0969357+08:00||;True|2022-11-07T18:49:23.2583784+08:00||;True|2022-10-31T18:27:45.8083537+08:00||;True|2022-10-23T11:43:53.2906112+08:00||;True|2022-08-22T15:57:17.7096003+08:00||;True|2022-08-19T15:24:03.8948501+08:00||;True|2022-08-18T10:32:15.4408153+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

Ropin.Inspection.Api/TdevDevStoreController.cs

@@ -17,6 +17,9 @@ using Ropin.Inspection.Model.ViewModel.DEV;
 using Newtonsoft.Json.Linq;
 using Ropin.Inspection.Model.SearchModel.DEV;
 using System.Text.RegularExpressions;
+using Ropin.Inspection.Common.Helper;
+using Microsoft.Extensions.FileSystemGlobbing.Internal;
+using K4os.Compression.LZ4.Internal;
 
 namespace Ropin.Inspection.Api
 {
@@ -404,31 +407,24 @@ namespace Ropin.Inspection.Api
             }
             try
             {
-                string ZzEnglish = @"^[a-zA-Z]+$";
-                string MsgStr = "";
-                List<string> errorStr = new List<string>();
+                string pattern = @"[^a-zA-Z0-9\u4e00-\u9fa5]";// 定义正则表达式模式，匹配非字母、数字和汉字的字符
                 foreach (var item in updateModel.RunSpotConfigList)
                 {
-                    bool isValid = Regex.IsMatch(item.Name, ZzEnglish);
-                    if (!isValid)
+                    if (string.IsNullOrEmpty(item.Name))
                     {
-                        errorStr.Add(item.Name);
+                        string LabPInYIn = ChineseAndEnglishHelper.GetLedgerConfigurationEnglishTab(item.Label);
+                        int cut = updateModel.RunSpotConfigList.Where(t => t.Name == LabPInYIn).ToList().Count();
+                        if (cut > 0)
+                        {
+                            LabPInYIn = LabPInYIn + cut;
+                        }
+                        item.Name = LabPInYIn;
+                    }
+                    else
+                    {
+                        string vals = Regex.Replace(item.Name, pattern, ""); // 替换匹配到的字符为空
+                        item.Name = vals;
                     }
-                }
-                List<string> RepeatNameList = updateModel.RunSpotConfigList.GroupBy(e => e.Name).Where(g => g.Count() > 1).Select(g => g.Key).ToList();
-                if (errorStr != null && errorStr.Count > 0)
-                {
-                    string errorMsg = string.Join(", ", errorStr);
-                    MsgStr = $"【{errorMsg}】英文标签存在特殊字符。";
-                }
-                if (RepeatNameList != null && RepeatNameList.Count > 0)
-                {
-                    string RepeatMsg = string.Join(", ", RepeatNameList);
-                    MsgStr = MsgStr + $"【{RepeatMsg}】英文标签重复。";
-                }
-                if (!string.IsNullOrEmpty(MsgStr))
-                {
-                    return new ApiResult(ReturnCode.ArgsError, MsgStr);
                 }
                 await _TdevDevStoreService.UpdateDevStoreRunSpotConfigAsync(id, updateModel);
             }

Ropin.Inspection.Api/TmtnDevOpsRecordController.cs

@@ -18,6 +18,7 @@ using Ropin.Inspection.Api.Controllers;
 using Ropin.Inspection.Common.Helper;
 using Ropin.Inspection.Model;
 using Ropin.Inspection.Model.Common;
+using Ropin.Inspection.Model.Entities;
 using Ropin.Inspection.Service;
 using System;
 using System.Collections.Generic;
@@ -38,16 +39,21 @@ namespace Ropin.Inspection.Api
         public ILogger<TmtnDevOpsRecordController> _logger { get; }
         private readonly ITmtnDevOpsRecordService _TmtnDevOpsRecordService;
         private readonly ITpntStoreService _TpntStoreService;
+        private readonly IPushMsgService _pushMsgService;
+        private readonly ITmtnDevOpsService _tmtnDevOpsService;
+        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(TmtnDevOpsRecordController));
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="TmtnDevOpsRecordService"></param>
         /// <param name="logger"></param>
-        public TmtnDevOpsRecordController(ITmtnDevOpsRecordService TmtnDevOpsRecordService, ILogger<TmtnDevOpsRecordController> logger, ITpntStoreService TpntStoreService)
+        public TmtnDevOpsRecordController(ITmtnDevOpsRecordService TmtnDevOpsRecordService, ILogger<TmtnDevOpsRecordController> logger, ITpntStoreService TpntStoreService, IPushMsgService pushMsgService, ITmtnDevOpsService tmtnDevOpsService)
         {
             _TmtnDevOpsRecordService = TmtnDevOpsRecordService;
             _logger = logger;
             _TpntStoreService = TpntStoreService;
+            _pushMsgService = pushMsgService;
+            _tmtnDevOpsService = tmtnDevOpsService;
         }
 
         /// <summary>
@@ -151,7 +157,16 @@ namespace Ropin.Inspection.Api
             }
             try
             {
-                await _TmtnDevOpsRecordService.CreateDevOpsRecordListAsync(record);
+                string id = await _TmtnDevOpsRecordService.CreateDevOpsRecordListAsync(record);
+                await _pushMsgService.PushRecordMsgAsync("MSG_TYPE_002", null, new TpushMsgModel
+                {
+                    C_MsgTypeCode = "MSG_TYPE_002",
+                    Msg = record.C_Name + "  " + record.C_Remark,
+                    Subject = "上报维保: " + record.C_Name,
+                    CreateOn = DateTime.Now.ToString(),
+                    GenerationType = 2,
+                    msgStatus = 0,
+                }, record.C_SpotCode, id, "1", record.C_Name);
             }
             catch (Exception ex)
             {
@@ -174,6 +189,23 @@ namespace Ropin.Inspection.Api
             try
             {
                 await _TmtnDevOpsRecordService.UpdataDevOpsRecordListAsync(record);
+                TMTN_DevOps devOps = await _tmtnDevOpsService.GetByIdAsync(record.C_DevOpsCode);
+                if (devOps != null)
+                {
+                    await _pushMsgService.PushRecordMsgAsync("MSG_TYPE_009", null, new TpushMsgModel
+                    {
+                        C_MsgTypeCode = "MSG_TYPE_009",
+                        Msg = record.C_Name + "  " + record.C_Remark,
+                        Subject = record.C_Status == "5" ? "维保取消，" : "维保确认，" + record.C_Name,
+                        CreateOn = DateTime.Now.ToString(),
+                        GenerationType = 2,
+                        msgStatus = 0,
+                    }, devOps.C_SpotCode, record.C_DevOpsCode, record.C_Status,devOps.C_Name);
+                }
+                else
+                {
+                    log.Info($"更新运维记录根据【C_DevOpsCode={record.C_DevOpsCode}】获取运维工单");
+                }
             }
             catch (Exception ex)
             {

Ropin.Inspection.Common/DataDictionaryHelper.cs

@@ -105,14 +105,14 @@ namespace Ropin.Inspection.Common
         /// <summary>
         /// 根据编号获小程序跳转页面
         /// </summary>
-        /// <param name="code"></param>
+        /// <param name="type"></param>
         /// <returns></returns>
-        public static string GetXCXPage(string code,string messId,string dataId,string DevId,string status)
+        public static string GetXCXPage(string type,string messId,string dataId,string DevId,string StoreCode,string QRCode, string status,string title)
         {
             string val = "";
             try
             {
-                switch (code)
+                switch (type)
                 {
                     case "MSG_TYPE_001": //val = "通知维修"; break;
                     case "MSG_TYPE_006": //val = "维修确认"; break;
@@ -121,32 +121,36 @@ namespace Ropin.Inspection.Common
                     case "MSG_TYPE_014": //val = "正在维修"; break;
                     case "MSG_TYPE_015": //val = "维修返工"; break;
                     case "MSG_TYPE_016": //val = "维修完成确认"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + code + "&Code=" + dataId;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId;
                         break;
                     case "MSG_TYPE_002": //val = "通知运维"; break;
                     case "MSG_TYPE_009": //val = "运维审核"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + code + "&Code=" + dataId;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId + "&Status=" + status+ "&Title="+ title;
                         break;
                     case "MSG_TYPE_003": //val = "通知巡检"; break;
                     case "MSG_TYPE_004": //val = "巡检异常"; break;
                     case "MSG_TYPE_005": //val = "异常消除"; break;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId+ "&QRCode="+ QRCode + "&StoreCode="+ StoreCode + "&Title=" + title;
+                        break;
                     case "MSG_TYPE_010": //val = "异常确认"; break;
                     //case "MSG_TYPE_011": //val = "设备启停"; break;
                     case "MSG_TYPE_012": //val = "设备点报警"; break;
                     //case "MSG_TYPE_013": //val = "设备点报警消除"; break;
                     case "MSG_TYPE_017": //val = "设备点预警"; break;
-                    //case "MSG_TYPE_018": //val = "设备点预警消除"; break;
+                    //case "MSG_TYPE_018": //val = "设备点预警消除"; break;                    
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + messId;
+                        break;
                     case "MSG_TYPE_019": //val = "报警上报"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + code + "&Code=" + dataId ;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId ;
                         break;
                     case "MSG_TYPE_020": //val = "报警取消"; break;
                     case "MSG_TYPE_021": //val = "报警确认"; break;
                     case "MSG_TYPE_022": //val = "报警完成"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + code + "&Code=" + dataId + "&Status=" + status;
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + dataId + "&Status=" + status;
                         break;
                     case "MSG_TYPE_023": //val = "手动报警"; break;
                     case "MSG_TYPE_024": //val = "AI设备报警"; break;
-                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + code + "&Code=" + messId; 
+                        val = WXConstModel.XCXPublicPage + "?MessId=" + messId + "&msgType=" + type + "&Code=" + messId; 
                         break;
                     default:   val = ""; break;
                 }

Ropin.Inspection.Common/Helper/ChineseAndEnglishHelper.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using ToolGood.Words;
+
+namespace Ropin.Inspection.Common.Helper
+{
+    public static class ChineseAndEnglishHelper
+    {
+        /// <summary>
+        /// 根据中文名字获取台账配置的英文标签
+        /// </summary>
+        /// <param name="name"></param>
+        public static string GetLedgerConfigurationEnglishTab(string name)
+        {
+            string str = "";
+            switch (name)
+            {
+                case "设备名称":
+                case "设施名称": str = "DevStoreName"; break;
+                case "运行状况开始时间":
+                case "运行状况@开始时间": str = "RunStartTime"; break;
+                case "运行状况结束时间":
+                case "运行状况@结束时间": str = "RunEndTime"; break;
+                case "运行状况是否正常":
+                case "运行状况@是否正常": str = "RunWhetherNormal"; break;
+                case "排放时间":
+                case "排放时间（h）": str = "DischargeTime"; break;
+                case "耗材情况名称":
+                case "耗材情况@名称": str = "ConsumableName"; break;
+                case "废弃物名称":
+                case "废弃物@名称": str = "WasteName"; break;
+                case "耗材情况更换量":
+                case "耗材情况更换量（kg）":
+                case "耗材情况@更换量":
+                case "耗材情况@更换量（kg）": str = "ConsumableReplacementQuantity"; break;
+                case "废弃物产生量":
+                case "废弃物产生量（kg）":
+                case "废弃物@产生量":
+                case "废弃物@产生量（kg）": str = "WasteProduction"; break;
+                default: str = GetTextSpell(name); break;
+            }
+            return str;
+        }
+        /// <summary>
+        /// 获取文字拼音
+        /// </summary>
+        /// <param name="text">文字</param>
+        /// <returns></returns>
+        public static string GetTextSpell(string text)
+        {
+            StringBuilder result = new StringBuilder();
+            string pattern = @"[^a-zA-Z0-9\u4e00-\u9fa5]";// 定义正则表达式模式，匹配非字母、数字和汉字的字符
+            if (text.Contains("@"))
+            {
+                string[] tmp = text.Split('@');//按,分割字符串 
+                for (int i = 0; i < tmp.Length; i++)
+                {
+                    string vals = Regex.Replace(tmp[i], pattern, ""); // 替换匹配到的字符为空
+                    if (i== tmp.Length-1)
+                    {
+                        result.Append(WordsHelper.GetPinyin(vals));
+                    }
+                    else
+                    {
+                        result.Append(WordsHelper.GetFirstPinyin(vals));
+                    }
+                }
+            }
+            else
+            {
+                string vals = Regex.Replace(text, pattern, ""); // 替换匹配到的字符为空
+                result.Append(WordsHelper.GetPinyin(vals));
+            }
+            return result.ToString();
+
+            //// 使用 WordsHelper 类的 GetPinyin 方法将汉字转换为拼音
+            //string pinyin = WordsHelper.GetPinyin(chineseText);
+
+            //Console.WriteLine($"原始中文: {chineseText}");
+            //Console.WriteLine($"转换后的拼音: {pinyin}");
+
+            //// 若需要获取每个汉字对应的拼音首字母
+            //string firstLetters = WordsHelper.GetFirstPinyin(chineseText);
+            //Console.WriteLine($"每个汉字的拼音首字母: {firstLetters}");
+        }
+
+    }
+}

Ropin.Inspection.Common/Ropin.Inspection.Common.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
+    <PackageReference Include="ToolGood.Words" Version="3.1.0.2" />
   </ItemGroup>
 
 </Project>

Ropin.Inspection.Model/TmtnDevOpsRecordViewModel.cs

@@ -139,6 +139,7 @@ namespace Ropin.Inspection.Model
         /// </summary>
         public string ReportUserName { get; set; }
         public string C_SolidWaste { get; set; }
+        public string DevOpsName { get; set; }
 
     }
 
@@ -175,6 +176,7 @@ namespace Ropin.Inspection.Model
         /// 上报人员姓名
         /// </summary>
         public string ReportUserName { get; set; }
+        public string DevOpsName { get; set; }
 
         public IEnumerable<MtnRecordImage> RecordImageList { get; set; }
 

Ropin.Inspection.Model/TmtnPushMsgToCreateModel.cs

@@ -24,6 +24,7 @@ namespace Ropin.Inspection.Model
     {
         public string C_DevStoreCode { get; set; }
         public string C_MsgTypeCode { get; set; }
+        public string C_SpotCode { get; set; }
         public string Subject { get; set; }
         public string Msg { get; set; }
         public string DevNumber { get; set; }

Ropin.Inspection.Model/ViewModel/ISP/TispRecordItemAlarmDetailViewModel.cs

@@ -65,6 +65,14 @@ namespace Ropin.Inspection.Model.ViewModel
         /// </summary>
         public string SpotName { get; set; }
         /// <summary>
+        /// 网点编号-巡检点
+        /// </summary>
+        public string C_StoreCode { get; set; }
+        /// <summary>
+        /// 二维码-巡检点
+        /// </summary>
+        public string C_QRCode { get; set; }
+        /// <summary>
         /// 巡检点编号
         /// </summary>
         public string SpotNumber { get; set; }

Ropin.Inspection.Model/ViewModel/ISP/TispRecordItemWithImageViewModel.cs

@@ -52,6 +52,14 @@ namespace Ropin.Inspection.Model.ViewModel
         /// </summary>
         public string SpotName { get; set; }
         /// <summary>
+        /// 网点编号-巡检点
+        /// </summary>
+        public string C_StoreCode { get; set; }
+        /// <summary>
+        /// 二维码-巡检点
+        /// </summary>
+        public string C_QRCode { get; set; }
+        /// <summary>
         /// 巡检点编号
         /// </summary>
         public string SpotNumber { get; set; }

Ropin.Inspection.Repository/ISP/TispRecordItemRepository.cs

@@ -464,7 +464,12 @@ WHERE (A.C_Status = '2' || A.C_Status = '3' || A.C_Status = '4') AND E.C_Status
         public Task<IEnumerable<TispRecordItemDetailViewModel>> GetRecordItemByIdAsync(Guid id)
         {
             MySqlConnector.MySqlParameter[] parameters = new[] { new MySqlConnector.MySqlParameter("id", id) };
-            string sql = "SELECT A.*,B.C_AlarmLevel,B.C_Name,C.C_ID AS C_RecordImageId ,C.C_ImageURL,C.C_Status AS RecordImageStatus FROM TISP_RecordItem A LEFT JOIN TISP_Content B ON A.C_ContentCode = B.C_ID LEFT JOIN TISP_RecordImage C ON C.C_RecordItemCode = A.C_ID WHERE A.C_ID = @id";
+            string sql = @"SELECT A.*,S.C_Name as SpotName,B.C_AlarmLevel,B.C_Name,C.C_ID AS C_RecordImageId ,C.C_ImageURL,C.C_Status AS RecordImageStatus FROM TISP_RecordItem A 
+LEFT JOIN TISP_Record R on (A.C_RecordCode=R.C_ID)
+LEFT JOIN TISP_Spot S on (R.C_SpotCode=S.C_Code)
+LEFT JOIN TISP_Content B ON A.C_ContentCode = B.C_ID 
+LEFT JOIN TISP_RecordImage C ON C.C_RecordItemCode = A.C_ID 
+WHERE A.C_ID = @id";
             IEnumerable<TispRecordItemWithImageViewModel> recordItemlist = EntityFrameworkCoreExtensions.GetList<TispRecordItemWithImageViewModel>(DbContext.Database, sql, parameters);
             if (null == recordItemlist || recordItemlist.First() == null)
             {
@@ -477,6 +482,7 @@ WHERE (A.C_Status = '2' || A.C_Status = '3' || A.C_Status = '4') AND E.C_Status
                     {
                         C_ID = g.Key,
                         C_RecordCode = g.First().C_RecordCode,
+                        SpotName=g.First().SpotName,
                         C_ContentCode = g.First().C_ContentCode,
                         C_SpotContentCode = g.First().C_SpotContentCode,
                         C_InspectionContent = g.First().C_InspectionContent,
@@ -543,7 +549,7 @@ WHERE A.C_Status = '3' AND A.C_LastUpdatedBy IS NULL AND E.C_QRCode = @QRCode AN
         public Task<IEnumerable<TispRecordItemAlarmDetailViewModel>> GetAlarmRecordsByRecordItemIdAsync(Guid itemId)
         {
             MySqlConnector.MySqlParameter[] parameters = new[] { new MySqlConnector.MySqlParameter("ItemId", itemId) };
-            string sql = "SELECT A.*,B.C_AlarmLevel,B.C_Name,C.C_ID AS C_RecordImageId ,C.C_ImageURL,C.C_Status AS RecordImageStatus,E.C_Name AS SpotName,E.C_Number AS SpotNumber,E.C_Position AS SpotPosition ,F.C_Name AS ReportUserName,F.C_Mobile AS ReportUserMobile FROM TISP_RecordItem A LEFT JOIN TISP_Content B ON A.C_ContentCode = B.C_ID LEFT JOIN TISP_RecordImage C ON C.C_RecordItemCode = A.C_ID LEFT JOIN TISP_Record D ON D.C_ID = A.C_RecordCode LEFT JOIN TISP_Spot E ON E.C_Code = D.C_SpotCode LEFT JOIN TSYS_User F ON F.C_UserID = A.C_CreateBy WHERE A.C_ID  = @ItemId ";
+            string sql = "SELECT A.*,B.C_AlarmLevel,B.C_Name,C.C_ID AS C_RecordImageId ,C.C_ImageURL,C.C_Status AS RecordImageStatus,E.C_Name AS SpotName,E.C_StoreCode,E.C_QRCode,E.C_Number AS SpotNumber,E.C_Position AS SpotPosition ,F.C_Name AS ReportUserName,F.C_Mobile AS ReportUserMobile FROM TISP_RecordItem A LEFT JOIN TISP_Content B ON A.C_ContentCode = B.C_ID LEFT JOIN TISP_RecordImage C ON C.C_RecordItemCode = A.C_ID LEFT JOIN TISP_Record D ON D.C_ID = A.C_RecordCode LEFT JOIN TISP_Spot E ON E.C_Code = D.C_SpotCode LEFT JOIN TSYS_User F ON F.C_UserID = A.C_CreateBy WHERE A.C_ID  = @ItemId ";
             IEnumerable<TispRecordItemWithImageViewModel> recordItemlist = EntityFrameworkCoreExtensions.GetList<TispRecordItemWithImageViewModel>(DbContext.Database, sql, parameters);
             if (null == recordItemlist || recordItemlist.First() == null)
             {
@@ -565,6 +571,8 @@ WHERE A.C_Status = '3' AND A.C_LastUpdatedBy IS NULL AND E.C_QRCode = @QRCode AN
                         C_Name = g.First().C_Name,
                         D_CreateOn = g.First().D_CreateOn,
                         SpotName = g.First().SpotName,
+                        C_StoreCode = g.First().C_StoreCode,
+                        C_QRCode= g.First().C_QRCode,
                         SpotNumber = g.First().SpotNumber,
                         SpotPosition = g.First().SpotPosition,
                         ReportUserName = g.First().ReportUserName,

Ropin.Inspection.Repository/TmtnDevOpsRecordRepository.cs

@@ -450,8 +450,9 @@ WHERE A.C_DevOpsCode = @recordId  ORDER BY A.D_CreateOn ASC ";
         public Task<List<List<TmtnDevOpsRecordDetailWithImageViewModel>>> GetRecordItemsGroupByRecordIdAsync(string recordId)
         {
             MySqlConnector.MySqlParameter[] parameters = new[] { new MySqlConnector.MySqlParameter("recordId", recordId) };
-            string sql = @"SELECT A.*,E.C_AlarmLevel,E.C_Name,C.C_ID AS C_RecordImageId ,C.C_Url AS C_ImageURL,C.C_Status AS RecordImageStatus,C.C_Name AS RecordImageName,D.C_Name AS ReportUserName
+            string sql = @"SELECT A.*,T.C_Name as DevOpsName,E.C_AlarmLevel,E.C_Name,C.C_ID AS C_RecordImageId ,C.C_Url AS C_ImageURL,C.C_Status AS RecordImageStatus,C.C_Name AS RecordImageName,D.C_Name AS ReportUserName
 FROM TMTN_DevOpsRecord A 
+LEFT JOIN TMTN_DevOps T on (A.C_DevOpsCode=T.C_ID)
 LEFT JOIN TMTN_SpotDevOpsContent F ON F.C_DevOpsContentCode = A.C_SpotDevOpsContentCode
 LEFT JOIN TMTN_DevOpsContent E ON E.C_ID = F.C_DevOpsContentCode 
 LEFT JOIN TISP_Spot B ON B.C_Code = F.C_SpotCode 
@@ -479,6 +480,7 @@ WHERE A.C_DevOpsCode = @recordId  ORDER BY A.D_CreateOn ASC ";
                             //C_RecordCode = g.First().C_RecordCode,
                             //C_ContentCode = g.First().C_ContentCode,
                             C_SpotDevOpsContentCode = g.First().C_SpotDevOpsContentCode,
+                            DevOpsName=g.First().DevOpsName,
                             C_Record = g.First().C_Record,
                             D_CreateOn = g.First().D_CreateOn,
                             C_Remark = g.First().C_Remark,