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

common/src/main/java/com/diagbot/biz/push/entity/Medicition.java

@@ -1,5 +1,6 @@
 package com.diagbot.biz.push.entity;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,6 +19,7 @@ public class Medicition {
     /**
      * 药品名称
      */
+    @CryptField
     private String medicitionName;
     /**
      * 词性（10：药品通用名）

common/src/main/java/com/diagbot/util/CryptPojoUtils.java

@@ -11,6 +11,7 @@ import com.diagbot.annotation.CryptField;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,15 @@ public class CryptPojoUtils {
                         for (Object listValue : fieldValue) {
                             encryptField(listValue);
                         }
+                    } else if (field.getType().equals(LinkedList.class)) {
+                        field.setAccessible(true);
+                        LinkedList fieldValue = (LinkedList) field.get(t);
+                        if (ListUtil.isEmpty(fieldValue)) {
+                            continue;
+                        }
+                        for (Object listValue : fieldValue) {
+                            encryptField(listValue);
+                        }
                     } else {
                         field.setAccessible(true);
                         Object fieldValue = field.get(t);
@@ -136,6 +146,15 @@ public class CryptPojoUtils {
                         for (Object listValue : fieldValue) {
                             decryptField(listValue);
                         }
+                    } else if (field.getType().equals(LinkedList.class)) {
+                        field.setAccessible(true);
+                        LinkedList fieldValue = (LinkedList) field.get(t);
+                        if (ListUtil.isEmpty(fieldValue)) {
+                            continue;
+                        }
+                        for (Object listValue : fieldValue) {
+                            decryptField(listValue);
+                        }
                     } else {
                         field.setAccessible(true);
                         Object fieldValue = field.get(t);

knowledgeman-service/src/main/java/com/diagbot/entity/Concept.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.annotation.CryptField;
 
 /**
  * <p>
@@ -59,6 +60,7 @@ public class Concept implements Serializable {
     /**
      * 概念名称(冗余)
      */
+    @CryptField
     private String libName;
 
     /**

knowledgeman-service/src/main/java/com/diagbot/entity/LibraryInfo.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.diagbot.annotation.CryptField;
 
 /**
  * <p>
@@ -54,6 +55,7 @@ public class LibraryInfo implements Serializable {
     /**
      * 名称
      */
+    @CryptField
     private String name;
 
     /**

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.ICSSManServiceClient;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.BIItemDTO;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRes;
@@ -123,6 +124,8 @@ public class ConceptFacade extends ConceptServiceImpl {
     private ICSSManServiceClient icssManServiceClient;
     @Autowired
     private ScaleContentFacade scaleContentFacade;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 获取所有化验公表项
@@ -131,7 +134,7 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<GetAllLisConceptDTO> getAllLisConcept(GetAllLisConceptVO getAllLisConceptVO) {
-        List<GetAllLisConceptDTO> getAllLisConceptDTOList = new ArrayList<>();
+        List<GetAllLisConceptDTO> getAllLisConceptDTOList = Lists.newArrayList();
 
         QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
         conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
@@ -143,10 +146,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                             + "'),'%')");
         }
 
-
-        List<Concept> conceptList = list(conceptQe);
-
-        conceptList.forEach(i -> {
+        list(conceptQe).forEach(i -> {
             if (getAllLisConceptVO.getExcludedConceptNames() != null
                     && getAllLisConceptVO.getExcludedConceptNames().contains(i.getLibName())) {
                 return;
@@ -157,7 +157,6 @@ public class ConceptFacade extends ConceptServiceImpl {
             getAllLisConceptDTOList.add(getAllLisConceptDTO);
         });
 
-        //return this.baseMapper.getAllLisConcept(getAllLisConceptVO);
         return getAllLisConceptDTOList;
     }
 
@@ -204,21 +203,6 @@ public class ConceptFacade extends ConceptServiceImpl {
             libraryInfoList = libraryInfoList.stream()
                     .filter(i -> i.getIsDeleted().equals(IsDeleteEnum.N.getKey())).collect(Collectors.toList());
         }
-        
-        /*//添加过术语医学属性的过滤掉
-        if (getAllConceptVO.getIsMedical() != null && getAllConceptVO.getIsMedical() == 1) {
-            QueryWrapper<Medical> medicalQe = new QueryWrapper<>();
-            medicalQe.eq("is_deleted", "N");
-            medicalQe.in("concept_id", libraryInfoList.stream().map(i -> i.getConceptId()).collect(Collectors.toList()));
-            Map<Long, Medical> medicalMap = medicalFacade.list(medicalQe).stream().collect(Collectors.toMap(Medical::getConceptId, i -> i));
-            libraryInfoList = libraryInfoList.stream().filter(i -> {
-                if (medicalMap.get(i.getConceptId()) == null) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }).collect(Collectors.toList());
-        }*/
 
         getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
         getAllConceptDTOList.forEach(i -> {
@@ -242,12 +226,10 @@ public class ConceptFacade extends ConceptServiceImpl {
                 || getAllForRelationVO.getTypeId() != null) {
             QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
             conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-            if (StringUtil.isNotBlank(getAllForRelationVO.getName())) {
-                conceptQe.apply(
-                        "UPPER(lib_name) LIKE CONCAT('%',trim('"
-                                + getAllForRelationVO.getName().toUpperCase()
-                                + "'),'%')");
-            }
+            conceptQe.apply(StringUtil.isNotBlank(getAllForRelationVO.getName()),
+                    "UPPER(lib_name) LIKE CONCAT('%',trim('"
+                            + getAllForRelationVO.getName().toUpperCase()
+                            + "'),'%')");
             conceptQe.eq(getAllForRelationVO.getTypeId() != null,
                     "lib_type", getAllForRelationVO.getTypeId());
             List<Concept> conceptList = list(conceptQe);

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

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class GetAllConceptVO {
     /**
      * 名称
      */
+    @CryptField
     @ApiModelProperty(value="名称")
     private String name;
     

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

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class GetAllForRelationVO {
     /**
      * 名称
      */
+    @CryptField
     @ApiModelProperty(value="名称")
     private String name;
     

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

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ public class GetAllLisConceptVO {
     /**
      * 名称
      */
+    @CryptField
     @ApiModelProperty(value="名称")
     private String conceptName;