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
0a441584
Commit
0a441584
authored
Oct 27, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改上传文件大小限制
parent
cb4be7db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
device-manager-ui/admin/src/views/device/drawershow.vue
device-manager-ui/admin/src/views/device/drawershow.vue
+2
-2
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java
...mortals/xhx/base/system/message/impl/MessageProducer.java
+0
-2
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
...a/com/mortals/xhx/module/device/web/DeviceController.java
+4
-4
No files found.
device-manager-ui/admin/src/views/device/drawershow.vue
View file @
0a441584
...
...
@@ -22,8 +22,8 @@
/>
-->
<Field
label=
"MAC地址"
prop=
"device
Mac
"
v-model=
"form.device
Mac
"
prop=
"device
Code
"
v-model=
"form.device
Code
"
placeholder=
"请输入设备的MAC地址"
/>
<!--
<Field
label=
"平台类型"
prop=
"platformId"
v-model=
"form.platformId"
type=
"select"
:enumData=
"dict.platformId"
placeholder=
"请选择平台类型"
/>
-->
...
...
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageProducer.java
View file @
0a441584
...
...
@@ -43,7 +43,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer
@Override
public
void
syncErrorSend
(
ErrorLogPdu
errorLogPdu
)
{
rabbitTemplate
.
convertAndSend
(
QueueKey
.
EXCHANGE
,
QueueKey
.
ERROR_LOG_QUEUE
,
JSON
.
toJSONString
(
errorLogPdu
));
}
...
...
@@ -74,7 +73,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer
);
log
.
debug
(
"队列创建绑定成功,queue:{}"
,
queue
);
}
@Override
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @
0a441584
...
...
@@ -85,11 +85,11 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
this
.
addDict
(
model
,
"productId"
,
productService
.
find
(
new
ProductEntity
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getProductName
())));
this
.
addDict
(
model
,
"productCode"
,
productService
.
find
(
new
ProductEntity
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getProductCode
())));
this
.
addDict
(
model
,
"deviceFirmId"
,
firmService
.
find
(
new
FirmEntity
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getFirmName
())));
this
.
addDict
(
model
,
"deviceSrc"
,
paramService
.
getParamBySecondOrganize
(
"Device"
,
"deviceSrc"
));
this
.
addDict
(
model
,
"deviceDataSourceWay"
,
paramService
.
getParamBySecondOrganize
(
"Device"
,
"deviceDataSourceWay"
));
this
.
addDict
(
model
,
"isReceiveMess"
,
paramService
.
getParamBySecondOrganize
(
"Device"
,
"isReceiveMess"
));
this
.
addDict
(
model
,
"deviceSrc"
,
DeviceSrcEnum
.
getEnumMap
(
));
this
.
addDict
(
model
,
"deviceDataSourceWay"
,
DeviceDataSourceWayEnum
.
getEnumMap
(
));
this
.
addDict
(
model
,
"isReceiveMess"
,
IsReceiveMessEnum
.
getEnumMap
(
));
this
.
addDict
(
model
,
"deviceStatus"
,
DeviceStatusEnum
.
getEnumMap
());
this
.
addDict
(
model
,
"enabled"
,
paramService
.
getParamBySecondOrganize
(
"Device"
,
"enabled"
));
this
.
addDict
(
model
,
"enabled"
,
EnabledEnum
.
getEnumMap
(
));
this
.
addDict
(
model
,
"source"
,
DeviceSourceEnum
.
getEnumMap
());
//返回产品列表及其样式
//productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())).
...
...
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