diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceJpaRepository.java index ff4d4948..1b21cc5d 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceJpaRepository.java @@ -8,11 +8,13 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @Repository public interface NamespaceJpaRepository extends JpaRepository, NamespaceRepository { + List findByIdIn(List ids); Optional findBySlug(String slug); Page findByStatus(NamespaceStatus status, Pageable pageable); } diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceMemberJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceMemberJpaRepository.java index ddcda523..7a745cc3 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceMemberJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/NamespaceMemberJpaRepository.java @@ -13,8 +13,8 @@ import java.util.Optional; @Repository public interface NamespaceMemberJpaRepository extends JpaRepository, NamespaceMemberRepository { - Optional findByNamespaceIdAndUserId(Long namespaceId, Long userId); - List findByUserId(Long userId); + Optional findByNamespaceIdAndUserId(Long namespaceId, String userId); + List findByUserId(String userId); Page findByNamespaceId(Long namespaceId, Pageable pageable); - void deleteByNamespaceIdAndUserId(Long namespaceId, Long userId); + void deleteByNamespaceIdAndUserId(Long namespaceId, String userId); } diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/PromotionRequestJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/PromotionRequestJpaRepository.java index c215a6eb..a7b91107 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/PromotionRequestJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/PromotionRequestJpaRepository.java @@ -33,7 +33,7 @@ public interface PromotionRequestJpaRepository extends JpaRepository Page findByNamespaceIdAndStatus(Long namespaceId, ReviewTaskStatus status, Pageable pageable); - Page findBySubmittedByAndStatus(Long submittedBy, ReviewTaskStatus status, Pageable pageable); + Page findBySubmittedByAndStatus(String submittedBy, ReviewTaskStatus status, Pageable pageable); @Modifying @Query(""" @@ -33,7 +33,7 @@ public interface ReviewTaskJpaRepository extends JpaRepository """) int updateStatusWithVersion(@Param("id") Long id, @Param("status") ReviewTaskStatus status, - @Param("reviewedBy") Long reviewedBy, + @Param("reviewedBy") String reviewedBy, @Param("reviewComment") String reviewComment, @Param("expectedVersion") Integer expectedVersion); } diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillJpaRepository.java index 8b093b82..feeda77a 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillJpaRepository.java @@ -16,6 +16,7 @@ import java.util.Optional; @Repository public interface SkillJpaRepository extends JpaRepository, SkillRepository { + List findByIdIn(List ids); Optional findByNamespaceIdAndSlug(Long namespaceId, String slug); @Override @@ -25,7 +26,7 @@ public interface SkillJpaRepository extends JpaRepository, SkillRep List findByNamespaceIdAndStatusOrderByCreatedAtDesc(Long namespaceId, SkillStatus status); Page findByNamespaceIdAndStatus(Long namespaceId, SkillStatus status, Pageable pageable); - List findByOwnerId(Long ownerId); + List findByOwnerId(String ownerId); @Modifying @Query("UPDATE Skill s SET s.downloadCount = s.downloadCount + 1 WHERE s.id = :skillId") diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSearchDocumentEntity.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSearchDocumentEntity.java index b6d83ec9..4eeae924 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSearchDocumentEntity.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillSearchDocumentEntity.java @@ -21,9 +21,9 @@ public class SkillSearchDocumentEntity { private String namespaceSlug; @Column(name = "owner_id", nullable = false) - private Long ownerId; + private String ownerId; - @Column(nullable = false, length = 200) + @Column(length = 256) private String title; @Column(columnDefinition = "TEXT") @@ -51,7 +51,7 @@ public class SkillSearchDocumentEntity { Long skillId, Long namespaceId, String namespaceSlug, - Long ownerId, + String ownerId, String title, String summary, String keywords, @@ -93,7 +93,7 @@ public class SkillSearchDocumentEntity { return namespaceSlug; } - public Long getOwnerId() { + public String getOwnerId() { return ownerId; } @@ -134,7 +134,7 @@ public class SkillSearchDocumentEntity { this.namespaceSlug = namespaceSlug; } - public void setOwnerId(Long ownerId) { + public void setOwnerId(String ownerId) { this.ownerId = ownerId; } diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillVersionJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillVersionJpaRepository.java index 5af5f958..319ec036 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillVersionJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/SkillVersionJpaRepository.java @@ -13,6 +13,7 @@ import java.util.Optional; @Repository public interface SkillVersionJpaRepository extends JpaRepository, SkillVersionRepository { + List findByIdIn(List ids); Optional findBySkillIdAndVersion(Long skillId, String version); @Override diff --git a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/UserAccountJpaRepository.java b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/UserAccountJpaRepository.java index 2968eccf..4f6e9eb7 100644 --- a/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/UserAccountJpaRepository.java +++ b/server/skillhub-infra/src/main/java/com/iflytek/skillhub/infra/jpa/UserAccountJpaRepository.java @@ -7,5 +7,5 @@ import org.springframework.stereotype.Repository; @Repository public interface UserAccountJpaRepository - extends JpaRepository, UserAccountRepository { + extends JpaRepository, UserAccountRepository { }