Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-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
赵啸非
device-new-platform
Commits
7ce67c53
Commit
7ce67c53
authored
Nov 29, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改配置文件
parent
44ba047a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
...tals/xhx/base/system/message/impl/MessageServiceImpl.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
...odule/device/service/impl/DeviceAlarmInfoServiceImpl.java
+1
-0
No files found.
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
View file @
7ce67c53
...
...
@@ -151,7 +151,7 @@ public class MessageServiceImpl implements MessageService{
Map
<
String
,
String
>
header
=
new
HashMap
<>();
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
log
.
info
(
"\n thirdPartyUrl=>{} \n reqbody=>{} \n type=>{}"
,
sendUrl
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
),
DeviceMethodEnum
.
getByValue
(
deviceReq
.
getDeviceStatus
()).
getDesc
());
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
));
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
)
,
"UTF-8"
,
10000
);
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
}
catch
(
Exception
e
)
{
log
.
error
(
"异常:"
,
e
);
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceAlarmInfoServiceImpl.java
View file @
7ce67c53
...
...
@@ -60,6 +60,7 @@ public class DeviceAlarmInfoServiceImpl extends AbstractCRUDServiceImpl<DeviceAl
if
(
rest
.
getCode
()
==
YesNoEnum
.
NO
.
getValue
())
{
return
Rest
.
fail
(
"获取站点列表异常!"
);
}
if
(
ObjectUtils
.
isEmpty
(
rest
.
getData
()))
return
Rest
.
fail
(
"站点列表数据为空!"
);
Map
<
Long
,
SitePdu
>
siteMap
=
rest
.
getData
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
(),
y
->
y
,
(
o
,
n
)
->
n
));
Map
<
Long
,
FirmEntity
>
FirmMap
=
firmService
.
findToMap
(
new
FirmEntity
(),
context
);
...
...
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