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
ba56485c
Commit
ba56485c
authored
Mar 24, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改校验
parent
386abac8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
1 deletion
+28
-1
device-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java
...java/com/mortals/xhx/busiz/web/TestSendMsgController.java
+23
-0
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+1
-1
device-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+4
-0
No files found.
device-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java
View file @
ba56485c
...
...
@@ -15,11 +15,14 @@ import com.mortals.xhx.busiz.req.TestReq;
import
com.mortals.xhx.busiz.rsp.ApiResp
;
import
com.mortals.xhx.busiz.rsp.DeviceResp
;
import
com.mortals.xhx.common.code.ApiRespCodeEnum
;
import
com.mortals.xhx.common.code.DeviceMethodEnum
;
import
com.mortals.xhx.common.utils.ControllerScanUtil
;
import
com.mortals.xhx.common.utils.ImgUtils
;
import
com.mortals.xhx.module.device.model.DeviceEntity
;
import
com.mortals.xhx.module.device.model.DeviceQuery
;
import
com.mortals.xhx.module.device.service.DeviceService
;
import
com.mortals.xhx.module.platform.model.PlatformEntity
;
import
com.mortals.xhx.module.platform.service.PlatformService
;
import
com.mortals.xhx.module.product.model.ProductEntity
;
import
com.mortals.xhx.module.product.service.ProductService
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -47,6 +50,8 @@ public class TestSendMsgController {
@Autowired
private
ProductService
productService
;
@Autowired
private
PlatformService
platformService
;
@Autowired
private
DeviceService
deviceService
;
@Autowired
private
ICacheService
cacheService
;
...
...
@@ -189,6 +194,24 @@ public class TestSendMsgController {
return
"ok"
;
}
/**
* 发送第三方接口
*
* @return
*/
@PostMapping
(
"sendThirdParty"
)
public
String
sendThirdParty
()
{
List
<
DeviceEntity
>
deviceEntities
=
deviceService
.
find
(
new
DeviceEntity
());
for
(
DeviceEntity
deviceEntity
:
deviceEntities
)
{
PlatformEntity
platformEntity
=
platformService
.
getCache
(
deviceEntity
.
getPlatformId
()
==
null
?
"-1"
:
deviceEntity
.
getPlatformId
().
toString
());
ProductEntity
productEntity
=
productService
.
getCache
(
deviceEntity
.
getProductId
()
==
null
?
"-1"
:
deviceEntity
.
getProductId
().
toString
());
deviceService
.
sendThirdParty
(
deviceEntity
,
productEntity
,
platformEntity
,
DeviceMethodEnum
.
ADD
);
deviceService
.
sendThirdParty
(
deviceEntity
,
productEntity
,
platformEntity
,
DeviceMethodEnum
.
ACTIVE
);
}
return
"ok"
;
}
public
static
void
main
(
String
[]
args
)
{
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
ba56485c
...
...
@@ -116,7 +116,7 @@ POST {{baseUrl}}/api/register
Content-Type: application/json
{
"deviceCode": "
0c-cf-89-09-d1-c
8"
"deviceCode": "
C0-FB-F9-CD-6F-A
8"
}
###获取产品与
...
...
device-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
ba56485c
...
...
@@ -38,6 +38,10 @@
"baseUrl"
:
"http://112.19.80.237:11091/m"
},
"pengxi-web"
:
{
"baseUrl"
:
"http://118.122.189.109:11091/m"
},
"reg-web"
:
{
"baseUrl"
:
"http://8.136.255.30:1136/m"
}
...
...
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