-
-
Notifications
You must be signed in to change notification settings - Fork 613
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #91 from ZhouYixun/beta2
rc
- Loading branch information
Showing
22 changed files
with
314 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 53 additions & 41 deletions
94
...ntroller/models/http/DevicePwdChange.java → ...oller/models/http/DeviceDetailChange.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,53 @@ | ||
| package com.sonic.controller.models.http; | ||
|
|
||
| import io.swagger.annotations.ApiModel; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
|
|
||
| import javax.validation.constraints.NotNull; | ||
| import javax.validation.constraints.Positive; | ||
|
|
||
| @ApiModel("更新设备密码请求模型") | ||
| public class DevicePwdChange { | ||
| @Positive | ||
| @ApiModelProperty(value = "设备id", required = true, example = "1") | ||
| private int id; | ||
| @NotNull | ||
| @ApiModelProperty(value = "设备安装密码", required = true, example = "123456") | ||
| private String password; | ||
|
|
||
| public int getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(int id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public void setPassword(String password) { | ||
| this.password = password; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "DevicePwdChange{" + | ||
| "id=" + id + | ||
| ", password='" + password + '\'' + | ||
| '}'; | ||
| } | ||
| } | ||
| package com.sonic.controller.models.http; | ||
|
|
||
| import io.swagger.annotations.ApiModel; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
|
|
||
| import javax.validation.constraints.NotNull; | ||
| import javax.validation.constraints.Positive; | ||
|
|
||
| @ApiModel("更新设备详情请求模型") | ||
| public class DeviceDetailChange { | ||
| @Positive | ||
| @ApiModelProperty(value = "设备id", required = true, example = "1") | ||
| private int id; | ||
| @NotNull | ||
| @ApiModelProperty(value = "设备安装密码", required = true, example = "123456") | ||
| private String password; | ||
| @NotNull | ||
| @ApiModelProperty(value = "设备备注", required = true, example = "123456") | ||
| private String nickName; | ||
|
|
||
| public int getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(int id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getPassword() { | ||
| return password; | ||
| } | ||
|
|
||
| public void setPassword(String password) { | ||
| this.password = password; | ||
| } | ||
|
|
||
| public String getNickName() { | ||
| return nickName; | ||
| } | ||
|
|
||
| public void setNickName(String nickName) { | ||
| this.nickName = nickName; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "DeviceDetailChange{" + | ||
| "id=" + id + | ||
| ", password='" + password + '\'' + | ||
| ", nickName='" + nickName + '\'' + | ||
| '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.