关联维护修改

knowledgeman-service/src/main/java/com/diagbot/dto/LisSonContactListDTO.java

@@ -0,0 +1,69 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class LisSonContactListDTO {
+	
+    
+    /**
+     * 概念id
+     */
+	@ApiModelProperty(value="概念id")
+    private Long conceptId;
+    
+    /**
+     * 医学标准术语
+     */
+	@ApiModelProperty(value="医学标准术语")
+    private String libName;
+    
+    /**
+     * 术语类型
+     */
+	@ApiModelProperty(value="术语类型")
+    private String libType;
+    
+    /**
+     * 同义词
+     */
+	@ApiModelProperty(value="同义词")
+    private String otherNames;
+    
+    /**
+     * 操作人
+     */
+	@ApiModelProperty(value="操作人")
+    private String operName;
+    
+    /**
+     * 操作时间
+     */
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@ApiModelProperty(value="操作时间")
+    private Date operTime;
+    
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+    
+    
+    
+    
+
+}

knowledgeman-service/src/main/java/com/diagbot/dto/MultContactListDTO.java

@@ -0,0 +1,69 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class MultContactListDTO {
+	
+    
+    /**
+     * 概念id
+     */
+	@ApiModelProperty(value="概念id")
+    private Long conceptId;
+    
+    /**
+     * 医学标准术语
+     */
+	@ApiModelProperty(value="医学标准术语")
+    private String libName;
+    
+    /**
+     * 术语类型
+     */
+	@ApiModelProperty(value="术语类型")
+    private String libType;
+    
+    /**
+     * 同义词
+     */
+	@ApiModelProperty(value="同义词")
+    private String otherNames;
+    
+    /**
+     * 操作人
+     */
+	@ApiModelProperty(value="操作人")
+    private String operName;
+    
+    /**
+     * 操作时间
+     */
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@ApiModelProperty(value="操作时间")
+    private Date operTime;
+    
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+    
+    
+    
+    
+
+}

knowledgeman-service/src/main/java/com/diagbot/dto/RelationContactListDTO.java

@@ -0,0 +1,69 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class RelationContactListDTO {
+	
+    
+    /**
+     * 概念id
+     */
+	@ApiModelProperty(value="概念id")
+    private Long conceptId;
+    
+    /**
+     * 医学标准术语
+     */
+	@ApiModelProperty(value="医学标准术语")
+    private String libName;
+    
+    /**
+     * 术语类型
+     */
+	@ApiModelProperty(value="术语类型")
+    private String libType;
+    
+    /**
+     * 同义词
+     */
+	@ApiModelProperty(value="同义词")
+    private String otherNames;
+    
+    /**
+     * 操作人
+     */
+	@ApiModelProperty(value="操作人")
+    private String operName;
+    
+    /**
+     * 操作时间
+     */
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@ApiModelProperty(value="操作时间")
+    private Date operTime;
+    
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+    
+    
+    
+    
+
+}

knowledgeman-service/src/main/java/com/diagbot/facade/LisSonContactFacade.java

@@ -0,0 +1,48 @@
+package com.diagbot.facade;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.LisSonContactListDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.LisSonContactListVO;
+
+/**
+ * @Description: 医学术语关联业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class LisSonContactFacade extends RelationServiceImpl {
+	
+	@Autowired
+    private UserServiceClient userServiceClient;
+	
+	/**
+     * 化验子项维护-列表
+     * @param relationContactListVO
+     * @return
+     */
+    public IPage<LisSonContactListDTO> lisSonContactList(LisSonContactListVO lisSonContactListVO) {
+    	IPage<LisSonContactListDTO> ipage = this.baseMapper.lisSonContactList(lisSonContactListVO);
+        if (ipage.getRecords().size() > 0) {
+            List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+            RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+            ipage.getRecords().forEach(i -> {
+                i.setOperName(respDTO.data.get(i.getOperName()));
+            });
+        }
+        return ipage;
+    }
+
+
+}

knowledgeman-service/src/main/java/com/diagbot/facade/MultContactFacade.java

