edit Enter result
This commit is contained in:
parent
46db5ec986
commit
a6fb15f5d7
@ -46,7 +46,7 @@ public class EmployeeController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PatchMapping("/{login}/open")
|
@PatchMapping("/{login}/open")
|
||||||
public ResponseEntity<String> openEmployee(@PathVariable String login, @RequestBody CodeDto value) {
|
public ResponseEntity<Boolean> openEmployee(@PathVariable String login, @RequestBody CodeDto value) {
|
||||||
Long code = value.getValue();
|
Long code = value.getValue();
|
||||||
return ResponseEntity.ok(employeeService.enterEmployee(login, code));
|
return ResponseEntity.ok(employeeService.enterEmployee(login, code));
|
||||||
}
|
}
|
||||||
|
@ -9,5 +9,5 @@ public interface EmployeeService {
|
|||||||
EmployeeDto getByLogin(String login);
|
EmployeeDto getByLogin(String login);
|
||||||
String blockEmployee(String login);
|
String blockEmployee(String login);
|
||||||
String unblockEmployee(String login);
|
String unblockEmployee(String login);
|
||||||
String enterEmployee(String login, Long value);
|
Boolean enterEmployee(String login, Long value);
|
||||||
}
|
}
|
@ -11,6 +11,7 @@ import com.example.nto.service.EmployeeService;
|
|||||||
import com.example.nto.repository.EmployeeRepository;
|
import com.example.nto.repository.EmployeeRepository;
|
||||||
|
|
||||||
import com.example.nto.utils.EmployeeMapper;
|
import com.example.nto.utils.EmployeeMapper;
|
||||||
|
import liquibase.pro.packaged.B;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -60,7 +61,7 @@ public class EmployeeServiceImpl implements EmployeeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String enterEmployee(String login, Long value) {
|
public Boolean enterEmployee(String login, Long value) {
|
||||||
Employee employee = EmployeeMapper.convertFromDto(getByLogin(login));
|
Employee employee = EmployeeMapper.convertFromDto(getByLogin(login));
|
||||||
if (employee != null) {
|
if (employee != null) {
|
||||||
Optional<Code> codeOp = codeRepository.findByValue(value);
|
Optional<Code> codeOp = codeRepository.findByValue(value);
|
||||||
@ -73,9 +74,9 @@ public class EmployeeServiceImpl implements EmployeeService {
|
|||||||
enter.setEntered_at(Timestamp.valueOf(LocalDateTime.now()));
|
enter.setEntered_at(Timestamp.valueOf(LocalDateTime.now()));
|
||||||
enter.setEnterType("Phone");
|
enter.setEnterType("Phone");
|
||||||
enterRepository.save(enter);
|
enterRepository.save(enter);
|
||||||
return "дверь открылась";
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return "Доступ закрыт";
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new CodeNotFoundException("Неверный код");
|
throw new CodeNotFoundException("Неверный код");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user