forked from WeBankFinTech/DataSphereStudio
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add workspace favorites and resolve conflicts
- Loading branch information
1 parent
d18a6a7
commit 4dadcfe
Showing
7 changed files
with
272 additions
and
3 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
65 changes: 65 additions & 0 deletions
65
...er/src/main/java/com/webank/wedatasphere/dss/server/dto/response/WorkspaceFavoriteVo.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 |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package com.webank.wedatasphere.dss.server.dto.response; | ||
|
|
||
| /** | ||
| * Created by Adamyuanyuan on 2020/6/25 | ||
| */ | ||
| public class WorkspaceFavoriteVo { | ||
| private Long id; | ||
|
|
||
| private Long menuApplicationId; | ||
|
|
||
| private String name; | ||
|
|
||
| private String url; | ||
|
|
||
| private String icon; | ||
|
|
||
| private String title; | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public Long getMenuApplicationId() { | ||
| return menuApplicationId; | ||
| } | ||
|
|
||
| public void setMenuApplicationId(Long menuApplicationId) { | ||
| this.menuApplicationId = menuApplicationId; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public void setUrl(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getIcon() { | ||
| return icon; | ||
| } | ||
|
|
||
| public void setIcon(String icon) { | ||
| this.icon = icon; | ||
| } | ||
|
|
||
| public String getTitle() { | ||
| return title; | ||
| } | ||
|
|
||
| public void setTitle(String title) { | ||
| this.title = title; | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
dss-server/src/main/java/com/webank/wedatasphere/dss/server/entity/DWSFavorite.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 |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.webank.wedatasphere.dss.server.entity; | ||
|
|
||
| /** | ||
| * Created by Adamyuanyuan on 2020/6/25 | ||
| */ | ||
| public class DWSFavorite extends BaseEntity{ | ||
|
|
||
| private Long id; | ||
|
|
||
| private String username; | ||
|
|
||
| private Long workspaceId; | ||
|
|
||
| private Long menuApplicationId; | ||
|
|
||
| private Integer order; | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getUsername() { | ||
| return username; | ||
| } | ||
|
|
||
| public void setUsername(String username) { | ||
| this.username = username; | ||
| } | ||
|
|
||
| public Long getWorkspaceId() { | ||
| return workspaceId; | ||
| } | ||
|
|
||
| public void setWorkspaceId(Long workspaceId) { | ||
| this.workspaceId = workspaceId; | ||
| } | ||
|
|
||
| public Long getMenuApplicationId() { | ||
| return menuApplicationId; | ||
| } | ||
|
|
||
| public void setMenuApplicationId(Long menuApplicationId) { | ||
| this.menuApplicationId = menuApplicationId; | ||
| } | ||
|
|
||
| public Integer getOrder() { | ||
| return order; | ||
| } | ||
|
|
||
| public void setOrder(Integer order) { | ||
| this.order = order; | ||
| } | ||
| } |
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.