|
@@ -112,6 +112,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
|
|
|
private final MercPlaceService mercPlaceService;
|
|
private final MercPlaceService mercPlaceService;
|
|
|
|
|
|
|
|
+ private final MercUserBindDeviceService mercUserBindDeviceService;
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@ApiOperation("设备列表-管理员")
|
|
@ApiOperation("设备列表-管理员")
|
|
@@ -591,10 +593,19 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
@ApiOperation("修改")
|
|
@ApiOperation("修改")
|
|
@PostMapping("update")
|
|
@PostMapping("update")
|
|
public R update(@RequestBody @Validated DeviceInfoDto.Update update) {
|
|
public R update(@RequestBody @Validated DeviceInfoDto.Update update) {
|
|
- DeviceInfo deviceInfo = copy(DeviceInfo.class, update)
|
|
|
|
|
|
+ DeviceInfo deviceInfo = getById(update.getDeviceId());
|
|
|
|
+ //判断是否更新了点位
|
|
|
|
+ if(Emptys.check(update.getPlaceId()) && !Objects.equals(deviceInfo.getPlaceId(),update.getPlaceId())){
|
|
|
|
+ //把设备绑定给点位管理员
|
|
|
|
+ MercUserBindDeviceDto.BindByPlaceId bindByPlaceIdDTto = new MercUserBindDeviceDto.BindByPlaceId();
|
|
|
|
+ mercUserBindDeviceService.bindByPlaceId(bindByPlaceIdDTto);
|
|
|
|
+ }
|
|
|
|
+ DeviceInfo deviceSave = copy(DeviceInfo.class, update)
|
|
.setUpdateTime(LocalDateTime.now());
|
|
.setUpdateTime(LocalDateTime.now());
|
|
- updateById(deviceInfo);
|
|
|
|
- Long deviceId = deviceInfo.getDeviceId();
|
|
|
|
|
|
+ updateById(deviceSave);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ Long deviceId = deviceSave.getDeviceId();
|
|
DeviceInfoDto.Vo device = R.feignCheckData(this.obj(new DeviceInfoDto.Obj().setDeviceId(deviceId).setIsSysinfo(true)));
|
|
DeviceInfoDto.Vo device = R.feignCheckData(this.obj(new DeviceInfoDto.Obj().setDeviceId(deviceId).setIsSysinfo(true)));
|
|
Long algorithmId = update.getAlgorithmId();
|
|
Long algorithmId = update.getAlgorithmId();
|
|
if (algorithmId != null && AlgorithmTypeEnum.CLOUD.getId() == algorithmId) {
|
|
if (algorithmId != null && AlgorithmTypeEnum.CLOUD.getId() == algorithmId) {
|