免责声明移到知识库

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

@@ -0,0 +1,66 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+	private Long id;
+
+//    /**
+//     * 记录创建时间
+//     */
+//    private Date gmtCreate;
+//
+//
+//
+//    /**
+//     * 创建人，0表示无创建人值
+//     */
+//    private String creator;
+//
+//    /**
+//     * 主表id
+//     */
+//    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+//    /**
+//     * 1：启动，0：不启用
+//     */
+//    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+//    /**
+//     * 备注
+//     */
+//    private String remark;
+
+}

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

@@ -0,0 +1,196 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 免责申明详情
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("kl_disclaimer_information")
+public class DisclaimerInformation 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;
+
+    /**
+     * 主表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 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 Long getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(Long versionId) {
+        this.versionId = versionId;
+    }
+    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() {
+        return disclaimerCode;
+    }
+
+    public void setDisclaimerCode(String disclaimerCode) {
+        this.disclaimerCode = disclaimerCode;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DisclaimerInformation{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", versionId=" + versionId +
+        ", title=" + title +
+        ", description=" + description +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", disclaimerCode=" + disclaimerCode +
+        ", remark=" + remark +
+        "}";
+    }
+}

aipt-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;
+    }
+}
+

aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -0,0 +1,38 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
+
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+
+		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
+		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.orderByAsc("order_no");
+		List<DisclaimerInformation> data = list(disclaimerInformation);
+		// getDisclaimerInformationAll();
+		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
+		return datas;
+	}
+
+}

aipt-service/src/main/java/com/diagbot/mapper/DisclaimerInformationMapper.java

@@ -0,0 +1,21 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 免责申明详情 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationMapper extends BaseMapper<DisclaimerInformation> {
+	
+	public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
+
+}

aipt-service/src/main/java/com/diagbot/service/DisclaimerInformationService.java

@@ -0,0 +1,21 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 免责申明详情 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationService extends IService<DisclaimerInformation> {
+
+    public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
+
+}

aipt-service/src/main/java/com/diagbot/service/impl/DisclaimerInformationServiceImpl.java

@@ -0,0 +1,30 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.mapper.DisclaimerInformationMapper;
+import com.diagbot.service.DisclaimerInformationService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 免责申明详情 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class DisclaimerInformationServiceImpl extends ServiceImpl<DisclaimerInformationMapper, DisclaimerInformation> implements DisclaimerInformationService {
+
+
+    @Override
+    public List<DisclaimerInformationDTO> getDisclaimerInformationAll() {
+
+        return baseMapper.getDisclaimerInformationAll();
+    }
+
+}

aipt-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,41 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInformationFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * @author wangfeng
+ * @Description: 免责申明详情 前端控制器
+ * @date 2018年11月27日 下午3:35:57
+ */
+@RestController
+@RequestMapping("/disclaimerInformation")
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
+@SuppressWarnings("unchecked")
+public class DisclaimerInformationController {
+
+    @Autowired
+    DisclaimerInformationFacade disclaimerInformationFacade;
+
+    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @PostMapping("/getDisclaimerInformations")
+    @SysLogger("getDisclaimerInformations")
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DisclaimerInformationMapper">
+
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.DisclaimerInformation">
+		<id column="id" property="id" />
+		<result column="is_deleted" property="isDeleted" />
+		<result column="gmt_create" property="gmtCreate" />
+		<result column="gmt_modified" property="gmtModified" />
+		<result column="creator" property="creator" />
+		<result column="modifier" property="modifier" />
+		<result column="version_id" property="versionId" />
+		<result column="title" property="title" />
+		<result column="description" property="description" />
+		<result column="order_no" property="orderNo" />
+		<result column="status" property="status" />
+		<result column="disclaimer_code" property="disclaimerCode" />
+		<result column="remark" property="remark" />
+	</resultMap>
+	<select id="getDisclaimerInformationAll" resultType="com.diagbot.dto.DisclaimerInformationDTO">
+		SELECT
+		id as id,
+		gmt_create as gmtCreate,
+		creator as creator,
+		version_id as versionId,
+		title as title,
+		description as description,
+		order_no as orderNo,
+		status as status,
+		disclaimer_code as disclaimerCode,
+		remark as remark
+		FROM kl_disclaimer_information
+		WHERE is_deleted = "N"
+		and STATUS = '1'
+		AND version_id =0
+		ORDER BY order_no
+	</select>
+</mapper>

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -14,6 +14,7 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.FeatureConceptDTO;
@@ -198,4 +199,8 @@ public interface AiptServiceClient {
      */
     @PostMapping(value = "/indexData/saveIndexDatas")
     RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
-}
+
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+
+    }

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -14,6 +14,7 @@ import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.DiseaseIcdDTO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.FeatureConceptDTO;
@@ -260,4 +261,10 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "saveIndexDatas");
         return null;
     }
+
+    @Override
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(){
+        log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
+        return null;
+    }
 }

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

@@ -1,14 +1,12 @@
 package com.diagbot.dto;
 
-import java.util.Date;
-
-import com.diagbot.entity.DisclaimerInformation;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
- * 
+ *
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午4:23:48
@@ -16,24 +14,24 @@ import lombok.Setter;
 @Setter
 @Getter
 public class DisclaimerInformationDTO {
-	private Long id;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    
+    private Long id;
 
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 主表id
-     */
-    private Long versionId;
+    //    /**
+    //     * 记录创建时间
+    //     */
+    //    private Date gmtCreate;
+    //
+    //
+    //
+    //    /**
+    //     * 创建人，0表示无创建人值
+    //     */
+    //    private String creator;
+    //
+    //    /**
+    //     * 主表id
+    //     */
+    //    private Long versionId;
 
     /**
      * 标题
@@ -50,19 +48,19 @@ public class DisclaimerInformationDTO {
      */
     private String orderNo;
 
-    /**
-     * 1：启动，0：不启用
-     */
-    private String status;
+    //    /**
+    //     * 1：启动，0：不启用
+    //     */
+    //    private String status;
 
     /**
      * 免责申明编号
      */
     private String disclaimerCode;
 
-    /**
-     * 备注
-     */
-    private String remark;
+    //    /**
+    //     * 备注
+    //     */
+    //    private String remark;
 
 }

icss-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -1,16 +1,14 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisclaimerInformationDTO;
-import com.diagbot.entity.DisclaimerInformation;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.StatusEnum;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
-import com.diagbot.util.BeanUtil;
+import com.diagbot.util.RespDTOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * 
@@ -19,21 +17,18 @@ import com.diagbot.util.BeanUtil;
  * @date 2018年11月27日 下午3:36:14
  */
 @Component
-public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
+public class DisclaimerInformationFacade {
 
+	@Autowired
+	private AiptServiceClient aiptServiceClient;
 	/**
 	 * 
 	 * @return
 	 */
 	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-
-		QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
-		disclaimerInformation.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.orderByAsc("order_no");
-		List<DisclaimerInformation> data = list(disclaimerInformation);
-		// getDisclaimerInformationAll();
-		List<DisclaimerInformationDTO> datas = BeanUtil.listCopyTo(data, DisclaimerInformationDTO.class);
-		return datas;
+		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
+		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+		return res.data;
 	}
 
 }

icss-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -22,20 +22,18 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/disclaimerInformation")
-@Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "知识库标准化-免责申明详情API" })
 @SuppressWarnings("unchecked")
 public class DisclaimerInformationController {
 
     @Autowired
     DisclaimerInformationFacade disclaimerInformationFacade;
 
-    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "知识库标准化-获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
     public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
-
         List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
-
         return RespDTO.onSuc(data);
     }
 }