From a99a3974be061a99d11306e75d9820de59cdc374 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 23 七月 2024 12:01:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Organize.Core/05-service/03-LoginUserMain---/LoginUserMain.cs | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/HStation.Service.Organize.Core/05-service/02-UserLoginMap/UserLoginMap.cs b/Service/HStation.Service.Organize.Core/05-service/03-LoginUserMain---/LoginUserMain.cs
similarity index 69%
copy from HStation.Service.Organize.Core/05-service/02-UserLoginMap/UserLoginMap.cs
copy to Service/HStation.Service.Organize.Core/05-service/03-LoginUserMain---/LoginUserMain.cs
index c372d74..5ffca68 100644
--- a/HStation.Service.Organize.Core/05-service/02-UserLoginMap/UserLoginMap.cs
+++ b/Service/HStation.Service.Organize.Core/05-service/03-LoginUserMain---/LoginUserMain.cs
@@ -3,21 +3,21 @@
/// <summary>
///
/// </summary>
- public partial class UserLoginMap
+ public partial class LoginUserMain
{
//鑾峰彇缂撳瓨
- private static List<Model.UserLoginMap> GetCache()
+ private static List<Model.LoginUserMain> GetCache()
{
#region Cache
- var all = UserLoginMapCacheHelper.GetSet(() =>
+ var all = LoginUserMainCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
{
- model_list = new List<Model.UserLoginMap>();
+ model_list = new List<Model.LoginUserMain>();
}
return model_list;
}, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
@@ -27,11 +27,32 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
var model = all.Find(x => x.ID == ID);
+ if (model == null)
+ {
+ all.Add(model_ds);
+ }
+ else
+ {
+ model.Reset(model_ds);
+ }
+ LoginUserMainCacheHelper.Trigger();
+ }
+
+ //閫氳繃 鍛樺伐ID 鏇存柊缂撳瓨
+ public static void UpdateCacheByEmployeeID(long ID)
+ {
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
+ var loginuser = UserLoginMap.GetLoginUserIDByEmployeeID(ID);
+ var alllist = dal.GetAll();
+ var select = alllist.Find(x => x.ID == loginuser.LoginID);
+ var model_ds = Entity2Model(select);
+ var all = GetCache();
+ var model = all.Find(x => x.ID == loginuser.LoginID);
if (model == null)
{
all.Add(model_ds);
@@ -50,7 +71,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -59,7 +80,7 @@
{
all.AddRange(model_list);
}
- UserLoginMapCacheHelper.Trigger();
+ LoginUserMainCacheHelper.Trigger();
}
//绉婚櫎缂撳瓨
@@ -67,7 +88,7 @@
{
var all = GetCache();
all.RemoveAll(x => x.ID == ID);
- UserLoginMapCacheHelper.Trigger();
+ LoginUserMainCacheHelper.Trigger();
}
/// <summary>
@@ -75,7 +96,7 @@
/// </summary>
public static void PublishCache(string key)
{
- UserLoginMapCacheHelper.Publish(key);
+ LoginUserMainCacheHelper.Publish(key);
}
#endregion Cache
@@ -85,7 +106,7 @@
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
- public List<Model.UserLoginMap> GetAll()
+ public List<Model.LoginUserMain> GetAll()
{
var all = GetCache();
return all;
@@ -94,7 +115,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public Model.UserLoginMap GetByID(long ID)
+ public Model.LoginUserMain GetByID(long ID)
{
var all = GetAll();
return all.Find(x => x.ID == ID);
@@ -103,7 +124,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public List<Model.UserLoginMap> GetByIds(List<long> Ids)
+ public List<Model.LoginUserMain> GetByIds(List<long> Ids)
{
if (Ids == null || Ids.Count < 1)
{
@@ -120,13 +141,13 @@
/// <summary>
/// 鎻掑叆涓�鏉℃暟鎹�
/// </summary>
- public long Insert(Model.UserLoginMap model)
+ public long Insert(Model.LoginUserMain model)
{
if (model == null)
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -139,13 +160,13 @@
/// <summary>
/// 鎻掑叆澶氭潯
/// </summary>
- public bool Inserts(List<Model.UserLoginMap> list)
+ public bool Inserts(List<Model.LoginUserMain> list)
{
if (list == null || list.Count < 1)
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -163,14 +184,14 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public bool Update(Model.UserLoginMap model)
+ public bool Update(Model.LoginUserMain model)
{
if (model == null)
{
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var bol = dal.Update(entity);
if (bol)
{
@@ -182,7 +203,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public bool Updates(List<Model.UserLoginMap> list)
+ public bool Updates(List<Model.LoginUserMain> list)
{
if (list == null || list.Count < 1)
{
@@ -193,7 +214,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -212,7 +233,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IUserLoginMap>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.ILoginUserMain>();
var bol = dal.DeleteByID(ID);
if (bol)
{
--
Gitblit v1.9.3