报警

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

@@ -17,6 +17,7 @@ using Ropin.Inspection.Model;
 using System.Collections.Generic;
 using System;
 using Newtonsoft.Json;
+using Microsoft.AspNetCore.Identity;
 
 namespace Ropin.Inspection.Api.Controllers.Base
 {
@@ -75,7 +76,7 @@ namespace Ropin.Inspection.Api.Controllers.Base
         public async Task<ApiResult> AiAlmSaveMessage()
         {
             //40124884581189；33379713109829
-            var data = await aIHelper.GetAlmDispose("", 1, 100, 40124884581189);
+            var data = await aIHelper.GetAlmDispose("", 1, 100, 40124884581189);        
             //var data = await aIHelper.GetHistoricAlmrecord("", 7, 10, 33379713109829);
             if (data!=null)
             {
@@ -111,16 +112,32 @@ namespace Ropin.Inspection.Api.Controllers.Base
                         bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
                         if (bol)
                         {
-                            bool result = await aIHelper.UpdateAlmIsDelete(item.Id);
+                            DateTime updTime = DateTime.Now;
+                            var updData = new
+                            {
+                                Id = item.Id,
+                                ConfrimContent = "环保测试数据，自动确认",
+                                Mistake = false,
+                                Confirmed = true,
+                                ConfirmTime = updTime,
+                                ConfirmUserName = "环保同步程序",
+                                Closed = true,
+                                CloseContent = "环保测试数据，自动关闭",
+                                EndTime = updTime,
+                                CloseUserName = "环保同步程序"
+                            }; 
+                            var dataStr = JsonConvert.SerializeObject(updData);
+                            bool result = await aIHelper.UpdateAlm(dataStr);
+                            //bool result = await aIHelper.UpdateAlmIsDelete(item.Id);
                         }
                     }
                 }
             }
-            TsysMessageSearchModel searchModel = new TsysMessageSearchModel();
-            searchModel.IsPagination = true;
-            searchModel.C_MsgTypeCode = "MSG_TYPE_024";
-            var msgData = await _TsysMessageService.GetConditionAsync(searchModel);
-            return new ApiResult<IEnumerable<TsysMessageViewModel>>(msgData, ReturnCode.Success);
+            //TsysMessageSearchModel searchModel = new TsysMessageSearchModel();
+            //searchModel.IsPagination = true;
+            //searchModel.C_MsgTypeCode = "MSG_TYPE_024";
+            //var msgData = await _TsysMessageService.GetConditionAsync(searchModel);
+            return new ApiResult(ReturnCode.Success);
         }
     }
 }

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

@@ -643,20 +643,20 @@ namespace Ropin.Inspection.Api.Controllers.MTN
         {
             try
             {
-                if (searchModel==null&&string.IsNullOrEmpty(searchModel.C_PushMsgResultCode))
+                if (searchModel==null&&string.IsNullOrEmpty(searchModel.C_MessageCode))
                 {
                     return new ApiResult(ReturnCode.ArgsError, "请输入参数");
                 }
                 AlarmOrderSearchModel orderSearchModel = new AlarmOrderSearchModel();
                 orderSearchModel.IsPagination = false;
-                orderSearchModel.C_PushMsgResultCode = searchModel.C_PushMsgResultCode;
+                orderSearchModel.C_PushMsgResultCode = searchModel.C_MessageCode;
                 var recordItems = await _repository.GetAlarmOrderRecordList(orderSearchModel);
                 string zip = @"wwwroot\\ZipFile";
                 if (!System.IO.Directory.Exists(zip))
                 {
                     Directory.CreateDirectory(zip);
                 }
-                string zipPaht = zip + $"\\{searchModel.C_PushMsgResultCode}报警详情下载.zip";
+                string zipPaht = zip + $"\\{searchModel.C_MessageCode}报警详情下载.zip";
                 if (recordItems.Count() > 0)
                 {
                     XWPFDocument doc = new XWPFDocument();
@@ -731,7 +731,7 @@ namespace Ropin.Inspection.Api.Controllers.MTN
 
                             using (var archive = new ZipArchive(zipFile, ZipArchiveMode.Update))
                             {
-                                archive.CreateEntry($"{searchModel.C_PushMsgResultCode}报警详情.docx").Open().Write(excelData, 0, excelData.Length);
+                                archive.CreateEntry($"{searchModel.C_MessageCode}报警详情.docx").Open().Write(excelData, 0, excelData.Length);
                             }
                         }
                     }

Ropin.Inspection.Common/Helper/AIProjectHelper.cs

@@ -221,6 +221,70 @@ namespace Ropin.Inspection.Common.Helper
             return almData;
         }
 
