Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IoTSharp
IoTSharp
提交
5866a8ad
IoTSharp
项目概览
IoTSharp
/
IoTSharp
12 个月 前同步成功
通知
15
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
IoTSharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5866a8ad
编写于
3月 29, 2022
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/IoTSharp/IoTSharp
上级
66d597e4
cfab60fb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
214 addition
and
13 deletion
+214
-13
IoTSharp.TaskAction/ITaskAction.cs
IoTSharp.TaskAction/ITaskAction.cs
+1
-1
IoTSharp.TaskAction/TelemetryArrayPullExcutor.cs
IoTSharp.TaskAction/TelemetryArrayPullExcutor.cs
+199
-0
IoTSharp/Controllers/RulesController.cs
IoTSharp/Controllers/RulesController.cs
+4
-1
IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
+10
-11
未找到文件。
IoTSharp.TaskAction/ITaskAction.cs
浏览文件 @
5866a8ad
...
...
@@ -78,7 +78,7 @@ namespace IoTSharp.TaskAction
set
{
_value
=
value
;
_DynamicOutput
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
_value
,
expConverter
);
_DynamicOutput
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
_value
,
expConverter
);
}
}
}
...
...
IoTSharp.TaskAction/TelemetryArrayPullExcutor.cs
0 → 100644
浏览文件 @
5866a8ad
using
System
;
using
System.Collections.Generic
;
using
System.ComponentModel
;
using
System.Linq
;
using
System.Net
;
using
System.Text
;
using
System.Threading.Tasks
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Linq
;
using
RestSharp
;
namespace
IoTSharp.TaskAction
{
[
DisplayName
(
"用于遥测数组推送的执行器"
)]
public
class
TelemetryArrayPullExcutor
:
ITaskAction
{
public
TelemetryArrayPullExcutor
()
{
}
public
override
Task
<
TaskActionOutput
>
ExecuteAsync
(
TaskActionInput
input
)
{
try
{
// var cache = this.ServiceProvider.GetService(typeof(IMemoryCache)) as IMemoryCache;
return
SendData
(
input
);
}
catch
(
Exception
ex
)
{
return
Task
.
FromResult
(
new
TaskActionOutput
()
{
ExecutionInfo
=
ex
.
Message
,
ExecutionStatus
=
false
});
}
}
private
void
Login
(
ModelExecutorConfig
config
)
{
}
private
async
Task
<
TaskActionOutput
>
SendData
(
TaskActionInput
input
)
{
try
{
var
config
=
JsonConvert
.
DeserializeObject
<
ModelExecutorConfig
>(
input
.
ExecutorConfig
);
var
restclient
=
new
RestClient
(
config
.
BaseUrl
);
restclient
.
AddDefaultHeader
(
KnownHeaders
.
Accept
,
"*/*"
);
var
request
=
new
RestRequest
(
config
.
Url
+
(
input
.
DeviceId
==
Guid
.
Empty
?
""
:
"/"
+
input
.
DeviceId
));
request
.
AddHeader
(
"X-Access-Token"
,
config
.
Token
);
request
.
RequestFormat
=
DataFormat
.
Json
;
request
.
AddHeader
(
"cache-control"
,
"no-cache"
);
request
.
AddHeader
(
"Content-Type"
,
"application/json"
);
request
.
AddJsonBody
(
JsonConvert
.
DeserializeObject
(
input
.
Input
));
var
response
=
await
restclient
.
ExecutePostAsync
(
request
);
if
(
response
.
StatusCode
==
HttpStatusCode
.
OK
)
{
var
result
=
JsonConvert
.
DeserializeObject
<
MessagePullResult
>(
response
.
Content
);
if
(
result
is
{
success
:
true
})
{
return
new
TaskActionOutput
()
{
ExecutionInfo
=
response
.
Content
,
ExecutionStatus
=
result
.
success
,
DynamicOutput
=
input
.
DynamicInput
};
;
}
else
{
return
new
TaskActionOutput
()
{
ExecutionInfo
=
response
.
Content
,
ExecutionStatus
=
false
};
;
}
}
else
{
return
new
TaskActionOutput
()
{
ExecutionInfo
=
$"StatusCode:
{
response
.
StatusCode
}
StatusDescription:
{
response
.
StatusDescription
}
{
response
.
ErrorMessage
}
"
,
ExecutionStatus
=
false
};
}
}
catch
(
Exception
ex
)
{
return
new
TaskActionOutput
()
{
ExecutionInfo
=
ex
.
Message
,
ExecutionStatus
=
false
};
;
}
}
public
static
object
JPropertyToObject
(
JProperty
property
)
{
object
obj
=
null
;
switch
(
property
.
Value
.
Type
)
{
case
JTokenType
.
Integer
:
obj
=
property
.
Value
.
ToObject
<
int
>();
break
;
case
JTokenType
.
Float
:
obj
=
property
.
Value
.
ToObject
<
float
>();
break
;
case
JTokenType
.
String
:
obj
=
property
.
Value
.
ToObject
<
string
>();
break
;
case
JTokenType
.
Boolean
:
obj
=
property
.
Value
.
ToObject
<
bool
>();
break
;
case
JTokenType
.
Date
:
obj
=
property
.
Value
.
ToObject
<
DateTime
>();
break
;
case
JTokenType
.
Bytes
:
obj
=
property
.
Value
.
ToObject
<
byte
[
]>
();
break
;
case
JTokenType
.
Guid
:
obj
=
property
.
Value
.
ToObject
<
Guid
>();
break
;
case
JTokenType
.
Uri
:
obj
=
property
.
Value
.
ToObject
<
Uri
>();
break
;
case
JTokenType
.
TimeSpan
:
obj
=
property
.
Value
.
ToObject
<
TimeSpan
>();
break
;
default
:
obj
=
property
.
Value
;
break
;
}
return
obj
;
}
class
MessagePullResult
{
public
bool
success
{
get
;
set
;
}
public
string
message
{
get
;
set
;
}
public
string
code
{
get
;
set
;
}
public
long
timestamp
{
get
;
set
;
}
public
dynamic
result
{
get
;
set
;
}
}
public
class
LoginParam
{
}
public
class
ParamObject
{
public
string
keyName
{
get
;
set
;
}
public
dynamic
value
{
get
;
set
;
}
}
class
ModelExecutorConfig
{
public
string
Url
{
get
;
set
;
}
public
string
BaseUrl
{
get
;
set
;
}
public
string
Method
{
get
;
set
;
}
public
string
Password
{
get
;
set
;
}
public
string
UserName
{
get
;
set
;
}
public
string
Token
{
get
;
set
;
}
}
}
}
IoTSharp/Controllers/RulesController.cs
浏览文件 @
5866a8ad
...
...
@@ -1112,7 +1112,10 @@ namespace IoTSharp.Controllers
var
__ruleid
=
obj
.
Value
<
string
>();
var
ruleid
=
Guid
.
Parse
(
__ruleid
);
var
d
=
formdata
.
Value
<
JToken
>().
ToObject
(
typeof
(
ExpandoObject
));
var
d
=
formdata
.
Value
<
JToken
>().
ToObject
<
object
>();
var
testabizId
=
Guid
.
NewGuid
().
ToString
();
//根据业务保存起来,用来查询执行事件和步骤
var
result
=
await
_flowRuleProcessor
.
RunFlowRules
(
ruleid
,
d
,
Guid
.
Empty
,
EventType
.
TestPurpose
,
testabizId
);
...
...
IoTSharp/FlowRuleEngine/FlowRuleProcessor.cs
浏览文件 @
5866a8ad
...
...
@@ -10,7 +10,6 @@ using Microsoft.Extensions.Options;
using
Newtonsoft.Json
;
using
System
;
using
System.Collections.Generic
;
using
System.Dynamic
;
using
System.Linq
;
using
System.Threading.Tasks
;
...
...
@@ -288,7 +287,7 @@ namespace IoTSharp.FlowRuleEngine
try
{
string
result
=
pse
.
Do
(
scriptsrc
,
taskoperation
.
Data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
catch
(
Exception
ex
)
{
...
...
@@ -307,7 +306,7 @@ namespace IoTSharp.FlowRuleEngine
{
try
{
string
result
=
pse
.
Do
(
scriptsrc
,
taskoperation
.
Data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
catch
(
Exception
ex
)
{
...
...
@@ -329,7 +328,7 @@ namespace IoTSharp.FlowRuleEngine
try
{
string
result
=
lua
.
Do
(
scriptsrc
,
taskoperation
.
Data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
catch
(
Exception
ex
)
{
...
...
@@ -351,7 +350,7 @@ namespace IoTSharp.FlowRuleEngine
try
{
string
result
=
js
.
Do
(
scriptsrc
,
taskoperation
.
Data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
catch
(
Exception
ex
)
...
...
@@ -375,7 +374,7 @@ namespace IoTSharp.FlowRuleEngine
{
string
result
=
js
.
Do
(
scriptsrc
,
taskoperation
.
Data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
catch
(
Exception
ex
)
{
...
...
@@ -611,7 +610,7 @@ namespace IoTSharp.FlowRuleEngine
using
(
var
pse
=
_sp
.
GetRequiredService
<
PythonScriptEngine
>())
{
string
result
=
pse
.
Do
(
scriptsrc
,
data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
}
break
;
...
...
@@ -621,7 +620,7 @@ namespace IoTSharp.FlowRuleEngine
using
(
var
pse
=
_sp
.
GetRequiredService
<
SQLEngine
>())
{
string
result
=
pse
.
Do
(
scriptsrc
,
data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
}
...
...
@@ -632,7 +631,7 @@ namespace IoTSharp.FlowRuleEngine
using
(
var
lua
=
_sp
.
GetRequiredService
<
LuaScriptEngine
>())
{
string
result
=
lua
.
Do
(
scriptsrc
,
data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
}
break
;
...
...
@@ -642,7 +641,7 @@ namespace IoTSharp.FlowRuleEngine
using
(
var
js
=
_sp
.
GetRequiredService
<
JavaScriptEngine
>())
{
string
result
=
js
.
Do
(
scriptsrc
,
data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
}
break
;
...
...
@@ -652,7 +651,7 @@ namespace IoTSharp.FlowRuleEngine
using
(
var
js
=
_sp
.
GetRequiredService
<
CSharpScriptEngine
>())
{
string
result
=
js
.
Do
(
scriptsrc
,
data
);
obj
=
JsonConvert
.
DeserializeObject
<
ExpandoO
bject
>(
result
);
obj
=
JsonConvert
.
DeserializeObject
<
o
bject
>(
result
);
}
}
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录