Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
3dfe42a7
Commit
3dfe42a7
authored
Mar 13, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加部分
parent
1a555313
Pipeline
#2770
failed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
...a/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
+2
-2
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
.../java/com/mortals/xhx/module/home/web/HomeController.java
+6
-3
No files found.
fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
View file @
3dfe42a7
...
...
@@ -70,8 +70,8 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
siteRest
.
getData
().
forEach
(
site
->
{
log
.
info
(
"站点名称:{}"
,
site
.
getSiteName
());
DevicePdu
devicePdu
=
new
DevicePdu
();
devicePdu
.
setProductCode
(
"tdj"
);
//
devicePdu.setProductId(9L);
//
devicePdu.setProductCode("tdj");
devicePdu
.
setProductId
(
9L
);
devicePdu
.
setSiteId
(
site
.
getId
());
devicePdu
.
setSize
(-
1
);
Rest
<
RespData
<
List
<
DevicePdu
>>>
deviceRest
=
deviceFeign
.
list
(
devicePdu
);
...
...
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
View file @
3dfe42a7
...
...
@@ -375,8 +375,10 @@ public class HomeController extends BaseJsonBodyController {
String
serverName
=
request
.
getHeader
(
"server-name"
);
Integer
serverPort
=
DataUtil
.
converStr2Int
(
request
.
getHeader
(
"server-port"
),
0
);
log
.
info
(
"【应用请求】【请求体】-->serverName{} ,port:{}"
,
serverName
,
serverPort
);
//
log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
String
appWhiteStr
=
GlobalSysInfo
.
getParamValue
(
Constant
.
PARAMS_WHITE_APP_LIST
,
"中心简介,办事指南,意见建议,通知公告"
);
log
.
info
(
"【应用请求】【请求体】-->appWhiteStr{} "
,
appWhiteStr
);
Set
<
String
>
appWhiteSet
=
StrUtil
.
split
(
appWhiteStr
,
","
).
stream
().
collect
(
Collectors
.
toSet
());
Rest
<
List
<
AppPdu
>>
ret
=
new
Rest
();
List
<
AppPdu
>
collect
=
new
ArrayList
<>();
...
...
@@ -397,11 +399,12 @@ public class HomeController extends BaseJsonBodyController {
.
peek
(
item
->
{
item
.
setCustUrl
(
UrlBuilder
.
ofHttp
(
domainUrl
).
addPath
(
item
.
getCustUrl
()).
build
());
//item.setAppIconPath(UrlBuilder.ofHttp(domainUrl1).addPath(item.getAppIconPath()).build());
log
.
info
(
item
.
getCustUrl
());
log
.
info
(
item
.
getAppIconPath
());
//
log.info(item.getCustUrl());
//
log.info(item.getAppIconPath());
}).
collect
(
Collectors
.
toList
());
}
}
catch
(
Exception
e
)
{
log
.
error
(
"异常"
,
e
);
code
=
VALUE_RESULT_FAILURE
;
}
ret
.
setCode
(
code
);
...
...
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