@@ -0,0 +1,48 @@
+package com.diagbot.facade;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.MultContactListDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.MultContactListVO;
+
+/**
+ * @Description: 医学术语关联业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class MultContactFacade extends RelationServiceImpl {
+	
+	@Autowired
+    private UserServiceClient userServiceClient;
+	
+	/**
+     * 医学术语多层关联维护-列表
+     * @param relationContactListVO
+     * @return
+     */
+    public IPage<MultContactListDTO> multContactList(MultContactListVO multContactListVO) {
+    	IPage<MultContactListDTO> ipage = this.baseMapper.multContactList(multContactListVO);
+        if (ipage.getRecords().size() > 0) {
+            List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+            RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+            ipage.getRecords().forEach(i -> {
+                i.setOperName(respDTO.data.get(i.getOperName()));
+            });
+        }
+        return ipage;
+    }
+
+
+}

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,15 +11,21 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RelationContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Relation;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.RelationContactDetailVO;
+import com.diagbot.vo.RelationContactListVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
 
@@ -31,10 +38,28 @@ import com.diagbot.vo.RemoveRelationContactVO;
 public class RelationContactFacade extends RelationServiceImpl {
 	
 	@Autowired
-	private RelationFacade relationFacade;
-	@Autowired
     @Qualifier("relationServiceImpl")
     private RelationService relationService;
+	@Autowired
+    private UserServiceClient userServiceClient;
+	
+    /**
+     * 医学术语关联维护-列表
+     * @param relationContactListVO
+     * @return
+     */
+    public IPage<RelationContactListDTO> relationContactList(RelationContactListVO relationContactListVO) {
+    	IPage<RelationContactListDTO> ipage = this.baseMapper.relationContactList(relationContactListVO);
+        if (ipage.getRecords().size() > 0) {
+            List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+            RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+            ipage.getRecords().forEach(i -> {
+                i.setOperName(respDTO.data.get(i.getOperName()));
+            });
+        }
+        return ipage;
+    }
 
 	/**
 	 * 医学术语关联维护/医学术语多层关联维护/化验子项维护-添加或者编辑
@@ -74,7 +99,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 			}else{
 				relationQe.in("relation_id", relationNodeVO.getNodeList().stream().map(i->i.getRelationId()).distinct().collect(Collectors.toList()));
 			}
-			relationFacade.remove(relationQe);
+			remove(relationQe);
 			
 			relationNodeVO.getNodeList().forEach(i->{
 				i.setParentConceptId(relationNodeVO.getConceptId());
@@ -111,7 +136,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @return
 	 */
 	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId){
-		List<RelationNodeDTO> relationNodeDTOList = relationFacade.getBaseMapper().getRelationNodeDTOs(conceptId, relationId);
+		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId);
 		
 		relationNodeDTOList.forEach(i->{
 			i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId));
@@ -140,7 +165,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
 		relationQe.eq("end_id", conceptId);
 		relationQe.eq(relationId!=null,"relation_id", relationId);
