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

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

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import java.util.Date;
 
+import com.diagbot.annotation.CryptField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -32,6 +33,7 @@ public class GetRelationInfoListDTO {
     /**
      * 关系起点术语名称
      */
+    @CryptField
 	@ApiModelProperty(value="关系起点术语名称")
     private String startName;
 	
@@ -50,6 +52,7 @@ public class GetRelationInfoListDTO {
     /**
      * 关系终点术语名称
      */
+    @CryptField
 	@ApiModelProperty(value="关系终点术语名称")
     private String endName;
 	

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

@@ -238,10 +238,11 @@ public class RelationContactFacade extends RelationServiceImpl {
 
         Concept concept = conceptFacade.getById(relationContactDetailVO.getConceptId());
         relationNodeDTO.setConceptId(concept.getId());
-        relationNodeDTO.setConceptName(concept.getLibName());
+        relationNodeDTO.setConceptName(
+                cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(concept.getLibName()) : concept.getLibName());
         relationNodeDTO.setConceptTypeId(concept.getLibType());
         relationNodeDTO.setConceptTypeName(LexiconTypeEnum.getName(concept.getLibType().intValue()));
-        relationNodeDTO.setConceptNameType(concept.getLibName() + "("
+        relationNodeDTO.setConceptNameType(relationNodeDTO.getConceptName() + "("
                 + LexiconTypeEnum.getName(concept.getLibType().intValue()) + ")");
         relationNodeDTO.setIsDeletedConcept(concept.getIsDeleted());
 
@@ -283,6 +284,10 @@ public class RelationContactFacade extends RelationServiceImpl {
         List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId, endTypeId);
 
         for (RelationNodeDTO i : relationNodeDTOList) {
+            i.setConceptName(
+                    cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getConceptName()) : i.getConceptName());
+            i.setParentConceptName(
+                    cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getParentConceptName()) : i.getParentConceptName());
             i.setConceptTypeName(LexiconTypeEnum.getName(i.getConceptTypeId().intValue()));
             i.setConceptNameType(i.getConceptName() + "(" + LexiconTypeEnum.getName(i.getConceptTypeId().intValue()) + ")");
             i.setParentConceptTypeName(LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue()));

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

@@ -9,6 +9,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.config.CryptConfiguer;
+import com.diagbot.util.CryptUtil;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -66,6 +68,8 @@ public class RelationFacade extends RelationServiceImpl {
     @Autowired
     @Qualifier("relationServiceImpl")
     private RelationService relationService;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 获取医学术语关系列表
@@ -137,7 +141,8 @@ public class RelationFacade extends RelationServiceImpl {
             throw new CommonException(CommonErrorCode.RPC_ERROR, "起始术语不存在");
         }
         getRelationInfoDetailDTO.setStartId(startLibraryInfo.getConceptId());
-        getRelationInfoDetailDTO.setStartName(startLibraryInfo.getName());
+        getRelationInfoDetailDTO.setStartName(
+                cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(startLibraryInfo.getName()) : startLibraryInfo.getName());
         getRelationInfoDetailDTO.setStartType(LexiconTypeEnum.getName(startLibraryInfo.getTypeId().intValue()));
 
 
@@ -150,7 +155,8 @@ public class RelationFacade extends RelationServiceImpl {
             throw new CommonException(CommonErrorCode.RPC_ERROR, "终点术语不存在");
         }
         getRelationInfoDetailDTO.setEndId(endLibraryInfo.getConceptId());
-        getRelationInfoDetailDTO.setEndName(endLibraryInfo.getName());
+        getRelationInfoDetailDTO.setEndName(
+                cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(endLibraryInfo.getName()) : endLibraryInfo.getName());
         getRelationInfoDetailDTO.setEndType(LexiconTypeEnum.getName(endLibraryInfo.getTypeId().intValue()));
 
         LexiconRelationship lexiconRelationship = lexiconRelationshipFacade.getById(relation.getRelationId());
@@ -197,6 +203,11 @@ public class RelationFacade extends RelationServiceImpl {
     private Map<String, Object> checkAddRelationInfoVO(AddRelationInfoVO addRelationInfoVO) {
         Map<String, Object> retMap = new HashMap<>();
 
+        addRelationInfoVO.setStartName(
+                cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char(addRelationInfoVO.getStartName()) : addRelationInfoVO.getStartName());
+        addRelationInfoVO.setEndName(
+                cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char(addRelationInfoVO.getEndName()) : addRelationInfoVO.getEndName());
+
         QueryWrapper<LibraryInfo> libraryInfoQe1 = new QueryWrapper<>();
         libraryInfoQe1.eq("is_deleted", "N");
         libraryInfoQe1.eq("is_concept", 1);

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

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,12 +26,14 @@ public class GetRelationInfoListVO extends Page {
     /**
      * 关系起点术语名称
      */
+    @CryptField
 	@ApiModelProperty(value="关系起点术语名称")
     private String startName;
     
     /**
      * 关系终点术语名称
      */
+    @CryptField
 	@ApiModelProperty(value="关系终点术语名称")
     private String endName;