+        /// <summary>
+        /// AI报警修改
+        /// </summary>
+        /// <returns></returns>
+        public async Task<bool> UpdateAlm(string dataStr)
+        {
+            if (loginResult == null)
+            {
+                loginResult = await GetToken();
+            }
+            if (loginResult == null || loginResult.RefreshToken == null)
+            {
+                log.Info($"AI-AI报警修改-token 为空");
+                return false;
+            }
+            bool result = false;
+            string url = AIConst.ApiUrl + AIConst.AlmUpdateDispose;
+            using (var client = _httpClientFactory.CreateClient())
+            {
+                // 设置请求头，添加 token
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", loginResult.AccessToken);
+                //var data = new
+                //{
+                //    Id = AlmId
+                //};
+                //var dataStr = JsonConvert.SerializeObject(data);
+                var request = new HttpRequestMessage(HttpMethod.Post, url)
+                {
+                    Content = new StringContent(dataStr, System.Text.Encoding.UTF8, "application/json")
+                };
+                request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                try
+                {
+                    var response = await client.SendAsync(request);
+                    response.EnsureSuccessStatusCode(); // 确保响应状态码为成功
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var strReturn = await response.Content.ReadAsStringAsync();
+                        AIModel<object> ResponseRestult = JsonConvert.DeserializeObject<AIModel<object>>(strReturn);
+                        if (ResponseRestult != null && ResponseRestult.code == "200")
+                        {
+                            result = true;
+                        }
+                        else
+                        {
+                            log.Info($"AI报警修改-失败【{strReturn}】");
+                        }
+                    }
+                }
+                catch (HttpRequestException ex)
+                {
+                    log.Info($"AI报警修改-异常【{ex.Message}】");
+                }
+                catch (JsonException ex)
+                {
+                    log.Info($"AI报警修改-响应异常【{ex.Message}】");
+                }
+                catch (Exception ex)
+                {
+                    log.Info($"AI报警修改-时发生未知异常【{ex.Message}】");
+                }
+            }
+            return result;
+        }
         /// <summary>
         /// AI报警软删除
         /// </summary>
@@ -621,5 +685,6 @@ namespace Ropin.Inspection.Common.Helper
         public const string HistoricAlmrecord = "/AlmRecord/HistoryPage";
         public const string AlmDispose = "/AlmRecord/NotPage";
         public const string AlmDeleteDispose = "/AlmRecord/Delete";
+        public const string AlmUpdateDispose = "/AlmRecord/AlmRecordUpdate";
     }
 }

Ropin.Inspection.Common/Helper/WeChatHelper.cs

