添加日志和公共参数接口

Controllers/Admin/SysLogController.cs

@@ -0,0 +1,108 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// SysLog)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "SysLog")]
+    public class SysLogController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ISysLogService _SysLogService;
+
+
+        public SysLogController(ISysLogService SysLogService)
+        {
+            _SysLogService = SysLogService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysLog/getSysLogList")]
+        public IActionResult getSysLogList([FromQuery] PagerInfo page, [FromQuery] SysLog param)
+        {
+            var response = _SysLogService.getSysLogList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysLog/getSysLogQuery")]
+        public IActionResult getSysLogQuery([FromQuery] SysLog param)
+        {
+            var response = _SysLogService.getSysLogQuery(param).Adapt<GetSysLogQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_admin/SysLog/addSysLog")]
+        public IActionResult addSysLog([FromBody] SysLog param)
+        {
+            var modal = param.Adapt<SysLog>().ToCreate(HttpContext);
+            var response = _SysLogService.addSysLog(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_admin/SysLog/updateSysLog")]
+        public IActionResult updateSysLog([FromBody] SysLog param)
+        {
+            var modal = param.Adapt<SysLog>().ToCreate(HttpContext);
+            var response = _SysLogService.updateSysLog(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">编号</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_admin/SysLog/deleteSysLog/{id}")]
+        public IActionResult deleteSysLog(long id)
+        {
+            var response = _SysLogService.deleteSysLog(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/Admin/SysPublicParamController.cs

@@ -0,0 +1,109 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// SysPublicParam)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "SysPublicParam")]
+    public class SysPublicParamController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ISysPublicParamService _SysPublicParamService;
+
+
+        public SysPublicParamController(ISysPublicParamService SysPublicParamService)
+        {
+            _SysPublicParamService = SysPublicParamService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysPublicParam/getSysPublicParamList")]
+        public IActionResult getSysPublicParamList([FromQuery] PagerInfo page, [FromQuery] SysPublicParam param)
+        {
+            var response = _SysPublicParamService.getSysPublicParamList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysPublicParam/getSysPublicParamQuery")]
+        public IActionResult getSysPublicParamQuery([FromQuery] SysPublicParam param)
+        {
+            var response = _SysPublicParamService.GetFirst(m => m.id == param.id).Adapt<GetSysPublicParamQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_admin/SysPublicParam/addSysPublicParam")]
+        public IActionResult addSysPublicParam([FromBody] SysPublicParam param)
+        {
+            var modal = param.Adapt<SysPublicParam>().ToCreate(HttpContext);
+            var response = _SysPublicParamService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_admin/SysPublicParam/updateSysPublicParam")]
+        public IActionResult updateSysPublicParam([FromBody] SysPublicParam param)
+        {
+            var modal = param.Adapt<SysPublicParam>().ToCreate(HttpContext);
+            var response = _SysPublicParamService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">编号</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_admin/SysPublicParam/deleteSysPublicParam/{id}")]
+        public IActionResult deleteSysPublicParam(int id)
+        {
+            var response = _SysPublicParamService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Model/Base/SysPublicParam.cs

@@ -10,8 +10,8 @@ namespace Model
         /// <summary>
         /// 编号
         /// </summary>
-        [SugarColumn(ColumnDescription = "编号", ColumnName = "public_id")]
-        public long PublicId { get; set; }
+        [SugarColumn(ColumnDescription = "编号", ColumnName = "id")]
+        public long id { get; set; }
 
 
         /// <summary>

Model/Vo/Admin/AddSysPublicParamVo.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class AddSysPublicParamVo
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int id { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysLogListVo.cs

@@ -0,0 +1,90 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetSysLogListVo
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 日志类型
+        /// </summary>
+        public string logType { get; set; }
+
+
+        /// <summary>
+        /// 日志标题
+        /// </summary>
+        public string title { get; set; }
+
+
+        /// <summary>
+        /// 服务ID
+        /// </summary>
+        public string serviceId { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 远程地址
+        /// </summary>
+        public string remoteAddr { get; set; }
+
+
+        /// <summary>
+        /// 请求URI
+        /// </summary>
+        public string requestUri { get; set; }
+
+
+        /// <summary>
+        /// 请求方法
+        /// </summary>
+        public string method { get; set; }
+
+
+        /// <summary>
+        /// 执行时间
+        /// </summary>
+        public long time { get; set; }
+
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public string delFlag { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysLogQueryVo.cs

@@ -0,0 +1,108 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetSysLogQueryVo
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 日志类型
+        /// </summary>
+        public string logType { get; set; }
+
+
+        /// <summary>
+        /// 日志标题
+        /// </summary>
+        public string title { get; set; }
+
+
+        /// <summary>
+        /// 服务ID
+        /// </summary>
+        public string serviceId { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 远程地址
+        /// </summary>
+        public string remoteAddr { get; set; }
+
+
+        /// <summary>
+        /// 用户代理
+        /// </summary>
+        public string userAgent { get; set; }
+
+
+        /// <summary>
+        /// 请求URI
+        /// </summary>
+        public string requestUri { get; set; }
+
+
+        /// <summary>
+        /// 请求方法
+        /// </summary>
+        public string method { get; set; }
+
+
+        /// <summary>
+        /// 请求参数
+        /// </summary>
+        public string paramss { get; set; }
+
+
+        /// <summary>
+        /// 执行时间
+        /// </summary>
+        public long time { get; set; }
+
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public string delFlag { get; set; }
+
+
+        /// <summary>
+        /// 异常信息
+        /// </summary>
+        public string exception { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysPublicParamListVo.cs

@@ -0,0 +1,90 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetSysPublicParamListVo
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string publicName { get; set; }
+
+
+        /// <summary>
+        /// 键
+        /// </summary>
+        public string publicKey { get; set; }
+
+
+        /// <summary>
+        /// 值
+        /// </summary>
+        public string publicValue { get; set; }
+
+
+        /// <summary>
+        /// 状态，0禁用，1启用
+        /// </summary>
+        public string status { get; set; }
+
+
+        /// <summary>
+        /// 校验码
+        /// </summary>
+        public string validateCode { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 类型，0未知，1系统，2业务
+        /// </summary>
+        public string publicType { get; set; }
+
+
+        /// <summary>
+        /// 系统标识，0非系统，1系统
+        /// </summary>
+        public string systemFlag { get; set; }
+
+
+        /// <summary>
+        /// 删除标记，0未删除，1已删除
+        /// </summary>
+        public string delFlag { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysPublicParamQueryVo.cs

@@ -0,0 +1,90 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetSysPublicParamQueryVo
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string publicName { get; set; }
+
+
+        /// <summary>
+        /// 键
+        /// </summary>
+        public string publicKey { get; set; }
+
+
+        /// <summary>
+        /// 值
+        /// </summary>
+        public string publicValue { get; set; }
+
+
+        /// <summary>
+        /// 状态，0禁用，1启用
+        /// </summary>
+        public string status { get; set; }
+
+
+        /// <summary>
+        /// 校验码
+        /// </summary>
+        public string validateCode { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 类型，0未知，1系统，2业务
+        /// </summary>
+        public string publicType { get; set; }
+
+
+        /// <summary>
+        /// 系统标识，0非系统，1系统
+        /// </summary>
+        public string systemFlag { get; set; }
+
+
+        /// <summary>
+        /// 删除标记，0未删除，1已删除
+        /// </summary>
+        public string delFlag { get; set; }
+
+
+
+    }
+}

Services/IService/ISysLogService.cs

@@ -0,0 +1,53 @@
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    public interface ISysLogService : IBaseService<SysLog>
+    {
+        /// <summary>
+        /// 日志表-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetSysLogListVo> getSysLogList([FromQuery] PagerInfo page, [FromQuery] SysLog param);
+
+
+        /// <summary>
+        /// 日志表-详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        SysLog getSysLogQuery([FromQuery] SysLog param);
+
+
+        /// <summary>
+        /// 日志表-添加
+        /// </summary>
+        /// <returns>添加</returns>
+        long addSysLog([FromBody] SysLog param);
+
+
+        /// <summary>
+        /// 日志表-修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        long updateSysLog([FromBody] SysLog param);
+
+
+        /// <summary>
+        /// 日志表-删除
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>删除</returns>
+        long deleteSysLog(long id);
+
+
+
+    }
+}

Services/IService/ISysPublicParamService.cs

@@ -0,0 +1,22 @@
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    public interface ISysPublicParamService : IBaseService<SysPublicParam>
+    {
+        /// <summary>
+        /// 公共参数配置表-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetSysPublicParamListVo> getSysPublicParamList([FromQuery] PagerInfo page, [FromQuery] SysPublicParam param);
+
+
+
+    }
+}

Services/SysLogService.cs

@@ -0,0 +1,93 @@
+using Attribute;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    /// <summary>
+    /// 日志表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(ISysLogService), ServiceLifetime = LifeTime.Transient)]
+    public class SysLogService : BaseService<SysLog>, ISysLogService
+    {
+        /// <summary>
+        /// 日志表-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetSysLogListVo> getSysLogList([FromQuery] PagerInfo page, [FromQuery] SysLog param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<SysLog>();
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.Title), m => m.Title.Contains(param.Title));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.CreateBy), m => m.CreateBy.Contains(param.CreateBy));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.UpdateBy), m => m.UpdateBy.Contains(param.UpdateBy));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.Method), m => m.Method.Contains(param.Method));
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .SplitTable(DateTime.Now.AddMonths(-3), DateTime.Now)
+                .OrderByDescending(m => m.Id)
+                .ToPage<SysLog, GetSysLogListVo>(page);
+            return response;
+        }
+
+
+        /// <summary>
+        /// 日志表-详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        public SysLog getSysLogQuery([FromQuery] SysLog param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<SysLog>();
+            predicate = predicate.AndIF(param.Id > 0, m => m.Id == param.Id);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .SplitTable(DateTime.Now.AddMonths(-3), DateTime.Now)
+                .First();
+            return response;
+        }
+
+
+        /// <summary>
+        /// 日志表-添加
+        /// </summary>
+        /// <returns>添加</returns>
+        public long addSysLog([FromBody] SysLog param)
+        {
+            return Insertable(param).SplitTable().ExecuteReturnSnowflakeId();
+        }
+
+
+        /// <summary>
+        /// 日志表-修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        public long updateSysLog([FromBody] SysLog param)
+        {
+            return Context.Updateable(param).SplitTable().ExecuteCommand();
+        }
+
+
+        /// <summary>
+        /// 日志表-删除
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>删除</returns>
+        public long deleteSysLog(long id)
+        {
+            return Context.Deleteable<SysLog>(id).SplitTable().ExecuteCommand();
+        }
+
+
+
+    }
+}

Services/SysPublicParamService.cs

@@ -0,0 +1,42 @@
+using Attribute;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    /// <summary>
+    /// 公共参数配置表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(ISysPublicParamService), ServiceLifetime = LifeTime.Transient)]
+    public class SysPublicParamService : BaseService<SysPublicParam>, ISysPublicParamService
+    {
+        /// <summary>
+        /// 公共参数配置表-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetSysPublicParamListVo> getSysPublicParamList([FromQuery] PagerInfo page, [FromQuery] SysPublicParam param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<SysPublicParam>();
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.PublicName), m => m.PublicName.Contains(param.PublicName));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.PublicKey), m => m.PublicKey.Contains(param.PublicKey));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.CreateBy), m => m.CreateBy.Contains(param.CreateBy));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.UpdateBy), m => m.UpdateBy.Contains(param.UpdateBy));
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<SysPublicParam, GetSysPublicParamListVo>(page);
+            return response;
+        }
+
+
+
+    }
+}