|
@@ -61,6 +61,9 @@ public class MercMiniDeviceController {
|
|
|
@PostMapping("detail")
|
|
|
R<DeviceInfoDto.Vo> detail(@RequestBody DeviceInfoDto.Obj obj) {
|
|
|
obj.setMercId(MercAuthUtils.getMercId());
|
|
|
+ obj.setIsStatus(Boolean.TRUE);
|
|
|
+ obj.setIsSysinfo(Boolean.TRUE);
|
|
|
+ obj.setIsRegister(Boolean.TRUE);
|
|
|
return deviceInfoService.obj(obj);
|
|
|
}
|
|
|
|
|
@@ -118,12 +121,12 @@ public class MercMiniDeviceController {
|
|
|
|
|
|
@ApiOperation("修改设备信息、上传坐标等")
|
|
|
@PostMapping("updateInfo")
|
|
|
- public R updateInfo(@RequestBody @Validated MercMiniDeviceDto.UpdateInfo dto){
|
|
|
+ public R updateInfo(@RequestBody @Validated MercMiniDeviceDto.UpdateInfo dto) {
|
|
|
DeviceInfo deviceInfo = deviceInfoService.getById(dto.getDeviceId());
|
|
|
- if(!Emptys.check(deviceInfo) || Objects.equals(deviceInfo.getDeviceId(),MercAuthUtils.getMercId())){
|
|
|
+ if (!Emptys.check(deviceInfo) || Objects.equals(deviceInfo.getDeviceId(), MercAuthUtils.getMercId())) {
|
|
|
return R.fail("设备不存在");
|
|
|
}
|
|
|
- DeviceInfoDto.Update update = copy(DeviceInfoDto.Update.class,dto);
|
|
|
+ DeviceInfoDto.Update update = copy(DeviceInfoDto.Update.class, dto);
|
|
|
deviceInfoService.update(update);
|
|
|
return R.ok();
|
|
|
}
|