bug修改

Ropin.Inspection.Api/Controllers/SYS/TsysMessageController.cs

@@ -1,11 +1,17 @@
 using Castle.Core.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
 using Ropin.Inspection.Api.Common;
+using Ropin.Inspection.Common.Helper;
+using Ropin.Inspection.Common;
 using Ropin.Inspection.Model;
+using Ropin.Inspection.Model.Common;
 using Ropin.Inspection.Service;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -204,6 +210,134 @@ namespace Ropin.Inspection.Api.Controllers
             return new ApiResult(ReturnCode.Success);
         }
 
+        /// <summary>
+        /// 发送邮件(附件为报警记录)
+        /// </summary>
+        /// <param name="searchModel"></param>
+        /// <returns></returns>
+        [HttpPost("SendMessageToEmail")]
+        public async Task SendMessageToEmail(SendMessageToEmailModel searchModel)
+        {
+            if (searchModel == null)
+            {
+                return;
+            }
+            try
+            {
+                TsysMessageSearchModel tsysMessage = new TsysMessageSearchModel
+                {
+                    IsPagination = false,
+                    C_PushMsgToCode= searchModel.C_PushMsgToCode,
+                    C_StoreCode = searchModel.C_StoreCode,
+                    C_DevCode = searchModel.C_DevCode,
+                    C_MsgTypeCode = searchModel.C_MsgTypeCode,
+                    MsgTypeList = searchModel.MsgTypeList,
+                    C_Content = searchModel.C_Content,
+                    I_GenerationType = searchModel.I_GenerationType,
+                    MsgStatus = searchModel.MsgStatus,
+                    C_Status = searchModel.C_Status,
+                    BeginTime = searchModel.BeginTime,
+                    EndTime = searchModel.EndTime,
+                };
+                var contentList = await _TsysMessageService.GetConditionScreenAsync(tsysMessage);
+                var pushMsg = contentList.Select(x => x.PushMsg).ToList();
+
+                IWorkbook workbook = new XSSFWorkbook();
+                ISheet sheet = workbook.CreateSheet("sheet1");
+                sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, 6));
+                var titleRow = sheet.CreateRow(0);
+                titleRow.Height = 20 * 25;
+                ICell titleCell = titleRow.CreateCell(0);
+                titleCell.SetCellValue("设备报警记录");
+                //第一行字体样式
+                IFont font = workbook.CreateFont();
+                font.IsBold = true;
+                font.FontHeightInPoints = 16;
+                font.FontName = "宋体";
+                ICellStyle titleCellStyle = workbook.CreateCellStyle();
+                titleCellStyle.SetFont(font);
+                titleCellStyle.Alignment = HorizontalAlignment.Center;  //字体居中
+                                                                        //边框
+                titleCellStyle.BorderBottom = BorderStyle.Thin;
+                titleCellStyle.BorderLeft = BorderStyle.Thin;
+                titleCellStyle.BorderRight = BorderStyle.Thin;
+                titleCellStyle.BorderTop = BorderStyle.Thin;
+                titleCell.CellStyle = titleCellStyle;
+
+                var headRow = sheet.CreateRow(1);
+                headRow.CreateCell(0).SetCellValue("设备名称");
+                headRow.CreateCell(1).SetCellValue("设备编号");
+                headRow.CreateCell(2).SetCellValue("报警时间");
+                headRow.CreateCell(3).SetCellValue("报警类型");
+                headRow.CreateCell(4).SetCellValue("报警内容");
+                headRow.CreateCell(5).SetCellValue("报警来源");
+                //第二行,列名
+                IFont font1 = workbook.CreateFont();
+                font1.IsBold = true;
+                font1.FontHeightInPoints = 12;
+                font1.FontName = "宋体";
+                ICellStyle headCellStyle = workbook.CreateCellStyle();
+                headCellStyle.SetFont(font1);
+                //边框
+                headCellStyle.BorderBottom = BorderStyle.Thin;
+                headCellStyle.BorderLeft = BorderStyle.Thin;
+                headCellStyle.BorderRight = BorderStyle.Thin;
+                headCellStyle.BorderTop = BorderStyle.Thin;
+                foreach (var item in headRow.Cells)
+                {
+                    item.CellStyle = headCellStyle;
+                }
+
+                int start = 2;
+                IFont font3 = workbook.CreateFont();
+                font3.FontHeightInPoints = 9;
+                font3.FontName = "宋体";
+                ICellStyle contentCellStyle = workbook.CreateCellStyle();
+                contentCellStyle.SetFont(font3);
+                //边框
+                contentCellStyle.BorderBottom = BorderStyle.Thin;
+                contentCellStyle.BorderLeft = BorderStyle.Thin;
+                contentCellStyle.BorderRight = BorderStyle.Thin;
+                contentCellStyle.BorderTop = BorderStyle.Thin;
+                foreach (var item in pushMsg)
+                {
+                    var row = sheet.CreateRow(start);
+                    row.CreateCell(0).SetCellValue(item.DevName);
+                    row.CreateCell(1).SetCellValue(item.DevNumber);
+                    row.CreateCell(2).SetCellValue(item.CreateOn);
+                    row.CreateCell(3).SetCellValue(item.Subject);
+                    row.CreateCell(4).SetCellValue(item.Msg);
+                    row.CreateCell(5).SetCellValue(!string.IsNullOrEmpty(item.UserName) ? item.UserName : "");
+                    start++;
+                    foreach (var cell in row.Cells)
+                    {
+                        cell.CellStyle = contentCellStyle;
+                    }
+                }
+                // 自适应单元格
+                for (int i = 0; i < sheet.LastRowNum; i++)
+                {
+                    sheet.AutoSizeRow(i);
+                }
+                for (int i = 0; i < 7; i++)
+                {
+                    sheet.AutoSizeColumn(i, true);
+                }
+                using (var stream = new NpoiMemoryStream())
+                {
+
+                    workbook.Write(stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    string emailName = $"{searchModel.DevName} 设备报警记录报表 {searchModel.BeginTime?.ToString("yyyy-MM-dd HH:mm:ss")}至{searchModel.EndTime?.ToString("yyyy-MM-dd HH:mm:ss")}";
+                    EmailHelper.SendEmail(searchModel.Mails, emailName, "", "报表见附件", $"{emailName}.xlsx", "application/vnd.ms-excel", stream);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+        }
+
     }
 }
 

