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

aipt-service/src/main/java/com/diagbot/dto/ConceptRetrievalDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,14 +13,18 @@ import lombok.Setter;
 @Setter
 public class ConceptRetrievalDTO {
     private Long selfId;//本身概念id
+    @CryptField
     private String selfName;//本身名称
     private Long parentId;//父级id
+    @CryptField
     private String parentName;//父级名称
+    @CryptField
     private String sameName;//同义词名称
     private Long showType;//显示类型（1本体，0同义词）
     private Long libTypeId;//标签类型id
     private String libTypeName;//标签类型名称
     private Integer type;//questionType
     private Long uniqueId;//公表id
+    @CryptField
     private String uniqueName;//公表名称
 }

aipt-service/src/main/java/com/diagbot/dto/RetrievalDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,12 +13,14 @@ import lombok.Setter;
 @Setter
 public class RetrievalDTO {
     //标签名称
+    @CryptField
     private String name;
     //标签id
     private Long questionId;
     //显示类型（静态知识出参时：0.同义词 1.本体 11.子项推出父项 21.（父项--子项）公表名）
     private Long showType;
     //Tag名称
+    @CryptField
     private String retrievalName;
     //概念id
     private Long conceptId;
@@ -28,6 +31,7 @@ public class RetrievalDTO {
     //icss标签type
     private Integer type;
     //公表名称
+    @CryptField
     private String uniqueName;
     //公表ID
     private Long uniqueId;

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

@@ -103,15 +103,12 @@ public class ConceptFacade extends ConceptServiceImpl {
         //出参封装
         Map<Long, String> map = new HashMap<>();
         if (ListUtil.isNotEmpty(concepts)) {
-            map = concepts.stream().collect(Collectors.toMap(r -> r.getId(), r -> r.getLibName()));
+            map = concepts
+                    .stream()
+                    .collect(Collectors.toMap(r -> r.getId(),
+                            r -> configuer.cryptFlag ? CryptUtil.decrypt_char(r.getLibName()) : r.getLibName()));
         }
 
-        // 判断是否加解密
-        if (configuer.cryptFlag) {
-            for (Long id : map.keySet()) {
-                map.put(id, CryptUtil.decrypt_char(map.get(id)));
-            }
-        }
         return map;
     }
 
@@ -142,15 +139,12 @@ public class ConceptFacade extends ConceptServiceImpl {
         //出参封装
         Map<Long, String> map = new HashMap<>();
         if (ListUtil.isNotEmpty(concepts)) {
-            map = concepts.stream().collect(Collectors.toMap(r -> r.getConceptId(), r -> r.getName()));
+            map = concepts
+                    .stream()
+                    .collect(Collectors.toMap(r -> r.getConceptId(),
+                            r -> configuer.cryptFlag ? CryptUtil.decrypt_char(r.getName()) : r.getName()));
         }
 
-        // 判断是否加解密
-        if (configuer.cryptFlag) {
-            for (Long id : map.keySet()) {
-                map.put(id, CryptUtil.decrypt_char(map.get(id)));
-            }
-        }
         return map;
     }
 
@@ -229,6 +223,9 @@ public class ConceptFacade extends ConceptServiceImpl {
             conceptExistVO.setLibType(libType);
         }
 
+        if (configuer.cryptFlag){
+            CryptUtil.encryptList(conceptExistVO.getNameList());
+        }
         //获取结构
         List<Concept> concepts
                 = this.getListByNamesAndType(conceptExistVO.getNameList(), conceptExistVO.getLibType());
@@ -236,7 +233,11 @@ public class ConceptFacade extends ConceptServiceImpl {
         //出参封装
         Map<String, Long> map = new HashMap<>();
         if (ListUtil.isNotEmpty(concepts)) {
-            map = concepts.stream().collect(Collectors.toMap(r -> r.getLibName(), r -> r.getId()));
+            map = concepts
+                    .stream()
+                    .collect(Collectors.toMap(
+                            r -> configuer.cryptFlag ? CryptUtil.decrypt_char(r.getLibName()) : r.getLibName(),
+                            r -> r.getId()));
         }
         return map;
     }

aipt-service/src/main/java/com/diagbot/vo/ConceptBaseVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class ConceptBaseVO {
+    @CryptField
     @NotBlank(message = "概念名称不能为空")
     private String name;
     @NotNull(message = "词性不能为空")

aipt-service/src/main/java/com/diagbot/vo/ConceptExistVO.java

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +15,6 @@ import java.util.List;
 @Setter
 public class ConceptExistVO {
     @ApiModelProperty(value = "名称列表")
-    @CryptField
     private List<String> nameList;
     @ApiModelProperty(value = "类型")
     private Integer type;

aipt-service/src/main/java/com/diagbot/vo/GetStaticKnowledgeVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,6 +17,7 @@ import java.util.List;
 @Setter
 public class GetStaticKnowledgeVO {
     //检索内容
+    @CryptField
     @NotBlank(message = "请输入检索内容")
     private String InputStr;
     //需要去重的id

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;