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
22952079
authored
Jan 17, 2024
by
罗志长
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
feat: 设备配网前校验
parent
c502deb3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
View file @
22952079
package
com
.
makeit
.
module
.
controller
.
wechat
.
device
;
package
com
.
makeit
.
module
.
controller
.
wechat
.
device
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.dto.BaseIdDTO
;
import
com.makeit.common.page.PageReqDTO
;
import
com.makeit.common.page.PageReqDTO
;
...
@@ -14,6 +15,7 @@ import com.makeit.dto.wechat.device.PlatDeviceNetAttrWechatDTO;
...
@@ -14,6 +15,7 @@ import com.makeit.dto.wechat.device.PlatDeviceNetAttrWechatDTO;
import
com.makeit.dto.wechat.device.PlatDeviceSetupDTO
;
import
com.makeit.dto.wechat.device.PlatDeviceSetupDTO
;
import
com.makeit.entity.platform.auth.PlatOrg
;
import
com.makeit.entity.platform.auth.PlatOrg
;
import
com.makeit.entity.platform.auth.PlatRole
;
import
com.makeit.entity.platform.auth.PlatRole
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.enums.HeaderConst
;
import
com.makeit.enums.HeaderConst
;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.global.annotation.AuthIgnore
;
import
com.makeit.module.iot.vo.DeviceProperties
;
import
com.makeit.module.iot.vo.DeviceProperties
;
...
@@ -29,10 +31,7 @@ import io.swagger.annotations.Api;
...
@@ -29,10 +31,7 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -80,6 +79,15 @@ public class PlatDeviceWechatController {
...
@@ -80,6 +79,15 @@ public class PlatDeviceWechatController {
return
ApiResponseUtils
.
success
(
platDeviceService
.
viewByDeviceId
(
baseIdDTO
.
getId
()));
return
ApiResponseUtils
.
success
(
platDeviceService
.
viewByDeviceId
(
baseIdDTO
.
getId
()));
}
}
@ApiOperation
(
"配网前校验"
)
@PostMapping
(
"setUpCheck"
)
public
ApiResponseEntity
<?>
setUpCheck
(
@RequestParam
String
oriDeviceId
)
{
PlatDevice
platDevice
=
platDeviceService
.
getOne
(
new
QueryWrapper
<
PlatDevice
>().
lambda
()
.
eq
(
PlatDevice:
:
getOriDeviceId
,
oriDeviceId
)
.
last
(
"limit 1"
));
return
ApiResponseUtils
.
success
(
platDevice
!=
null
);
}
@ApiOperation
(
"配网"
)
@ApiOperation
(
"配网"
)
@PostMapping
(
"setUp"
)
@PostMapping
(
"setUp"
)
public
ApiResponseEntity
<?>
setup
(
@Validated
@RequestBody
PlatDeviceSetupDTO
dto
)
{
public
ApiResponseEntity
<?>
setup
(
@Validated
@RequestBody
PlatDeviceSetupDTO
dto
)
{
...
...
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