Ropin.Inspection.Api/Properties/launchSettings.json

@@ -13,7 +13,7 @@
       "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development" //Production
+        "ASPNETCORE_ENVIRONMENT": "Production" //Production
       },
       "dotnetRunMessages": "true",
       "applicationUrl": "http://localhost:5000"

Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -2675,6 +2675,13 @@
             <param name="msgStstus"></param>
             <returns></returns>
         </member>
+        <member name="M:Ropin.Inspection.Api.Controllers.TsysMessageController.SendMessageToEmail(Ropin.Inspection.Model.SendMessageToEmailModel)">
+            <summary>
+            发送邮件(附件为报警记录)
+            </summary>
+            <param name="searchModel"></param>
+            <returns></returns>
+        </member>
         <member name="M:Ropin.Inspection.Api.Controllers.TsysOrganizeController.#ctor(Ropin.Inspection.Service.Interface.ITsysOrganizeService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.Controllers.TsysOrganizeController},Ropin.Inspection.Service.ITpntStoreOrgService,Ropin.Inspection.Service.Interface.ITsysUserService,Ropin.Inspection.Service.ITdevDevStoreService)">
             <summary>
             构造函数

Ropin.Inspection.Api/obj/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -2675,6 +2675,13 @@
             <param name="msgStstus"></param>
             <returns></returns>
         </member>
+        <member name="M:Ropin.Inspection.Api.Controllers.TsysMessageController.SendMessageToEmail(Ropin.Inspection.Model.SendMessageToEmailModel)">
+            <summary>
+            发送邮件(附件为报警记录)
+            </summary>
+            <param name="searchModel"></param>
+            <returns></returns>
+        </member>
         <member name="M:Ropin.Inspection.Api.Controllers.TsysOrganizeController.#ctor(Ropin.Inspection.Service.Interface.ITsysOrganizeService,Microsoft.Extensions.Logging.ILogger{Ropin.Inspection.Api.Controllers.TsysOrganizeController},Ropin.Inspection.Service.ITpntStoreOrgService,Ropin.Inspection.Service.Interface.ITsysUserService,Ropin.Inspection.Service.ITdevDevStoreService)">
             <summary>
             构造函数

Ropin.Inspection.Model/TdevDevSpotViewModel.cs

