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
ff6ae83e
Commit
ff6ae83e
authored
Jul 12, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加前端页面
parent
c4a5f851
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
...ortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
+6
-3
device-manager-ui/admin/src/views/device/drawershow.vue
device-manager-ui/admin/src/views/device/drawershow.vue
+1
-1
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+1
-1
No files found.
common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
View file @
ff6ae83e
...
@@ -8,10 +8,9 @@ import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
...
@@ -8,10 +8,9 @@ import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
import
com.mortals.xhx.common.model.MessageHeader
;
import
com.mortals.xhx.common.model.MessageHeader
;
import
com.mortals.xhx.queue.*
;
import
com.mortals.xhx.queue.*
;
import
com.mortals.xhx.queue.kafka.AbstractTbQueueConsumerTemplate
;
import
com.mortals.xhx.queue.kafka.AbstractTbQueueConsumerTemplate
;
import
com.rabbitmq.client.Channel
;
import
com.rabbitmq.client.*
;
import
com.rabbitmq.client.Connection
;
import
com.rabbitmq.client.GetResponse
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.SneakyThrows
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
...
@@ -48,11 +47,15 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
...
@@ -48,11 +47,15 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
stopped
=
false
;
stopped
=
false
;
}
}
@SneakyThrows
@Override
@Override
protected
List
<
GetResponse
>
doPoll
(
long
durationInMillis
)
{
protected
List
<
GetResponse
>
doPoll
(
long
durationInMillis
)
{
List
<
GetResponse
>
result
=
queues
.
stream
()
List
<
GetResponse
>
result
=
queues
.
stream
()
.
map
(
queue
->
{
.
map
(
queue
->
{
try
{
try
{
AMQP
.
Queue
.
DeclareOk
declareOk
=
channel
.
queueDeclarePassive
(
queue
);
log
.
info
(
"declareOk:{}"
,
JSON
.
toJSONString
(
declareOk
));
GetResponse
getResponse
=
channel
.
basicGet
(
queue
,
true
);
GetResponse
getResponse
=
channel
.
basicGet
(
queue
,
true
);
return
getResponse
;
return
getResponse
;
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
device-manager-ui/admin/src/views/device/drawershow.vue
View file @
ff6ae83e
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
:direction=
"direction"
:direction=
"direction"
size=
"70%"
size=
"70%"
>
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"1
4
0px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"1
2
0px"
>
<el-row>
<el-row>
<Field
label=
"设备名称"
prop=
"deviceName"
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
<Field
label=
"设备名称"
prop=
"deviceName"
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
ff6ae83e
...
@@ -389,7 +389,7 @@ public class DeviceApiController {
...
@@ -389,7 +389,7 @@ public class DeviceApiController {
}
}
/**
/**
*
设备数据上报
*
第三方回调
*
*
* @param list
* @param list
* @return
* @return
...
...
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