完善接口

Controllers/Admin/LogicNodeController.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>
+    /// LogicNode)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "LogicNode")]
+    public class LogicNodeController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ILogicNodeService _LogicNodeService;
+
+
+        public LogicNodeController(ILogicNodeService LogicNodeService)
+        {
+            _LogicNodeService = LogicNodeService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicNode/getLogicNodeList")]
+        public IActionResult getLogicNodeList([FromQuery] PagerInfo page, [FromQuery] LogicNode param)
+        {
+            var response = _LogicNodeService.getLogicNodeList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicNode/getLogicNodeQuery")]
+        public IActionResult getLogicNodeQuery([FromQuery] LogicNode param)
+        {
+            var response = _LogicNodeService.GetFirst(m => m.id == param.id).Adapt<GetLogicNodeQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_logic/LogicNode/addLogicNode")]
+        public IActionResult addLogicNode([FromBody] LogicNode param)
+        {
+            var modal = param.Adapt<LogicNode>().ToCreate(HttpContext);
+            var response = _LogicNodeService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_logic/LogicNode/updateLogicNode")]
+        public IActionResult updateLogicNode([FromBody] LogicNode param)
+        {
+            var modal = param.Adapt<LogicNode>().ToCreate(HttpContext);
+            var response = _LogicNodeService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">ID</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_logic/LogicNode/deleteLogicNode/{id}")]
+        public IActionResult deleteLogicNode(int id)
+        {
+            var response = _LogicNodeService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/Admin/LogicNodeKindController.cs

@@ -0,0 +1,124 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// LogicNodeKind)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "LogicNodeKind")]
+    public class LogicNodeKindController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ILogicNodeKindService _LogicNodeKindService;
+        private readonly ILogicNodeService _LogicNodeService;
+
+        public LogicNodeKindController(ILogicNodeKindService LogicNodeKindService, ILogicNodeService LogicNodeService)
+        {
+            _LogicNodeKindService = LogicNodeKindService;
+            _LogicNodeService = LogicNodeService;
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicNodeKind/getLogicNodeKindList")]
+        public IActionResult getLogicNodeKindList([FromQuery] PagerInfo page)
+        {
+            var response = _LogicNodeKindService.getLogicNodeKindList(page);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicNodeKind/getLogicNodeKindQuery")]
+        public IActionResult getLogicNodeKindQuery([FromQuery] LogicNodeKind param)
+        {
+            var response = _LogicNodeKindService.GetFirst(m => m.id == param.id).Adapt<GetLogicNodeKindQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_logic/LogicNodeKind/addLogicNodeKind")]
+        public IActionResult addLogicNodeKind([FromBody] LogicNodeKind param)
+        {
+            var modal = param.Adapt<LogicNodeKind>().ToCreate(HttpContext);
+            var response = _LogicNodeKindService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_logic/LogicNodeKind/updateLogicNodeKind")]
+        public IActionResult updateLogicNodeKind([FromBody] LogicNodeKind param)
+        {
+            var modal = param.Adapt<LogicNodeKind>().ToCreate(HttpContext);
+            var response = _LogicNodeKindService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">ID</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_logic/LogicNodeKind/deleteLogicNodeKind/{id}")]
+        public IActionResult deleteLogicNodeKind(int id)
+        {
+            var response = _LogicNodeKindService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 节点分类数据
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <returns>节点分类数据</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicNodeKind/getLogicNodeTree")]
+        public IActionResult getLogicNodeTree()
+        {
+            var nodes = _LogicNodeService.GetList();
+            var response = _LogicNodeKindService.getLogicNodeTree(nodes);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/Admin/LogicProjectController.cs

@@ -0,0 +1,110 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Dto.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// LogicProject)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "LogicProject")]
+    public class LogicProjectController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ILogicProjectService _LogicProjectService;
+
+
+        public LogicProjectController(ILogicProjectService LogicProjectService)
+        {
+            _LogicProjectService = LogicProjectService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicProject/getLogicProjectList")]
+        public IActionResult getLogicProjectList([FromQuery] PagerInfo page, [FromQuery] LogicProject param)
+        {
+            var response = _LogicProjectService.getLogicProjectList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_logic/LogicProject/getLogicProjectQuery")]
+        public IActionResult getLogicProjectQuery([FromQuery] LogicProject param)
+        {
+            var response = _LogicProjectService.GetFirst(m => m.id == param.id).Adapt<GetLogicProjectQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_logic/LogicProject/addLogicProject")]
+        public IActionResult addLogicProject([FromBody] AddLogicProjectDto param)
+        {
+            var modal = param.Adapt<LogicProject>().ToCreate(HttpContext);
+            var response = _LogicProjectService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_logic/LogicProject/updateLogicProject")]
+        public IActionResult updateLogicProject([FromBody] UpdateLogicProjectDto param)
+        {
+            var modal = param.Adapt<LogicProject>().ToCreate(HttpContext);
+            var response = _LogicProjectService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">ID</param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_logic/LogicProject/deleteLogicProject/{id}")]
+        public IActionResult deleteLogicProject(int id)
+        {
+            var response = _LogicProjectService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Model/Database/LogicNode.cs

@@ -4,9 +4,9 @@ using Mapster;
 namespace Model
 {
     /// <summary>
-    /// 逻辑节点配置 logic_node
+    /// 逻辑节点 logic_node
     /// </summary>
-    [SugarTable("logic_node", "逻辑节点配置")]
+    [SugarTable("logic_node", "逻辑节点")]
     [Tenant("0")]
     public class LogicNode
     {
@@ -80,6 +80,13 @@ namespace Model
         public string? nodeTemplate { get; set; }
 
 
+        /// <summary>
+        /// 节点分类
+        /// </summary>
+        [SugarColumn(ColumnDescription = "节点分类", ColumnName = "node_kind")]
+        public int nodeKind { get; set; }
+
+
 
     }
 }

Model/Database/LogicNodeKind.cs

@@ -0,0 +1,78 @@
+using Mapster;
+
+
+namespace Model
+{
+    /// <summary>
+    /// 逻辑节点分类 logic_node_kind
+    /// </summary>
+    [SugarTable("logic_node_kind", "逻辑节点分类")]
+    [Tenant("0")]
+    public class LogicNodeKind
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
+        public int version { get; set; }
+
+
+        /// <summary>
+        /// 删除标记
+        /// </summary>
+        [SugarColumn(ColumnDescription = "删除标记", ColumnName = "del_flag")]
+        public int delFlag { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_time")]
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_time")]
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建人", Length = 32, ColumnName = "create_by")]
+        public string? createBy { get; set; }
+
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新人", Length = 32, ColumnName = "update_by")]
+        public string? updateBy { get; set; }
+
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分类名称", Length = 50, ColumnName = "kind_name")]
+        public string? kindName { get; set; }
+
+
+        /// <summary>
+        /// 分类介绍
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分类介绍", Length = 255, ColumnName = "kind_detail")]
+        public string? kindDetail { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/AddLogicNodeVo.cs

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

Model/Vo/Admin/GetLogicNodeKindListVo.cs

@@ -0,0 +1,24 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetLogicNodeKindListVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string kindName { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetLogicNodeKindQueryVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetLogicNodeKindQueryVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string kindName { get; set; }
+
+
+        /// <summary>
+        /// 分类介绍
+        /// </summary>
+        public string kindDetail { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetLogicNodeListVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetLogicNodeListVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 节点名称
+        /// </summary>
+        public string nodeName { get; set; }
+
+
+        /// <summary>
+        /// 节点分类
+        /// </summary>
+        public int nodeKind { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetLogicNodeQueryVo.cs

@@ -0,0 +1,42 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetLogicNodeQueryVo
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 节点名称
+        /// </summary>
+        public string nodeName { get; set; }
+
+
+        /// <summary>
+        /// 节点介绍
+        /// </summary>
+        public string nodeDetail { get; set; }
+
+
+        /// <summary>
+        /// 配置模板
+        /// </summary>
+        public string nodeTemplate { get; set; }
+
+
+        /// <summary>
+        /// 节点分类
+        /// </summary>
+        public int nodeKind { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetLogicNodeTreeVo.cs

@@ -0,0 +1,62 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 节点分类数据
+    /// </summary>
+    public class GetLogicNodeTreeVo
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string kindName { get; set; }
+
+
+        /// <summary>
+        /// 分类介绍
+        /// </summary>
+        public string kindDetail { get; set; }
+        
+
+
+        /// <summary>
+        /// 子节点
+        /// </summary>
+        public List<LogicNodeTreeItemVo> logicNodeList { get; set; }
+
+
+    }
+
+    public class LogicNodeTreeItemVo
+    {
+        /// <summary>
+        /// 节点名称
+        /// </summary>
+        public string nodeName { get; set; }
+
+
+        /// <summary>
+        /// 节点介绍
+        /// </summary>
+        public string nodeDetail { get; set; }
+
+
+        /// <summary>
+        /// 配置模板
+        /// </summary>
+        public string nodeTemplate { get; set; }
+
+
+        /// <summary>
+        /// 节点分类
+        /// </summary>
+        public int nodeKind { get; set; }
+    }
+}

Model/Vo/Admin/GetLogicProjectQueryVo.cs

@@ -1,4 +1,3 @@
-using Model;
 using Newtonsoft.Json;
 
 namespace Vo.Admin
@@ -59,7 +58,7 @@ namespace Vo.Admin
         /// <summary>
         /// 配置数据
         /// </summary>
-        public List<LogicProjectProcess> setData { get; set; }
+        public string setData { get; set; }
 
 
 

Services/IService/ILogicNodeKindService.cs

@@ -0,0 +1,28 @@
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
+
+namespace Services
+{
+    public interface ILogicNodeKindService : IBaseService<LogicNodeKind>
+    {
+        /// <summary>
+        /// 逻辑节点分类-列表
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetLogicNodeKindListVo> getLogicNodeKindList([FromQuery] PagerInfo page);
+
+
+        /// <summary>
+        /// 逻辑节点分类-节点分类数据
+        /// </summary>
+        /// <returns>节点分类数据</returns>
+        List<GetLogicNodeTreeVo> getLogicNodeTree(List<LogicNode> nodes);
+
+
+
+    }
+}

Services/IService/ILogicNodeService.cs

@@ -1,12 +1,22 @@
 using Model;
 using Model.Base;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
 
 
 namespace Services
 {
     public interface ILogicNodeService : IBaseService<LogicNode>
     {
+        /// <summary>
+        /// 逻辑节点-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetLogicNodeListVo> getLogicNodeList([FromQuery] PagerInfo page, [FromQuery] LogicNode param);
+
+
 
     }
 }

Services/LogicNodeKindService.cs

@@ -0,0 +1,58 @@
+using Attribute;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+using Mapster;
+
+
+namespace Services
+{
+    /// <summary>
+    /// 逻辑节点分类Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(ILogicNodeKindService), ServiceLifetime = LifeTime.Transient)]
+    public class LogicNodeKindService : BaseService<LogicNodeKind>, ILogicNodeKindService
+    {
+        /// <summary>
+        /// 逻辑节点分类-列表
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetLogicNodeKindListVo> getLogicNodeKindList([FromQuery] PagerInfo page)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<LogicNodeKind>();
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<LogicNodeKind, GetLogicNodeKindListVo>(page);
+            return response;
+        }
+
+
+        /// <summary>
+        /// 逻辑节点分类-节点分类数据
+        /// </summary>
+        /// <param name="page">分页参数</param>
+        /// <returns>节点分类数据</returns>
+        public List<GetLogicNodeTreeVo> getLogicNodeTree(List<LogicNode> nodes)
+        {
+            var response = GetList().Adapt<List<GetLogicNodeTreeVo>>();
+            foreach(var kind in response)
+            {
+                var nodeList = nodes
+                    .Where(m => m.nodeKind == kind.id)
+                    .ToList()
+                    .Adapt<List<LogicNodeTreeItemVo>>();
+                kind.logicNodeList = nodeList;
+            }
+            return response;
+        }
+
+
+
+    }
+}

Services/LogicNodeService.cs

@@ -4,16 +4,36 @@ using Model.Base;
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
 
 
 namespace Services
 {
     /// <summary>
-    /// 逻辑节点配置Service业务层处理
+    /// 逻辑节点Service业务层处理
     /// </summary>
     [AppService(ServiceType = typeof(ILogicNodeService), ServiceLifetime = LifeTime.Transient)]
     public class LogicNodeService : BaseService<LogicNode>, ILogicNodeService
     {
+        /// <summary>
+        /// 逻辑节点-列表
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetLogicNodeListVo> getLogicNodeList([FromQuery] PagerInfo page, [FromQuery] LogicNode param)
+        {
+            //拼装查询条件
+            var predicate = Expressionable.Create<LogicNode>();
+            predicate = predicate.AndIF(param.nodeKind > 0, m => m.nodeKind == param.nodeKind);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .ToPage<LogicNode, GetLogicNodeListVo>(page);
+            return response;
+        }
+
+
 
     }
 }

appsettings.Development.json

@@ -14,8 +14,8 @@
         "Group": "DEFAULT"
       }
     ],
-    "Namespace": "3844cb7b-89e8-40d8-b9b0-082da19c0806",
-    "ServerAddresses": [ "http://nacos-csharp.kexiaoshuang.com/" ],
+    "Namespace": "063782d2-102a-435d-9355-b96294bb62e1",
+    "ServerAddresses": [ "http://test-nacos-csharp.kexiaoshuang.com/" ],
     "ServiceName": "omega_logic",
     "GroupName": "DEFAULT",
     "Ip": "",