esoe
1 week ago
55 changed files with 169 additions and 221 deletions
@ -1,25 +0,0 @@ |
|||||||
package gsp.technologies.main.access.login; |
|
||||||
|
|
||||||
import java.io.Serializable; |
|
||||||
|
|
||||||
import lombok.AllArgsConstructor; |
|
||||||
import lombok.Data; |
|
||||||
import lombok.NoArgsConstructor; |
|
||||||
|
|
||||||
/** |
|
||||||
* DTO для обмена данными с сервисом авторизации |
|
||||||
* хранит: |
|
||||||
* - номер сессии пользователя |
|
||||||
* - номер запрошенного аккаунта |
|
||||||
*/ |
|
||||||
|
|
||||||
@AllArgsConstructor |
|
||||||
@NoArgsConstructor |
|
||||||
@Data |
|
||||||
public class AuthDTO implements Serializable { |
|
||||||
|
|
||||||
private String sessionId; |
|
||||||
private String accountId; |
|
||||||
private String code35; |
|
||||||
|
|
||||||
} |
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.code; |
package gsp.technologies.main.common.code; |
||||||
|
|
||||||
/** |
/** |
||||||
* Класс, содержащий методы преобразования id в 35-ричное представление |
* Класс, содержащий методы преобразования id в 35-ричное представление |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.organization; |
package gsp.technologies.main.supplier.organization; |
||||||
|
|
||||||
import org.slf4j.Logger; |
import org.slf4j.Logger; |
||||||
import org.slf4j.LoggerFactory; |
import org.slf4j.LoggerFactory; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.organization; |
package gsp.technologies.main.supplier.organization; |
||||||
|
|
||||||
import jakarta.persistence.Column; |
import jakarta.persistence.Column; |
||||||
import jakarta.persistence.Entity; |
import jakarta.persistence.Entity; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.organization; |
package gsp.technologies.main.supplier.organization; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
import java.util.stream.Collectors; |
import java.util.stream.Collectors; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.organization; |
package gsp.technologies.main.supplier.organization; |
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository; |
import org.springframework.data.jpa.repository.JpaRepository; |
||||||
import org.springframework.stereotype.Repository; |
import org.springframework.stereotype.Repository; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.organization; |
package gsp.technologies.main.supplier.organization; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.position; |
package gsp.technologies.main.supplier.position; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.position; |
package gsp.technologies.main.supplier.position; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.position; |
package gsp.technologies.main.supplier.position; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
@ -1,10 +1,10 @@ |
|||||||
package gsp.technologies.main.api.target; |
package gsp.technologies.main.supplier.target; |
||||||
|
|
||||||
import org.hibernate.annotations.OnDelete; |
import org.hibernate.annotations.OnDelete; |
||||||
import org.hibernate.annotations.OnDeleteAction; |
import org.hibernate.annotations.OnDeleteAction; |
||||||
|
|
||||||
import gsp.technologies.main.api.course.CourseEntity; |
import gsp.technologies.main.supplier.position.PositionEntity; |
||||||
import gsp.technologies.main.api.position.PositionEntity; |
import gsp.technologies.main.user.course.CourseEntity; |
||||||
import jakarta.persistence.Entity; |
import jakarta.persistence.Entity; |
||||||
import jakarta.persistence.FetchType; |
import jakarta.persistence.FetchType; |
||||||
import jakarta.persistence.GeneratedValue; |
import jakarta.persistence.GeneratedValue; |
@ -1,9 +1,11 @@ |
|||||||
package gsp.technologies.main.api.target; |
package gsp.technologies.main.supplier.target; |
||||||
|
|
||||||
|
import java.util.Collection; |
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository; |
import org.springframework.data.jpa.repository.JpaRepository; |
||||||
import org.springframework.stereotype.Repository; |
import org.springframework.stereotype.Repository; |
||||||
|
|
||||||
@Repository |
@Repository |
||||||
public interface TargetRepository extends JpaRepository<TargetEntity, Long> { |
public interface TargetRepository extends JpaRepository<TargetEntity, Long> { |
||||||
|
Collection<TargetEntity> findAllByPositionId(Long id); |
||||||
} |
} |
@ -1,9 +1,9 @@ |
|||||||
package gsp.technologies.main.api.account; |
package gsp.technologies.main.user.account; |
||||||
|
|
||||||
import org.hibernate.annotations.OnDelete; |
import org.hibernate.annotations.OnDelete; |
||||||
import org.hibernate.annotations.OnDeleteAction; |
import org.hibernate.annotations.OnDeleteAction; |
||||||
|
|
||||||
import gsp.technologies.main.api.position.PositionEntity; |
import gsp.technologies.main.supplier.position.PositionEntity; |
||||||
import jakarta.persistence.Entity; |
import jakarta.persistence.Entity; |
||||||
import jakarta.persistence.FetchType; |
import jakarta.persistence.FetchType; |
||||||
import jakarta.persistence.GeneratedValue; |
import jakarta.persistence.GeneratedValue; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.account; |
package gsp.technologies.main.user.account; |
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository; |
import org.springframework.data.jpa.repository.JpaRepository; |
||||||
import org.springframework.stereotype.Repository; |
import org.springframework.stereotype.Repository; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.account; |
package gsp.technologies.main.user.account; |
||||||
|
|
||||||
import org.springframework.stereotype.Service; |
import org.springframework.stereotype.Service; |
||||||
|
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.course; |
package gsp.technologies.main.user.course; |
||||||
|
|
||||||
import jakarta.persistence.Entity; |
import jakarta.persistence.Entity; |
||||||
import jakarta.persistence.GeneratedValue; |
import jakarta.persistence.GeneratedValue; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.course; |
package gsp.technologies.main.user.course; |
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository; |
import org.springframework.data.jpa.repository.JpaRepository; |
||||||
import org.springframework.stereotype.Repository; |
import org.springframework.stereotype.Repository; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.course; |
package gsp.technologies.main.user.course; |
||||||
|
|
||||||
import java.util.Collection; |
import java.util.Collection; |
||||||
|
|
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.access.logout; |
package gsp.technologies.main.user.logout; |
||||||
|
|
||||||
import org.slf4j.Logger; |
import org.slf4j.Logger; |
||||||
import org.slf4j.LoggerFactory; |
import org.slf4j.LoggerFactory; |
@ -1,4 +1,4 @@ |
|||||||
package gsp.technologies.main.api.quiz; |
package gsp.technologies.main.user.quiz; |
||||||
|
|
||||||
import org.slf4j.Logger; |
import org.slf4j.Logger; |
||||||
import org.slf4j.LoggerFactory; |
import org.slf4j.LoggerFactory; |
@ -1 +1 @@ |
|||||||
# Курс: Работы на высоте |
# Курс: Охрана труда |
@ -1,10 +0,0 @@ |
|||||||
<!DOCTYPE html> |
|
||||||
<html xmlns:th="http://www.thymeleaf.org"> |
|
||||||
<body> |
|
||||||
<div th:fragment="main"> |
|
||||||
<hr> |
|
||||||
CODE: |
|
||||||
|
|
||||||
</div> |
|
||||||
</body> |
|
||||||
</html> |
|
@ -1,11 +0,0 @@ |
|||||||
<!-- Коллекция фрагментов для построения страницы курса --> |
|
||||||
<!DOCTYPE html> |
|
||||||
<html xmlns:th="http://www.thymeleaf.org"> |
|
||||||
|
|
||||||
<body> |
|
||||||
<div th:fragment="main(id)"> |
|
||||||
<hr> |
|
||||||
<zero-md th:src="@{/content/courses/{id}/main.md (id=${id})}"></zero-md> |
|
||||||
</div> |
|
||||||
</body> |
|
||||||
</html> |
|
Loading…
Reference in new issue