-		List<Relation> relationList = relationFacade.list(relationQe);
+		List<Relation> relationList = list(relationQe);
 		
 		if(relationList.size()==0){
 			return;
@@ -162,7 +187,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		
 		Relation relation = new Relation();
 		relation.setIsDeleted(isDeleted);
-		if(!relationFacade.update(relation, relationQe)){
+		if(!update(relation, relationQe)){
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
 		}
 		

knowledgeman-service/src/main/java/com/diagbot/mapper/RelationMapper.java

@@ -5,9 +5,15 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetRelationInfoListDTO;
+import com.diagbot.dto.LisSonContactListDTO;
+import com.diagbot.dto.MultContactListDTO;
+import com.diagbot.dto.RelationContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.entity.Relation;
 import com.diagbot.vo.GetRelationInfoListVO;
+import com.diagbot.vo.LisSonContactListVO;
+import com.diagbot.vo.MultContactListVO;
+import com.diagbot.vo.RelationContactListVO;
 
 /**
  * <p>
@@ -24,4 +30,10 @@ public interface RelationMapper extends BaseMapper<Relation> {
 	
 	List<RelationNodeDTO> getRelationNodeDTOs(Long conceptId,Long relationId);
 	
+	IPage<RelationContactListDTO> relationContactList(RelationContactListVO relationContactListVO);
+	
+	IPage<MultContactListDTO> multContactList(MultContactListVO multContactListVO);
+	
+	IPage<LisSonContactListDTO> lisSonContactList(LisSonContactListVO lisSonContactListVO);
+	
 }

knowledgeman-service/src/main/java/com/diagbot/vo/LisSonContactListVO.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@SuppressWarnings({ "serial", "rawtypes" })
+@Getter
+@Setter
+public class LisSonContactListVO extends Page {
+    
+    /**
+     * 术语名称
+     */
+    @ApiModelProperty(value="术语名称")
+    private String name;
+
+    /**
+     * 术语类型
+     */
+    @ApiModelProperty(value="术语类型")
+    private String type;
+    
+    /**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+}

knowledgeman-service/src/main/java/com/diagbot/vo/MultContactListVO.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@SuppressWarnings({ "serial", "rawtypes" })
+@Getter
+@Setter
+public class MultContactListVO extends Page {
+    
+    /**
+     * 术语名称
+     */
+    @ApiModelProperty(value="术语名称")
+    private String name;
+
+    /**
+     * 术语类型
+     */
+    @ApiModelProperty(value="术语类型")
+    private String type;
+    
+    /**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+}

knowledgeman-service/src/main/java/com/diagbot/vo/RelationContactListVO.java

@@ -0,0 +1,37 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@SuppressWarnings({ "serial", "rawtypes" })
+@Getter
+@Setter
+public class RelationContactListVO extends Page {
+    
+    /**
+     * 术语名称
+     */
+    @ApiModelProperty(value="术语名称")
+    private String name;
+
+    /**
+     * 术语类型
+     */
+    @ApiModelProperty(value="术语类型")
+    private String type;
+    
+    /**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
+}

knowledgeman-service/src/main/java/com/diagbot/web/LisSonContactController.java

@@ -9,10 +9,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.LisSonContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.LisSonContactFacade;
 import com.diagbot.facade.RelationContactFacade;
+import com.diagbot.vo.LisSonContactListVO;
 import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
@@ -36,6 +40,15 @@ public class LisSonContactController {
 	
     @Autowired
     private RelationContactFacade relationContactFacade;
+    @Autowired
+    private LisSonContactFacade lisSonContactFacade;
+    
+    @ApiOperation(value = "化验子项维护-列表[by:rengb]")
+    @PostMapping("/lisSonContactList")
+    @SysLogger("lisSonContactList")
+    public RespDTO<IPage<LisSonContactListDTO>> lisSonContactList(@RequestBody LisSonContactListVO lisSonContactListVO) {
+        return RespDTO.onSuc(lisSonContactFacade.lisSonContactList(lisSonContactListVO));
+    }
     
     @ApiOperation(value = "化验子项维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")

knowledgeman-service/src/main/java/com/diagbot/web/MultContactController.java

@@ -9,10 +9,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.MultContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.MultContactFacade;
 import com.diagbot.facade.RelationContactFacade;
+import com.diagbot.vo.MultContactListVO;
 import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
@@ -36,6 +40,15 @@ public class MultContactController {
 	
     @Autowired
     private RelationContactFacade relationContactFacade;
+    @Autowired
+    private MultContactFacade multContactFacade;
+    
+    @ApiOperation(value = "医学术语多层关联维护-列表[by:rengb]")
+    @PostMapping("/multContactList")
+    @SysLogger("multContactList")
+    public RespDTO<IPage<MultContactListDTO>> multContactList(@RequestBody MultContactListVO multContactListVO) {
+        return RespDTO.onSuc(multContactFacade.multContactList(multContactListVO));
+    }
     
     @ApiOperation(value = "医学术语多层关联维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")

knowledgeman-service/src/main/java/com/diagbot/web/RelationContactController.java

@@ -9,11 +9,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RelationContactListDTO;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.RelationContactFacade;
 import com.diagbot.vo.RelationContactDetailVO;
+import com.diagbot.vo.RelationContactListVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
 
@@ -37,6 +40,13 @@ public class RelationContactController {
     @Autowired
     private RelationContactFacade relationContactFacade;
     
+    @ApiOperation(value = "医学术语关联维护-列表[by:rengb]")
+    @PostMapping("/relationContactList")
+    @SysLogger("relationContactList")
+    public RespDTO<IPage<RelationContactListDTO>> relationContactList(@RequestBody RelationContactListVO relationContactListVO) {
+        return RespDTO.onSuc(relationContactFacade.relationContactList(relationContactListVO));
+    }
+    
     @ApiOperation(value = "医学术语关联维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")
     @SysLogger("addRelation")