From a4f725f0fc99e1e51106af1b60263ac3bd2a7c30 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期二, 13 八月 2024 10:09:14 +0800
Subject: [PATCH] 合并上格新增代码
---
MES.Service/service/MessageCenterManager.cs | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/MES.Service/service/MessageCenterManager.cs b/MES.Service/service/MessageCenterManager.cs
index c835790..255bac7 100644
--- a/MES.Service/service/MessageCenterManager.cs
+++ b/MES.Service/service/MessageCenterManager.cs
@@ -1,5 +1,6 @@
锘縰sing MES.Service.DB;
using MES.Service.Modes;
+using SqlSugar;
namespace MES.Service.service;
@@ -7,25 +8,54 @@
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- public List<MessageCenter> getPushFailedPage(MessageCenter query)
+ public List<MessageCenter> GetPushFailedPage(MessageCenter query)
{
return Context.Queryable<MessageCenter>()
.Where(it =>
it.Result == 0 && it.Status == 1 &&
- it.Seq == 1 &&
- it.CreateBy == query.CreateBy)
+ it.Seq == 1 && it.Title != null)
.WhereIF(query.isShow == 1, it => it.DealWith == 0)
.OrderByDescending(it => it.CreateDate)
.ToPageList(1, 20);
}
- public bool save(MessageCenter entity)
+ public int save(MessageCenter entity)
{
entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
entity.Method = "POST";
+ return Db.Insertable(entity).ExecuteReturnIdentity();
+ }
+
+ public bool SetError(MessageCenter entity)
+ {
+ entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ entity.Method = "POST";
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.Status = 1;
return base.Insert(entity);
}
+ //鑾峰彇鎵�鏈夋病鏈夋垚鍔熺殑璇锋眰
+ public List<MessageCenter> ErrorMsg()
+ {
+ return Context.Queryable<MessageCenter>()
+ .GroupBy(a => new
+ {
+ a.TableName, a.Pid, a.Title, a.PageName
+ })
+ .Where(a =>
+ a.DealWith == 0 && a.Status == 0 && a.Result == 0 &&
+ a.Title == null)
+ .Select<MessageCenter>(a => new MessageCenter
+ {
+ TableName = a.TableName,
+ Pid = a.Pid,
+ Title = a.Title,
+ PageName = a.PageName,
+ Count = SqlFunc.AggregateCount(a.Id)
+ }).ToList();
+ }
//鏍规嵁鍑犵鎯呭喌鏇存柊 淇濇寔椤甸潰id鏄浐瀹氱殑
--
Gitblit v1.9.3