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

Merge branch 'master' of https://gitee.com/izory/ZrAdminNetCore

Browse Source
This commit is contained in:
不做码农
2022-01-17 22:01:08 +08:00
parent 7f88556632 512c5bc176
commit 5aa229c381
21 changed files with 186 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ZR.Admin.WebApi/Controllers/CommonController.cs
View File

@@ -97,7 +97,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <param name="formFile"></param>
/// <param name="fileDir">存储目录</param>
/// <param name="fileName">文件名</param>
/// <param name="fileName">自定义文件名</param>
/// <param name="uploadType">上传类型 1、发送邮件</param>
/// <returns></returns>
[HttpPost()]
@@ -152,16 +152,17 @@ namespace ZR.Admin.WebApi.Controllers
/// 存储文件到阿里云
/// </summary>
/// <param name="formFile"></param>
/// <param name="fileName">自定义文件名</param>
/// <param name="fileDir">上传文件夹路径</param>
/// <returns></returns>
[HttpPost]
[Verify]
[ActionPermissionFilter(Permission = "common")]
public IActionResult UploadFileAliyun([FromForm(Name = "file")] IFormFile formFile, string fileDir = "")
public IActionResult UploadFileAliyun([FromForm(Name = "file")] IFormFile formFile, string fileName = "", string fileDir = "")
{
if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空");
string fileExt = Path.GetExtension(formFile.FileName);
string[] AllowedFileExtensions = new string[] { ".jpg", ".gif", ".png", ".jpeg", ".webp", ".svga", ".xls", ".doc", ".zip", ".json", ".txt" };
string[] AllowedFileExtensions = new string[] { ".jpg", ".gif", ".png", ".jpeg", ".webp", ".svga", ".xls", ".doc", ".zip", ".json", ".txt", ".bundle" };
int MaxContentLength = 1024 * 1024 * 15;
double fileSize = formFile.Length / 1024;
if (!AllowedFileExtensions.Contains(fileExt))
@@ -174,7 +175,7 @@ namespace ZR.Admin.WebApi.Controllers
return ToResponse(ResultCode.CUSTOM_ERROR, "上传文件过大，不能超过 " + (MaxContentLength / 1024).ToString() + " MB");
}
(bool, string, string) result = SysFileService.SaveFile(fileDir, formFile);
(bool, string, string) result = SysFileService.SaveFile(fileDir, formFile, fileName);
long fileId = SysFileService.InsertFile(new SysFile()
{
AccessUrl = result.Item2,

3
ZR.Admin.WebApi/Controllers/System/SysFileController.cs
View File

@@ -43,6 +43,7 @@ namespace ZR.Admin.WebApi.Controllers
predicate = predicate.AndIF(parm.BeginCreate_time != null, it => it.Create_time >= parm.BeginCreate_time);
predicate = predicate.AndIF(parm.EndCreate_time != null, it => it.Create_time <= parm.EndCreate_time);
predicate = predicate.AndIF(parm.StoreType != null, m => m.StoreType == parm.StoreType);
predicate = predicate.AndIF(parm.FileId != null, m => m.Id == parm.FileId);
//搜索条件查询语法参考Sqlsugar
var response = _SysFileService.GetPages(predicate.ToExpression(), parm);
@@ -59,7 +60,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult GetSysFile(int Id)
{
var response = _SysFileService.GetFirst(x => x.Id == Id);
return SUCCESS(response);
}

7
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
View File

@@ -8,6 +8,7 @@ using ZR.Admin.WebApi.Filters;
using ZR.Model.System.Dto;
using ZR.Model.System;
using ZR.Service.System.IService;
using ZR.Model;
namespace ZR.Admin.WebApi.Controllers.System
{
@@ -32,10 +33,10 @@ namespace ZR.Admin.WebApi.Controllers.System
/// <returns></returns>
[ActionPermissionFilter(Permission = "system:menu:list")]
[HttpGet("list")]
public IActionResult MenuList([FromQuery] SysMenu menu)
public IActionResult TreeMenuList([FromQuery] SysMenu menu)
{
long userId = HttpContext.GetUId();
return SUCCESS(sysMenuService.SelectMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
return SUCCESS(sysMenuService.SelectTreeMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
}
/// <summary>
@@ -74,7 +75,7 @@ namespace ZR.Admin.WebApi.Controllers.System
public IActionResult RoleMenuTreeselect(int roleId)
{
long userId = HttpContext.GetUId();
var menus = sysMenuService.SelectMenuList(userId);
var menus = sysMenuService.SelectMenuList(new SysMenu(), userId);
var checkedKeys = sysRoleService.SelectUserRoleMenus(roleId);
return SUCCESS(new
{

5
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@@ -45,8 +45,7 @@ $if(column.CsharpType == "string")
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
$elseif(column.CsharpType == "DateTime")
predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.AddDays(-1));
predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField});
predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField});
predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField} && it.${column.CsharpField} <= parm.End${column.CsharpField});
$elseif(column.CsharpType == "int" || column.CsharpType == "long")
predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
$end
@@ -54,7 +53,7 @@ $end
$end
$if(genTable.SortField != "" && genTable.SortField != null)
var response = _${replaceDto.ModelTypeName}repository
.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}");
.GetPages(predicate.ToExpression(), parm, it => it.${genTable.SortField}, "${genTable.SortType}");
$else
var response = _${replaceDto.ModelTypeName}repository
.Queryable()