代码优化格式化

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

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.HospitalInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,5 +10,44 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class HospitalInfoDTO extends HospitalInfo {
+public class HospitalInfoDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 医院编码
+     */
+    private String code;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 是否对接（0-不对接，1-对接）
+     */
+    private Integer connect;
+
+    /**
+     * 导入方式
+     */
+    private Integer importWay;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -1,212 +0,0 @@
-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 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 Integer importWay;
-
-    /**
-     * 备注
-     */
-    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 Integer getImportWay() {
-		return importWay;
-	}
-
-	public void setImportWay(Integer importWay) {
-		this.importWay = importWay;
-	}
-
-	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 +
-        "}";
-    }
-}

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

@@ -1,10 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.LisDataDTO;
 import com.diagbot.dto.LisRetrieveListAllDTO;
@@ -16,45 +11,46 @@ import com.diagbot.vo.LisArgumentsVO;
 import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年5月27日 上午11:09:20
  */
 @Component
 public class DockingImportFacade {
-	
-	@Autowired
-	TranServiceClient tranServiceClient;
-	
-	/**
-     * 
-     * @param lisHospitalCodeVO
+
+    @Autowired
+    TranServiceClient tranServiceClient;
+
+    /**
+     * @param lisArgumentsVO
      * @return
      */
-	public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
-		RespDTO<LisRetrieveListAllDTO> lisDataVOList = tranServiceClient.getLisDatas(lisArgumentsVO);
-		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
-		return lisDataVOList.data;
-	}
-
-	public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
-		RespDTO<LisDataDTO> lisDataVOList = tranServiceClient.getByGroupNameLisData(lisGroupNameVO);
-		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
-		return lisDataVOList.data;
-	}
-
-	public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
-		RespDTO<PacsRetrieveListAllDTO> lisDataVOList = tranServiceClient.pacsDockingImports(pacsArgumentsVO);
-		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
-		return lisDataVOList.data;
-	}
-
-	public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
-		RespDTO<PacsDataDTO> lisDataVOList = tranServiceClient.getByCheckItemPacsDatas(pacsGroupNameVO);
-		RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
-		return lisDataVOList.data;
-	}
+    public LisRetrieveListAllDTO lisDockingImport(LisArgumentsVO lisArgumentsVO) {
+        RespDTO<LisRetrieveListAllDTO> lisDataVOList = tranServiceClient.getLisDatas(lisArgumentsVO);
+        RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+        return lisDataVOList.data;
+    }
+
+    public LisDataDTO getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
+        RespDTO<LisDataDTO> lisDataVOList = tranServiceClient.getByGroupNameLisData(lisGroupNameVO);
+        RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+        return lisDataVOList.data;
+    }
+
+    public PacsRetrieveListAllDTO pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
+        RespDTO<PacsRetrieveListAllDTO> lisDataVOList = tranServiceClient.pacsDockingImports(pacsArgumentsVO);
+        RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+        return lisDataVOList.data;
+    }
+
+    public PacsDataDTO getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
+        RespDTO<PacsDataDTO> lisDataVOList = tranServiceClient.getByCheckItemPacsDatas(pacsGroupNameVO);
+        RespDTOUtil.respNGDeal(lisDataVOList, "导入化验数据失败！");
+        return lisDataVOList.data;
+    }
 
 }

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

@@ -1,12 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LisDataDTO;
 import com.diagbot.dto.LisRetrieveListAllDTO;
@@ -18,52 +11,54 @@ import com.diagbot.vo.LisArgumentsVO;
 import com.diagbot.vo.LisGroupNameVO;
 import com.diagbot.vo.PacsArgumentsVO;
 import com.diagbot.vo.PacsCheckItemVO;
-
 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;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年5月27日 上午11:06:55
  */
 @RestController
 @RequestMapping("/dockingImport")
