Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

测试

Browse Source
This commit is contained in:
不做码农
2021-09-27 08:06:09 +08:00
parent 48e14b4d4f
commit 40026f596f
53 changed files with 1306 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Service/System/ArticleCategoryService.cs
View File

@@ -10,7 +10,7 @@ namespace ZR.Service.System
/// 文章目录
/// </summary>
[AppService(ServiceType = typeof(IArticleCategoryService), ServiceLifetime = LifeTime.Transient)]
public class ArticleCategoryService : BaseService<ArticleCategory>, IArticleCategoryService
public class ArticleCategoryService : IArticleCategoryService
{
/// <summary>
/// 构建前端所需要树结构

2
ZR.Service/System/ArticleService.cs
View File

@@ -8,7 +8,7 @@ namespace ZR.Service.System
///
/// </summary>
[AppService(ServiceType = typeof(IArticleService), ServiceLifetime = LifeTime.Transient)]
public class ArticleService : BaseService<Article>, IArticleService
public class ArticleService : IArticleService
{
}

72
ZR.Service/System/GenTableService.cs
View File

@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using ZR.Model.System.Generate;
using ZR.Repository.System;
using ZR.Service.System.IService;
namespace ZR.Service.System
@@ -14,12 +15,14 @@ namespace ZR.Service.System
/// 代码生成表
/// </summary>
[AppService(ServiceType = typeof(IGenTableService), ServiceLifetime = LifeTime.Transient)]
public class GenTableService : BaseService<GenTable>, IGenTableService
public class GenTableService : IGenTableService
{
public IGenTableColumnService GenTableColumnService;
public GenTableService(IGenTableColumnService genTableColumnService)
private GenTableRepository GenTableRepository;
private IGenTableColumnService GenTableColumnService;
public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository)
{
GenTableColumnService = genTableColumnService;
GenTableRepository = genTableRepository;
}
/// <summary>
@@ -29,7 +32,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int DeleteGenTableByIds(long[] tableIds)
{
Db.Deleteable<GenTable>().Where(f => tableIds.Contains(f.TableId)).ExecuteCommand();
GenTableRepository.Delete(f => tableIds.Contains(f.TableId));
return GenTableColumnService.DeleteGenTableColumn(tableIds);
}
@@ -40,7 +43,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int DeleteGenTableByTbName(string tableName)
{
return Db.Deleteable<GenTable>().Where(f => f.TableName == tableName).ExecuteCommand();
return GenTableRepository.Delete(f => f.TableName == tableName) ? 1 : 0;
}
/// <summary>
@@ -50,7 +53,7 @@ namespace ZR.Service.System
/// <returns></returns>
public GenTable GetGenTableInfo(long tableId)
{
return GetId(tableId);
return GenTableRepository.GetById(tableId);
}
/// <summary>
@@ -64,7 +67,11 @@ namespace ZR.Service.System
var predicate = Expressionable.Create<GenTable>();
predicate = predicate.AndIF(genTable.TableName.IfNotEmpty(), it => it.TableName.Contains(genTable.TableName));
return GetPages(predicate.ToExpression(), pagerInfo);
(List<GenTable>, int) ts = GenTableRepository.QueryableToPage(predicate.ToExpression(), pagerInfo.PageNum, pagerInfo.PageSize);
PagedInfo<GenTable> pagedInfo = new(ts.Item1, pagerInfo.PageNum, pagerInfo.PageSize);
pagedInfo.TotalCount = ts.Item2;
return pagedInfo;
}
/// <summary>
@@ -74,13 +81,12 @@ namespace ZR.Service.System
/// <returns></returns>
public int ImportGenTable(GenTable table)
{
var db = Db;
table.Create_time = db.GetDate();
table.Create_time = DateTime.Now;
//导入前删除现有表
//DeleteGenTableByIds(new long[] { table.TableId });
DeleteGenTableByTbName(table.TableName);
return db.Insertable(table).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnIdentity();
return GenTableRepository.Context.Insertable(table).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnIdentity();
}
/// <summary>
@@ -95,7 +101,7 @@ namespace ZR.Service.System
public int UpdateGenTable(GenTable genTable)
{
var db = Db;
var db = GenTableRepository.Context;
genTable.Update_time = db.GetDate();
return db.Updateable(genTable).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
}
@@ -105,8 +111,14 @@ namespace ZR.Service.System
/// 代码生成表列
/// </summary>
[AppService(ServiceType = typeof(IGenTableColumnService), ServiceLifetime = LifeTime.Transient)]
public class GenTableColumnService : BaseService<GenTableColumn>, IGenTableColumnService
public class GenTableColumnService : IGenTableColumnService
{
private GenTableColumnRepository GetTableColumnRepository;
public GenTableColumnService(GenTableColumnRepository genTableColumnRepository)
{
GetTableColumnRepository = genTableColumnRepository;
}
/// <summary>
/// 删除表字段
/// </summary>
@@ -114,7 +126,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int DeleteGenTableColumn(long tableId)
{
return DeleteGenTableColumn(new long[] { tableId });
return GetTableColumnRepository.DeleteGenTableColumn(new long[] { tableId });
}
/// <summary>
/// 根据表id批量删除表字段
@@ -123,7 +135,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int DeleteGenTableColumn(long[] tableId)
{
return Db.Deleteable<GenTableColumn>().Where(f => tableId.Contains(f.TableId)).ExecuteCommand();
return GetTableColumnRepository.DeleteGenTableColumn(tableId);
}
/// <summary>
@@ -133,7 +145,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int DeleteGenTableColumnByTableName(string tableName)
{
return Db.Deleteable<GenTableColumn>().Where(f => f.TableName == tableName).ExecuteCommand();
return GetTableColumnRepository.DeleteGenTableColumnByTableName(tableName);
}
/// <summary>
@@ -143,7 +155,7 @@ namespace ZR.Service.System
/// <returns></returns>
public List<GenTableColumn> GenTableColumns(long tableId)
{
return Db.Queryable<GenTableColumn>().Where(f => f.TableId == tableId).OrderBy(x => x.Sort).ToList();
return GetTableColumnRepository.GenTableColumns(tableId);
}
/// <summary>
@@ -153,7 +165,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int InsertGenTableColumn(List<GenTableColumn> tableColumn)
{
return Db.Insertable(tableColumn).IgnoreColumns(x => new { x.Remark }).ExecuteCommand();
return GetTableColumnRepository.InsertGenTableColumn(tableColumn);
}
/// <summary>
@@ -163,31 +175,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int UpdateGenTableColumn(List<GenTableColumn> tableColumn)
{
foreach (var item in tableColumn)
{
Db.Updateable<GenTableColumn>()
.Where(f => f.TableId == item.TableId)
.SetColumns(it => new GenTableColumn()
{
ColumnComment = item.ColumnComment,
CsharpField = item.CsharpField,
CsharpType = item.CsharpType,
IsQuery = item.IsQuery,
IsEdit = item.IsEdit,
IsInsert = item.IsInsert,
IsList = item.IsList,
QueryType = item.QueryType,
HtmlType = item.HtmlType,
IsRequired = item.IsRequired,
Sort = item.Sort,
Update_time = DateTime.Now,
DictType = item.DictType
})
.Where(f => f.ColumnId == item.ColumnId)
.ExecuteCommand();
}
return 1;
return GetTableColumnRepository.UpdateGenTableColumn(tableColumn);
}
}
}

