Skip to content

Commit f828d6a

Browse files
author
Schumi Yi
committed
complete part of workspace develop
1 parent 8c271a5 commit f828d6a

File tree

14 files changed

+875
-2
lines changed

14 files changed

+875
-2
lines changed

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ public class DSSServerConstant {
2222
public static final String DWS_PROJECT_FIRST_VERSION = "v000001";
2323
public static final String DWS_PROJECT_FIRST_VERSION_COMMENT = "first version";
2424
public static final String DWS_PROJECT_SOURCE = "create by user";
25+
public static final String DWS_WORKSPACE_SOURCE = "create by user";
2526
public static final String PROJECT_VERSION_ID = "projectVersionID";
2627
public static final String PUBLISH_FLOW_REPORT_FORMATE = "工作流名:%s,版本号:%s，工作流内容为空,请自行修改或者删除";
27-
public static final String EMVEDDEDFLOWID ="\"embeddedFlowId\":" ;
28+
public static final String EMVEDDEDFLOWID = "\"embeddedFlowId\":";
2829
public static final String VERSION_FORMAT = "%06d";
2930
public static final String VERSION_PREFIX = "v";
3031
}

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package com.webank.wedatasphere.dss.server.dao;
2+
3+
import com.webank.wedatasphere.dss.server.dto.response.*;
4+
import com.webank.wedatasphere.dss.server.entity.*;
5+
6+
import java.util.List;
7+
8+
/**
9+
* Created by schumiyi on 2020/6/22
10+
*/
11+
public interface WorkspaceMapper {
12+
13+
List<DWSWorkspace> getWorkspaces();
14+
15+
List<DWSWorkspace> findByWorkspaceName(String name);
16+
17+
void addWorkSpace(DWSWorkspace dwsWorkspace);
18+
19+
List<HomepageDemoMenuVo> getHomepageDemoMenusEn();
20+
List<HomepageDemoMenuVo> getHomepageDemoMenusCn();
21+
22+
List<HomepageDemoInstanceVo> getHomepageInstancesByMenuIdCn(Long id);
23+
List<HomepageDemoInstanceVo> getHomepageInstancesByMenuIdEn(Long id);
24+
25+
List<HomepageVideoVo> getHomepageVideosEn();
26+
List<HomepageVideoVo> getHomepageVideosCn();
27+
28+
DWSWorkspace getWorkspaceById(Long workspaceId);
29+
30+
List<OnestopMenuVo> getManagementMenuCn();
31+
List<OnestopMenuVo> getManagementMenuEn();
32+
33+
List<OnestopMenuVo> getApplicationMenuCn();
34+
List<OnestopMenuVo> getApplicationMenuEn();
35+
36+
List<OnestopMenuAppInstanceVo> getMenuAppInstancesCn(Long id);
37+
List<OnestopMenuAppInstanceVo> getMenuAppInstanceEn(Long id);
38+
39+
}

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!--
3+
~ Copyright 2019 WeBank
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
~
17+
-->
18+
19+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
20+
21+
<mapper namespace="com.webank.wedatasphere.dss.server.dao.WorkspaceMapper">
22+
23+
<sql id="workspace_main">
24+
id,`name`,`label`,`description`,`department`,`product`,`source`,`create_by`,`create_time`,`last_update_user`,`last_update_time`
25+
</sql>
26+
27+
<sql id="menu_appInstances_cn">
28+
m.`id`,m.`title_cn` AS `title`, m.`desc_cn` AS `description`,m.`labels_cn` AS `labels`,
29+
m.`access_button_cn` AS `access_button`,m.`manual_button_cn` AS `manualButton`,m.`is_active`,
30+
m.`manual_button_url`,m.`icon`,m.`order`,app.`homepage_url` AS `access_button_url`,app.project_url, app.`name`
31+
</sql>
32+
<sql id="menu_appInstances_en">
33+
m.`id`,m.`title_en` AS `title`, m.`desc_en` AS `description`,m.`labels_en` AS `labels`,
34+
m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`
35+
m.`manual_button_url`,m.`icon`,m.`order`,app.`homepage_url` AS `access_button_url`,app.project_url, app.`name`
36+
</sql>
37+
38+
39+
<select id="getWorkspaces" resultType="com.webank.wedatasphere.dss.server.entity.DWSWorkspace">
40+
SELECT *
41+
FROM dss_workspace
42+
ORDER BY dss_workspace.`create_time` DESC
43+
</select>
44+
45+
<select id="getWorkspaceById" resultType="com.webank.wedatasphere.dss.server.entity.DWSWorkspace">
46+
SELECT *
47+
FROM dss_workspace
48+
WHERE id = #{workspaceId}
49+
</select>
50+
51+
<select id="findByWorkspaceName" resultType="com.webank.wedatasphere.dss.server.entity.DWSWorkspace">
52+
SELECT *
53+
FROM dss_workspace
54+
<where>
55+
dss_workspace.`name` = #{name}
56+
</where>
57+
</select>
58+
59+
<insert id="addWorkSpace" useGeneratedKeys="true" keyProperty="id" parameterType="com.webank.wedatasphere.dss.server.entity.DWSWorkspace">
60+
INSERT INTO dss_workspace (<include refid = "workspace_main" />)
61+
VALUES
62+
(#{id},#{name},#{label},#{description},#{department},#{product},#{source},#{createBy},#{createTime},#{lastUpdateUser},#{lastUpdateTime})
63+
</insert>
64+
65+
<select id="getHomepageDemoMenusCn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo">
66+
SELECT `id`,`name`,`title_cn` AS title,`description`,`icon`,`order`
67+
FROM dss_homepage_demo_menu
68+
<where>
69+
`is_active` = 1
70+
</where>
71+
</select>
72+
<select id="getHomepageDemoMenusEn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageDemoMenuVo">
73+
SELECT `id`,`name`,`title_en` AS `title`,`description`,`icon`,`order`
74+
FROM dss_homepage_demo_menu
75+
<where>
76+
`is_active` = 1
77+
</where>
78+
</select>
79+
80+
<select id="getHomepageInstancesByMenuIdCn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageDemoInstanceVo">
81+
SELECT `id`,`menu_id`,`name`,`url`,`title_cn` AS `title`,`description`,`icon`,`order`
82+
FROM dss_homepage_demo_instance
83+
<where>
84+
`is_active` = 1 AND `menu_id` = #{id}
85+
</where>
86+
</select>
87+
<select id="getHomepageInstancesByMenuIdEn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageDemoInstanceVo">
88+
SELECT `id`,`menu_id`,`name`,`url`,`title_en` AS `title`,`description`,`icon`,`order`
89+
FROM dss_homepage_demo_instance
90+
<where>
91+
`is_active` = 1 AND `menu_id` = #{id}
92+
</where>
93+
</select>
94+
95+
<select id="getHomepageVideosCn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageVideoVo">
96+
SELECT `id`,`name`,`title_cn` AS `title`,`url`,`description`,`order`
97+
FROM dss_homepage_video
98+
<where>
99+
`is_active` = 1
100+
</where>
101+
</select>
102+
<select id="getHomepageVideosEn" resultType="com.webank.wedatasphere.dss.server.dto.response.HomepageVideoVo">
103+
SELECT `id`,`name`,`title_en` AS `title`,`url`,`description`,`order`
104+
FROM dss_homepage_video
105+
<where>
106+
`is_active` = 1
107+
</where>
108+
</select>
109+
110+
<select id="getManagementMenuCn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo">
111+
SELECT `id`,`name`,`title_cn` AS `title`,`order`
112+
FROM dss_onestop_menu
113+
<where>
114+
`is_active` = 0
115+
</where>
116+
</select>
117+
<select id="getManagementMenuEn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo">
118+
SELECT `id`,`name`,`title_en` AS `title`,`order`
119+
FROM dss_onestop_menu
120+
<where>
121+
`is_active` = 0
122+
</where>
123+
</select>
124+
125+
<select id="getApplicationMenuCn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo">
126+
SELECT `id`,`name`,`title_cn` AS `title`,`order`
127+
FROM dss_onestop_menu
128+
<where>
129+
`is_active` = 1
130+
</where>
131+
</select>
132+
<select id="getApplicationMenuEn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuVo">
133+
SELECT `id`,`name`,`title_en` AS `title`,`order`
134+
FROM dss_onestop_menu
135+
<where>
136+
`is_active` = 1
137+
</where>
138+
</select>
139+
140+
<select id="getMenuAppInstancesCn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuAppInstanceVo">
141+
SELECT <include refid = "menu_appInstances_cn"/>
142+
FROM dss_onestop_menu_application m
143+
LEFT JOIN dss_application app
144+
ON m.`application_id` = app.`id`
145+
<where>
146+
m.`onestop_menu_id` = #{id}
147+
</where>
148+
</select>
149+
<select id="getMenuAppInstancesEn" resultType="com.webank.wedatasphere.dss.server.dto.response.OnestopMenuAppInstanceVo">
150+
SELECT <include refid = "menu_appInstances_en"/>
151+
FROM dss_onestop_menu_application m
152+
LEFT JOIN dss_application app
153+
ON m.`application_id` = app.`id`
154+
<where>
155+
m.`onestop_menu_id` = #{id}
156+
</where>
157+
</select>
158+
</mapper>

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/HomepageDemoInstanceVo.java‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package com.webank.wedatasphere.dss.server.dto.response;
2+
3+
/**
4+
* Created by schumiyi on 2020/6/23
5+
*/
6+
public class HomepageDemoInstanceVo {
7+
8+
private Long id;
9+
private Long menuId;
10+
private String name;
11+
private String url;
12+
private String title;
13+
private String description;
14+
private String icon;
15+
private Integer order;
16+
17+
public Long getId() {
18+
return id;
19+
}
20+
21+
public void setId(Long id) {
22+
this.id = id;
23+
}
24+
25+
public Long getMenuId() {
26+
return menuId;
27+
}
28+
29+
public void setMenuId(Long menuId) {
30+
this.menuId = menuId;
31+
}
32+
33+
public String getName() {
34+
return name;
35+
}
36+
37+
public void setName(String name) {
38+
this.name = name;
39+
}
40+
41+
public String getUrl() {
42+
return url;
43+
}
44+
45+
public void setUrl(String url) {
46+
this.url = url;
47+
}
48+
49+
public String getTitle() {
50+
return title;
51+
}
52+
53+
public void setTitle(String title) {
54+
this.title = title;
55+
}
56+
57+
public String getDescription() {
58+
return description;
59+
}
60+
61+
public void setDescription(String description) {
62+
this.description = description;
63+
}
64+
65+
public String getIcon() {
66+
return icon;
67+
}
68+
69+
public void setIcon(String icon) {
70+
this.icon = icon;
71+
}
72+
73+
public Integer getOrder() {
74+
return order;
75+
}
76+
77+
public void setOrder(Integer order) {
78+
this.order = order;
79+
}
80+
}

‎dss-server/src/main/java/com/webank/wedatasphere/dss/server/dto/response/HomepageDemoMenuVo.java‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
package com.webank.wedatasphere.dss.server.dto.response;
2+
3+
import java.util.List;
4+
5+
/**
6+
* Created by schumiyi on 2020/6/23
7+
*/
8+
public class HomepageDemoMenuVo {
9+
10+
private Long id;
11+
private String name;
12+
private String title;
13+
private String description;
14+
private String icon;
15+
private Integer order;
16+
private List<HomepageDemoInstanceVo> demoInstances;
17+
18+
public Long getId() {
19+
return id;
20+
}
21+
22+
public void setId(Long id) {
23+
this.id = id;
24+
}
25+
26+
public String getName() {
27+
return name;
28+
}
29+
30+
public void setName(String name) {
31+
this.name = name;
32+
}
33+
34+
public String getTitle() {
35+
return title;
36+
}
37+
38+
public void setTitle(String title) {
39+
this.title = title;
40+
}
41+
42+
public String getDescription() {
43+
return description;
44+
}
45+
46+
public void setDescription(String description) {
47+
this.description = description;
48+
}
49+
50+
public String getIcon() {
51+
return icon;
52+
}
53+
54+
public void setIcon(String icon) {
55+
this.icon = icon;
56+
}
57+
58+
public Integer getOrder() {
59+
return order;
60+
}
61+
62+
public void setOrder(Integer order) {
63+
this.order = order;
64+
}
65+
66+
public List<HomepageDemoInstanceVo> getDemoInstances() {
67+
return demoInstances;
68+
}
69+
70+
public void setDemoInstances(List<HomepageDemoInstanceVo> demoInstances) {
71+
this.demoInstances = demoInstances;
72+
}
73+
}

0 commit comments

Comments
 (0)