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

knowledgeman-service/src/main/java/com/diagbot/dto/GetLexiconListDTO.java

@@ -36,12 +36,6 @@ public class GetLexiconListDTO {
 	@ApiModelProperty(value="类型名称")
     private String name;
 
-    /**
-     * 类型备注
-     */
-	@ApiModelProperty(value="类型备注")
-    private String remark;
-
     
 
 }

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

@@ -1,136 +1,134 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2019-03-26
- */
-public class Lexicon implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreated;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    private String name;
-
-    private String remark;
-
-    private String classCont;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreated() {
-        return gmtCreated;
-    }
-
-    public void setGmtCreated(Date gmtCreated) {
-        this.gmtCreated = gmtCreated;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getClassCont() {
-        return classCont;
-    }
-
-    public void setClassCont(String classCont) {
-        this.classCont = classCont;
-    }
-
-    @Override
-    public String toString() {
-        return "Lexicon{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreated=" + gmtCreated +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", remark=" + remark +
-        ", classCont=" + classCont +
-        "}";
-    }
-}
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 术语分类表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-10
+ */
+@TableName("kl_lexicon")
+public class Lexicon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 类型名称
+     */
+    private String name;
+
+    /**
+     * 是否有通用扩展：0-无，1-有
+     */
+    private Integer isHasCommon;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Integer getIsHasCommon() {
+        return isHasCommon;
+    }
+
+    public void setIsHasCommon(Integer isHasCommon) {
+        this.isHasCommon = isHasCommon;
+    }
+
+    @Override
+    public String toString() {
+        return "Lexicon{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", isHasCommon=" + isHasCommon +
+        "}";
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/facade/LexiconFacade.java

@@ -88,9 +88,8 @@ public class LexiconFacade extends LexiconServiceImpl {
 		if(lexicon==null){
 			lexicon = new Lexicon();
 			lexicon.setName(addLexiconVO.getName());
-			lexicon.setRemark(addLexiconVO.getRemark());
 			lexicon.setCreator(currentUser);
-			lexicon.setGmtCreated(now);
+			lexicon.setGmtCreate(now);
 		}else if(lexicon.getIsDeleted().equals("Y")){
 			lexicon.setIsDeleted("N");
 		}else{

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

@@ -22,10 +22,4 @@ public class AddLexiconVO {
 	@ApiModelProperty(value="类型名称",required=true)
     private String name;
 
-    /**
-     * 类型备注
-     */
-	@ApiModelProperty(value="类型备注")
-    private String remark;
-
 }

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

@@ -21,7 +21,7 @@
     	FROM
     	((SELECT
 		b.`name` as conceptName
-		FROM concept a JOIN library_info b ON a.lib_id=b.id
+		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
 		WHERE a.is_deleted='N' AND b.type='化验套餐'
 		ORDER BY a.gmt_modified DESC)
 		UNION
@@ -34,16 +34,16 @@
 		(SELECT
 		a.id as conceptId,
 		b.`name` as conceptName
-		FROM concept a JOIN library_info b ON a.lib_id=b.id
+		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
 		WHERE a.is_deleted='N' AND b.type='化验套餐') t1
 		JOIN
-		relation t2 
+		kl_relation t2 
 		ON t1.conceptId=t2.end_id 
 		JOIN
 		(SELECT
 		a.id as conceptId,
 		b.`name` as conceptName
-		FROM concept a JOIN library_info b ON a.lib_id=b.id
+		FROM kl_concept a JOIN kl_library_info b ON a.lib_id=b.id
 		WHERE a.is_deleted='N' AND b.type='化验明细') t3
 		ON t2.start_id=t3.conceptId
 		WHERE t2.is_deleted='N' AND t2.relation_id=3

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

@@ -6,18 +6,17 @@
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Lexicon">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_created" property="gmtCreated" />
+        <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="name" property="name" />
-        <result column="remark" property="remark" />
-        <result column="class_cont" property="classCont" />
+        <result column="is_has_common" property="isHasCommon" />
     </resultMap>
     
     <select id="getLexiconList" resultType="com.diagbot.dto.GetLexiconListDTO">
     	SELECT  
-			gmt_modified,modifier,name,remark
+			gmt_modified,modifier,name
 		FROM `lexicon`
 		WHERE is_deleted="N"
     	<if test="name!=null and name!=''">

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

@@ -31,7 +31,7 @@
 		a.modifier as operName,
 		a.gmt_modified as operTime,
 		a.is_deleted as isDeleted
-		FROM concept a JOIN library_info b ON a.id=b.concept_id
+		FROM kl_concept a JOIN kl_library_info b ON a.id=b.concept_id
 		GROUP BY a.id) t
 		where 1=1
 		<if test="name!=null and name!=''">

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

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_concept_common"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_lexicon"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);