Commit 0a441584 authored by 赵啸非's avatar 赵啸非

更改上传文件大小限制

parent cb4be7db
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
/> --> /> -->
<Field <Field
label="MAC地址" label="MAC地址"
prop="deviceMac" prop="deviceCode"
v-model="form.deviceMac" v-model="form.deviceCode"
placeholder="请输入设备的MAC地址" placeholder="请输入设备的MAC地址"
/> />
<!-- <Field label="平台类型" prop="platformId" v-model="form.platformId" type="select" :enumData="dict.platformId" placeholder="请选择平台类型"/> --> <!-- <Field label="平台类型" prop="platformId" v-model="form.platformId" type="select" :enumData="dict.platformId" placeholder="请选择平台类型"/> -->
......
...@@ -43,7 +43,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer ...@@ -43,7 +43,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer
@Override @Override
public void syncErrorSend(ErrorLogPdu errorLogPdu) { public void syncErrorSend(ErrorLogPdu errorLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu)); rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
} }
...@@ -74,7 +73,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer ...@@ -74,7 +73,6 @@ public class MessageProducer implements IMessageProduceService, RabbitMessageSer
); );
log.debug("队列创建绑定成功,queue:{}", queue); log.debug("队列创建绑定成功,queue:{}", queue);
} }
@Override @Override
......
...@@ -85,11 +85,11 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -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, "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, "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, "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, "deviceSrc", DeviceSrcEnum.getEnumMap());
this.addDict(model, "deviceDataSourceWay", paramService.getParamBySecondOrganize("Device", "deviceDataSourceWay")); this.addDict(model, "deviceDataSourceWay", DeviceDataSourceWayEnum.getEnumMap());
this.addDict(model, "isReceiveMess", paramService.getParamBySecondOrganize("Device", "isReceiveMess")); this.addDict(model, "isReceiveMess", IsReceiveMessEnum.getEnumMap());
this.addDict(model, "deviceStatus", DeviceStatusEnum.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()); this.addDict(model, "source", DeviceSourceEnum.getEnumMap());
//返回产品列表及其样式 //返回产品列表及其样式
//productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())). //productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment