事件列表修改

IoTSharp.TaskAction/MessagePullExcutor.cs

@@ -52,36 +52,47 @@ namespace IoTSharp.TaskAction
 
         private TaskActionOutput SendData(TaskActionInput input)
         {
-            JObject o = JsonConvert.DeserializeObject(input.Input) as JObject;
-            var config = JsonConvert.DeserializeObject<ModelExecutorConfig>(input.ExecutorConfig);
-            var dd = o.Properties().Select(c => new ParamObject { keyName = c.Name, value = JPropertyToObject(c) }).ToList();
-
-            string contentType = "application/json";
-            var restclient = new RestClient(config.BaseUrl);
-            var request = new RestRequest(config.Url+(input.DeviceId==Guid.Empty ?"":"/"+input.DeviceId), Method.POST);
-            request.AddHeader("X-Access-Token",
-                config.Token);
-            request.RequestFormat = DataFormat.Json;
-            request.AddHeader("cache-control", "no-cache");
-            request.AddJsonBody(JsonConvert.SerializeObject(dd));
-            var response = restclient.Execute(request);
-            if (response.StatusCode == HttpStatusCode.OK)
+
+
+            try
             {
-                var result = JsonConvert.DeserializeObject<MessagePullResult>(response.Content);
-                if (result != null && result.success)
+                JObject o = JsonConvert.DeserializeObject(input.Input) as JObject;
+                var config = JsonConvert.DeserializeObject<ModelExecutorConfig>(input.ExecutorConfig);
+                var dd = o.Properties().Select(c => new ParamObject { keyName = c.Name, value = JPropertyToObject(c) }).ToList();
+                string contentType = "application/json";
+                var restclient = new RestClient(config.BaseUrl);
+                var request = new RestRequest(config.Url + (input.DeviceId == Guid.Empty ? "" : "/" + input.DeviceId), Method.POST);
+                request.AddHeader("X-Access-Token",
+                    config.Token);
+                request.RequestFormat = DataFormat.Json;
+                request.AddHeader("cache-control", "no-cache");
+                request.AddJsonBody(JsonConvert.SerializeObject(dd));
+                var response = restclient.Execute(request);
+                if (response.StatusCode == HttpStatusCode.OK)
                 {
-                     return new TaskActionOutput() { ExecutionInfo = result.message, ExecutionStatus = result.success , DynamicOutput = input .DynamicInput}; ;
+                    var result = JsonConvert.DeserializeObject<MessagePullResult>(response.Content);
+                    if (result != null && result.success)
+                    {
+                        return new TaskActionOutput() { ExecutionInfo = result.message, ExecutionStatus = result.success, DynamicOutput = input.DynamicInput }; ;
+                    }
+                    else
+                    {
+                        return new TaskActionOutput() { ExecutionInfo = result.message, ExecutionStatus = result.success }; ;
+                    }
                 }
                 else
                 {
-                    return new TaskActionOutput() { ExecutionInfo = result.message, ExecutionStatus = result.success }; ;
+                    return new TaskActionOutput() { ExecutionInfo = response.ErrorMessage, ExecutionStatus = false }; ;
                 }
+
             }
-            else
+            catch (Exception ex)
             {
-                return new TaskActionOutput() { ExecutionInfo = response.ErrorMessage,  ExecutionStatus = false}; ;
+                return new TaskActionOutput() { ExecutionInfo = ex.Message, ExecutionStatus = false }; ;
             }
 
+          
+
 
 
         }

IoTSharp/ClientApp/src/app/routes/flow/flowevents/flowevents.component.html

@@ -61,9 +61,15 @@
         </nz-dropdown-menu>
       </ng-container>
   
-      <st #st [columns]="columns" [data]="url" ps="10" [page]="page" [req]="req" [res]="res">
-        <ng-template st-row="rulestatus" let-i>
-          <nz-badge [nzStatus]="i.statusType" [nzText]="i.statusText"></nz-badge>
+      <st #st [columns]="columns" [data]="url" ps="10" [page]="page" [req]="req" [res]="res"   [expand]="expand" expandAccordion>
+        <ng-template #expand let-item let-index="index" let-column="column">
+          <nz-card nzTitle="描述">
+            {{ item.eventDesc }}
+          </nz-card>
+          <nz-card nzTitle="输入值">
+            {{ item.mataData }}
+          </nz-card>
+     
         </ng-template>
       </st>
     </nz-card>

IoTSharp/ClientApp/src/app/routes/flow/flowevents/flowevents.component.ts

@@ -59,7 +59,6 @@ export class FloweventsComponent implements OnInit {
   columns: STColumn[] = [
     { title: '', index: 'eventId', type: 'checkbox' },
     { title: '事件名称', index: 'eventName', render: 'name' },
-    { title: '备注', index: 'eventDesc' },
     { title: '类型', index: 'type',type:'tag',tag: this.TAG },
     { title: '触发规则', index: 'name' },
     { title: '事件源', index: 'creatorName' },

IoTSharp/Controllers/HomeController.cs

@@ -14,7 +14,7 @@ namespace IoTSharp.Controllers
     [ApiController]
     public class HomeController :  ControllerBase
     {
-        public new ApiResult<HomeDto> Index()
+        public  ApiResult<HomeDto> Index()
         {