zishuo/FastBee
1
0
Fork 0
mirror of https://github.com/kerwincui/FastBee.git synced 2025-10-07 00:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

验证设备的唯一性和设备字段添加验证

Browse Source
This commit is contained in:
kerwincui
2021-07-23 01:11:55 +08:00
parent 09b771f1d2
commit 185fe0c776
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/com/kerwin/wumei/fragment/device/DeviceEditFragment.java
View File

@@ -199,7 +199,7 @@ public class DeviceEditFragment extends BaseFragment {
et_device_remark.setText(device.getRemark()); et_device_remark.setText(device.getRemark());
txt_device_num.setText(device.getDeviceNum()); txt_device_num.setText(device.getDeviceNum());
txt_device_category.setText(device.getCategoryName()); txt_device_category.setText(device.getCategoryName());
txt_firmware_version.setText("v"+device.getFirmwareVersion()); txt_firmware_version.setText("v"+(device.getFirmwareVersion()==null || device.getFirmwareVersion().length()==0? "1.0" : device.getFirmwareVersion()));
txt_create_time.setText(device.getCreateTime()); txt_create_time.setText(device.getCreateTime());
sp_device_temperature.setText(device.getDeviceTemp()==null?0+"℃":device.getDeviceTemp()+"℃"); sp_device_temperature.setText(device.getDeviceTemp()==null?0+"℃":device.getDeviceTemp()+"℃");
} }

5
spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/controller/IotDeviceController.java
View File

@@ -115,7 +115,10 @@ public class IotDeviceController extends BaseController
{ {
LoginUser user=(LoginUser)SecurityContextHolder.getContext().getAuthentication().getPrincipal(); LoginUser user=(LoginUser)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
iotDevice.setOwnerId(user.getUser().getUserId().toString()); iotDevice.setOwnerId(user.getUser().getUserId().toString());
iotDevice.setDeviceTemp(BigDecimal.valueOf(0)); IotDevice device=iotDeviceService.selectIotDeviceByNum(iotDevice.getDeviceNum());
if(device!=null){
return AjaxResult.error("设备编号已存在，请重新填写");
}
return toAjax(iotDeviceService.insertIotDevice(iotDevice)); return toAjax(iotDeviceService.insertIotDevice(iotDevice));
} }

12
vue/src/views/system/device/index.vue
View File

@@ -285,7 +285,7 @@
<el-form-item label="编号" prop="deviceNum"> <el-form-item label="编号" prop="deviceNum">
<el-input <el-input
v-model="form.deviceNum" v-model="form.deviceNum"
placeholder="请输入编号" placeholder="请输入编号，必须唯一"
/> />
</el-form-item> </el-form-item>
<el-form-item label="分类" prop="categoryId"> <el-form-item label="分类" prop="categoryId">
@@ -303,7 +303,7 @@
<el-form-item label="固件版本" prop="firmwareVersion"> <el-form-item label="固件版本" prop="firmwareVersion">
<el-input <el-input
v-model="form.firmwareVersion" v-model="form.firmwareVersion"
placeholder="请输入固件版本" placeholder="请输入固件版本,例如1.0"
/> />
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="deviceName"> <el-form-item label="名称" prop="deviceName">
@@ -733,7 +733,13 @@ export default {
], ],
deviceName: [ deviceName: [
{ required: true, message: "名称不能为空", trigger: "blur" } { required: true, message: "名称不能为空", trigger: "blur" }
] ],
categoryId: [
{required:true,message:"设备分类不能为空",trigger: "blur"}
],
firmwareVersion: [
{required:true,message:"版本号不能为空", trigger: "blur"}
],
} }
}; };
}, },