对接接口修改（获取医院信息）

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

@@ -3,9 +3,11 @@ package com.diagbot.client;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,8 +24,27 @@ public interface TranServiceClient {
 //    @PostMapping(value = "/web/doc/algorithm/neural")
 //    Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);
 
+    /**
+     * 获取医生信息
+     * @param doctorInfoVo
+     * @return
+     */
     @PostMapping("/doctorInfo/getDoctorInfo")
     RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo);
+
+    /**
+     * 获取科室信息
+     * @param hospitalDeptInfoVO
+     * @return
+     */
     @PostMapping("/hospitalDeptInfo/getHospitalDeptInfo")
     RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(@RequestBody HospitalDeptInfoVO hospitalDeptInfoVO);
+
+    /**
+     * 获取医院信息
+     * @param hospitalInfoVO
+     * @return
+     */
+    @PostMapping("/hospitalInfo/getHospitalInfo")
+    RespDTO<List<HospitalInfoDTO>> getHospitalInfo(@RequestBody HospitalInfoVO hospitalInfoVO);
 }

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

@@ -3,9 +3,11 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
+import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
+import com.diagbot.vo.HospitalInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +28,12 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
+    @Override
+    public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+        log.error("【hystrix】调用{}异常", "getHospitalInfo");
+        return null;
+    }
+
     @Override
     public RespDTO<HospitalDeptInfoDTO> getHospitalDeptInfo(HospitalDeptInfoVO hospitalDeptInfoVO) {
         log.error("【hystrix】调用{}异常", "getHospitalDeptInfo");

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

@@ -38,7 +38,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         RespDTO<HospitalDeptInfoDTO> hospitalDeptInfoDTORespDTO = tranServiceClient.getHospitalDeptInfo(hospitalDeptInfoVO);
         if (hospitalDeptInfoDTORespDTO == null || !"0".equals(hospitalDeptInfoDTORespDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取用医生信息失败");
+                    "获取科室信息失败");
         }
         QueryWrapper<DeptInfo> deptInfoDTOQueryWrapper = new QueryWrapper<>();
         deptInfoDTOQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())

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

@@ -31,7 +31,7 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
         RespDTO<List<DoctorInfoDTO>> doctorInfoDTOList = tranServiceClient.getDoctorInfo(doctorInfoVo);
         if (doctorInfoDTOList == null || !"0".equals(doctorInfoDTOList.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取用医生信息失败");
+                    "获取医生信息失败");
         }
         return doctorInfoDTOList.data;
     }

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

@@ -1,12 +1,17 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.HospitalInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
 import com.diagbot.vo.HospitalInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -19,6 +24,9 @@ import java.util.List;
 @Component
 public class HospitalInfoFacade extends HospitalInfoServiceImpl {
 
+    @Autowired
+    TranServiceClient tranServiceClient;
+
     /**
      * 获取医院信息
      *
@@ -26,8 +34,12 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      * @return
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
-        List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
-        return hospitalInfoDTOList;
+        RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
+        if (hospitalInfoDTOList == null || !"0".equals(hospitalInfoDTOList.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "获取医院信息失败");
+        }
+        return hospitalInfoDTOList.data;
     }
 
     /**

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

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -26,7 +25,7 @@ import java.util.List;
 @RequestMapping("/hospitalInfo")
 @Api(value = "医院信息API", tags = { "医院信息API" })
 @SuppressWarnings("unchecked")
-@ApiIgnore
+/*@ApiIgnore*/
 public class HospitalInfoController {
 
     @Autowired

tran-service/src/main/java/com/diagbot/dto/HospitalInfoDTO.java

@@ -0,0 +1,15 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.HospitalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:42
+ */
+@Getter
+@Setter
+public class HospitalInfoDTO extends HospitalInfo {
+}

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -0,0 +1,199 @@
+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 rengb
+ * @since 2018-11-19
+ */
+@TableName("tran_hospital_info")
+public class HospitalInfo 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 code;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 状态：0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    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 String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "HospitalInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", code=" + code +
+        ", name=" + name +
+        ", address=" + address +
+        ", spell=" + spell +
+        ", status=" + status +
+        ", orderNo=" + orderNo +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

tran-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -0,0 +1,47 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.HospitalInfoServiceImpl;
+import com.diagbot.vo.HospitalInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:43
+ */
+@Component
+public class HospitalInfoFacade extends HospitalInfoServiceImpl {
+
+    /**
+     * 获取医院信息
+     *
+     * @param hospitalInfoVO
+     * @return
+     */
+    public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
+        List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
+        return hospitalInfoDTOList;
+    }
+
+    /**
+     * 通过医院编码获取医院信息
+     *
+     * @param code 医院编码
+     * @return
+     */
+    public HospitalInfo getHospitalByCode(String code) {
+        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<HospitalInfo>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        queryWrapper.eq("code", code);
+        queryWrapper.eq("status", StatusEnum.Enable.getKey());
+        return this.getOne(queryWrapper);
+    }
+
+}

tran-service/src/main/java/com/diagbot/mapper/HospitalInfoMapper.java

@@ -0,0 +1,30 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.vo.HospitalInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表 Mapper 接口
+ * </p>
+ *
+ * @author rengb
+ * @since 2018-11-19
+ */
+public interface HospitalInfoMapper extends BaseMapper<HospitalInfo> {
+
+
+    /**
+     * 获取医院信息
+     * @param hospitalInfoVO
+     * @return
+     */
+    List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
+    
+    
+    
+}

tran-service/src/main/java/com/diagbot/service/HospitalInfoService.java

@@ -0,0 +1,27 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.vo.HospitalInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表 服务类
+ * </p>
+ *
+ * @author rengb
+ * @since 2018-11-19
+ */
+public interface HospitalInfoService extends IService<HospitalInfo> {
+
+    /**
+     * 获取医院信息
+     *
+     * @param hospitalInfoVO
+     * @return
+     */
+    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO);
+}

