免责声明移到知识库维护系统

icssman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,6 +1,5 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.enums.DisclaimerCodeEnum;
 import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.ModuleInfoTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
@@ -30,7 +29,6 @@ public class EnumsDataServiceImpl implements EnumsDataService {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
                 .addEnums("introducePositionEnum", IntroducePositionEnum.values())
-                .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
                 .addEnums("questionUsualTypeEnum", QuestionUsualTypeEnum.values())
                 .addEnums("dataSourcesEnums", QuestionUsualTypeEnum.values())
                 .addEnums("moduleInfoTypeEnum", ModuleInfoTypeEnum.values())

icssman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -1,142 +1,142 @@
-package com.diagbot.dto;
-
-import com.diagbot.enums.DisclaimerCodeEnum;
-
-import java.util.Date;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午4:23:48
- */
-
-public class DisclaimerInformationDTO {
-	private Long id;
-
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	private String modifier;
-
-	/**
-	 * 主表id
-	 */
-	// private Long versionId;
-
-	/**
-	 * 标题
-	 */
-	private String title;
-
-	/**
-	 * 描述
-	 */
-	private String description;
-
-	/**
-	 * 排序号
-	 */
-	private String orderNo;
-
-	/**
-	 * 1：启动，0：不启用
-	 */
-	private String status;
-
-	/**
-	 * 免责申明位置
-	 */
-	private String disclaimerCode;
-
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Date getGmtCreate() {
-		return gmtCreate;
-	}
-
-	public void setGmtCreate(Date gmtCreate) {
-		this.gmtCreate = gmtCreate;
-	}
-
-	public String getModifier() {
-		return modifier;
-	}
-
-	public void setModifier(String modifier) {
-		this.modifier = modifier;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getDisclaimerCode() {
-		if (disclaimerCode.equals("1")) {
-			return DisclaimerCodeEnum.getName(1);
-		} else if (disclaimerCode.equals("2")) {
-			return DisclaimerCodeEnum.getName(2);
-		} else if (disclaimerCode.equals("3")) {
-			return DisclaimerCodeEnum.getName(3);
-		} else {
-			return disclaimerCode;
-		}
-	}
-
-	public void setDisclaimerCode(String disclaimerCode) {
-		this.disclaimerCode = disclaimerCode;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-}
+package com.diagbot.dto;
+
+import com.diagbot.enums.DisclaimerCodeEnum;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+
+public class DisclaimerInformationDTO {
+	private Long id;
+
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String modifier;
+
+	/**
+	 * 主表id
+	 */
+	// private Long versionId;
+
+	/**
+	 * 标题
+	 */
+	private String title;
+
+	/**
+	 * 描述
+	 */
+	private String description;
+
+	/**
+	 * 排序号
+	 */
+	private String orderNo;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	/**
+	 * 免责申明位置
+	 */
+	private String disclaimerCode;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Date getGmtCreate() {
+		return gmtCreate;
+	}
+
+	public void setGmtCreate(Date gmtCreate) {
+		this.gmtCreate = gmtCreate;
+	}
+
+	public String getModifier() {
+		return modifier;
+	}
+
+	public void setModifier(String modifier) {
+		this.modifier = modifier;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getDisclaimerCode() {
+		if (disclaimerCode.equals("1")) {
+			return DisclaimerCodeEnum.getName(1);
+		} else if (disclaimerCode.equals("2")) {
+			return DisclaimerCodeEnum.getName(2);
+		} else if (disclaimerCode.equals("3")) {
+			return DisclaimerCodeEnum.getName(3);
+		} else {
+			return disclaimerCode;
+		}
+	}
+
+	public void setDisclaimerCode(String disclaimerCode) {
+		this.disclaimerCode = disclaimerCode;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+}

icssman-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java

@@ -16,7 +16,7 @@ import com.diagbot.enums.DisclaimerCodeEnum;
  * @author wangfeng
  * @since 2018-11-20
  */
-@TableName("icss_disclaimer_information")
+@TableName("kl_disclaimer_information")
 public class DisclaimerInformation implements Serializable {
 
     private static final long serialVersionUID = 1L;

icssman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java

@@ -1,47 +1,46 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-
-import lombok.Setter;
-
-public enum DisclaimerCodeEnum implements KeyedNamed{
-	
-	DiagnoseDisclaimer(1, "诊断免责信息"),
-	PushLiability(2, "推送免责信息"),
-	Disclaimer(3,"免责声明");
-	
-	@Setter
-    private Integer key;
-
-    @Setter
-    private String name;
-
-    DisclaimerCodeEnum(Integer key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static DisclaimerCodeEnum getEnum(Integer key) {
-        for (DisclaimerCodeEnum item : DisclaimerCodeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer key) {
-    	DisclaimerCodeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+public enum DisclaimerCodeEnum implements KeyedNamed{
+	
+	DiagnoseDisclaimer(1, "诊断免责信息"),
+	PushLiability(2, "推送免责信息"),
+	Disclaimer(3,"免责声明");
+	
+	@Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DisclaimerCodeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DisclaimerCodeEnum getEnum(Integer key) {
+        for (DisclaimerCodeEnum item : DisclaimerCodeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+    	DisclaimerCodeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum StatusEnum implements KeyedNamed {
+    Disable(0, "禁用"),
+    Enable(1, "启用");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    StatusEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static StatusEnum getEnum(Integer key) {
+        for (StatusEnum item : StatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        StatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationAllVO.java

@@ -1,55 +1,54 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 修改免责申明详情
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:33:07
- */
-@Getter
-@Setter
-public class DisclaimerInformationAllVO {
-	
-	@NotNull(message = "请输入id")
-	private Long id;
-    /**
-     * 主表id
-     */
-   // private Long versionId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    /**
-     * 排序号
-     */
-    //private String orderNo;
-
-    /**
-     * 1：启动，0：不启用
-     */
-   // private String status;
-
-    /**
-     * 免责申明编号
-     */
-    private String disclaimerCode;
-
-    /**
-     * 备注
-     */
-    //private String remark;
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 修改免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:07
+ */
+@Getter
+@Setter
+public class DisclaimerInformationAllVO {
+	
+	@NotNull(message = "请输入id")
+	private Long id;
+    /**
+     * 主表id
+     */
+   // private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    //private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+   // private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    //private String remark;
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationIdVO.java

@@ -1,22 +1,21 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 删除免责申明详情,启用免责申明详情,停用免责申明详情
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:34:02
- */
-@Getter
-@Setter
-public class DisclaimerInformationIdVO {
-
-	@NotNull(message = "请输入id")
-	private Long id;
-	
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 删除免责申明详情,启用免责申明详情,停用免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:34:02
+ */
+@Getter
+@Setter
+public class DisclaimerInformationIdVO {
+
+	@NotNull(message = "请输入id")
+	private Long id;
+	
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationTitleVO.java

@@ -1,23 +1,22 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * 获取免责申明详情
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:33:22
- */
-@Setter
-@Getter
-public class DisclaimerInformationTitleVO extends Page{
-
-	/**
-     * 名称
-     */
-    private String title;
-}
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * 获取免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:22
+ */
+@Setter
+@Getter
+public class DisclaimerInformationTitleVO extends Page{
+
+	/**
+     * 名称
+     */
+    private String title;
+}

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -1,49 +1,49 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 增加免责申明详情
- * @author wangfeng
- * @Description: TODO
- * @date 2018年12月13日 下午2:33:36
- */
-@Getter
-@Setter
-public class DisclaimerInformationVO {
-	 /**
-     * 主表id
-     */
-   // private Long versionId;
-
-    /**
-     * 标题
-     */
-	@NotBlank(message = "标题不能为空")
-    private String title;
-
-    /**
-     * 描述
-     */
-	@NotBlank(message = "内容不能为空")
-    private String description;
-
-    /**
-     * 排序号
-     */
-    private String orderNo;
-
-    /**
-     * 免责申明编号
-     */
-    private String disclaimerCode;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 增加免责申明详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月13日 下午2:33:36
+ */
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+	 /**
+     * 主表id
+     */
+   // private Long versionId;
+
+    /**
+     * 标题
+     */
+	@NotBlank(message = "标题不能为空")
+    private String title;
+
+    /**
+     * 描述
+     */
+	@NotBlank(message = "内容不能为空")
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

icssman-service/src/main/resources/mapper/DisclaimerInformationMapper.xml

@@ -30,7 +30,7 @@
 		status as status,
 		disclaimer_code as disclaimerCode,
 		remark as remark
-		FROM icss_disclaimer_information
+		FROM kl_disclaimer_information
 		WHERE is_deleted = "N"
 		<if test="disAll.title != null">
 		and title like concat('%',#{disAll.title},'%')