@@ -11,6 +11,7 @@ namespace Ropin.Inspection.Model
         public string C_ID { get; set; }
         public string C_DevStoreCode { get; set; }
         public string C_SpotCode { get; set; }
+        public string C_SpotName { get; set; }
         public string C_Remark { get; set; }
         public Guid C_CreateBy { get; set; }
         public DateTime D_CreateOn { get; set; }

Ropin.Inspection.Model/ViewModel/SYS/TsysMessageSearchModel.cs

@@ -28,4 +28,9 @@ namespace Ropin.Inspection.Model
         public string C_MessageCode { get; set; }
         public string C_Status { get; set; }
     }
+    public class SendMessageToEmailModel : TsysMessageSearchModel
+    {
+        public string DevName { get; set; }
+        public List<string> Mails { get; set; }
+    }
 }

Ropin.Inspection.Repository/ITdevDevSpotRepository.cs

@@ -1,4 +1,5 @@
-using Ropin.Inspection.Model.Entities;
+using Ropin.Inspection.Model;
+using Ropin.Inspection.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,5 +11,6 @@ namespace Ropin.Inspection.Repository
     public interface ITdevDevSpotRepository : IRepositoryBase<TDEV_DevSpot>, IRepositoryBaseById<TDEV_DevSpot, Guid>
     {
         Task<int> DeleteByDevIdAsync(string devId);
+        Task<IEnumerable<TdevDevSpotViewModel>> GetList(TdevDevSpotSearchModel searchModel);
     }
 }

Ropin.Inspection.Repository/TdevDevSpotRepository.cs

@@ -1,4 +1,5 @@
-using Ropin.Inspection.Model.Entities;
+using Ropin.Inspection.Model;
+using Ropin.Inspection.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,5 +21,39 @@ namespace Ropin.Inspection.Repository
             return Task.FromResult(result);
         }
 
+        public Task<IEnumerable<TdevDevSpotViewModel>> GetList(TdevDevSpotSearchModel searchModel)
+        {
+            MySqlConnector.MySqlParameter[] parameters = new[] {
+                new MySqlConnector.MySqlParameter("devStoreCode", searchModel.C_DevStoreCode),
+                new MySqlConnector.MySqlParameter("spotCode", searchModel.C_SpotCode),
+                new MySqlConnector.MySqlParameter("Id", searchModel.C_ID)
+            };
+            StringBuilder sql = new StringBuilder();
+            sql.Append(@" SELECT * FROM (
+SELECT ds.*,s.C_Name as C_SpotName FROM TDEV_DevSpot ds
+LEFT JOIN TISP_Spot s ON (ds.C_SpotCode=s.C_Code)
+) tab WHERE 1=1
+");
+            if (!string.IsNullOrEmpty(searchModel.C_DevStoreCode))
+            {
+                sql.Append(" AND C_DevStoreCode=@devStoreCode ");
+            }
+            if (!string.IsNullOrEmpty(searchModel.C_SpotCode))
+            {
+                sql.Append(" AND C_SpotCode=@spotCode ");
+            }
+            if (!string.IsNullOrEmpty(searchModel.C_ID))
+            {
+                sql.Append(" AND C_ID=@Id ");
+            }
+            sql.Append(" order by D_CreateOn desc ");
+            IEnumerable<TdevDevSpotViewModel> recordItemlist = EntityFrameworkCoreExtensions.GetList<TdevDevSpotViewModel>(DbContext.Database, sql.ToString(), parameters);
+            searchModel.TotalCount = recordItemlist.First() != null ? recordItemlist.ToList().Count : 0;
+            if (searchModel.TotalCount == 0)
+            {
+                recordItemlist = new List<TdevDevSpotViewModel>();
+            }
+            return Task.FromResult(searchModel.IsPagination ? recordItemlist.Skip((searchModel.PageIndex - 1) * searchModel.PageSize).Take(searchModel.PageSize) : recordItemlist);
+        }
     }
 }

Ropin.Inspection.Repository/TmtnRepairOrderRepository.cs

