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
2ca0c53b
Commit
2ca0c53b
authored
May 31, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设备新增等
parent
63a08e48
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
...tals/xhx/base/system/message/impl/MessageServiceImpl.java
+1
-0
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+6
-0
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+2
-2
No files found.
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
View file @
2ca0c53b
...
...
@@ -162,6 +162,7 @@ public class MessageServiceImpl implements MessageService {
try
{
Map
<
String
,
String
>
header
=
new
HashMap
<>();
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
log
.
info
(
"thirdParty httpUrl:{} req:{}"
,
sendUrl
,
JSON
.
toJSONString
(
deviceReqApiReq
));
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
));
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
}
catch
(
Exception
e
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
2ca0c53b
...
...
@@ -165,6 +165,12 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
return
jsonObject
.
toJSONString
();
}
@Override
protected
int
saveAfter
(
HttpServletRequest
request
,
HttpServletResponse
response
,
DeviceForm
form
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
return
super
.
saveAfter
(
request
,
response
,
form
,
model
,
context
);
}
/**
* 设备激活
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
2ca0c53b
...
...
@@ -91,8 +91,8 @@ Content-Type: application/json
{
"receiveMethod": 1,
"deviceName": "测试接口创建设备
2
",
"deviceCode": "A1:12:23:12:23:112
2
",
"deviceName": "测试接口创建设备
3
",
"deviceCode": "A1:12:23:12:23:112
3
",
"siteId": 123,
"siteCode": "adfasfdasfdasf",
"siteName": "测试站点",
...
...
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