diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java index 0b241da..82d7f1e 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java @@ -112,7 +112,10 @@ public class UserPostController extends BaseController { discussion.setStartTime(new Date()); discussion.setLastTime(new Date()); - Discussion saveDiscussion = discussionsService.insert(discussion); + Discussion discussionOne = new Discussion(); + BeanUtils.copyProperties(discussion, discussionOne); + + Discussion saveDiscussion = discussionsService.insert(discussionOne); if (null != discussion.getTag()) { //执行组装标签 diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/Tag.java b/src/main/java/com/yaoyuan/jiscuss/entity/Tag.java index 609dada..a211d64 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/Tag.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/Tag.java @@ -30,6 +30,9 @@ public class Tag implements Serializable{ @Column(name="color") private String color; + + @Column(name="icon") + private String icon; @Column(name="position") private Integer position; diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/custom/DiscussionCustom.java b/src/main/java/com/yaoyuan/jiscuss/entity/custom/DiscussionCustom.java index f3beb41..4717df0 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/custom/DiscussionCustom.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/custom/DiscussionCustom.java @@ -3,7 +3,10 @@ package com.yaoyuan.jiscuss.entity.custom; import com.yaoyuan.jiscuss.entity.Discussion; import com.yaoyuan.jiscuss.entity.Tag; import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import javax.persistence.Entity; import java.util.List; /** @@ -15,6 +18,8 @@ import java.util.List; */ @Data +@Setter +@Getter public class DiscussionCustom extends Discussion { private String avatar; diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/custom/PostCustom.java b/src/main/java/com/yaoyuan/jiscuss/entity/custom/PostCustom.java index 2cae7ac..a654372 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/custom/PostCustom.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/custom/PostCustom.java @@ -2,8 +2,11 @@ package com.yaoyuan.jiscuss.entity.custom; import com.yaoyuan.jiscuss.entity.Post; import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.persistence.Column; +import javax.persistence.Entity; import java.util.List; /** @@ -14,6 +17,8 @@ import java.util.List; * @date 2020/9/9 14:44 */ @Data +@Setter +@Getter public class PostCustom extends Post { private String avatar; diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 6aa49b7..0bbd153 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -45,7 +45,7 @@ insert into discussion values (11, '测试主题11', '测试内容3测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试',null,null,null,null,null,null,null,1,null,null,null,null,null,null,null); insert into tag -values (1, '测试标签1',null,null,null,null,null,null,null,null,null); +values (1, '测试标签1',null,null,null,null,null,null,null,null,null,null); insert into post diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 3b7a6b6..66cd0f5 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -78,6 +78,7 @@ id INTEGER not null primary key auto_increment, name varchar(200), description varchar(200), color varchar(200), +icon varchar(200), position INTEGER, parent_id INTEGER, discussions_count text, diff --git a/src/main/resources/static/js/user/system.js b/src/main/resources/static/js/user/system.js index 58efebc..50d7451 100644 --- a/src/main/resources/static/js/user/system.js +++ b/src/main/resources/static/js/user/system.js @@ -94,12 +94,24 @@ $("#newdiscussions").click(function () { }); -$("#newtags").click(function () { - $('#createNewtagsDiv').show(); - $('#createNewtagsBtn').show(); - return false; +$("#cancelnewtags").click(function () { + $('#createNewtagsDiv').hide(); + $('#tagDescriptionDiv').hide(); + $('#parentTagDiv').hide(); + $('#colorIconDiv').hide(); }); +$("#newtags").click(function () { + $('#createNewtagsDiv').show(); + $('#tagDescriptionDiv').show(); + $('#parentTagDiv').show(); + $('#colorIconDiv').show(); +}); + +function onTags(data) { + console.log('123'); + console.log(data); +} $("#commitnewtags").click(function () { diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index 8698a74..780048a 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -73,11 +73,11 @@
-