SpecialKnowledge增加字段

src/main/frontend/nginx.conf

@@ -26,6 +26,7 @@ http {
         #error_log /usr/share/nginx/logs/error.log;
         #access_log  /usr/share/nginx/logs/host.access.log;
 
+        # /rest/diagnosis/login  --> /login
     	location /rest/diagnosis/ {
     	    proxy_pass http://diagnosis:8080/;
     	    #proxy_set_header   Host             $host;

src/main/java/com/yaoxiang/diagnosis/config/Constants.java

@@ -112,4 +112,7 @@ public class Constants {
     public static final int PAPER_STATUS_PREPARE = 0;
     public static final int PAPER_STATUS_READY = 1;
     public static final int PAPER_STATUS_INVALIDATE = 2;
+
+    public static final String SPECIAL_KNOWLEDGE_MASTER = "掌握";
+    public static final String SPECIAL_KNOWLEDGE_UNMASTER  = "未掌握";
 }

src/main/java/com/yaoxiang/diagnosis/entity/SpecialKnowledge.java

@@ -1,5 +1,6 @@
 package com.yaoxiang.diagnosis.entity;
 
+import com.yaoxiang.diagnosis.config.Constants;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.persistence.*;
@@ -54,10 +55,18 @@ public class SpecialKnowledge {
 
     @Transient
     @ApiModelProperty("掌握率")
-    private Double master;
+    private Double master = 100.0;
     @Transient
     @ApiModelProperty("掌握情况")
-    private Double masterStatus;
+    private String masterStatus = Constants.SPECIAL_KNOWLEDGE_MASTER;
+
+    @Transient
+    @ApiModelProperty("该知识点拥有的题目数量")
+    private Integer questionNum;
+
+    @Transient
+    @ApiModelProperty("该知识点答对的数量")
+    private Integer collectNum;
 
     @Transient
     private SpecialKnowledge parent;
@@ -161,14 +170,30 @@ public class SpecialKnowledge {
         this.master = master;
     }
 
-    public Double getMasterStatus() {
+    public String getMasterStatus() {
         return masterStatus;
     }
 
-    public void setMasterStatus(Double masterStatus) {
+    public void setMasterStatus(String masterStatus) {
         this.masterStatus = masterStatus;
     }
 
+    public Integer getQuestionNum() {
+        return questionNum;
+    }
+
+    public void setQuestionNum(Integer questionNum) {
+        this.questionNum = questionNum;
+    }
+
+    public Integer getCollectNum() {
+        return collectNum;
+    }
+
+    public void setCollectNum(Integer collectNum) {
+        this.collectNum = collectNum;
+    }
+
     @Override
     public String toString() {
         return "SpecialKnowledge{" +