Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7d53644a
authored
Nov 27, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
feat:激活按钮要先可以写入设备
parent
396e53a5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
View file @
7d53644a
...
...
@@ -754,6 +754,12 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
active
(
BaseIdDTO
dto
)
{
PlatDevice
platDevice
=
getById
(
dto
.
getId
());
Map
<
String
,
Object
>
resMap
=
new
HashMap
<>();
resMap
.
put
(
"appid"
,
shengwangProperties
.
getAppId
());
String
AttrResult
=
devicePropertiesOperateService
.
deviceWriteAttr
(
platDevice
.
getOriDeviceId
(),
resMap
);
if
(
StringUtils
.
isNotEmpty
(
AttrResult
))
{
throw
new
RuntimeException
(
AttrResult
);
}
String
active
=
shengwangHttpUtil
.
active
(
platDevice
.
getOriDeviceId
());
ApiResponseEntity
responseEntity
=
JSON
.
parseObject
(
active
,
ApiResponseEntity
.
class
);
if
(
responseEntity
.
getCode
()
!=
200
)
{
...
...
@@ -771,7 +777,6 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
// 调用设备写入接口
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"license"
,
platDeviceActiveVO
.
getLicense
());
map
.
put
(
"appid"
,
shengwangProperties
.
getAppId
());
String
result
=
devicePropertiesOperateService
.
deviceWriteAttr
(
platDevice
.
getOriDeviceId
(),
map
);
if
(
StringUtils
.
isNotEmpty
(
result
))
{
...
...
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