提交 40a0e9c0 authored 作者: Whispa's avatar Whispa

commit

上级 221e07a3
...@@ -201,10 +201,9 @@ public class PostController { ...@@ -201,10 +201,9 @@ public class PostController {
RedirectAttributes redirectAttributes) throws IOException { RedirectAttributes redirectAttributes) throws IOException {
TbCfUserInfo user = this.user.user(); TbCfUserInfo user = this.user.user();
post.setUser(user); post.setUser(user);
repository.save(post); //repository.save(post);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
List<String> thumbList = new ArrayList<>(); List<String> thumbList = new ArrayList<>();
List<Content> contents = new ArrayList<>();
if (thumbs != null) { if (thumbs != null) {
for (MultipartFile file : thumbs) { for (MultipartFile file : thumbs) {
...@@ -229,13 +228,13 @@ public class PostController { ...@@ -229,13 +228,13 @@ public class PostController {
String string = UploadController.sendFile(sb.toString(), api); String string = UploadController.sendFile(sb.toString(), api);
list.add(string); list.add(string);
Content content = new Content(); Content content = new Content();
content.setPost(post); //content.setPost(post);
content.setImage(true); content.setImage(true);
// content.path = store.toFile().getAbsolutePath(); // content.path = store.toFile().getAbsolutePath();
content.setContent(string); content.setContent(string);
content.setSize(file.getSize()); content.setSize(file.getSize());
contentRepository.save(content); post.contentList.add(content);
contents.add(content); //contentRepository.save(content);
} }
} }
...@@ -256,12 +255,12 @@ public class PostController { ...@@ -256,12 +255,12 @@ public class PostController {
Optional<Hashtag> byName = hashtagRepository.findByName(hashtag.getName()); Optional<Hashtag> byName = hashtagRepository.findByName(hashtag.getName());
hashtag = hashtagRepository.existsByName(hashtag.getName()) && byName.isPresent() ? hashtag = hashtagRepository.existsByName(hashtag.getName()) && byName.isPresent() ?
byName.get() : byName.get() :
hashtagRepository.save(hashtag); hashtag;
PostHashtag postHashtag = new PostHashtag(); PostHashtag postHashtag = new PostHashtag();
postHashtag.setHashtag(hashtag); postHashtag.setHashtag(hashtag);
postHashtag.setPost(post); //postHashtag.setPost(post);
if( !postHashtagRepository.existsByHashtagNameAndPostId(hashtag.getName(),post.getId()) ) { if( !postHashtagRepository.existsByHashtagNameAndPostId(hashtag.getName(),post.getId()) ) {
postHashtagRepository.save(postHashtag); post.hashtagList.add(postHashtag);
} }
} }
} }
...@@ -270,8 +269,8 @@ public class PostController { ...@@ -270,8 +269,8 @@ public class PostController {
int index = 0; int index = 0;
int vid = 0; int vid = 0;
for (JsonTag jsonTag : tags) { for (JsonTag jsonTag : tags) {
if (contents.size() > index) { if (post.contentList.size() > index) {
Content content = contents.get(index); Content content = post.contentList.get(index);
content.setImage(jsonTag.isImage()); content.setImage(jsonTag.isImage());
if (!jsonTag.isImage()) { if (!jsonTag.isImage()) {
if (vid < thumbList.size()) { if (vid < thumbList.size()) {
...@@ -280,7 +279,7 @@ public class PostController { ...@@ -280,7 +279,7 @@ public class PostController {
vid++; vid++;
} }
} }
contentRepository.save(content); //contentRepository.save(content);
for (Position position : jsonTag.list) { for (Position position : jsonTag.list) {
Tag tag = position.getTag(); Tag tag = position.getTag();
...@@ -291,22 +290,22 @@ public class PostController { ...@@ -291,22 +290,22 @@ public class PostController {
if (b) { if (b) {
item = itemRepository.findByItemId(item.getItemId()); item = itemRepository.findByItemId(item.getItemId());
} else { } else {
item = itemRepository.save(item); //item = itemRepository.save(item);
} }
tag.setItem(item); tag.setItem(item);
ContentTag contentTag = new ContentTag(); ContentTag contentTag = new ContentTag();
if (!tagRepository.existsByTagName(tag.getTagName())) { if (!tagRepository.existsByTagName(tag.getTagName())) {
tagRepository.save(tag); // tagRepository.save(tag);
} else { } else {
tag = tagRepository.findByTagName(tag.getTagName()); tag = tagRepository.findByTagName(tag.getTagName());
} }
contentTag.setTag(tag); contentTag.setTag(tag);
contentTag.setX(position.getX()); contentTag.setX(position.getX());
contentTag.setY(position.getY()); contentTag.setY(position.getY());
contentTag.setContent(content); //contentTag.setContent(content);
postTagRepository.save(contentTag); content.contentTags.add(contentTag);
} }
index++; index++;
} }
...@@ -314,6 +313,12 @@ public class PostController { ...@@ -314,6 +313,12 @@ public class PostController {
} }
//redirectAttributes.addFlashAttribute(); //redirectAttributes.addFlashAttribute();
try {
repository.save(post);
}catch (Exception e){
System.out.println(e.getMessage());
}
return list; return list;
} }
......
...@@ -27,6 +27,9 @@ public class Content extends Model { ...@@ -27,6 +27,9 @@ public class Content extends Model {
private boolean isImage; private boolean isImage;
@OneToMany(mappedBy = "content",cascade = CascadeType.ALL)
public List<ContentTag> contentTags = new ArrayList<>();
public void setThumbnail(String thumbnail) { public void setThumbnail(String thumbnail) {
......
...@@ -17,7 +17,7 @@ public class ContentTag extends Model { ...@@ -17,7 +17,7 @@ public class ContentTag extends Model {
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL)
private Content content; private Content content;
@ManyToOne() @ManyToOne(cascade = CascadeType.ALL)
private Tag tag; private Tag tag;
private double x; private double x;
......
...@@ -41,12 +41,12 @@ public class Post extends Model { ...@@ -41,12 +41,12 @@ public class Post extends Model {
public boolean liked = false; public boolean liked = false;
@OneToMany(mappedBy = "post") @OneToMany(mappedBy = "post",cascade = CascadeType.ALL)
public List<Content> contentList = new ArrayList<>(); public List<Content> contentList = new ArrayList<>();
@JsonIgnore @JsonIgnore
@OneToMany(mappedBy = "post") @OneToMany(mappedBy = "post",cascade = CascadeType.ALL)
public List<PostHashtag> hashtagList = new ArrayList<>(); public List<PostHashtag> hashtagList = new ArrayList<>();
......
...@@ -3,16 +3,19 @@ package com.example.afrishop_v3.models; ...@@ -3,16 +3,19 @@ package com.example.afrishop_v3.models;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity @Entity
@Getter @Getter
@Setter @Setter
@Table(name = "post_hashtag_v2")
public class PostHashtag extends Model { public class PostHashtag extends Model {
@ManyToOne @ManyToOne
private Post post; private Post post;
@ManyToOne @ManyToOne(cascade = CascadeType.ALL)
private Hashtag hashtag; private Hashtag hashtag;
public void setPost(Post post) { public void setPost(Post post) {
......
...@@ -7,10 +7,12 @@ import lombok.Setter; ...@@ -7,10 +7,12 @@ import lombok.Setter;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.Table;
@Entity @Entity
@Getter @Getter
@Setter @Setter
@Table(name = "post_like_v2")
public class PostLike extends Model { public class PostLike extends Model {
@JsonIgnore @JsonIgnore
@ManyToOne(cascade = CascadeType.ALL) @ManyToOne(cascade = CascadeType.ALL)
......
...@@ -4,6 +4,7 @@ import lombok.Getter; ...@@ -4,6 +4,7 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.Formula; import org.hibernate.annotations.Formula;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
...@@ -11,7 +12,7 @@ import javax.persistence.ManyToOne; ...@@ -11,7 +12,7 @@ import javax.persistence.ManyToOne;
@Getter @Getter
@Setter @Setter
public class Tag extends Model { public class Tag extends Model {
@ManyToOne() @ManyToOne(cascade = CascadeType.ALL)
protected Item item; protected Item item;
protected String tagName; protected String tagName;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论