|
@@ -8,6 +8,7 @@ import com.xy.entity.DeviceInfo;
|
|
|
import com.xy.enums.MercStatus;
|
|
|
import com.xy.service.DeviceInfoServiceImpl;
|
|
|
import com.xy.service.be.MercFeignService;
|
|
|
+import com.xy.utils.Emptys;
|
|
|
import com.xy.utils.MercAuthUtils;
|
|
|
import com.xy.utils.PageBean;
|
|
|
import com.xy.utils.R;
|
|
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
import static com.xy.utils.Beans.copy;
|
|
|
|
|
@@ -117,6 +119,10 @@ public class MercMiniDeviceController {
|
|
|
@ApiOperation("修改设备信息、上传坐标等")
|
|
|
@PostMapping("updateInfo")
|
|
|
public R updateInfo(@RequestBody @Validated MercMiniDeviceDto.UpdateInfo dto){
|
|
|
+ DeviceInfo deviceInfo = deviceInfoService.getById(dto.getDeviceId());
|
|
|
+ if(!Emptys.check(deviceInfo) || Objects.equals(deviceInfo.getDeviceId(),MercAuthUtils.getMercId())){
|
|
|
+ return R.fail("设备不存在");
|
|
|
+ }
|
|
|
DeviceInfoDto.Update update = copy(DeviceInfoDto.Update.class,dto);
|
|
|
deviceInfoService.update(update);
|
|
|
return R.ok();
|