Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
0a5e05db
Commit
0a5e05db
authored
Jun 01, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加门户系统模块添加配置
parent
4519353d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
...als/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
+5
-3
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinTemplateServiceImpl.java
...xhx/module/skin/service/impl/SkinTemplateServiceImpl.java
+2
-1
No files found.
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
View file @
0a5e05db
...
...
@@ -32,6 +32,7 @@ import java.util.Arrays;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -141,11 +142,12 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
//加载模板,合成模板数据
Map
data
=
new
HashMap
();
entity
.
getSkinFieldList
().
stream
().
forEach
(
field
->
{
List
<
SkinFieldEntity
>
collect
=
entity
.
getSkinFieldList
().
stream
().
map
(
field
->
{
updateUrl
(
field
);
});
return
field
;
}).
collect
(
Collectors
.
toList
());
data
.
put
(
"columns"
,
entity
.
getSkinFieldList
()
);
data
.
put
(
"columns"
,
collect
);
String
temp
=
"skin.css.ftl"
;
try
{
FreeMarkerUtils
.
initFreeMarker
(
temp
);
...
...
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinTemplateServiceImpl.java
View file @
0a5e05db
...
...
@@ -34,7 +34,8 @@ public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplat
@Override
protected
void
findAfter
(
SkinTemplateEntity
params
,
PageInfo
pageInfo
,
Context
context
,
List
<
SkinTemplateEntity
>
list
)
throws
AppException
{
list
.
stream
().
forEach
(
item
->
{
List
<
SkinFieldEntity
>
skinFieldEntities
=
skinFieldService
.
find
(
new
SkinFieldQuery
().
templateId
(
item
.
getId
())).
stream
().
filter
(
f
->
f
.
getSkinId
()==
null
).
collect
(
Collectors
.
toList
());
List
<
SkinFieldEntity
>
skinFieldEntities
=
skinFieldService
.
find
(
new
SkinFieldQuery
().
templateId
(
item
.
getId
()))
.
stream
().
filter
(
f
->
f
.
getSkinId
()==
null
).
collect
(
Collectors
.
toList
());
item
.
setSkinFieldList
(
skinFieldEntities
);
});
...
...
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