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
848cf3fb
Commit
848cf3fb
authored
Jul 14, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设备列表导出优化
parent
2dbe8014
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
...tals/xhx/base/system/message/impl/MessageServiceImpl.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java
...a/com/mortals/xhx/module/product/model/ProductEntity.java
+0
-4
device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java
...com/mortals/xhx/module/product/web/ProductController.java
+9
-12
No files found.
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
View file @
848cf3fb
...
@@ -73,7 +73,7 @@ public class MessageServiceImpl implements MessageService {
...
@@ -73,7 +73,7 @@ public class MessageServiceImpl implements MessageService {
@Override
@Override
public
void
send
(
TopicPartitionInfo
info
,
TbQueueMsgHeaders
header
,
String
message
,
TbQueueCallback
callback
)
{
public
void
send
(
TopicPartitionInfo
info
,
TbQueueMsgHeaders
header
,
String
message
,
TbQueueCallback
callback
)
{
TbQueueProducer
<
TbQueueMsg
>
producer
=
producerProvider
.
getTbCoreMsgProducer
();
TbQueueProducer
<
TbQueueMsg
>
producer
=
producerProvider
.
getTbCoreMsgProducer
();
TbQueueMsg
queueMsg
=
new
DefaultTbQueueMsg
(
IdUtil
.
fastUUID
(),
message
==
null
?
""
.
getBytes
()
:
message
.
getBytes
()
,
header
);
TbQueueMsg
queueMsg
=
new
DefaultTbQueueMsg
(
IdUtil
.
fastUUID
(),
message
==
null
?
""
:
message
,
header
);
producer
.
send
(
info
,
queueMsg
,
callback
);
producer
.
send
(
info
,
queueMsg
,
callback
);
}
}
...
...
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java
View file @
848cf3fb
package
com.mortals.xhx.module.product.model
;
package
com.mortals.xhx.module.product.model
;
import
java.util.List
;
import
java.util.ArrayList
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.product.model.vo.ProductVo
;
import
com.mortals.xhx.module.product.model.vo.ProductVo
;
/**
/**
* 产品实体对象
* 产品实体对象
...
...
device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java
View file @
848cf3fb
...
@@ -15,28 +15,25 @@ import java.util.Map;
...
@@ -15,28 +15,25 @@ import java.util.Map;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
/**
/**
*
* 产品
* 产品
*
*
* @author zxfei
* @author zxfei
* @date 2022-06-27
* @date 2022-06-27
*/
*/
@RestController
@RestController
@RequestMapping
(
"product"
)
@RequestMapping
(
"product"
)
public
class
ProductController
extends
BaseCRUDJsonBodyMappingController
<
ProductService
,
ProductEntity
,
Long
>
{
public
class
ProductController
extends
BaseCRUDJsonBodyMappingController
<
ProductService
,
ProductEntity
,
Long
>
{
@Autowired
private
ParamService
paramService
;
@Autowired
@Autowired
private
PlatformService
platformService
;
private
PlatformService
platformService
;
public
ProductController
(){
public
ProductController
()
{
super
.
setModuleDesc
(
"产品"
);
super
.
setModuleDesc
(
"产品"
);
}
}
@Override
@Override
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"platformId"
,
platformService
.
find
(
new
PlatformQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getPlatformName
())));
this
.
addDict
(
model
,
"platformId"
,
platformService
.
find
(
new
PlatformQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getPlatformName
())));
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
...
...
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