diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index 777bffd..086c52b 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -46,7 +46,7 @@ public class EmployeeController { } @PatchMapping("/{login}/open") - public ResponseEntity openEmployee(@PathVariable String login, @RequestBody CodeDto value) { + public ResponseEntity openEmployee(@PathVariable String login, @RequestBody CodeDto value) { Long code = value.getValue(); return ResponseEntity.ok(employeeService.enterEmployee(login, code)); } diff --git a/src/main/java/com/example/nto/service/EmployeeService.java b/src/main/java/com/example/nto/service/EmployeeService.java index 2650d2a..2bcbd35 100644 --- a/src/main/java/com/example/nto/service/EmployeeService.java +++ b/src/main/java/com/example/nto/service/EmployeeService.java @@ -9,5 +9,5 @@ public interface EmployeeService { EmployeeDto getByLogin(String login); String blockEmployee(String login); String unblockEmployee(String login); - String enterEmployee(String login, Long value); + Boolean enterEmployee(String login, Long value); } \ No newline at end of file diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index e4f2c3a..3cb4662 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -11,6 +11,7 @@ import com.example.nto.service.EmployeeService; import com.example.nto.repository.EmployeeRepository; import com.example.nto.utils.EmployeeMapper; +import liquibase.pro.packaged.B; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -60,7 +61,7 @@ public class EmployeeServiceImpl implements EmployeeService { } @Override - public String enterEmployee(String login, Long value) { + public Boolean enterEmployee(String login, Long value) { Employee employee = EmployeeMapper.convertFromDto(getByLogin(login)); if (employee != null) { Optional codeOp = codeRepository.findByValue(value); @@ -73,9 +74,9 @@ public class EmployeeServiceImpl implements EmployeeService { enter.setEntered_at(Timestamp.valueOf(LocalDateTime.now())); enter.setEnterType("Phone"); enterRepository.save(enter); - return "дверь открылась"; + return true; } else { - return "Доступ закрыт"; + return false; } } else { throw new CodeNotFoundException("Неверный код");