代码提交

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()) {
             //执行组装标签

src/main/java/com/yaoyuan/jiscuss/entity/Tag.java

@@ -31,6 +31,9 @@ public class Tag implements Serializable{
     @Column(name="color")
     private String color;
 
+    @Column(name="icon")
+    private String icon;
+    
     @Column(name="position")
     private Integer position;
     

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;

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;

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

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,

src/main/resources/static/js/user/system.js

@@ -94,12 +94,24 @@ $("#newdiscussions").click(function () {
 
 });
 
-$("#newtags").click(function () {
+$("#cancelnewtags").click(function () {
-    $('#createNewtagsDiv').show();
+    $('#createNewtagsDiv').hide();
-    $('#createNewtagsBtn').show();
+    $('#tagDescriptionDiv').hide();
-    return false;
+    $('#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 () {
 

src/main/resources/templates/index.ftl

@@ -73,11 +73,11 @@
                             <input type="text" placeholder="标签名" id="tagsname">
                         </div>
                         <div class="two fields">
-                        <div class="field" id="createNewtagsDiv" style="display:none">
+                        <div class="field" id="tagDescriptionDiv" style="display:none">
                             <label>描述</label>
                             <input type="text" placeholder="描述" id="tagdescription">
                         </div>
-                        <div class="field" id="createNewtagsDiv" style="display:none">
+                        <div class="field" id="parentTagDiv" style="display:none">
                             <label>父标签</label>
                             <select class="ui fluid dropdown" id="parentTag">
                                 <#list allTags as tag>
@@ -86,7 +86,7 @@
                             </select>
                         </div>
                         </div>
-                        <div class="two fields">
+                        <div class="two fields" id="colorIconDiv" style="display:none">
                             <div class="field">
                                 <label>选择颜色</label>
                                 <div class="ui fluid search selection dropdown">
@@ -130,8 +130,8 @@
                             </div>
                         </div>
                         <div class="field" id="createNewtagsBtn" style="display:none">
-                            <button class="ui teal button" id="commitnewtags">保存</button>
+                            <a class="ui teal button" id="commitnewtags">保存</a>
-                            <button class="ui grey button" id="cancelnewtags">取消</button>
+                            <a class="ui grey button" id="cancelnewtags">取消</a>
                         </div>
 
                         <div class="field">
@@ -223,6 +223,16 @@
                                 <div class="description">Contains build settings for gulp</div>
                             </div>
                         </div>
+                        <#list allTags as tags>
+                            <div class="item">
+                                <i class="icon ${tags.icon} ${tags.color}"></i>
+                                <div class="content">
+                                    <a class="header" onclick="onTags(${tags.id})">${tags.name}</a>
+                                    <div class="description">${tags.description}</div>
+                                </div>
+                            </div>
+                        </#list>
+
                     </div>
                 </div>
             </div>