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

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

@@ -1,13 +1,12 @@
 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;
 
+import java.util.Date;
+
 /**
  * @Description
  * @author rgb

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

@@ -395,7 +395,8 @@ public class ConceptFacade extends ConceptServiceImpl {
             iPage.getRecords().forEach(i -> {
                 GetAllInformationDTO getAllInformationDTO = new GetAllInformationDTO();
                 getAllInformationDTO.setConceptId(i.getId());
-                getAllInformationDTO.setLibName(i.getLibName());
+                getAllInformationDTO.setLibName(
+                        cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getLibName()) : i.getLibName());
                 getAllInformationDTO.setLibType(LexiconTypeEnum.getName(i.getLibType().intValue()));
                 getAllInformationDTO.setIsDeleted(i.getIsDeleted());
                 getAllInformationDTO.setOperName(respDTO.data.get(i.getModifier()));
@@ -404,7 +405,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                     getAllInformationDTO.setOtherNames(
                             libraryInfoListMap.get(i.getId()).stream()
                                     .sorted((a, b) -> b.getIsConcept() - a.getIsConcept())
-                                    .map(k -> k.getName())
+                                    .map(k -> cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(k.getName()) : k.getName())
                                     .collect(Collectors.joining("、")));
                 }
                 getAllInformationDTOList.add(getAllInformationDTO);
@@ -518,6 +519,8 @@ public class ConceptFacade extends ConceptServiceImpl {
         List<GetConceptInfoDetailDTO> getConceptInfoDetailDTOList = BeanUtil.listCopyTo(
                 libraryinfoFacade.list(libraryInfoQe), GetConceptInfoDetailDTO.class);
         getConceptInfoDetailDTOList.forEach(i -> {
+            i.setName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getName()) : i.getName());
+            i.setSpell(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getSpell()) : i.getSpell());
             i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
         });
 

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,12 +27,14 @@ public class GetAllInformationVO {
     /**
      * 标准术语名称
      */
+    @CryptField
     @ApiModelProperty(value="标准术语名称")
     private String name;
     
     /**
      * 同义词名称
      */
+    @CryptField
     @ApiModelProperty(value="同义词名称")
     private String libName;