Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
IoTSharp
提交
62fa128b
I
IoTSharp
项目概览
jobily
/
IoTSharp
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
IoTSharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
62fa128b
编写于
10月 25, 2021
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修正 重复错误
上级
0de66de5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
16 deletion
+10
-16
IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoT.Sharp.Hub.nswag
IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoT.Sharp.Hub.nswag
+2
-2
IoTSharp/Controllers/DevicesController.cs
IoTSharp/Controllers/DevicesController.cs
+7
-9
IoTSharp/IoTSharp.xml
IoTSharp/IoTSharp.xml
+1
-5
未找到文件。
IoTSharp.SDKs/IoTSharp.Sdk.CSharp/IoT.Sharp.Hub.nswag
浏览文件 @
62fa128b
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
IoTSharp/Controllers/DevicesController.cs
浏览文件 @
62fa128b
...
@@ -62,8 +62,8 @@ namespace IoTSharp.Controllers
...
@@ -62,8 +62,8 @@ namespace IoTSharp.Controllers
/// </summary>
/// </summary>
/// <param name="customerId"></param>
/// <param name="customerId"></param>
/// <returns></returns>
/// <returns></returns>
// GET: api/
Devices
// GET: api/
Customers/All
[
HttpGet
(
"
Customers
"
)]
[
HttpGet
(
"
Devices/Customers/All
"
)]
[
Authorize
(
Roles
=
nameof
(
UserRole
.
NormalUser
))]
[
Authorize
(
Roles
=
nameof
(
UserRole
.
NormalUser
))]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesResponseType
(
typeof
(
ApiResult
<
Guid
>),
StatusCodes
.
Status404NotFound
)]
[
ProducesResponseType
(
typeof
(
ApiResult
<
Guid
>),
StatusCodes
.
Status404NotFound
)]
...
@@ -85,7 +85,7 @@ namespace IoTSharp.Controllers
...
@@ -85,7 +85,7 @@ namespace IoTSharp.Controllers
/// 获取指定客户的设备列表
/// 获取指定客户的设备列表
/// </summary>
/// </summary>
/// <returns></returns>
/// <returns></returns>
// GET: api/Devices
// GET: api/Devices
/Customers
[
HttpGet
(
"Customers"
)]
[
HttpGet
(
"Customers"
)]
[
Authorize
(
Roles
=
nameof
(
UserRole
.
NormalUser
))]
[
Authorize
(
Roles
=
nameof
(
UserRole
.
NormalUser
))]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
...
@@ -589,8 +589,6 @@ namespace IoTSharp.Controllers
...
@@ -589,8 +589,6 @@ namespace IoTSharp.Controllers
{
{
var
attributes
=
from
dev
in
_context
.
AttributeLatest
where
dev
.
DeviceId
==
deviceId
select
dev
;
var
attributes
=
from
dev
in
_context
.
AttributeLatest
where
dev
.
DeviceId
==
deviceId
select
dev
;
var
fs
=
from
at
in
await
attributes
.
ToListAsync
()
where
at
.
DataSide
==
dataSide
&&
keys
.
Split
(
','
,
options
:
StringSplitOptions
.
RemoveEmptyEntries
).
Contains
(
at
.
KeyName
)
select
at
;
var
fs
=
from
at
in
await
attributes
.
ToListAsync
()
where
at
.
DataSide
==
dataSide
&&
keys
.
Split
(
','
,
options
:
StringSplitOptions
.
RemoveEmptyEntries
).
Contains
(
at
.
KeyName
)
select
at
;
return
Ok
(
fs
.
ToArray
());
return
Ok
(
new
ApiResult
<
AttributeLatest
[
]>
(
ApiCode
.
Success
,
"Ok"
,
fs
.
ToArray
()));
return
Ok
(
new
ApiResult
<
AttributeLatest
[
]>
(
ApiCode
.
Success
,
"Ok"
,
fs
.
ToArray
()));
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
...
@@ -635,9 +633,9 @@ namespace IoTSharp.Controllers
...
@@ -635,9 +633,9 @@ namespace IoTSharp.Controllers
[
HttpGet
(
"SessionStatus"
)]
[
HttpGet
(
"SessionStatus"
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesDefaultResponseType
]
[
ProducesDefaultResponseType
]
public
async
Task
<
A
ction
Result
<
IList
<
IMqttSessionStatus
>>>
GetSessionStatus
(
Guid
deviceId
)
public
async
Task
<
A
pi
Result
<
IList
<
IMqttSessionStatus
>>>
GetSessionStatus
(
Guid
deviceId
)
{
{
return
Ok
(
new
ApiResult
<
IList
<
IMqttSessionStatus
>>(
ApiCode
.
Success
,
"OK"
,
await
_serverEx
.
GetSessionStatusAsync
()
));
return
new
ApiResult
<
IList
<
IMqttSessionStatus
>>(
ApiCode
.
Success
,
"OK"
,
await
_serverEx
.
GetSessionStatusAsync
(
));
}
}
/// <summary>
/// <summary>
/// SessionStatus
/// SessionStatus
...
@@ -648,9 +646,9 @@ namespace IoTSharp.Controllers
...
@@ -648,9 +646,9 @@ namespace IoTSharp.Controllers
[
HttpGet
(
"ClientStatus"
)]
[
HttpGet
(
"ClientStatus"
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesResponseType
(
StatusCodes
.
Status200OK
)]
[
ProducesDefaultResponseType
]
[
ProducesDefaultResponseType
]
public
async
Task
<
A
ction
Result
<
IList
<
IMqttClientStatus
>>>
GetClientStatus
(
Guid
deviceId
)
public
async
Task
<
A
pi
Result
<
IList
<
IMqttClientStatus
>>>
GetClientStatus
(
Guid
deviceId
)
{
{
return
Ok
(
new
ApiResult
<
IList
<
IMqttClientStatus
>>(
ApiCode
.
Success
,
"OK"
,
await
_serverEx
.
GetClientStatusAsync
()
));
return
new
ApiResult
<
IList
<
IMqttClientStatus
>>(
ApiCode
.
Success
,
"OK"
,
await
_serverEx
.
GetClientStatusAsync
(
));
}
}
}
}
}
}
\ No newline at end of file
IoTSharp/IoTSharp.xml
浏览文件 @
62fa128b
...
@@ -95,28 +95,25 @@
...
@@ -95,28 +95,25 @@
<summary>
<summary>
返回用户信息
返回用户信息
</summary>
</summary>
<param
name=
"
customer
Id"
></param>
<param
name=
"Id"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:IoTSharp.Controllers.AccountController.Modify(IoTSharp.Dtos.UserItemDto)"
>
<member
name=
"M:IoTSharp.Controllers.AccountController.Modify(IoTSharp.Dtos.UserItemDto)"
>
<summary>
<summary>
修改用户信息
修改用户信息
</summary>
</summary>
<param
name=
"customerId"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:IoTSharp.Controllers.AccountController.ModifyMyInfo(IoTSharp.Dtos.UserItemDto)"
>
<member
name=
"M:IoTSharp.Controllers.AccountController.ModifyMyInfo(IoTSharp.Dtos.UserItemDto)"
>
<summary>
<summary>
修改当前用户信息
修改当前用户信息
</summary>
</summary>
<param
name=
"customerId"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:IoTSharp.Controllers.AccountController.ModifyMyPassword(IoTSharp.Dtos.UserPassword)"
>
<member
name=
"M:IoTSharp.Controllers.AccountController.ModifyMyPassword(IoTSharp.Dtos.UserPassword)"
>
<summary>
<summary>
修改当前用户信息
修改当前用户信息
</summary>
</summary>
<param
name=
"customerId"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"T:IoTSharp.Controllers.AuthorizedKeysController"
>
<member
name=
"T:IoTSharp.Controllers.AuthorizedKeysController"
>
...
@@ -146,7 +143,6 @@
...
@@ -146,7 +143,6 @@
<summary>
<summary>
获取指定租户下的所有客户
获取指定租户下的所有客户
</summary>
</summary>
<param
name=
"tenantId"
>
租户
</param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:IoTSharp.Controllers.CustomersController.GetCustomer(System.Guid)"
>
<member
name=
"M:IoTSharp.Controllers.CustomersController.GetCustomer(System.Guid)"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录