Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
5f5dc3da
提交
5f5dc3da
authored
5月 21, 2021
作者:
wangjiahao
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/main' into main
上级
7e6749e9
84833b07
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
22 行增加
和
9 行删除
+22
-9
ExtPanelStoreMapper.xml
.../java/io/dataease/base/mapper/ext/ExtPanelStoreMapper.xml
+1
-1
ExtSysMenuMapper.xml
...ain/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
+2
-1
PanelGroupService.java
...ain/java/io/dataease/service/panel/PanelGroupService.java
+9
-4
PanelLinkService.java
...main/java/io/dataease/service/panel/PanelLinkService.java
+4
-1
ShareService.java
...src/main/java/io/dataease/service/panel/ShareService.java
+5
-1
MenuService.java
...nd/src/main/java/io/dataease/service/sys/MenuService.java
+1
-1
没有找到文件。
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelStoreMapper.xml
浏览文件 @
5f5dc3da
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<select
id=
"query"
parameterType=
"io.dataease.base.mapper.ext.query.GridExample"
resultMap=
"panelStoreMap"
>
<select
id=
"query"
parameterType=
"io.dataease.base.mapper.ext.query.GridExample"
resultMap=
"panelStoreMap"
>
select s.store_id,s.panel_group_id, g.name
select s.store_id,s.panel_group_id, g.name
from panel_store s
from panel_store s
left
join panel_group g on g.id = s.panel_group_id
inner
join panel_group g on g.id = s.panel_group_id
<if
test=
"_parameter != null"
>
<if
test=
"_parameter != null"
>
<include
refid=
"io.dataease.base.mapper.ext.query.GridSql.gridCondition"
/>
<include
refid=
"io.dataease.base.mapper.ext.query.GridSql.gridCondition"
/>
</if>
</if>
...
...
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml
浏览文件 @
5f5dc3da
...
@@ -8,13 +8,14 @@
...
@@ -8,13 +8,14 @@
</resultMap>
</resultMap>
<select
id=
"allNodes"
resultMap=
"simpleNode"
>
<select
id=
"allNodes"
resultMap=
"simpleNode"
>
select menu_id as id, pid from sys_menu
select menu_id as id, pid from sys_menu
where hidden != 1
</select>
</select>
<select
id=
"nodesByExample"
parameterType=
"io.dataease.base.mapper.ext.query.GridExample"
resultMap=
"simpleNode"
>
<select
id=
"nodesByExample"
parameterType=
"io.dataease.base.mapper.ext.query.GridExample"
resultMap=
"simpleNode"
>
select menu_id as id, pid from sys_menu
select menu_id as id, pid from sys_menu
<include
refid=
"io.dataease.base.mapper.ext.query.GridSql.gridCondition"
/>
<include
refid=
"io.dataease.base.mapper.ext.query.GridSql.gridCondition"
/>
and hidden != 1
</select>
</select>
...
...
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
浏览文件 @
5f5dc3da
...
@@ -19,6 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
...
@@ -19,6 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
...
@@ -45,14 +46,15 @@ public class PanelGroupService {
...
@@ -45,14 +46,15 @@ public class PanelGroupService {
@Resource
@Resource
private
ExtPanelGroupMapper
extPanelGroupMapper
;
private
ExtPanelGroupMapper
extPanelGroupMapper
;
@Resource
@Resource
private
PanelDesignMapper
panelDesignMapper
;
@Resource
private
ChartViewService
chartViewService
;
private
ChartViewService
chartViewService
;
@Resource
@Resource
private
ChartViewMapper
chartViewMapper
;
private
ChartViewMapper
chartViewMapper
;
@Resource
@Resource
private
ExtPanelDesignMapper
extPanelDesignMapper
;
private
StoreService
storeService
;
@Resource
private
ShareService
shareService
;
@Resource
private
PanelLinkService
panelLinkService
;
public
List
<
PanelGroupDTO
>
tree
(
PanelGroupRequest
panelGroupRequest
)
{
public
List
<
PanelGroupDTO
>
tree
(
PanelGroupRequest
panelGroupRequest
)
{
String
userId
=
String
.
valueOf
(
AuthUtils
.
getUser
().
getUserId
());
String
userId
=
String
.
valueOf
(
AuthUtils
.
getUser
().
getUserId
());
panelGroupRequest
.
setUserId
(
userId
);
panelGroupRequest
.
setUserId
(
userId
);
...
@@ -93,6 +95,9 @@ public class PanelGroupService {
...
@@ -93,6 +95,9 @@ public class PanelGroupService {
public
void
deleteCircle
(
String
id
)
{
public
void
deleteCircle
(
String
id
)
{
Assert
.
notNull
(
id
,
"id cannot be null"
);
Assert
.
notNull
(
id
,
"id cannot be null"
);
extPanelGroupMapper
.
deleteCircle
(
id
);
extPanelGroupMapper
.
deleteCircle
(
id
);
storeService
.
removeByPanelId
(
id
);
shareService
.
delete
(
id
,
null
);
panelLinkService
.
deleteByResourceId
(
id
);
}
}
...
...
backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
浏览文件 @
5f5dc3da
...
@@ -73,6 +73,10 @@ public class PanelLinkService {
...
@@ -73,6 +73,10 @@ public class PanelLinkService {
return
convertDto
(
one
);
return
convertDto
(
one
);
}
}
public
void
deleteByResourceId
(
String
resourceId
){
mapper
.
deleteByPrimaryKey
(
resourceId
);
}
public
String
decryptParam
(
String
text
)
throws
Exception
{
public
String
decryptParam
(
String
text
)
throws
Exception
{
return
RsaUtil
.
decryptByPrivateKey
(
RsaProperties
.
privateKey
,
text
);
return
RsaUtil
.
decryptByPrivateKey
(
RsaProperties
.
privateKey
,
text
);
}
}
...
@@ -100,7 +104,6 @@ public class PanelLinkService {
...
@@ -100,7 +104,6 @@ public class PanelLinkService {
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
System
.
out
.
println
(
s
);
return
encrypt
;
return
encrypt
;
}
}
private
GenerateDto
convertDto
(
PanelLink
linl
){
private
GenerateDto
convertDto
(
PanelLink
linl
){
...
...
backend/src/main/java/io/dataease/service/panel/ShareService.java
浏览文件 @
5f5dc3da
...
@@ -76,7 +76,11 @@ public class ShareService {
...
@@ -76,7 +76,11 @@ public class ShareService {
@Transactional
@Transactional
public
void
delete
(
String
panel_group_id
,
Integer
type
){
public
void
delete
(
String
panel_group_id
,
Integer
type
){
PanelShareExample
example
=
new
PanelShareExample
();
PanelShareExample
example
=
new
PanelShareExample
();
example
.
createCriteria
().
andPanelGroupIdEqualTo
(
panel_group_id
).
andTypeEqualTo
(
type
);
PanelShareExample
.
Criteria
criteria
=
example
.
createCriteria
();
criteria
.
andPanelGroupIdEqualTo
(
panel_group_id
);
if
(
type
!=
null
){
criteria
.
andTypeEqualTo
(
type
);
}
mapper
.
deleteByExample
(
example
);
mapper
.
deleteByExample
(
example
);
}
}
...
...
backend/src/main/java/io/dataease/service/sys/MenuService.java
浏览文件 @
5f5dc3da
...
@@ -157,7 +157,7 @@ public class MenuService {
...
@@ -157,7 +157,7 @@ public class MenuService {
private
MenuTreeNode
format
(
SysMenu
sysMenu
)
{
private
MenuTreeNode
format
(
SysMenu
sysMenu
)
{
MenuTreeNode
menuTreeNode
=
new
MenuTreeNode
();
MenuTreeNode
menuTreeNode
=
new
MenuTreeNode
();
menuTreeNode
.
setId
(
sysMenu
.
getMenuId
());
menuTreeNode
.
setId
(
sysMenu
.
getMenuId
());
menuTreeNode
.
setLabel
(
sysMenu
.
get
Nam
e
());
menuTreeNode
.
setLabel
(
sysMenu
.
get
Titl
e
());
menuTreeNode
.
setHasChildren
(
false
);
menuTreeNode
.
setHasChildren
(
false
);
Optional
.
ofNullable
(
sysMenu
.
getMenuSort
()).
ifPresent
(
num
->
menuTreeNode
.
setHasChildren
(
num
>
0
));
Optional
.
ofNullable
(
sysMenu
.
getMenuSort
()).
ifPresent
(
num
->
menuTreeNode
.
setHasChildren
(
num
>
0
));
return
menuTreeNode
;
return
menuTreeNode
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论