-@Api(value = "对接导入API[by:wangfeng]", tags = { "WF——对接导入API" })
+@Api(value = "对接导入API[by:wangfeng]", tags = { "ICSS三期-对接导入API" })
 @SuppressWarnings("unchecked")
 public class DockingImportController {
 
-	@Autowired
-	DockingImportFacade dockingImportFacade;
-	
+    @Autowired
+    DockingImportFacade dockingImportFacade;
+
 
-    @ApiOperation(value = "导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
+    @ApiOperation(value = "ICSS三期-导入化验数据检索:[by:wangfeng]", notes = "导入化验数据检索")
     @PostMapping("/lisDockingImports")
     @SysLogger("lisDockingImports")
     public RespDTO<LisRetrieveListAllDTO> lisDockingImports(LisArgumentsVO lisArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.lisDockingImport(lisArgumentsVO));
     }
-    
-    @ApiOperation(value = "根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
+
+    @ApiOperation(value = "ICSS三期-根据组名称获取化验数据:[by:wangfeng]", notes = "根据组名称获取化验数据")
     @PostMapping("/getByGroupNameLisData")
     @SysLogger("getByGroupNameLisData")
     public RespDTO<LisDataDTO> getByGroupNameLisDatas(LisGroupNameVO lisGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByGroupNameLisDatas(lisGroupNameVO));
-    } 
-    
-    @ApiOperation(value = "导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
+    }
+
+    @ApiOperation(value = "ICSS三期-导入辅件数据检索:[by:wangfeng]", notes = "导入辅件数据检索")
     @PostMapping("/pacsDockingImport")
     @SysLogger("pacsDockingImport")
     public RespDTO<PacsRetrieveListAllDTO> pacsDockingImports(PacsArgumentsVO pacsArgumentsVO) {
         return RespDTO.onSuc(dockingImportFacade.pacsDockingImports(pacsArgumentsVO));
     }
-    
-    @ApiOperation(value = "根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
+
+    @ApiOperation(value = "ICSS三期-根据组名称获取辅件数据:[by:wangfeng]", notes = "根据组名称获取辅件数据")
     @PostMapping("/getByCheckItemPacsData")
     @SysLogger("getByCheckItemPacsData")
     public RespDTO<PacsDataDTO> getByCheckItemPacsDatas(PacsCheckItemVO pacsGroupNameVO) {
         return RespDTO.onSuc(dockingImportFacade.getByCheckItemPacsDatas(pacsGroupNameVO));
-    } 
-    
+    }
+
 }

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

@@ -24,16 +24,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/hospitalInfo")
-@Api(value = "医院信息API", tags = { "医院信息API" })
+@Api(value = "医院信息API", tags = { "ICSS三期-医院信息API" })
 @SuppressWarnings("unchecked")
-@ApiIgnore
-@Deprecated
 public class HospitalInfoController {
 
     @Autowired
     private HospitalInfoFacade hospitalInfoFacade;
 
-    @ApiOperation(value = "医院信息——根据医院编码获取医院信息[by:wangyu]",
+    @ApiOperation(value = "ICSS三期-医院信息——根据医院编码获取医院信息[by:wangyu]",
             notes = "id: 医院id<br>" +
                     "code：医院编码<br>")
     @PostMapping("/getHospitalInfo")

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

@@ -49,7 +49,7 @@ public class RetrievalController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "静态知识-页面检索[by:wangyu]",
+    @ApiOperation(value = "ICSS三期-静态知识-页面检索[by:wangyu]",
             notes = "inputStr：检索内容，必填<br>" +
                     "inputIds：需要去重的id<br>")
     @PostMapping("/getStaticKnowledge")

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

@@ -1,6 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.HospitalInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,5 +10,44 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class HospitalInfoDTO extends HospitalInfo {
+public class HospitalInfoDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 医院编码
+     */
+    private String code;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 是否对接（0-不对接，1-对接）
+     */
+    private Integer connect;
+
+    /**
+     * 导入方式
+     */
+    private Integer importWay;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

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

@@ -17,6 +17,7 @@
         <result column="status" property="status" />
         <result column="order_no" property="orderNo" />
         <result column="import_way" property="importWay" />
+        <result column="connect" property="connect" />
         <result column="remark" property="remark" />
     </resultMap>