@@ -189,7 +189,7 @@ INNER JOIN TMTN_RepairOrder B ON B.C_DevStoreCode = A.C_ID WHERE A.C_StoreCode =
 SELECT A.*,F.C_Url AS DevStoreImage,F.C_Name AS DevName,F.C_NumberCode AS DevNumberCode,F.C_OpsTempCode,F.C_PlanTempCode,F.C_RepairTempCode,F.C_RunTempCode,E.C_ImagePath AS DevTempImage, E.C_Manufacturer,E.C_Parameter,E.C_Marker ,D.C_Name AS CreateByName,E.C_Name AS LastUpdatedByName 
 FROM TMTN_RepairOrder A  
 LEFT JOIN TDEV_DevStore F ON F.C_ID = A.C_DevStoreCode
-LEFT JOIN TDEV_DevSpot A0 ON A0.C_DevStoreCode = A.C_DevStoreCode  INNER JOIN TISP_Spot B0 ON A0.C_SpotCode = B0.C_Code 
+LEFT JOIN TDEV_DevSpot A0 ON A0.C_DevStoreCode = A.C_DevStoreCode  LEFT JOIN TISP_Spot B0 ON A0.C_SpotCode = B0.C_Code 
 LEFT JOIN TDEV_DeviceTemplate E ON E.C_ID = F.C_DevTempCode
 LEFT JOIN TSYS_User D ON D.C_UserID = A.C_CreateBy 
 LEFT JOIN TSYS_User C ON C.C_UserID = A.C_LastUpdatedBy 

Ropin.Inspection.Service/TAIC/TaicAIBoxTemplateService.cs

@@ -2,6 +2,7 @@
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Internal;
+using Ropin.Core.Common;
 using Ropin.Inspection.Common.Accessor.Interface;
 using Ropin.Inspection.Model;
 using Ropin.Inspection.Model.Entities;
@@ -60,6 +61,8 @@ namespace Ropin.Inspection.Service.TAIC
         {
             var aiboxTemplate = _mapper.Map<TaicAiboxTemplate>(viewModel);
             aiboxTemplate.CId = Guid.NewGuid().ToString();
+            var path = QRCoderHelper.RenderQrCode(aiboxTemplate.CId, "M", _claims.Linsence);
+            aiboxTemplate.CQrcode = path;
             aiboxTemplate.CCreateBy = _claims.ApiUserId.ToString();
             _taicAIBoxTemplateRepository.Create(aiboxTemplate);
             var result = await _taicAIBoxTemplateRepository.SaveAsync();
@@ -156,6 +159,8 @@ namespace Ropin.Inspection.Service.TAIC
         {
             var taicAibox = _mapper.Map<TaicAibox>(aiBoxModel);
             taicAibox.CId = Guid.NewGuid().ToString();
+            var path = QRCoderHelper.RenderQrCode(taicAibox.CId, "M", _claims.Linsence);
+            taicAibox.CQrcode = path;
             taicAibox.CCreateBy = _claims.ApiUserId.ToString();
             _taicAIBoxRepository.Create(taicAibox);
             var result = await _taicAIBoxRepository.SaveAsync();

Ropin.Inspection.Service/TdevDevSpotService.cs

@@ -115,25 +115,7 @@ namespace Ropin.Inspection.Service
         }
         public async Task<IEnumerable<TdevDevSpotViewModel>> GetConditionAsync(TdevDevSpotSearchModel searchModel)
         {
-            var predicate = PredicateBuilder.New<TDEV_DevSpot>(true);//查询条件,推荐后台使用这种方式灵活筛选
-            #region 添加条件查询
-            //predicate = predicate.And(i => i.C_Status.Equals("1"));
-            if (!string.IsNullOrEmpty(searchModel.C_SpotCode))
-            {
-                predicate = predicate.And(i => i.C_SpotCode.Equals(searchModel.C_SpotCode));
-            }
-            if (!string.IsNullOrEmpty(searchModel.C_DevStoreCode))
-            {
-                predicate = predicate.And(i => i.C_DevStoreCode.Equals(searchModel.C_DevStoreCode));
-            }
-            if (!string.IsNullOrEmpty(searchModel.C_ID))
-            {
-                predicate = predicate.And(i => i.C_ID.Equals(searchModel.C_ID));
-            }
-            #endregion
-            var list = await _repository.GetPageAsync(predicate, "-D_CreateOn", searchModel.IsPagination, searchModel.PageIndex, searchModel.PageSize);
-            searchModel.TotalCount = list.Totals;
-            var dtoList = _mapper.Map<List<TDEV_DevSpot>, List<TdevDevSpotViewModel>>(list.Rows);
+            var dtoList = await _repository.GetList(searchModel);
             return dtoList;
         }