Long code to String
This commit is contained in:
parent
a6fb15f5d7
commit
2e20387bed
@ -47,7 +47,7 @@ public class EmployeeController {
|
|||||||
|
|
||||||
@PatchMapping("/{login}/open")
|
@PatchMapping("/{login}/open")
|
||||||
public ResponseEntity<Boolean> openEmployee(@PathVariable String login, @RequestBody CodeDto value) {
|
public ResponseEntity<Boolean> openEmployee(@PathVariable String login, @RequestBody CodeDto value) {
|
||||||
Long code = value.getValue();
|
String code = value.getValue();
|
||||||
return ResponseEntity.ok(employeeService.enterEmployee(login, code));
|
return ResponseEntity.ok(employeeService.enterEmployee(login, code));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,5 +5,5 @@ import lombok.Data;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class CodeDto {
|
public class CodeDto {
|
||||||
private Long value;
|
private String value;
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ public class Code {
|
|||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
@Column(name="value")
|
@Column(name="value")
|
||||||
private Long value;
|
private String value;
|
||||||
|
|
||||||
@Column(name ="name")
|
@Column(name ="name")
|
||||||
private String name;
|
private String name;
|
||||||
|
@ -7,5 +7,5 @@ import org.springframework.data.jpa.repository.Query;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
public interface CodeRepository extends JpaRepository<Code, Long> {
|
public interface CodeRepository extends JpaRepository<Code, Long> {
|
||||||
Optional<Code> findByValue(long value);
|
Optional<Code> findByValue(String value);
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
Boolean enterEmployee(String login, Long value);
|
Boolean enterEmployee(String login, String value);
|
||||||
}
|
}
|
@ -61,7 +61,7 @@ public class EmployeeServiceImpl implements EmployeeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean enterEmployee(String login, Long value) {
|
public Boolean enterEmployee(String login, String 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);
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
<column name="name" type="VARCHAR">
|
<column name="name" type="VARCHAR">
|
||||||
<constraints nullable="false" unique="true"/>
|
<constraints nullable="false" unique="true"/>
|
||||||
</column>
|
</column>
|
||||||
<column name="value" type="Long">
|
<column name="value" type="VARCHAR">
|
||||||
<constraints nullable="false"/>
|
<constraints nullable="false"/>
|
||||||
</column>
|
</column>
|
||||||
</createTable>
|
</createTable>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user