规则链适配

280780363 · Nov 17, 2022 · 2cd47cb · 2cd47cb
1 parent 4c0463b
commit 2cd47cb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/IoTSharp/Controllers/RulesController.cs b/IoTSharp/Controllers/RulesController.cs
@@ -687,7 +687,7 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 FlowRule = rule,
                                 Flowname = item.name,
                                 bpmnid = item.nodeId,
-                                FlowType = item.nodetype,
+                                FlowType = item.@namespace,
                                 FlowStatus = 1,
                                 CreateId = CreatorId,
                                 Createor = profile.Id,
@@ -696,7 +696,7 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 Tenant = rule.Tenant,
 
                                 FlowClass = item.@class,
-                                FlowNameSpace = item.@namespace,
+                                FlowNameSpace = item.nodetype,
                                 FlowIcon = item.icon,
                                 Top = item.top,
                                 Left = item.left
@@ -712,9 +712,9 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 FlowRule = rule,
                                 Flowname = item.name,
                                 bpmnid = item.nodeId,
-                                FlowType = item.nodetype,
+                                FlowType = item.@namespace,
                                 NodeProcessParams = item.content,
-              
+
                                 NodeProcessClass = item.mata,
                                 FlowStatus = 1,
                                 CreateId = CreatorId,
@@ -724,9 +724,9 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 Tenant = rule.Tenant,
 
                                 FlowClass = item.@class,
-                                FlowNameSpace = item.@namespace,
+                                FlowNameSpace = item.nodetype,
                                 FlowIcon = item.icon,
-                                Top=item.top,
+                                Top = item.top,
                                 Left = item.left
                             };
                             _context.Flows.AddRange(node);
@@ -740,7 +740,7 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 FlowRule = rule,
                                 Flowname = item.name,
                                 bpmnid = item.nodeId,
-                                FlowType = item.nodetype,
+                                FlowType = item.@namespace,
                                 NodeProcessScript = item.content,
                                 NodeProcessScriptType = item.mata,
                                 FlowStatus = 1,
@@ -751,7 +751,7 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                                 Tenant = rule.Tenant,
 
                                 FlowClass = item.@class,
-                                FlowNameSpace = item.@namespace,
+                                FlowNameSpace = item.nodetype,
                                 FlowIcon = item.icon,
                                 Top = item.top,
                                 Left = item.left
@@ -774,10 +774,11 @@ public ApiResult<bool> SaveDiagramV(ModelDiagram m)
                     FlowRule = rule,
                     Flowname = item.linename,
                     bpmnid = item.lineId,
-                    FlowType = "line",
+                    FlowType = item.@namespace,
                     TargetId = item.targetId,
                     SourceId = item.sourceId,
                     Conditionexpression = item.condition,
+                    FlowNameSpace = "line",
                     FlowStatus = 1,
                     CreateId = CreatorId,
                     Createor = profile.Id,
@@ -806,7 +807,7 @@ public async Task<ApiResult<ModelDiagram>> GetDiagramV(Guid id)
             m.nodes = new List<NodeObject>();
             foreach (var item in flows)
             {
-                switch (item.FlowType)
+                switch (item.FlowNameSpace)
                 {
                     case "line":
                         {
@@ -883,6 +884,7 @@ public async Task<ApiResult<ModelDiagram>> GetDiagramV(Guid id)
         }
 
 
+
         [HttpGet]
         public async Task<ApiResult<Activity>> GetDiagram(Guid id)
         {

diff --git a/IoTSharp/IoTSharp.xml b/IoTSharp/IoTSharp.xml
diff --git a/IoTSharp/Models/Rule/ModelWorkFlow.cs b/IoTSharp/Models/Rule/ModelWorkFlow.cs
@@ -30,6 +30,7 @@ public class LineObject
         public string linename { get; set; }
         public string condition { get; set; }
         public string lineId { get; set; }
+        public string @namespace { get; set; }
     }