提交 da6f2ee0 authored 作者: Whispa's avatar Whispa

commit

上级 789f1e4a
......@@ -21,7 +21,7 @@ public class CommentController {
@GetMapping(value = "/commentsByPostId/{postId}")
//@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
public List<Comment> getList(@PathVariable(value = "postId") long id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
public List<Comment> getList(@PathVariable(value = "postId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
return repository.findAllByPostId(id, PageRequest.of(pageNo, pageSize)).toList();
}
......
......@@ -31,7 +31,7 @@ public class CommentLikeController {
@GetMapping(value = "/CommentsLikesByCommentId/{commentId}")
//@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
public List<CommentLike> getList(@PathVariable(value = "commentId") long id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
public List<CommentLike> getList(@PathVariable(value = "commentId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
return repository.findAllByCommentId(id, PageRequest.of(pageNo, pageSize)).toList();
}
}
......@@ -20,7 +20,7 @@ public class LikeController {
@GetMapping(value = "/likesByPostId/{postId}")
//@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
public List<PostLike> getList(@PathVariable(value = "postId") long id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
public List<PostLike> getList(@PathVariable(value = "postId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
return repository.findAllByPostId(id, PageRequest.of(pageNo, pageSize)).toList();
}
......
......@@ -85,7 +85,7 @@ public class PostController {
@GetMapping("/visit/{postId}")
public Visit visitPage(@PathVariable(value = "postId") long id) {
public Visit visitPage(@PathVariable(value = "postId") String id) {
Optional<Post> byId = repository.findById(id);
if (byId.isPresent()) {
Post post = byId.get();
......@@ -96,7 +96,7 @@ public class PostController {
@PostMapping(value = "/repost/{userId}/{postId}")
public Optional<Post> saveRePost(@PathVariable("userId") String id, @PathVariable("postId") long postId) {
public Optional<Post> saveRePost(@PathVariable("userId") String id, @PathVariable("postId") String postId) {
Optional<TbCfUserInfo> byId = userRepository.findById(id);
Optional<Post> optional = repository.findById(postId);
if (byId.isPresent() && optional.isPresent()) {
......@@ -149,7 +149,7 @@ public class PostController {
}
@GetMapping("/community/{postId}")
public Optional<Post> findPost(@PathVariable(value = "postId") long id) {
public Optional<Post> findPost(@PathVariable(value = "postId") String id) {
Optional<Post> byId = repository.findById(id);
if (byId.isPresent()) {
Post post = byId.get();
......@@ -179,7 +179,7 @@ public class PostController {
}
@GetMapping("/delete/post/{postId}")
public String del(@PathVariable("postId") long id) {
public String del(@PathVariable("postId") String id) {
try {
likeRepository.removeByPost_Id(id);
......
......@@ -18,7 +18,7 @@ public class ReplyController {
@GetMapping(value = "/RepliesByCommentId/{commentId}")
//@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
public List<Reply> getList(@PathVariable(value = "commentId") long id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
public List<Reply> getList(@PathVariable(value = "commentId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
return repository.findAllByCommentId(id, PageRequest.of(pageNo, pageSize)).toList();
}
......
......@@ -16,7 +16,7 @@ public class CommentLike extends Model {
@ManyToOne
private TbCfUserInfo userInfo;
public Long commentId(){
public String commentId(){
return comment != null ? comment.id : null;
}
}
package com.example.afrishop_v3.models;
import com.example.afrishop_v3.util.IdUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -11,12 +12,16 @@ abstract class Model {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@JsonProperty
protected Long id;
protected String id;
@JsonIgnore
Date createDate = new Date();
public Long getId() {
Model(){
this.id = IdUtil.createIdbyUUID();
}
public String getId() {
return id;
}
......
......@@ -20,7 +20,7 @@ public class PostLike extends Model {
private TbCfUserInfo userInfo;
public Long getPostId() {
public String getPostId() {
return post == null ? null : post.id;
}
......
......@@ -10,7 +10,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface BonusRepository extends JpaRepository<Bonus,Long> {
public interface BonusRepository extends JpaRepository<Bonus,String> {
Page<Bonus> findAllByUserInfo_UserIdOrderByIdDesc(String id, Pageable pageable);
@Query(value = "select a from #{#entityName} a WHERE month(a.createDate) = :month and year(a.createDate) = :year and a.userInfo=:id order by a.id desc")
Page<Bonus> findAllByUser_IdAndCreateDateMonthAndCreateDateYear(TbCfUserInfo id, int month, int year, Pageable pageable);
......@@ -21,7 +21,7 @@ public interface BonusRepository extends JpaRepository<Bonus,Long> {
@Query(value = "delete from bonus WHERE post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
void removeByPost_Id(@Param("post") String post_id);
......
......@@ -9,12 +9,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface CommentLikeRepository extends PagingAndSortingRepository<CommentLike,Long> {
Page<CommentLike> findAllByCommentId(long id, Pageable pageable);
public interface CommentLikeRepository extends PagingAndSortingRepository<CommentLike,String> {
Page<CommentLike> findAllByCommentId(String comment_id, Pageable pageable);
@Query(value = "delete from comment_like WHERE comment_id=:comment",nativeQuery = true)
@Modifying
@Transactional
void removeByComment_Id(@Param("comment") Long comment_id);
void removeByComment_Id(@Param("comment") String comment_id);
}
......@@ -9,11 +9,11 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface CommentRepository extends PagingAndSortingRepository<Comment, Long> {
Page<Comment> findAllByPostId(long id, Pageable pageable);
public interface CommentRepository extends PagingAndSortingRepository<Comment, String> {
Page<Comment> findAllByPostId(String post_id, Pageable pageable);
@Query(value = "delete from comment WHERE post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
void removeByPost_Id(@Param("post") String post_id);
}
......@@ -3,5 +3,5 @@ package com.example.afrishop_v3.repository;
import com.example.afrishop_v3.models.Complain;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ComplainRepository extends PagingAndSortingRepository<Complain,Long> {
public interface ComplainRepository extends PagingAndSortingRepository<Complain,String> {
}
......@@ -7,10 +7,10 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface ContentRepository extends PagingAndSortingRepository<Content, Long> {
public interface ContentRepository extends PagingAndSortingRepository<Content, String> {
@Query(value = "delete from content WHERE post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
void removeByPost_Id(@Param("post") String post_id);
}
......@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface FollowRepository extends CrudRepository<Following,Long> {
public interface FollowRepository extends CrudRepository<Following,String> {
List<Following> findAllByFollowedInfoUserId(String followedInfo_userId);
List<Following> findAllByFollowerInfoUserId(String followerInfo_userId);
......
......@@ -7,7 +7,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Optional;
public interface HashtagRepository extends PagingAndSortingRepository<Hashtag,Long> {
public interface HashtagRepository extends PagingAndSortingRepository<Hashtag,String> {
boolean existsByName(String name);
Optional<Hashtag> findByName(String name);
......
......@@ -3,7 +3,7 @@ package com.example.afrishop_v3.repository;
import com.example.afrishop_v3.models.InvitationRequest;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface InvitationRequestRepository extends PagingAndSortingRepository<InvitationRequest, Long> {
public interface InvitationRequestRepository extends PagingAndSortingRepository<InvitationRequest, String> {
boolean existsByUserInfo_UserId(String userInfo_userId);
InvitationRequest findByUserInfo_UserId(String userInfo_userId);
}
......@@ -3,7 +3,7 @@ package com.example.afrishop_v3.repository;
import com.example.afrishop_v3.models.Item;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
public interface ItemRepository extends PagingAndSortingRepository<Item, String> {
boolean existsByItemId(String itemId);
boolean existsByItemName(String string);
Item findByItemId(String itemId);
......
......@@ -9,17 +9,17 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface LikeRepository extends PagingAndSortingRepository<PostLike, Long> {
Page<PostLike> findAllByPostId(long id, Pageable pageable);
public interface LikeRepository extends PagingAndSortingRepository<PostLike, String> {
Page<PostLike> findAllByPostId(String postId, Pageable pageable);
@Query(value = "delete from post_like WHERE user_info_user_id=:userId and post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByUser_IdAndPost_Id(@Param("userId") String user_id, @Param("post") Long post_id);
void removeByUser_IdAndPost_Id(@Param("userId") String user_id, @Param("post") String post_id);
@Query(value = "delete from post_like WHERE post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
boolean existsByUserInfo_UserIdAndPost_Id(String user_id, Long post_id);
void removeByPost_Id(@Param("post") String post_id);
boolean existsByUserInfo_UserIdAndPost_Id(String userInfo_userId, String post_id);
}
......@@ -7,7 +7,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Optional;
public interface NetworkRepository extends PagingAndSortingRepository<Network,Long> {
public interface NetworkRepository extends PagingAndSortingRepository<Network,String> {
boolean existsByUserInfo_UserIdAndNetworkInfo_UserId(String userInfo_userId, String networkInfo_userId);
boolean existsByUserInfo_CodeAndNetworkInfo_UserId(String userInfo_code, String networkInfo_userId);
Network findByUserInfo_UserIdAndNetworkInfo_UserId(String user, String network);
......
......@@ -3,7 +3,7 @@ package com.example.afrishop_v3.repository;
import com.example.afrishop_v3.models.PostHashtag;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface PostHashtagRepository extends PagingAndSortingRepository<PostHashtag,Long> {
public interface PostHashtagRepository extends PagingAndSortingRepository<PostHashtag,String> {
boolean existsByHashtagNameAndPostId(String name, long post);
boolean existsByHashtagNameAndPostId(String hashtag_name, String post_id);
}
......@@ -9,7 +9,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
public interface PostRepository extends PagingAndSortingRepository<Post, Long> {
public interface PostRepository extends PagingAndSortingRepository<Post, String> {
Page<Post> findAllByUserInfoUserIdOrderByIdDesc(String tUser_userId, Pageable pageable);
Page<Post> findAllByDescriptionContainingOrTitleContainingOrUserInfoNickContaining(String query, String query1, String query2, Pageable pageable);
//@Query(value = "select a from #{#entityName} a WHERE EXISTS(SELECT f.follower FROM Following f WHERE f.follower=:me and f.followed=a.user)")
......
......@@ -7,10 +7,10 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface PostTagRepository extends CrudRepository<ContentTag, Long> {
public interface PostTagRepository extends CrudRepository<ContentTag, String> {
@Query(value = "delete ct from content_tag ct INNER JOIN content c ON c.id = ct.content_id WHERE c.post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
void removeByPost_Id(@Param("post") String post_id);
}
......@@ -6,5 +6,5 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ReplyRepository extends PagingAndSortingRepository<Reply,Long> {
Page<Reply> findAllByCommentId(long id, Pageable pageable);
Page<Reply> findAllByCommentId(String comment_id, Pageable pageable);
}
......@@ -5,7 +5,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface TagRepository extends PagingAndSortingRepository<Tag, Long> {
public interface TagRepository extends PagingAndSortingRepository<Tag, String> {
boolean existsByTagName(String string);
Tag findByTagName(String string);
Page<Tag> findAllByTagNameContaining(String string, Pageable pageable);
......
......@@ -7,10 +7,10 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
public interface VisitRepository extends CrudRepository<Visit,Long> {
public interface VisitRepository extends CrudRepository<Visit,String> {
@Query(value = "delete from visit WHERE post_id=:post",nativeQuery = true)
@Modifying
@Transactional
void removeByPost_Id(@Param("post") Long post_id);
void removeByPost_Id(@Param("post") String post_id);
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论