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

⚡ 优化数据返回

Browse Source
This commit is contained in:
不做码农
2023-06-02 18:33:07 +08:00
parent 65543e651c
commit c9d18f12cf
12 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
View File

@@ -3,6 +3,7 @@ using Infrastructure.Attribute;
using Infrastructure.Enums;
using Microsoft.AspNetCore.Mvc;
using System.Collections;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Common;
using ZR.Model.System;
@@ -114,10 +115,10 @@ namespace ZR.Admin.WebApi.Controllers.System
{
if (UserConstants.NOT_UNIQUE.Equals(DeptService.CheckDeptNameUnique(dept)))
{
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"新增部门{dept.DeptName}失败，部门名称已存在"));
return ToResponse(ResultCode.CUSTOM_ERROR, $"新增部门{dept.DeptName}失败，部门名称已存在");
}
dept.Create_by = User.Identity.Name;
return ToResponse(ToJson(DeptService.InsertDept(dept)));
dept.Create_by = HttpContext.GetName();
return ToResponse(DeptService.InsertDept(dept));
}
/// <summary>
@@ -132,14 +133,14 @@ namespace ZR.Admin.WebApi.Controllers.System
{
if (UserConstants.NOT_UNIQUE.Equals(DeptService.CheckDeptNameUnique(dept)))
{
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，部门名称已存在"));
return ToResponse(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，部门名称已存在");
}
else if (dept.ParentId.Equals(dept.DeptId))
{
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，上级部门不能是自己"));
return ToResponse(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，上级部门不能是自己");
}
dept.Update_by = User.Identity.Name;
return ToResponse(ToJson(DeptService.UpdateDept(dept)));
dept.Update_by = HttpContext.GetName();
return ToResponse(DeptService.UpdateDept(dept));
}
/// <summary>
@@ -153,11 +154,11 @@ namespace ZR.Admin.WebApi.Controllers.System
{
if (DeptService.Queryable().Count(it => it.ParentId == deptId && it.DelFlag == "0") > 0)
{
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除"));
return ToResponse(ResultCode.CUSTOM_ERROR, $"存在下级部门，不允许删除");
}
if (UserService.Queryable().Count(it => it.DeptId == deptId && it.DelFlag == 0) > 0)
{
return ToResponse(GetApiResult(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除"));
return ToResponse(ResultCode.CUSTOM_ERROR, $"部门存在用户，不允许删除");
}
return SUCCESS(DeptService.Delete(deptId));

6
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
View File

@@ -140,7 +140,7 @@ namespace ZR.Admin.WebApi.Controllers.System
long uid = HttpContext.GetUId();
var menus = sysMenuService.SelectMenuTreeByUserId(uid);
return ToResponse(ToJson(1, sysMenuService.BuildMenus(menus)));
return SUCCESS(sysMenuService.BuildMenus(menus));
}
/// <summary>
@@ -148,7 +148,7 @@ namespace ZR.Admin.WebApi.Controllers.System
/// </summary>
/// <returns></returns>
[HttpGet("captchaImage")]
public ApiResult CaptchaImage()
public IActionResult CaptchaImage()
{
string uuid = Guid.NewGuid().ToString().Replace("-", "");
@@ -157,7 +157,7 @@ namespace ZR.Admin.WebApi.Controllers.System
var info = SecurityCodeHelper.Generate(uuid, 60);
var obj = new { captchaOff, uuid, img = info.Base64 };// File(stream, "image/png")
return ToJson(1, obj);
return SUCCESS(obj);
}
/// <summary>

4
ZR.Admin.WebApi/Controllers/System/SysPostController.cs
View File

@@ -73,7 +73,7 @@ namespace ZR.Admin.WebApi.Controllers.System
}
post.Create_by = HttpContext.GetName();
return ToResponse(ToJson(PostService.Add(post)));
return ToResponse(PostService.Add(post));
}
/// <summary>
@@ -109,7 +109,7 @@ namespace ZR.Admin.WebApi.Controllers.System
public IActionResult Delete(string id)
{
int[] ids = Tools.SpitIntArrary(id);
return ToResponse(ToJson(PostService.Delete(ids)));
return ToResponse(PostService.Delete(ids));
}
/// <summary>

6
ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
View File

@@ -76,7 +76,7 @@ namespace ZR.Admin.WebApi.Controllers.System
sysRoleDto.Create_by = HttpContext.GetName();
long roleId = sysRoleService.InsertRole(sysRoleDto);
return ToResponse(ToJson(roleId));
return ToResponse(roleId);
}
/// <summary>
@@ -145,7 +145,7 @@ namespace ZR.Admin.WebApi.Controllers.System
long[] roleIds = Tools.SpitLongArrary(roleId);
int result = sysRoleService.DeleteRoleByRoleId(roleIds);
return ToResponse(ToJson(result));
return ToResponse(result);
}
/// <summary>
@@ -161,7 +161,7 @@ namespace ZR.Admin.WebApi.Controllers.System
sysRoleService.CheckRoleAllowed(roleDto);
int result = sysRoleService.UpdateRoleStatus(roleDto);
return ToResponse(ToJson(result));
return ToResponse(result);
}
/// <summary>

8
ZR.Admin.WebApi/Controllers/System/SysUserController.cs
View File

@@ -76,7 +76,7 @@ namespace ZR.Admin.WebApi.Controllers.System
dic.Add("roleIds", sysUser.RoleIds);
}
return ToResponse(ApiResult.Success(dic));
return SUCCESS(dic);
}
/// <summary>
@@ -132,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers.System
if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
int result = UserService.ChangeUserStatus(user);
return ToResponse(ToJson(result));
return ToResponse(result);
}
/// <summary>
@@ -149,7 +149,7 @@ namespace ZR.Admin.WebApi.Controllers.System
if (userid == 1) return ToResponse(Infrastructure.ResultCode.FAIL, "不能删除管理员账号");
int result = UserService.DeleteUser(userid);
return ToResponse(ToJson(result));
return ToResponse(result);
}
/// <summary>
@@ -165,7 +165,7 @@ namespace ZR.Admin.WebApi.Controllers.System
sysUser.Password = NETCore.Encrypt.EncryptProvider.Md5(sysUser.Password);
int result = UserService.ResetPwd(sysUser.UserId, sysUser.Password);
return ToResponse(ToJson(result));
return ToResponse(result);
}
/// <summary>

2
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@@ -64,7 +64,7 @@ namespace ZR.Admin.WebApi.Controllers.System
int result = tasksLogService.Delete(jobIdArr);
return ToResponse(ToJson(result, result));
return ToResponse(result);
}
/// <summary>

4
ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs
View File

@@ -30,9 +30,9 @@ namespace ZR.Admin.WebApi.Controllers.monitor
/// </summary>
/// <returns></returns>
[HttpGet("monitor/cache")]
public ApiResult GetCache()
public IActionResult GetCache()
{
return ToJson(1);
return SUCCESS(1);
}
/// <summary>

6
ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
View File

@@ -65,15 +65,15 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[Log(Title = "清空操作日志", BusinessType = BusinessType.CLEAN)]
[ActionPermissionFilter(Permission = "monitor:operlog:delete")]
[HttpDelete("clean")]
public ApiResult ClearOperLog()
public IActionResult ClearOperLog()
{
if (!HttpContextExtension.IsAdmin(HttpContext))
{
return ApiResult.Error("操作失败");
return ToResponse(Infrastructure.ResultCode.CUSTOM_ERROR,"操作失败");
}
sysOperLogService.CleanOperLog();
return ToJson(1);
return SUCCESS(1);
}
/// <summary>