@@ -257,7 +257,7 @@ namespace Ropin.Inspection.Common.Helper
                     if (response.IsSuccessStatusCode)
                     {
                         var strReturn = await response.Content.ReadAsStringAsync();
-                        log.Info($"发送微信模板消息返回数据【strReturn={strReturn}】");
+                        log.Info($"发送微信模板消息返回数据【openId={openId}】【strReturn={strReturn}】");
                         var responseMessage = JsonConvert.DeserializeObject<WXResult>(strReturn);
                         if (responseMessage != null && responseMessage.errcode == 0)
                         {

Ropin.Inspection.Repository/SYS/Interface/ITsysUserRepository.cs

@@ -16,6 +16,7 @@ namespace Ropin.Inspection.Repository
         //Task<PagedList<TSYS_User>> GetAllAsync(UserResourceParameters parameters);
         void CheckUser(TsysUserCreateViewModel user);
         TSYS_User GetUser(TsysUserSearchModel user);
+        List<TSYS_User> GetUserList();
         Task<IEnumerable<TSYS_User>> GetByStoreCodeAsync(string storeCode);
         Task<IEnumerable<TSYS_User>> GetByRecordItemCodeAsync(string itemCode);
         Task<TSYS_User> LoginByAsync(LoginModel loginModel);

Ropin.Inspection.Repository/SYS/TsysUserRepository.cs

@@ -29,7 +29,11 @@ namespace Ropin.Inspection.Repository
         {
             return DbContext.Set<TSYS_User>().SingleOrDefault(user => user.C_UserID == searchModel.C_UserID || user.C_WechatID == searchModel.WxOpenId);
         }
-
+        public List<TSYS_User> GetUserList()
+        {
+            var list= DbContext.Set<TSYS_User>().AsNoTracking().Where(x => x.C_Status == "1").ToList();
+            return list;
+        }
         public async Task<TSYS_User> LoginByAsync(LoginModel loginModel)
         {
             return await DbContext.Set<TSYS_User>().FirstOrDefaultAsync(user => user.C_Mobile == loginModel.Mobile && user.C_Password == loginModel.Password.ToLower());

Ropin.Inspection.Service/ITmtnPushMsgResultService.cs

@@ -16,7 +16,7 @@ namespace Ropin.Inspection.Service
         Task UpdateAsync(string code, TmtnPushMsgResultUpdateModel updateModel);
         Task<IEnumerable<TmtnPushMsgResultViewModel>> GetConditionAsync(TmtnPushMsgResultSearchModel searchModel);
         Task DeleteAsync(string code);
-        //Task<DevAlarmCount> GetPushMsgResultContentAsync(TmtnPushMsgResultSearchModel searchModel);
+        Task<DevAlarmCount> GetPushMsgResultContentAsync(TmtnPushMsgResultSearchModel searchModel);
         Task UpdateStatusAsync(string msgCode, string Status, string userId);
     }
 }

Ropin.Inspection.Service/PushMsgService.cs

@@ -89,12 +89,10 @@ namespace Ropin.Inspection.Service
                 {
                     predicate = predicate.And(i => i.C_MsgTypeCode.Equals(pushModel.C_MsgTypeCode));
                 }
-
-
                 IEnumerable<TMTN_PushMsgTo> pushMsgTo = await _tmtnPushMsgToRepository.GetByConditionAsync(predicate);
                 IList<TMTN_PushMsgTo> pushMsgTolist = pushMsgTo.ToList();
-                IEnumerable<TSYS_User> users = await _tsysUserRepository.GetByConditionAsync(x=>x.C_Status == "1");
-                IList<TSYS_User> userList = users.ToList();
+                //IEnumerable<TSYS_User> users = await _tsysUserRepository.GetByConditionAsync(x=>x.C_Status == "1");
+                IList<TSYS_User> userList = _tsysUserRepository.GetUserList();//users.ToList();
                 IEnumerable<TBDM_CodeDetail> tBDMCodeDetail = await _tbdmCodeDetailRepository.GetAllAsync();
                 IList<TBDM_CodeDetail> tBDMCodeDetailList = tBDMCodeDetail.ToList();
                 List<string> sendUserWechatIDList = new List<string>();
@@ -211,6 +209,7 @@ namespace Ropin.Inspection.Service
                         //    if (!sendUserWechatIDList.Contains(user.C_WechatID))
                         //        sendUserWechatIDList.Add(user.C_WechatID);
                         //}
+                        log.Info($"发送消息-获取微信C_WxopenID【{user.C_WxopenID}】用户名字【{user.C_Name}】IsSendEmail【{IsSendEmail}】");
                         if (!string.IsNullOrEmpty(user.C_WxopenID) && IsSendEmail == "true")
                         {
                             if (!sendUserWechatIDList.Contains(user.C_WxopenID))

docker-compose.yml

@@ -200,6 +200,7 @@ services:
       PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     volumes:
       - ./Ropin.Environmentally.WebScada/appsettings.json:/app/appsettings.json
+      - ./Ropin.Environmentally.WebScada/log4net.config:/app/log4net.config
       #- ./Ropin.Environmentally.WebScada/app:/app
     networks: 
       - ocelot-gateway-demo_dev
@@ -315,6 +316,7 @@ services:
       PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     volumes:
       - ./Ropin.Environmentally.LedgeService1/appsettings.json:/app/appsettings.json
+      - ./Ropin.Environmentally.LedgeService1/log4net.config:/app/log4net.config
     networks: 
       - ocelot-gateway-demo_dev
     external_links:
@@ -335,6 +337,7 @@ services:
       PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     volumes:
       - ./Ropin.Environmentally.DcsService/appsettings.json:/app/appsettings.json
+      - ./Ropin.Environmentally.DcsService/log4net.config:/app/log4net.config
     networks: 
       - ocelot-gateway-demo_dev
     external_links:
@@ -355,6 +358,7 @@ services:
       PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     volumes:
       - ./Ropin.Environmentally.VideoService/appsettings.json:/app/appsettings.json
+      - ./Ropin.Environmentally.VideoService/log4net.config:/app/log4net.config
     networks: 
       - ocelot-gateway-demo_dev
     external_links:
@@ -375,6 +379,7 @@ services:
       PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     volumes:
       - ./Ropin.Environmentally.AlarmService/appsettings.json:/app/appsettings.json
+      - ./Ropin.Environmentally.AlarmService/log4net.config:/app/log4net.config
       #- ./Ropin.Environmentally.AlarmService/app:/app
     networks: 
       - ocelot-gateway-demo_dev