tran-service/src/main/java/com/diagbot/service/impl/HospitalInfoServiceImpl.java

@@ -0,0 +1,28 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.mapper.HospitalInfoMapper;
+import com.diagbot.service.HospitalInfoService;
+import com.diagbot.vo.HospitalInfoVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表 服务实现类
+ * </p>
+ *
+ * @author rengb
+ * @since 2018-11-19
+ */
+@Service
+public class HospitalInfoServiceImpl extends ServiceImpl<HospitalInfoMapper, HospitalInfo> implements HospitalInfoService {
+
+    @Override
+    public List<HospitalInfoDTO> getHospitalInfos(HospitalInfoVO hospitalInfoVO) {
+        return baseMapper.getHospitalInfos(hospitalInfoVO);
+    }
+}

tran-service/src/main/java/com/diagbot/vo/HospitalInfoVO.java

@@ -0,0 +1,27 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:42
+ */
+@Getter
+@Setter
+public class HospitalInfoVO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 医院编码
+     */
+    @NotNull(message = "请输入医院编码")
+    private String code;
+}

tran-service/src/main/java/com/diagbot/web/HospitalInfoController.java

@@ -0,0 +1,44 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.HospitalInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.HospitalInfoFacade;
+import com.diagbot.vo.HospitalInfoVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/22 13:41
+ */
+@RestController
+@RequestMapping("/hospitalInfo")
+@Api(value = "医院信息API", tags = { "医院信息API" })
+@SuppressWarnings("unchecked")
+@ApiIgnore
+public class HospitalInfoController {
+
+    @Autowired
+    private HospitalInfoFacade hospitalInfoFacade;
+
+    @ApiOperation(value = "医院信息——根据医院编码获取医院信息[by:wangyu]",
+            notes = "id: 医院id<br>" +
+                    "code：医院编码<br>")
+    @PostMapping("/getHospitalInfo")
+    @SysLogger("getHospitalInfo")
+    public RespDTO<List<HospitalInfoDTO>> getHospitalInfo(@RequestBody @Valid HospitalInfoVO hospitalInfoVO) {
+        List<HospitalInfoDTO> data = hospitalInfoFacade.getHospitalInfo(hospitalInfoVO);
+        return RespDTO.onSuc(data);
+    }
+}

tran-service/src/main/resources/mapper/HospitalInfoMapper.xml

@@ -0,0 +1,31 @@
+<?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.HospitalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.HospitalInfo">
+        <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="code" property="code" />
+        <result column="name" property="name" />
+        <result column="address" property="address" />
+        <result column="spell" property="spell" />
+        <result column="status" property="status" />
+        <result column="order_no" property="orderNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <select id="getHospitalInfos"  resultType="com.diagbot.dto.HospitalInfoDTO">
+        select * from tran_hospital_info i where i.status = 1 and i.is_deleted = 'N'
+        <if test="id != null and id != ''">
+            and i.id = #{id}
+        </if>
+        <if test="code != null and code != ''">
+            and i.code = #{code}
+        </if>
+    </select>
+</mapper>