Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-data-cloud
Commits
b6d19ece
Commit
b6d19ece
authored
Jul 23, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
97406fef
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
0 deletions
+35
-0
IndexQO.java
...ata-cloud-api/src/main/java/com/gic/cloud/qo/IndexQO.java
+9
-0
TabIndexGroupMapper.java
...in/java/com/gic/cloud/dao/mapper/TabIndexGroupMapper.java
+3
-0
IndexGroupService.java
...rc/main/java/com/gic/cloud/service/IndexGroupService.java
+2
-0
IndexGroupServiceImpl.java
...ava/com/gic/cloud/service/impl/IndexGroupServiceImpl.java
+5
-0
IndexServiceImpl.java
...ain/java/com/gic/cloud/service/impl/IndexServiceImpl.java
+7
-0
TabIndexGroupMapper.xml
...service/src/main/resources/mapper/TabIndexGroupMapper.xml
+9
-0
No files found.
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/IndexQO.java
View file @
b6d19ece
...
@@ -123,6 +123,7 @@ public class IndexQO extends PageQO implements Serializable {
...
@@ -123,6 +123,7 @@ public class IndexQO extends PageQO implements Serializable {
private
String
optUserName
;
private
String
optUserName
;
private
String
indexGroupName
;
private
String
indexGroupName
;
private
List
<
Integer
>
indexGroupIdList
;
public
Integer
getClassifyType
()
{
public
Integer
getClassifyType
()
{
...
@@ -364,4 +365,12 @@ public class IndexQO extends PageQO implements Serializable {
...
@@ -364,4 +365,12 @@ public class IndexQO extends PageQO implements Serializable {
public
void
setIndexGroupName
(
String
indexGroupName
)
{
public
void
setIndexGroupName
(
String
indexGroupName
)
{
this
.
indexGroupName
=
indexGroupName
;
this
.
indexGroupName
=
indexGroupName
;
}
}
public
void
setIndexGroupIdList
(
List
<
Integer
>
indexGroupIdList
)
{
this
.
indexGroupIdList
=
indexGroupIdList
;
}
public
List
<
Integer
>
getIndexGroupIdList
()
{
return
indexGroupIdList
;
}
}
}
gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexGroupMapper.java
View file @
b6d19ece
...
@@ -57,4 +57,6 @@ public interface TabIndexGroupMapper {
...
@@ -57,4 +57,6 @@ public interface TabIndexGroupMapper {
TabIndexGroup
getBySelective
(
TabIndexGroup
indexGroup
);
TabIndexGroup
getBySelective
(
TabIndexGroup
indexGroup
);
List
<
TabIndexGroup
>
listIndexGroup
(
@Param
(
"ids"
)
List
<
Integer
>
indexGroupIdList
);
List
<
TabIndexGroup
>
listIndexGroup
(
@Param
(
"ids"
)
List
<
Integer
>
indexGroupIdList
);
List
<
Integer
>
listChildIndexGroup
(
@Param
(
"indexGroupId"
)
Integer
indexGroupId
);
}
}
\ No newline at end of file
gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexGroupService.java
View file @
b6d19ece
...
@@ -24,4 +24,6 @@ public interface IndexGroupService {
...
@@ -24,4 +24,6 @@ public interface IndexGroupService {
List
<
TabIndexGroup
>
listIndexGroup
();
List
<
TabIndexGroup
>
listIndexGroup
();
String
getNameByIds
(
List
<
Integer
>
indexGroupIdList
);
String
getNameByIds
(
List
<
Integer
>
indexGroupIdList
);
List
<
Integer
>
listChildIndexGroup
(
Integer
indexGroupId
);
}
}
gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexGroupServiceImpl.java
View file @
b6d19ece
...
@@ -71,4 +71,9 @@ public class IndexGroupServiceImpl implements IndexGroupService {
...
@@ -71,4 +71,9 @@ public class IndexGroupServiceImpl implements IndexGroupService {
return
Optional
.
ofNullable
(
indexGroupList
).
orElse
(
Collections
.
emptyList
())
return
Optional
.
ofNullable
(
indexGroupList
).
orElse
(
Collections
.
emptyList
())
.
stream
().
map
(
TabIndexGroup:
:
getIndexGroupName
).
collect
(
Collectors
.
joining
(
"\\"
));
.
stream
().
map
(
TabIndexGroup:
:
getIndexGroupName
).
collect
(
Collectors
.
joining
(
"\\"
));
}
}
@Override
public
List
<
Integer
>
listChildIndexGroup
(
Integer
indexGroupId
)
{
return
tabIndexGroupMapper
.
listChildIndexGroup
(
indexGroupId
);
}
}
}
gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexServiceImpl.java
View file @
b6d19ece
...
@@ -4,6 +4,7 @@ import com.gic.cloud.dao.mapper.TabIndexMapper;
...
@@ -4,6 +4,7 @@ import com.gic.cloud.dao.mapper.TabIndexMapper;
import
com.gic.cloud.dto.IndexDTO
;
import
com.gic.cloud.dto.IndexDTO
;
import
com.gic.cloud.entity.TabIndex
;
import
com.gic.cloud.entity.TabIndex
;
import
com.gic.cloud.qo.IndexQO
;
import
com.gic.cloud.qo.IndexQO
;
import
com.gic.cloud.service.IndexGroupService
;
import
com.gic.cloud.service.IndexModuleRelService
;
import
com.gic.cloud.service.IndexModuleRelService
;
import
com.gic.cloud.service.IndexService
;
import
com.gic.cloud.service.IndexService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
...
@@ -29,6 +30,8 @@ public class IndexServiceImpl implements IndexService {
...
@@ -29,6 +30,8 @@ public class IndexServiceImpl implements IndexService {
private
TabIndexMapper
tabIndexMapper
;
private
TabIndexMapper
tabIndexMapper
;
@Autowired
@Autowired
private
IndexModuleRelService
indexModuleRelService
;
private
IndexModuleRelService
indexModuleRelService
;
@Autowired
private
IndexGroupService
indexGroupService
;
@Override
@Override
public
boolean
isNameRepeat
(
String
name
,
Integer
indexId
)
{
public
boolean
isNameRepeat
(
String
name
,
Integer
indexId
)
{
...
@@ -74,6 +77,10 @@ public class IndexServiceImpl implements IndexService {
...
@@ -74,6 +77,10 @@ public class IndexServiceImpl implements IndexService {
List
<
Integer
>
indexIdList
=
indexModuleRelService
.
listBusinessIdByModuleIds
(
Arrays
.
asList
(
indexQO
.
getModuleId
().
split
(
","
)));
List
<
Integer
>
indexIdList
=
indexModuleRelService
.
listBusinessIdByModuleIds
(
Arrays
.
asList
(
indexQO
.
getModuleId
().
split
(
","
)));
indexQO
.
setIndexIdList
(
indexIdList
);
indexQO
.
setIndexIdList
(
indexIdList
);
}
}
if
(
indexQO
.
getIndexGroupId
()
!=
null
)
{
List
<
Integer
>
indexGroupIdList
=
indexGroupService
.
listChildIndexGroup
(
indexQO
.
getIndexGroupId
());
indexQO
.
setIndexGroupIdList
(
indexGroupIdList
);
}
return
tabIndexMapper
.
listIndex
(
indexQO
);
return
tabIndexMapper
.
listIndex
(
indexQO
);
}
}
...
...
gic-data-cloud-service/src/main/resources/mapper/TabIndexGroupMapper.xml
View file @
b6d19ece
...
@@ -142,4 +142,12 @@
...
@@ -142,4 +142,12 @@
</foreach>
</foreach>
</if>
</if>
</select>
</select>
<!-- List<Integer> listChildIndexGroup(@Param("indexGroupId") Integer indexGroupId);-->
<select
id=
"listChildIndexGroup"
resultType=
"int"
>
select
index_group_id
from tab_index_group
where status = 1
and group_chain like concat('%_', #{indexGroupId}, '_%')
</select>
</mapper>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment