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
a811cbd4
Commit
a811cbd4
authored
Jun 23, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改redis 过期事件通知
parent
552d2b59
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
db/module.sql
db/module.sql
+4
-4
device-manager-ui/admin/src/views/device/list.vue
device-manager-ui/admin/src/views/device/list.vue
+1
-2
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+1
-1
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+1
-1
No files found.
db/module.sql
View file @
a811cbd4
...
@@ -25,10 +25,10 @@ CREATE TABLE mortals_xhx_device(
...
@@ -25,10 +25,10 @@ CREATE TABLE mortals_xhx_device(
`siteCode`
varchar
(
256
)
COMMENT
'站点编号,来源基础服务平台'
,
`siteCode`
varchar
(
256
)
COMMENT
'站点编号,来源基础服务平台'
,
`siteName`
varchar
(
256
)
COMMENT
'站点名称'
,
`siteName`
varchar
(
256
)
COMMENT
'站点名称'
,
`deviceMac`
varchar
(
64
)
COMMENT
'设备的MAC地址'
,
`deviceMac`
varchar
(
64
)
COMMENT
'设备的MAC地址'
,
`platformId`
bigint
(
20
)
NOT
NULL
COMMENT
'平台系统Id'
,
`platformId`
bigint
(
20
)
COMMENT
'平台系统Id'
,
`platformName`
varchar
(
256
)
NOT
NULL
COMMENT
'平台系统名称'
,
`platformName`
varchar
(
256
)
COMMENT
'平台系统名称'
,
`productId`
bigint
(
20
)
NOT
NULL
COMMENT
'产品Id'
,
`productId`
bigint
(
20
)
COMMENT
'产品Id'
,
`productName`
varchar
(
256
)
NOT
NULL
COMMENT
'产品名称'
,
`productName`
varchar
(
256
)
COMMENT
'产品名称'
,
`deviceFirmId`
bigint
(
20
)
COMMENT
'设备生产厂商ID'
,
`deviceFirmId`
bigint
(
20
)
COMMENT
'设备生产厂商ID'
,
`deviceFirmname`
varchar
(
20
)
COMMENT
'设备生产厂商名称'
,
`deviceFirmname`
varchar
(
20
)
COMMENT
'设备生产厂商名称'
,
`ip`
varchar
(
64
)
COMMENT
'设备访问ip'
,
`ip`
varchar
(
64
)
COMMENT
'设备访问ip'
,
...
...
device-manager-ui/admin/src/views/device/list.vue
View file @
a811cbd4
...
@@ -177,8 +177,7 @@ export default {
...
@@ -177,8 +177,7 @@ export default {
activeDevice
(
row
)
{
activeDevice
(
row
)
{
this
.
$post
(
"
/device/active
"
,
{
this
.
$post
(
"
/device/active
"
,
{
"
entity.id
"
:
row
.
id
,
"
deviceCode
"
:
row
.
deviceCode
"
entity.active
"
:
1
,
})
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
if
(
res
.
code
==
1
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
a811cbd4
...
@@ -177,7 +177,7 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
...
@@ -177,7 +177,7 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
public
String
deviceActive
(
@RequestParam
(
value
=
"deviceCode"
)
String
deviceCode
)
{
public
String
deviceActive
(
@RequestParam
(
value
=
"deviceCode"
)
String
deviceCode
)
{
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
busiDesc
=
this
.
getModuleDesc
()
+
"
下发设备消息
"
;
String
busiDesc
=
this
.
getModuleDesc
()
+
"
设备激活
"
;
try
{
try
{
this
.
service
.
active
(
deviceCode
,
getContext
());
this
.
service
.
active
(
deviceCode
,
getContext
());
this
.
init
(
request
,
response
,
null
,
model
,
getContext
());
this
.
init
(
request
,
response
,
null
,
model
,
getContext
());
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
a811cbd4
...
@@ -71,7 +71,7 @@ POST {{baseUrl}}/api/register
...
@@ -71,7 +71,7 @@ POST {{baseUrl}}/api/register
Content-Type: application/json
Content-Type: application/json
{
{
"deviceCode": "
a
12345678"
"deviceCode": "
b
12345678"
}
}
> {%
> {%
...
...
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