2
ZR.Service/System/IService/IArticleCategoryService.cs
View File

@@ -7,7 +7,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface IArticleCategoryService : IBaseService<ArticleCategory>
public interface IArticleCategoryService //: IBaseService<ArticleCategory>
{
List<ArticleCategory> BuildCategoryTree(List<ArticleCategory> categories);
}

2
ZR.Service/System/IService/IArticleService.cs
View File

@@ -8,7 +8,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface IArticleService : IBaseService<Article>
public interface IArticleService //: IBaseService<Article>
{
}

2
ZR.Service/System/IService/ISysDeptService.cs
View File

@@ -6,7 +6,7 @@ using ZR.Model.Vo.System;
namespace ZR.Service.System.IService
{
public interface ISysDeptService : IBaseService<SysDept>
public interface ISysDeptService //: IBaseService<SysDept>
{
public List<SysDept> GetSysDepts(SysDept dept);
public string CheckDeptNameUnique(SysDept dept);

2
ZR.Service/System/IService/ISysDictDataService.cs
View File

@@ -5,7 +5,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysDictDataService : IBaseService<SysDictData>
public interface ISysDictDataService
{
public List<SysDictData> SelectDictDataList(SysDictData dictData);
public List<SysDictData> SelectDictDataByType(string dictType);

2
ZR.Service/System/IService/ISysDictService.cs
View File

@@ -8,7 +8,7 @@ namespace ZR.Service.System.IService
/// <summary>
///
/// </summary>
public interface ISysDictService: IBaseService<SysDictType>
public interface ISysDictService : IBaseService<SysDictType>
{
public List<SysDictType> SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager);

2
ZR.Service/System/IService/ISysFileService.cs
View File

@@ -3,7 +3,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysFileService : IBaseService<SysFile>
public interface ISysFileService
{
}
}

2
ZR.Service/System/IService/ISysMenuService.cs
View File

@@ -6,7 +6,7 @@ using ZR.Model.Vo.System;
namespace ZR.Service.System.IService
{
public interface ISysMenuService: IBaseService<SysMenu>
public interface ISysMenuService
{
public List<SysMenu> SelectMenuList(long userId);

2
ZR.Service/System/IService/ISysOperLogService.cs
View File

@@ -6,7 +6,7 @@ using ZR.Service.System;
namespace ZR.Service.System.IService
{
public interface ISysOperLogService : IBaseService<SysOperLog>
public interface ISysOperLogService
{
public void InsertOperlog(SysOperLog operLog);

3
ZR.Service/System/IService/ISysPostService.cs
View File

@@ -2,10 +2,11 @@
using System.Collections.Generic;
using System.Text;
using ZR.Model.System;
using ZR.Repository;
namespace ZR.Service.System.IService
{
public interface ISysPostService: IBaseService<SysPost>
public interface ISysPostService: IBaseRepository<SysPost>
{
string CheckPostNameUnique(SysPost sysPost);
string CheckPostCodeUnique(SysPost sysPost);

2
ZR.Service/System/IService/ISysRoleService.cs
View File

@@ -6,7 +6,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysRoleService: IBaseService<SysRole>
public interface ISysRoleService
{
/// <summary>
/// 根据条件分页查询角色数据

3
ZR.Service/System/IService/ISysTasksLogService.cs
View File

@@ -1,8 +1,9 @@
using ZR.Model.System;
using ZR.Repository;
namespace ZR.Service.System.IService
{
public interface ISysTasksLogService : IBaseService<SysTasksLog>
public interface ISysTasksLogService: IBaseRepository<SysTasksLog>
{
/// <summary>
/// 记录任务执行日志

3
ZR.Service/System/IService/ISysTasksQzService.cs
View File

@@ -7,7 +7,8 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysTasksQzService: IBaseService<SysTasksQz>
public interface ISysTasksQzService
{
SysTasksQz GetId(object id);
}
}

3
ZR.Service/System/IService/ISysUserPostService.cs
View File

@@ -3,12 +3,13 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysUserPostService: IBaseService<SysUserPost>
public interface ISysUserPostService
{
public void InsertUserPost(SysUser user);
public List<long> GetUserPostsByUserId(long userId);
public string GetPostsStrByUserId(long userId);
int Delete(long userId);
}
}

2
ZR.Service/System/IService/ISysUserService.cs
View File

@@ -8,7 +8,7 @@ using ZR.Model.System;
namespace ZR.Service.System.IService
{
public interface ISysUserService : IBaseService<SysUser>
public interface ISysUserService
{
public List<SysUser> SelectUserList(SysUser user, PagerInfo pager);

20
ZR.Service/System/SysDeptService.cs
View File

@@ -18,7 +18,7 @@ namespace ZR.Service.System
/// 部门管理
/// </summary>
[AppService(ServiceType = typeof(ISysDeptService), ServiceLifetime = LifeTime.Transient)]
public class SysDeptService : BaseService<SysDept>, ISysDeptService
public class SysDeptService :ISysDeptService
{
public SysDeptRepository DeptRepository;
@@ -40,7 +40,7 @@ namespace ZR.Service.System
predicate = predicate.AndIF(dept.DeptName.IfNotEmpty(), it => it.DeptName.Contains(dept.DeptName));
predicate = predicate.AndIF(dept.Status.IfNotEmpty(), it => it.Status == dept.Status);
var response = GetWhere(predicate.ToExpression());
var response = DeptRepository.GetList(predicate.ToExpression());
return response;
}
@@ -53,7 +53,7 @@ namespace ZR.Service.System
public string CheckDeptNameUnique(SysDept dept)
{
long deptId = dept.DeptId == 0 ? -1L : dept.DeptId;
SysDept info = GetFirst(it => it.DeptName == dept.DeptName && it.ParentId == dept.ParentId);
SysDept info = DeptRepository.GetFirst(it => it.DeptName == dept.DeptName && it.ParentId == dept.ParentId);
if (info != null && info.DeptId != deptId)
{
return UserConstants.NOT_UNIQUE;
@@ -68,7 +68,7 @@ namespace ZR.Service.System
/// <returns></returns>
public int InsertDept(SysDept dept)
{
SysDept info = GetFirst(it => it.DeptId == dept.ParentId);
SysDept info = DeptRepository.GetSingle(it => it.DeptId == dept.ParentId);
//如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.Equals(info.Status))
{
@@ -76,7 +76,7 @@ namespace ZR.Service.System
}
dept.Ancestors = info.Ancestors + "," + dept.ParentId;
return Add(dept);
return DeptRepository.Insert(dept, true);
}
/// <summary>
@@ -86,8 +86,8 @@ namespace ZR.Service.System
/// <returns></returns>
public int UpdateDept(SysDept dept)
{
SysDept newParentDept = GetFirst(it => it.ParentId == dept.ParentId);
SysDept oldDept = GetFirst(m => m.DeptId == dept.DeptId);
SysDept newParentDept = DeptRepository.GetSingle(it => it.ParentId == dept.ParentId);
SysDept oldDept = DeptRepository.GetSingle(m => m.DeptId == dept.DeptId);
if (newParentDept != null && oldDept != null)
{
string newAncestors = newParentDept.Ancestors + "," + newParentDept.DeptId;
@@ -95,7 +95,7 @@ namespace ZR.Service.System
dept.Ancestors = newAncestors;
UpdateDeptChildren(dept.DeptId, newAncestors, oldAncestors);
}
int result = Update(dept);
int result = DeptRepository.Context.Updateable(dept).ExecuteCommand();
if (UserConstants.DEPT_NORMAL.Equals(dept.Status))
{
// 如果该部门是启用状态，则启用该部门的所有上级部门
@@ -111,7 +111,7 @@ namespace ZR.Service.System
private void UpdateParentDeptStatus(SysDept dept)
{
string updateBy = dept.Update_by;
dept = GetFirst(it => it.DeptId == dept.DeptId);
dept = DeptRepository.GetFirst(it => it.DeptId == dept.DeptId);
dept.Update_by = updateBy;
//DeptRepository.UpdateParentDeptStatus(dept);
}
@@ -132,7 +132,7 @@ namespace ZR.Service.System
if (child.DeptId.Equals(deptId))
{
Saveable(child, it => new { it.Ancestors });
//TODO Saveable(child, it => new { it.Ancestors });
//DeptRepository.UdateDeptChildren(child);
}
}

4
ZR.Service/System/SysDictDataService.cs
View File

@@ -10,7 +10,7 @@ using ZR.Service.System.IService;
namespace ZR.Service.System
{
[AppService(ServiceType = typeof(ISysDictDataService), ServiceLifetime = LifeTime.Transient)]
public class SysDictDataService: BaseService<SysDictData>, ISysDictDataService
public class SysDictDataService: ISysDictDataService
{
private readonly SysDictDataRepository SysDictDataRepository;
@@ -55,7 +55,7 @@ namespace ZR.Service.System
string CK = $"SelectDictDataByCode_{dictCode}";
if (CacheHelper.GetCache(CK) is not SysDictData list)
{
list = GetFirst(f => f.DictCode == dictCode);
list = SysDictDataRepository.GetFirst(f => f.DictCode == dictCode);
CacheHelper.SetCache(CK, list, 5);
}
return list;

20
ZR.Service/System/SysDictService.cs
View File

@@ -15,12 +15,12 @@ namespace ZR.Service.System
[AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)]
public class SysDictService : BaseService<SysDictType>, ISysDictService
{
private SysDictRepository sysDictRepository;
private SysDictRepository DictRepository;
private SysDictDataRepository DictDataRepository;
public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository)
{
this.sysDictRepository = sysDictRepository;
this.DictRepository = sysDictRepository;
this.DictDataRepository = dictDataRepository;
}
@@ -31,7 +31,7 @@ namespace ZR.Service.System
/// <returns></returns>
public List<SysDictType> SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager)
{
return sysDictRepository.SelectDictTypeList(dictType, pager);
return DictRepository.SelectDictTypeList(dictType, pager);
}
/// <summary>
@@ -41,7 +41,7 @@ namespace ZR.Service.System
/// <returns></returns>
public string CheckDictTypeUnique(SysDictType dictType)
{
SysDictType sysDictType = GetFirst(f => f.DictType == dictType.DictType);
SysDictType sysDictType = DictRepository.GetFirst(f => f.DictType == dictType.DictType);
if (sysDictType != null && sysDictType.DictId != dictType.DictId)
{
return UserConstants.NOT_UNIQUE;
@@ -58,13 +58,13 @@ namespace ZR.Service.System
{
foreach (var dictId in dictIds)
{
SysDictType dictType = GetFirst(x => x.DictId == dictId);
if (GetCount(f => f.DictType == dictType.DictType) > 0)
SysDictType dictType = DictRepository.GetFirst(x => x.DictId == dictId);
if (DictRepository.Count(f => f.DictType == dictType.DictType) > 0)
{
throw new CustomException($"{dictType.DictName}已分配,不能删除");
}
}
int count = sysDictRepository.DeleteDictTypeByIds(dictIds);
int count = DictRepository.DeleteDictTypeByIds(dictIds);
//if (count > 0)
//{
// DictUtils.clearDictCache();
@@ -79,7 +79,7 @@ namespace ZR.Service.System
/// <returns></returns>
public long InsertDictType(SysDictType sysDictType)
{
return Saveable(sysDictType, iColumns: it => new { sysDictType.Update_by }).DictId;
return DictRepository.InsertReturnEntity(sysDictType).DictId;
}
/// <summary>
@@ -89,13 +89,13 @@ namespace ZR.Service.System
/// <returns></returns>
public int UpdateDictType(SysDictType sysDictType)
{
SysDictType oldDict = GetFirst(x => x.DictId == sysDictType.DictId);
SysDictType oldDict = DictRepository.GetFirst(x => x.DictId == sysDictType.DictId);
if (sysDictType.DictType != oldDict.DictType)
{
//同步修改 dict_data表里面的DictType值
DictDataRepository.UpdateDictDataType(oldDict.DictType, sysDictType.DictType);
}
return sysDictRepository.UpdateDictType(sysDictType);
return DictRepository.UpdateDictType(sysDictType);
}
}
}

2
ZR.Service/System/SysFileService.cs
View File

@@ -8,7 +8,7 @@ namespace ZR.Service.System
/// 文件管理
/// </summary>
[AppService(ServiceType = typeof(ISysFileService), ServiceLifetime = LifeTime.Transient)]
public class SysFileService: BaseService<SysFile>, ISysFileService
public class SysFileService : ISysFileService
{
}

2
ZR.Service/System/SysMenuService.cs
View File

@@ -15,7 +15,7 @@ namespace ZR.Service
/// 菜单
/// </summary>
[AppService(ServiceType = typeof(ISysMenuService), ServiceLifetime = LifeTime.Transient)]
public class SysMenuService: BaseService<SysMenu>, ISysMenuService
public class SysMenuService: ISysMenuService
{
public SysMenuRepository MenuRepository;
public ISysRoleService SysRoleService;

2
ZR.Service/System/SysOperLogService.cs
View File

@@ -13,7 +13,7 @@ namespace ZR.Service.System
/// 操作日志
/// </summary>
[AppService(ServiceType = typeof(ISysOperLogService), ServiceLifetime = LifeTime.Transient)]
public class SysOperLogService: BaseService<SysOperLog>, ISysOperLogService
public class SysOperLogService : ISysOperLogService
{
public SysOperLogRepository sysOperLogRepository;

14
ZR.Service/System/SysPostService.cs
View File

@@ -3,6 +3,8 @@ using System;
using System.Collections.Generic;
using System.Text;
using ZR.Model.System;
using ZR.Repository;
using ZR.Repository.System;
using ZR.Service.System.IService;
namespace ZR.Service.System
@@ -11,8 +13,14 @@ namespace ZR.Service.System
/// 岗位管理
/// </summary>
[AppService(ServiceType = typeof(ISysPostService), ServiceLifetime = LifeTime.Transient)]
public class SysPostService : BaseService<SysPost>, ISysPostService
public class SysPostService : BaseRepository<SysPost>, ISysPostService
{
public SysPostRepository PostRepository;
public SysPostService(SysPostRepository postRepository)
{
PostRepository = postRepository;
}
/// <summary>
/// 校验岗位编码是否唯一
/// </summary>
@@ -20,7 +28,7 @@ namespace ZR.Service.System
/// <returns></returns>
public string CheckPostCodeUnique(SysPost post)
{
SysPost info = GetFirst(it => it.PostCode.Equals(post.PostCode));
SysPost info = PostRepository.GetFirst(it => it.PostCode.Equals(post.PostCode));
if (info != null && info.PostId != post.PostId)
{
return UserConstants.NOT_UNIQUE;
@@ -35,7 +43,7 @@ namespace ZR.Service.System
/// <returns></returns>
public string CheckPostNameUnique(SysPost post)
{
SysPost info = GetFirst(it => it.PostName.Equals(post.PostName));
SysPost info = PostRepository.GetFirst(it => it.PostName.Equals(post.PostName));
if (info != null && info.PostId != post.PostId)
{
return UserConstants.NOT_UNIQUE;

2
ZR.Service/System/SysRoleService.cs
View File

@@ -15,7 +15,7 @@ namespace ZR.Service
/// 角色
/// </summary>
[AppService(ServiceType = typeof(ISysRoleService), ServiceLifetime = LifeTime.Transient)]
public class SysRoleService: BaseService<SysRole>, ISysRoleService
public class SysRoleService: ISysRoleService
{
private SysRoleRepository SysRoleRepository;
private ISysUserRoleService SysUserRoleService;

5
ZR.Service/System/SysTasksLogService.cs
View File

@@ -1,12 +1,13 @@
using Infrastructure.Attribute;
using System;
using ZR.Model.System;
using ZR.Repository;
using ZR.Service.System.IService;
namespace ZR.Service.System
{
[AppService(ServiceLifetime = LifeTime.Transient, ServiceType = typeof(ISysTasksLogService))]
public class SysTasksLogService : BaseService<SysTasksLog>, ISysTasksLogService
public class SysTasksLogService : BaseRepository<SysTasksLog>, ISysTasksLogService
{
private ISysTasksQzService _tasksQzService;
public SysTasksLogService(ISysTasksQzService tasksQzService)
@@ -27,7 +28,7 @@ namespace ZR.Service.System
logModel.CreateTime = DateTime.Now;
}
Add(logModel);
Insert(logModel, true);
return logModel;
}
}

2
ZR.Service/System/SysTasksQzService.cs
View File

@@ -5,7 +5,7 @@ using ZR.Service.System.IService;
namespace ZR.Service.System
{
[AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)]
public class SysTasksQzService : BaseService<SysTasksQz>, ISysTasksQzService
public class SysTasksQzService : ISysTasksQzService
{
}

14
ZR.Service/System/SysUserPostService.cs
View File

@@ -13,10 +13,9 @@ namespace ZR.Service.System
/// 用户岗位
/// </summary>
[AppService(ServiceType = typeof(ISysUserPostService), ServiceLifetime = LifeTime.Transient)]
public class SysUserPostService : BaseService<SysUserPost>, ISysUserPostService
public class SysUserPostService : ISysUserPostService
{
public SysUserPostRepository UserPostRepository;
private SysUserPostRepository UserPostRepository;
public SysUserPostService(SysUserPostRepository userPostRepository)
{
UserPostRepository = userPostRepository;
@@ -34,7 +33,7 @@ namespace ZR.Service.System
{
list.Add(new SysUserPost() { PostId = item, UserId = user.UserId });
}
Add(list);
UserPostRepository.Insert(list);
}
@@ -45,7 +44,7 @@ namespace ZR.Service.System
/// <returns></returns>
public List<long> GetUserPostsByUserId(long userId)
{
var list = GetWhere(f => f.UserId == userId);
var list = UserPostRepository.GetList(f => f.UserId == userId);
return list.Select(x => x.PostId).ToList();
}
@@ -59,5 +58,10 @@ namespace ZR.Service.System
var list = UserPostRepository.SelectPostsByUserId(userId);
return string.Join(',', list.Select(x => x.PostName));
}
public int Delete(long userId)
{
return UserPostRepository.Delete(x => x.UserId == userId) ? 1: 0 ;
}
}
}

4
ZR.Service/System/SysUserService.cs
View File

@@ -11,7 +11,7 @@ using ZR.Service.System.IService;
namespace ZR.Service
{
[AppService(ServiceType = typeof(ISysUserService), ServiceLifetime = LifeTime.Transient)]
public class SysUserService : BaseService<SysUser>, ISysUserService
public class SysUserService : ISysUserService
{
private readonly SysUserRepository UserRepository;
private readonly ISysRoleService RoleService;
@@ -101,7 +101,7 @@ namespace ZR.Service
UserRoleService.InsertUserRole(user);
}
// 删除用户与岗位关联
UserPostService.Delete(it => it.UserId == user.UserId);
UserPostService.Delete(user.UserId);
// 新增用户与岗位管理
UserPostService.InsertUserPost(user);
return UserRepository.UpdateUser(user);