Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

knowledgeman-service/src/main/java/com/diagbot/entity/ConceptCommon.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-05-09
+ * @since 2019-06-17
  */
 @TableName("kl_concept_common")
 public class ConceptCommon implements Serializable {
@@ -81,6 +81,11 @@ public class ConceptCommon implements Serializable {
      */
     private String code;
 
+    /**
+     * 0-不推送；1-推送
+     */
+    private String isPush;
+
     /**
      * 备注
      */
@@ -170,6 +175,13 @@ public class ConceptCommon implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+    public String getIsPush() {
+        return isPush;
+    }
+
+    public void setIsPush(String isPush) {
+        this.isPush = isPush;
+    }
     public String getRemark() {
         return remark;
     }
@@ -193,6 +205,7 @@ public class ConceptCommon implements Serializable {
         ", maxAge=" + maxAge +
         ", deptId=" + deptId +
         ", code=" + code +
+        ", isPush=" + isPush +
         ", remark=" + remark +
         "}";
     }

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoVO.java

@@ -68,6 +68,12 @@ public class AddConceptInfoVO {
 	@Range(min=0,max=200,message="年龄须是0-200")
     private Integer maxAge=200;
 	
+    /**
+     * 是否推送：0-不推送；1-推送
+     */
+	@ApiModelProperty(value="是否推送：0-不推送；1-推送")
+    private String isPush="0";
+	
 	private Integer lineNum;
 	
 	

knowledgeman-service/src/main/resources/mapper/ConceptCommonMapper.xml

@@ -16,6 +16,7 @@
         <result column="max_age" property="maxAge" />
         <result column="dept_id" property="deptId" />
         <result column="code" property="code" />
+        <result column="is_push" property="isPush" />
         <result column="remark" property="remark" />
     </resultMap>
 

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("diagbot@20180822");
-        dsc.setUrl("jdbc:mysql://192.168.2.235:3306/med-dev?useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.235:3306/med-man?useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_relation"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_concept_common"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);