Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
IoTSharp
提交
de6e9c5d
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,发现更多精彩内容 >>
提交
de6e9c5d
编写于
1月 06, 2019
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify api for tenans and customers
上级
5673d1e6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
8 deletion
+23
-8
IoTSharp.Hub/Controllers/CustomersController.cs
IoTSharp.Hub/Controllers/CustomersController.cs
+17
-8
IoTSharp.Hub/Controllers/InstallerController.cs
IoTSharp.Hub/Controllers/InstallerController.cs
+2
-0
IoTSharp.Hub/Controllers/TenantsController.cs
IoTSharp.Hub/Controllers/TenantsController.cs
+1
-0
IoTSharp.Hub/Data/Customer.cs
IoTSharp.Hub/Data/Customer.cs
+1
-0
IoTSharp.Hub/Data/Tenant.cs
IoTSharp.Hub/Data/Tenant.cs
+2
-0
未找到文件。
IoTSharp.Hub/Controllers/CustomersController.cs
浏览文件 @
de6e9c5d
...
...
@@ -20,11 +20,11 @@ namespace IoTSharp.Hub.Controllers
_context
=
context
;
}
// GET: api/
Customer
s
[
HttpGet
]
public
async
Task
<
ActionResult
<
IEnumerable
<
Customer
>>>
GetCustomer
(
)
// GET: api/
Tenant
s
[
HttpGet
(
"Tenant/{tenantId}"
)
]
public
async
Task
<
ActionResult
<
IEnumerable
<
Customer
>>>
GetCustomer
s
(
Guid
tenantId
)
{
return
await
_context
.
Customer
.
ToListAsync
();
return
(
await
_context
.
Tenant
.
FindAsync
(
tenantId
)).
Customers
?.
ToList
();
}
// GET: api/Customers/5
...
...
@@ -49,9 +49,13 @@ namespace IoTSharp.Hub.Controllers
{
return
BadRequest
();
}
var
tent
=
await
_context
.
Tenant
.
FindAsync
(
customer
.
Id
);
if
(
tent
==
null
)
{
return
NotFound
();
}
customer
.
Tenant
=
tent
;
_context
.
Entry
(
customer
).
State
=
EntityState
.
Modified
;
try
{
await
_context
.
SaveChangesAsync
();
...
...
@@ -75,10 +79,10 @@ namespace IoTSharp.Hub.Controllers
[
HttpPost
]
public
async
Task
<
ActionResult
<
Customer
>>
PostCustomer
(
Customer
customer
)
{
customer
.
Tenant
=
_context
.
Tenant
.
Find
(
customer
.
Tenant
.
Id
);
_context
.
Customer
.
Add
(
customer
);
await
_context
.
SaveChangesAsync
();
return
CreatedAtAction
(
"GetCustomer"
,
new
{
id
=
customer
.
Id
},
customer
);
return
await
GetCustomer
(
customer
.
Id
);
}
// DELETE: api/Customers/5
...
...
@@ -101,5 +105,10 @@ namespace IoTSharp.Hub.Controllers
{
return
_context
.
Customer
.
Any
(
e
=>
e
.
Id
==
id
);
}
public
class
TenantDto
{
public
Guid
Id
{
get
;
set
;
}
}
}
}
IoTSharp.Hub/Controllers/InstallerController.cs
浏览文件 @
de6e9c5d
...
...
@@ -92,6 +92,8 @@ namespace IoTSharp.Hub.Controllers
await
_signInManager
.
SignInAsync
(
user
,
false
);
await
_signInManager
.
UserManager
.
AddClaimAsync
(
user
,
new
Claim
(
ClaimTypes
.
Email
,
model
.
Email
));
await
_signInManager
.
UserManager
.
AddClaimAsync
(
user
,
new
Claim
(
ClaimTypes
.
GroupSid
,
customer
.
Id
.
ToString
()));
var
rship
=
new
Relationship
();
rship
.
IdentityUser
=
_context
.
Users
.
Find
(
user
.
Id
);
rship
.
Customer
=
customer
;
...
...
IoTSharp.Hub/Controllers/TenantsController.cs
浏览文件 @
de6e9c5d
...
...
@@ -27,6 +27,7 @@ namespace IoTSharp.Hub.Controllers
return
await
_context
.
Tenant
.
ToListAsync
();
}
// GET: api/Tenants/5
[
HttpGet
(
"{id}"
)]
public
async
Task
<
ActionResult
<
Tenant
>>
GetTenant
(
Guid
id
)
...
...
IoTSharp.Hub/Data/Customer.cs
浏览文件 @
de6e9c5d
...
...
@@ -20,6 +20,7 @@ namespace IoTSharp.Hub.Data
public
string
Address
{
get
;
set
;
}
public
int
ZipCode
{
get
;
set
;
}
public
Tenant
Tenant
{
get
;
set
;
}
[
Newtonsoft
.
Json
.
JsonIgnore
]
public
List
<
Device
>
Devices
{
get
;
set
;
}
}
}
IoTSharp.Hub/Data/Tenant.cs
浏览文件 @
de6e9c5d
...
...
@@ -19,7 +19,9 @@ namespace IoTSharp.Hub.Data
public
string
Street
{
get
;
set
;
}
public
string
Address
{
get
;
set
;
}
public
int
ZipCode
{
get
;
set
;
}
[
Newtonsoft
.
Json
.
JsonIgnore
]
public
List
<
Customer
>
Customers
{
get
;
set
;
}
[
Newtonsoft
.
Json
.
JsonIgnore
]
public
List
<
Device
>
Devices
{
get
;
set
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录