评论优化

src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 
-import com.yaoyuan.jiscuss.entity.Discussions;
+import com.yaoyuan.jiscuss.entity.Discussion;
 import com.yaoyuan.jiscuss.repository.DiscussionsRepository;
 import com.yaoyuan.jiscuss.service.IDiscussionsService;
 
@@ -19,30 +19,30 @@ public class DiscussionsServiceImpl implements IDiscussionsService {
     private DiscussionsRepository discussionsRepository;
 
     @Override
-    public List<Discussions> getAllList() {
+    public List<Discussion> getAllList() {
         return discussionsRepository.findAll();
     }
 
     @Override
-    public Discussions insert(Discussions discussions) {
+    public Discussion insert(Discussion discussion) {
 
-        return discussionsRepository.save(discussions);
+        return discussionsRepository.save(discussion);
     }
 
     @Override
-    public Discussions findOne(Integer id) {
-        Discussions discussions = new Discussions();
-        discussions.setId(id);
+    public Discussion findOne(Integer id) {
+        Discussion discussion = new Discussion();
+        discussion.setId(id);
         return discussionsRepository.getOne(id);
     }
 
 	@Override
-	public Page<Discussions> queryAllDiscussionsList(Discussions discussions,int pageNum, int pageSize) {
+	public Page<Discussion> queryAllDiscussionsList(Discussion discussion, int pageNum, int pageSize) {
         Sort sort=new Sort(Sort.Direction.DESC,"id");
         @SuppressWarnings("deprecation")
 		Pageable pageable=new PageRequest(pageNum,pageSize,sort);
         //将匹配对象封装成Example对象
-        Example<Discussions> example = Example.of(discussions);
+        Example<Discussion> example = Example.of(discussion);
 
         return  discussionsRepository.findAll(example,pageable);
     }

src/main/java/com/yaoyuan/jiscuss/service/impl/DiscussionsTagsServiceImpl.java

@@ -7,7 +7,7 @@ import javax.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.yaoyuan.jiscuss.entity.DiscussionsTags;
+import com.yaoyuan.jiscuss.entity.DiscussionTag;
 import com.yaoyuan.jiscuss.repository.DiscussionsTagsRepository;
 import com.yaoyuan.jiscuss.service.IDiscussionsTagsService;
 
@@ -18,13 +18,13 @@ public class DiscussionsTagsServiceImpl implements IDiscussionsTagsService {
     private DiscussionsTagsRepository discussionsTagsRepository;
 
     @Override
-    public List<DiscussionsTags> getAllList() {
+    public List<DiscussionTag> getAllList() {
         return discussionsTagsRepository.findAll();
     }
 
     @Override
-    public DiscussionsTags insert(DiscussionsTags discussionsTags) {
-        return discussionsTagsRepository.save(discussionsTags);
+    public DiscussionTag insert(DiscussionTag discussionTag) {
+        return discussionsTagsRepository.save(discussionTag);
     }
 
 

src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java

@@ -1,13 +1,21 @@
 package com.yaoyuan.jiscuss.service.impl;
 
-import java.util.List;
-import java.util.Optional;
+import java.io.BufferedReader;
+import java.io.Reader;
+import java.sql.Clob;
+import java.util.*;
 
+import com.yaoyuan.jiscuss.common.PostCommonUtil;
+import com.yaoyuan.jiscuss.entity.Discussion;
+import com.yaoyuan.jiscuss.entity.custom.DiscussionCustom;
+import com.yaoyuan.jiscuss.entity.custom.PostCustom;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.yaoyuan.jiscuss.entity.Posts;
+import com.yaoyuan.jiscuss.entity.Post;
 import com.yaoyuan.jiscuss.repository.PostsRepository;
 import com.yaoyuan.jiscuss.service.IPostsService;
+import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -20,32 +28,86 @@ public class PostsServiceImpl implements IPostsService {
     private PostsRepository postsRepository;
 
     @Override
-    public List<Posts> getAllList() {
+    public List<Post> getAllList() {
         return postsRepository.findAll();
     }
 
     @Override
-    public List<Posts> findOneBy(Integer id) {
+    public List<Post> findOneBy(Integer id) {
 
-        List<Posts> posts = postsRepository.findOneBy(id);
+        List<Post> posts = postsRepository.findOneBy(id);
         return posts;
     }
 
     @Override
-    public List<Posts> findAllByDIdAndparentIdNull(Integer dId) {
-        List<Posts> posts = postsRepository.findAllByDIdAndparentIdNull(dId);
+    public Post findOneByid(Integer id) {
+        Post post =new Post();
+        post.setId(id);
+        Example<Post> example = Example.of(post);
+        Optional<Post> postRes = postsRepository.findOne(example);
+        return postRes.get();
+    }
+
+    @Override
+    public List<PostCustom> findPostCustomById(Integer id) {
+
+        List<Map<String, Object>> posts = postsRepository.findPostCustomById(id);
+//        List<Map<String, Object>> postsObjNew = this.getNewPostsObj(posts);
+
+        List<PostCustom> postCustomList = new ArrayList<>();
+        for(Map<String, Object> mapObj : posts){
+            PostCustom postCustom = new PostCustom();
+            postCustom.setId(Integer.parseInt(String.valueOf(mapObj.get("id"))));
+            postCustom.setParentId(mapObj.get("parent_id") != null ? Integer.parseInt(String.valueOf(mapObj.get("parent_id"))) : null);
+            if(null !=  mapObj.get("create_time")){
+                postCustom.setCreateTime((Date) mapObj.get("create_time"));
+            }
+            String content = "";
+            if(mapObj.get("content") != null){
+                Clob clob = (Clob) mapObj.get("content");
+                content = PostCommonUtil.clobToString(clob);
+            }
+            postCustom.setContent(content);
+            String avatar = "";
+            if(mapObj.get("create_avatar") != null){
+                Clob clob = (Clob) mapObj.get("create_avatar");
+                avatar = PostCommonUtil.clobToString(clob);
+            }
+            postCustom.setAvatar(avatar);
+            postCustom.setUsername(mapObj.get("create_username") != null ? String.valueOf(mapObj.get("create_username")): null);
+            postCustom.setRealname(mapObj.get("create_realname") != null ? String.valueOf(mapObj.get("create_realname")): null);
+            String avatarReply = "";
+            if(mapObj.get("user_avatar") != null){
+                Clob clob = (Clob) mapObj.get("user_avatar");
+                avatarReply = PostCommonUtil.clobToString(clob);
+            }
+            postCustom.setAvatarReply(avatarReply);
+            postCustom.setUsernameReply(mapObj.get("user_username") != null ? String.valueOf(mapObj.get("user_username")): null);
+            postCustom.setRealnameReply(mapObj.get("user_realname") != null ? String.valueOf(mapObj.get("user_realname")): null);
+
+            postCustomList.add(postCustom);
+        }
+
+        List<PostCustom> postCustomListNew = PostCommonUtil.getNewPostsObjCustom(postCustomList);
+
+        return postCustomListNew;
+    }
+
+   @Override
+    public List<Post> findAllByDIdAndparentIdNull(Integer dId) {
+        List<Post> posts = postsRepository.findAllByDIdAndparentIdNull(dId);
         return posts;
     }
 
     @Override
-    public List<Posts> findAllByDIdAndparentIdNotNull(Integer dId) {
-        List<Posts> posts = postsRepository.findAllByDIdAndparentIdNotNull(dId);
+    public List<Post> findAllByDIdAndparentIdNotNull(Integer dId) {
+        List<Post> posts = postsRepository.findAllByDIdAndparentIdNotNull(dId);
         return posts;
     }
 
 
     @Override
-    public Posts insert(Posts posts) {
-        return postsRepository.save(posts);
+    public Post insert(Post post) {
+        return postsRepository.save(post);
     }
 }

src/main/java/com/yaoyuan/jiscuss/service/impl/SettingsServiceImpl.java

@@ -7,7 +7,7 @@ import javax.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.yaoyuan.jiscuss.entity.Settings;
+import com.yaoyuan.jiscuss.entity.Setting;
 import com.yaoyuan.jiscuss.repository.SettingsRepository;
 import com.yaoyuan.jiscuss.service.ISettingsService;
 
@@ -18,12 +18,12 @@ public class SettingsServiceImpl implements ISettingsService {
     private SettingsRepository settingsRepository;
 
     @Override
-    public List<Settings> getAllList() {
+    public List<Setting> getAllList() {
         return settingsRepository.findAll();
     }
 
     @Override
-    public Settings insert(Settings settings) {
-        return settingsRepository.save(settings);
+    public Setting insert(Setting setting) {
+        return settingsRepository.save(setting);
     }
 }

src/main/java/com/yaoyuan/jiscuss/service/impl/TagsServiceImpl.java

@@ -5,10 +5,9 @@ import java.util.List;
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
-import com.yaoyuan.jiscuss.entity.Tags;
+import com.yaoyuan.jiscuss.entity.Tag;
 import com.yaoyuan.jiscuss.repository.TagsRepository;
 import com.yaoyuan.jiscuss.service.ITagsService;
 
@@ -19,17 +18,17 @@ public class TagsServiceImpl implements ITagsService {
     private TagsRepository tagsRepository;
 
     @Override
-    public List<Tags> getAllList() {
+    public List<Tag> getAllList() {
         return tagsRepository.findAll();
     }
 
     @Override
-    public Tags insert(Tags tags) {
-        return tagsRepository.save(tags);
+    public Tag insert(Tag tag) {
+        return tagsRepository.save(tag);
     }
 
     @Override
-    public List<Tags> findByDId(Integer id) {
+    public List<Tag> findByDId(Integer id) {
         return tagsRepository.findByDId(id);
     }
 }

src/main/java/com/yaoyuan/jiscuss/service/impl/UserDetailServiceImpl.java

@@ -1,13 +1,11 @@
 package com.yaoyuan.jiscuss.service.impl;
 
 import com.yaoyuan.jiscuss.entity.UserInfo;
-import com.yaoyuan.jiscuss.entity.Users;
+import com.yaoyuan.jiscuss.entity.User;
 import com.yaoyuan.jiscuss.service.IUsersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -37,7 +35,7 @@ public class UserDetailServiceImpl implements UserDetailsService {
     @Override
     public UserInfo loadUserByUsername(String username) throws UsernameNotFoundException {
         // 通过用户名从数据库获取用户信息
-        Users userInfo = userInfoService.getByUsername(username);
+        User userInfo = userInfoService.getByUsername(username);
         if (userInfo == null) {
             throw new UsernameNotFoundException("用户不存在");
         }

src/main/java/com/yaoyuan/jiscuss/service/impl/UsersServiceImpl.java

@@ -17,7 +17,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.cache.annotation.Cacheable;
 
-import com.yaoyuan.jiscuss.entity.Users;
+import com.yaoyuan.jiscuss.entity.User;
 import com.yaoyuan.jiscuss.repository.UsersRepository;
 import com.yaoyuan.jiscuss.service.IUsersService;
  
@@ -33,7 +33,7 @@ public class UsersServiceImpl implements IUsersService {
      */
     @Cacheable(value = "user")
     @Override
-    public List<Users> getAllList() {
+    public List<User> getAllList() {
         return usersRepository.findAll();
     }
 
@@ -44,7 +44,7 @@ public class UsersServiceImpl implements IUsersService {
      * @return
      */
     @Override
-    public Page<Users> queryAllUsersList(int pageNum,int pageSize) {
+    public Page<User> queryAllUsersList(int pageNum, int pageSize) {
         Sort sort=new Sort(Sort.Direction.DESC,"id");
         @SuppressWarnings("deprecation")
 		Pageable pageable=new PageRequest(pageNum,pageSize,sort);
@@ -57,7 +57,7 @@ public class UsersServiceImpl implements IUsersService {
      * @return
      */
     @Override
-    public List<Users> getByUsernameIsLike(String name) {
+    public List<User> getByUsernameIsLike(String name) {
         return usersRepository.getByUsernameIsLike(name);
     }
 
@@ -68,7 +68,7 @@ public class UsersServiceImpl implements IUsersService {
      */
     @Cacheable(value = "user", key = "#id")
     @Override
-    public Users findOne(Integer id) {
+    public User findOne(Integer id) {
         return usersRepository.getById(id);
     }
 
@@ -79,7 +79,7 @@ public class UsersServiceImpl implements IUsersService {
      */
     @CachePut(value = "user", key = "#user.id")
     @Override
-    public Users insert(Users user) {
+    public User insert(User user) {
         return usersRepository.save(user);
     }
 
@@ -91,7 +91,7 @@ public class UsersServiceImpl implements IUsersService {
      */
     @CachePut(value = "user", key = "#user.id")
     @Override
-    public Users update(Users user, Integer id) {
+    public User update(User user, Integer id) {
         return usersRepository.saveAndFlush(user);
     }
 
@@ -119,7 +119,7 @@ public class UsersServiceImpl implements IUsersService {
      * @return
      */
 	@Override
-	public Users getByUsername(String username) {
+	public User getByUsername(String username) {
 		return usersRepository.getByUsername(username);
 	}
 
@@ -130,7 +130,7 @@ public class UsersServiceImpl implements IUsersService {
      * @return
      */
 	@Override
-	public Users checkByUsernameAndPassword(String username,String password) {
+	public User checkByUsernameAndPassword(String username, String password) {
 		return usersRepository.checkByUsernameAndPassword(username,password);
 	}