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
4906bc69
Commit
4906bc69
authored
Jul 14, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备列表导出优化
parent
e6ed3153
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
6 deletions
+2
-6
common-lib/src/main/java/com/mortals/xhx/queue/kafka/AbstractTbQueueConsumerTemplate.java
...tals/xhx/queue/kafka/AbstractTbQueueConsumerTemplate.java
+0
-1
common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
...ortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
+1
-2
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
...n/applicationservice/DeviceMsgComsumerStartedService.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
...als/xhx/module/device/service/impl/DeviceServiceImpl.java
+0
-2
No files found.
common-lib/src/main/java/com/mortals/xhx/queue/kafka/AbstractTbQueueConsumerTemplate.java
View file @
4906bc69
...
...
@@ -41,7 +41,6 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
@Override
public
void
subscribe
()
{
if
(
stopped
)
{
log
.
error
(
"consumer 线程已停止 topic {}"
,
topic
);
return
;
...
...
common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
View file @
4906bc69
...
...
@@ -60,8 +60,6 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
List
<
GetResponse
>
result
=
queues
.
stream
()
.
map
(
queue
->
{
try
{
//AMQP.Queue.DeclareOk declareOk = channel.queueDeclarePassive(queue);
//log.info("declareOk:{}",JSON.toJSONString(declareOk));
GetResponse
getResponse
=
channel
.
basicGet
(
queue
,
true
);
return
getResponse
;
}
catch
(
IOException
e
)
{
...
...
@@ -89,6 +87,7 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
queues
=
partitions
.
stream
()
.
map
(
TopicPartitionInfo:
:
getFullTopicName
)
.
collect
(
Collectors
.
toSet
());
log
.
info
(
"doSubscribe:{}"
,
JSON
.
toJSONString
(
queues
));
}
@Override
...
...
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
View file @
4906bc69
...
...
@@ -154,7 +154,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
if
(
Objects
.
nonNull
(
messages
))
{
try
{
for
(
TbQueueMsg
queueMsg
:
messages
)
{
log
.
info
(
"[WRITE MESSAGE] ->message:{}"
,
JSON
.
toJSONString
(
queueMsg
));
log
.
debug
(
"[WRITE MESSAGE] ->message:{}"
,
JSON
.
toJSONString
(
queueMsg
));
//做相应业务,做日志操作
// TODO: 2022/7/12 设备来源从设备编码中获取,内容不做处理
String
deviceCode
=
queueMsg
.
getHeaders
().
get
(
"deviceCode"
);
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @
4906bc69
...
...
@@ -391,8 +391,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
}
}
}
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getPlatformCode
()))
{
PlatformEntity
platformEntity
=
platformService
.
selectOne
(
new
PlatformQuery
().
platformSn
(
entity
.
getPlatformCode
()));
if
(!
ObjectUtils
.
isEmpty
(
platformEntity
))
{
...
...
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