浏览代码

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

# Conflicts:
#	data-service/src/main/java/com/diagbot/client/AiptServiceClient.java
#	data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
Zhaops 6 年之前
父节点
当前提交
689efb205b
共有 23 个文件被更改,包括 412 次插入249 次删除
  1. 66 0
      aipt-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java
  2. 4 4
      icss-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java
  3. 51 0
      aipt-service/src/main/java/com/diagbot/enums/StatusEnum.java
  4. 38 0
      aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java
  5. 1 2
      icss-service/src/main/java/com/diagbot/mapper/DisclaimerInformationMapper.java
  6. 0 0
      aipt-service/src/main/java/com/diagbot/service/DisclaimerInformationService.java
  7. 0 0
      aipt-service/src/main/java/com/diagbot/service/impl/DisclaimerInformationServiceImpl.java
  8. 41 0
      aipt-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java
  9. 1 1
      icss-service/src/main/resources/mapper/DisclaimerInformationMapper.xml
  10. 11 0
      data-service/src/main/java/com/diagbot/client/AiptServiceClient.java
  11. 9 0
      data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
  12. 64 0
      data-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java
  13. 0 136
      data-service/src/main/java/com/diagbot/entity/User.java
  14. 33 0
      data-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java
  15. 0 12
      data-service/src/main/java/com/diagbot/facade/SysLogFacade.java
  16. 0 21
      data-service/src/main/java/com/diagbot/vo/SysLogVo.java
  17. 39 0
      data-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java
  18. 0 21
      data-service/src/main/java/com/diagbot/web/SysLogController.java
  19. 5 0
      icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java
  20. 7 0
      icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
  21. 28 30
      icss-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java
  22. 12 18
      icss-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java
  23. 2 4
      icss-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

+ 66 - 0
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;
+
+}

+ 4 - 4
icss-service/src/main/java/com/diagbot/entity/DisclaimerInformation.java

@@ -1,12 +1,12 @@
 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;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 免责申明详情
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * @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;

+ 51 - 0
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;
+    }
+}
+

+ 38 - 0
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;
+	}
+
+}

+ 1 - 2
icss-service/src/main/java/com/diagbot/mapper/DisclaimerInformationMapper.java

@@ -1,12 +1,11 @@
 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;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
  * <p>
  * 免责申明详情 Mapper 接口

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


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


+ 41 - 0
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);
+    }
+}

+ 1 - 1
icss-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"
 		and STATUS = '1'
 		AND version_id =0

+ 11 - 0
data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -2,10 +2,15 @@ package com.diagbot.client;
 
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
@@ -35,4 +40,10 @@ public interface AiptServiceClient {
      */
     @PostMapping("/push/treatment")
     RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData);
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+
 }

+ 9 - 0
data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -1,6 +1,8 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -10,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
+import java.util.List;
+
 /**
  * @Description: 调用知识库服务
  * @author: gaodm
@@ -18,6 +22,11 @@ import java.util.Map;
 @Component
 @Slf4j
 public class AiptServiceHystrix implements AiptServiceClient {
+    @Override
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(){
+        log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
+        return null;
+    }
     /**
      * 推理
      *

+ 64 - 0
data-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -0,0 +1,64 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ * @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;
+
+}

+ 0 - 136
data-service/src/main/java/com/diagbot/entity/User.java

@@ -1,136 +0,0 @@
-package com.diagbot.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统用户表
- * </p>
- *
- * @author gaodm
- * @since 2018-08-30
- */
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    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 password;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-
-    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 getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", password=" + password +
-                ", username=" + username +
-                "}";
-    }
-}

+ 33 - 0
data-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -0,0 +1,33 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade {
+
+	@Autowired
+	private AiptServiceClient aiptServiceClient;
+	/**
+	 * 
+	 * @return
+	 */
+	public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+		RespDTO<List<DisclaimerInformationDTO>> res =  aiptServiceClient.getDisclaimerInformations();
+		RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+		return res.data;
+	}
+
+}

+ 0 - 12
data-service/src/main/java/com/diagbot/facade/SysLogFacade.java

@@ -1,12 +0,0 @@
-package com.diagbot.facade;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 用户日志业务层
- * @author: gaodm
- * @time: 2018/8/6 9:11
- */
-@Component
-public class SysLogFacade {
-}

+ 0 - 21
data-service/src/main/java/com/diagbot/vo/SysLogVo.java

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/6 10:16
- */
-@Getter
-@Setter
-public class SysLogVo {
-    private Date createDate;
-    private String ip;
-    private String method;
-    private String operation;
-    private String params;
-}

+ 39 - 0
data-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,39 @@
+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 = { "知识库标准化-免责申明详情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);
+    }
+}

+ 0 - 21
data-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,21 +0,0 @@
-package com.diagbot.web;
-
-
-import com.diagbot.facade.SysLogFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: 日志操作控制层
- * @author: gaodm
- * @time: 2018/8/30 10:12
- */
-@RestController
-@RequestMapping("/log")
-public class SysLogController {
-
-    @Autowired
-    private SysLogFacade sysLogFacade;
-}
-

+ 5 - 0
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();
+
 }

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

+ 28 - 30
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;
 
 }

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

@@ -1,16 +1,13 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-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 java.util.List;
 
 /**
  * 
@@ -19,21 +16,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;
 	}
 
 }

+ 2 - 4
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);
     }
 }