Доработка

This commit is contained in:
Shilyaev_Dmitry 2025-02-20 15:37:24 +03:00
parent 07a01a55d6
commit 28bb3878f7
7 changed files with 37 additions and 5 deletions

View File

@ -64,6 +64,9 @@ public class EmployeeServiceImpl implements EmployeeService {
if(optionalEnterType.isEmpty()) if(optionalEnterType.isEmpty())
throw new IncorrectTypeException("Incorrect type"); throw new IncorrectTypeException("Incorrect type");
optionalEmployee.get().setLastVisit(enterDTO.getTime());
employeeRepository.save(optionalEmployee.get());
Enter enter = new Enter(); Enter enter = new Enter();
enter.setType(optionalEnterType.get()); enter.setType(optionalEnterType.get());
enter.setTime(enterDTO.getTime()); enter.setTime(enterDTO.getTime());

View File

@ -0,0 +1,14 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog-ext.xsd">
<changeSet id="2025-02-19-0006-enters.xml" author="dshilyaev">
<loadData tableName="Enters" file="db.changelog/1.0/data/csv/2025-02-19-0006-enters-data.csv"
separator=";"
quotchar='*'
encoding="UTF-8"/>
</changeSet>
</databaseChangeLog>

View File

@ -1,8 +1,8 @@
username;name;password;position;photo_url;last_visit username;name;password;position;photo_url;last_visit
pivanov;Иванов Петр Федорович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-12T08:30:21 pivanov;Иванов Петр Федорович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:48:33
ipetrov;Петров Иван Константинович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Аналитик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-13T08:35:44 ipetrov;Петров Иван Константинович;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Аналитик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:49:21
asemenov;Семенов Анатолий Анатольевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-13T08:31:33 asemenov;Семенов Анатолий Анатольевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Разработчик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:50:46
afedorov;Федоров Александр Сергеевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Тестировщик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2024-02-12T08:36:09 afedorov;Федоров Александр Сергеевич;$2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6;Тестировщик;https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg;2025-02-20T14:51:12

1 username name password position photo_url last_visit
2 pivanov Иванов Петр Федорович $2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6 Разработчик https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg 2024-02-12T08:30:21 2025-02-20T14:48:33
3 ipetrov Петров Иван Константинович $2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6 Аналитик https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg 2024-02-13T08:35:44 2025-02-20T14:49:21
4 asemenov Семенов Анатолий Анатольевич $2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6 Разработчик https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg 2024-02-13T08:31:33 2025-02-20T14:50:46
5 afedorov Федоров Александр Сергеевич $2a$12$sgNQzK6r02WoGZb0rJolB.AkVWYc.ZF0RtxZ6PXjhw8EhakqvoFU6 Тестировщик https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg 2024-02-12T08:36:09 2025-02-20T14:51:12
6
7
8

View File

@ -1,5 +1,5 @@
employee_id;authorities_id employee_id;authorities_id
1;1 1;1
2;2 2;2
3;3 3;1
4;1 4;1
1 employee_id authorities_id
2 1 1
3 2 2
4 3 3 1
5 4 1

View File

@ -0,0 +1,14 @@
username;value;enter_type_id;time
pivanov;1234567890123456789;2;2025-02-20T14:32:12
pivanov;9223372036854775807;2;2025-02-20T14:35:25
pivanov;1122334455667788990;2;2025-02-20T14:48:33
ipetrov;1234567890123456789;2;2025-02-20T14:32:12
ipetrov;9223372036854775807;2;2025-02-20T14:35:25
ipetrov;1122334455667788990;2;2025-02-20T14:49:21
asemenov;1234567890123456789;2;2025-02-20T14:32:12
asemenov;9223372036854775807;2;2025-02-20T14:35:25
asemenov;1122334455667788990;2;2025-02-20T14:50:46
afedorov;1234567890123456789;2;2025-02-20T14:32:12
afedorov;9223372036854775807;2;2025-02-20T14:35:25
afedorov;1122334455667788990;2;2025-02-20T14:51:12
1 username value enter_type_id time
2 pivanov 1234567890123456789 2 2025-02-20T14:32:12
3 pivanov 9223372036854775807 2 2025-02-20T14:35:25
4 pivanov 1122334455667788990 2 2025-02-20T14:48:33
5 ipetrov 1234567890123456789 2 2025-02-20T14:32:12
6 ipetrov 9223372036854775807 2 2025-02-20T14:35:25
7 ipetrov 1122334455667788990 2 2025-02-20T14:49:21
8 asemenov 1234567890123456789 2 2025-02-20T14:32:12
9 asemenov 9223372036854775807 2 2025-02-20T14:35:25
10 asemenov 1122334455667788990 2 2025-02-20T14:50:46
11 afedorov 1234567890123456789 2 2025-02-20T14:32:12
12 afedorov 9223372036854775807 2 2025-02-20T14:35:25
13 afedorov 1122334455667788990 2 2025-02-20T14:51:12

View File

@ -20,6 +20,7 @@
<include file="db.changelog/1.0/data/2025-02-18-0004-employee-authority-data.xml"/> <include file="db.changelog/1.0/data/2025-02-18-0004-employee-authority-data.xml"/>
<include file="db.changelog/1.0/1.0/2025-02-19-0006-enters.xml"/> <include file="db.changelog/1.0/1.0/2025-02-19-0006-enters.xml"/>
<include file="db.changelog/1.0/data/2025-02-19-0006-enters-data.xml"/>