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

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

@@ -1,26 +1,26 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-import java.util.List;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年5月6日 下午8:09:16
- */
-@Getter
-@Setter
-public class IndexDTO {
-	
-	private String itemName; // 指标名称
-	private Long uniqueId;
-	private Integer groupType;
-	private List<String> indexUnit;//单位
-	private List<Integer> isAbnormal;//是否异常
-	private List<String> indexValue; 
-	private List<Date> creatTime;
-}
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.diagbot.annotation.CryptField;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年5月6日 下午8:09:16
+ */
+@Getter
+@Setter
+public class IndexDTO {
+	private String itemName; // 指标名称
+	private Long uniqueId;
+	private Integer groupType;
+	private List<String> indexUnit;//单位
+	private List<Integer> isAbnormal;//是否异常
+	private List<String> indexValue; 
+	private List<Date> creatTime;
+}

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

@@ -1,35 +1,37 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: 数据数据获取入参
- * @date 2019年5月7日 上午10:00:15
- */
-@Getter
-@Setter
-public class IndexDataFindVO {
-
-	/**
-	 * 疾病ID
-	 */
-	@NotNull(message = "请输入疾病名")
-	private String diseaseName;
-	/**
-	 * 患者id
-	 */
-	@NotNull(message = "请输入患者id")
-	private Long patientId;
-
-	@NotBlank(message = "请输入开始时间")
-	private String startTime;
-
-	@NotBlank(message = "请输入结束时间")
-	private String endTime;
-}
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.diagbot.annotation.CryptField;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 数据数据获取入参
+ * @date 2019年5月7日 上午10:00:15
+ */
+@Getter
+@Setter
+public class IndexDataFindVO {
+
+	/**
+	 * 疾病ID
+	 */
+	@NotNull(message = "请输入疾病名")
+	@CryptField
+	private String diseaseName;
+	/**
+	 * 患者id
+	 */
+	@NotNull(message = "请输入患者id")
+	private Long patientId;
+
+	@NotBlank(message = "请输入开始时间")
+	private String startTime;
+
+	@NotBlank(message = "请输入结束时间")
+	private String endTime;
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -33,6 +34,7 @@ public class ScaleContentPageDTO {
     /**
      * 名称
      */
+    @CryptField
     private String name;
 
     /**

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

@@ -578,7 +578,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         //String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
         String regEx = "[0-9]+";
         for (AddConceptInfoDetailVO i : addConceptInfoVO.getDetailList()) {
-            if (i.getName().matches(regEx)) {
+            if ((cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getName()) : i.getName()).matches(regEx)) {
                 //throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
                 throw new CommonException(CommonErrorCode.RPC_ERROR,
                         lineNumStr + "无法输入纯数字，请输入正确数据！");
@@ -766,7 +766,8 @@ public class ConceptFacade extends ConceptServiceImpl {
 
             if (addConceptInfoVO.getAddCptDiseaseExtVO() == null) {
                 QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-                conceptQe.eq("lib_name", "全科");
+                conceptQe.eq("lib_name",
+                        cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char("全科") : "全科");
                 conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
                 disease.setDeptId(getOne(conceptQe, false).getId());
                 disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
@@ -994,8 +995,15 @@ public class ConceptFacade extends ConceptServiceImpl {
         ////优化后
         QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<>();
         libraryInfoQe.in("name", addConceptInfoDetailVOList.stream()
-                .map(i -> i.getName()).distinct().collect(Collectors.toList()));
-        Map<String, List<LibraryInfo>> libraryInfoListMap = libraryinfoFacade.list(libraryInfoQe)
+                .map(i -> i.getName())
+                .distinct()
+                .map(i -> cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char(i) : i)
+                .collect(Collectors.toList()));
+        List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
+        libraryInfoList.forEach(i -> {
+            i.setName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getName()) : i.getName());
+        });
+        Map<String, List<LibraryInfo>> libraryInfoListMap = libraryInfoList
                 .stream().collect(Collectors.groupingBy(LibraryInfo::getName));
 
         Map<String, Lexicon> lexiconMap = lexiconFacade.list().stream()
@@ -1128,6 +1136,10 @@ public class ConceptFacade extends ConceptServiceImpl {
             return sbf.toString();
         }
 
+        libraryInfoList.forEach(i -> {
+            i.setName(cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char(i.getName()) : i.getName());
+        });
+
         addConceptInfoVO.setConcept(concept);
         addConceptInfoVO.setConceptCommon(conceptCommon);
         addConceptInfoVO.setLibraryInfoList(libraryInfoList);
@@ -1214,7 +1226,8 @@ public class ConceptFacade extends ConceptServiceImpl {
             Date now = DateUtil.now();
 
             QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-            conceptQe.eq("lib_name", "全科");
+            conceptQe.eq("lib_name",
+                    cryptConfiguer.cryptFlag ? CryptUtil.encrypt_char("全科") : "全科");
             conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
             Concept deptConcept = getOne(conceptQe, false);
 

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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import com.diagbot.annotation.CryptField;
 import org.hibernate.validator.constraints.Range;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +22,7 @@ public class AddConceptInfoDetailVO {
 	/**
      * 术语名称
      */
+	@CryptField
 	@ApiModelProperty(value="术语名称",required=true)
 	@NotBlank(message="术语名称必传")
     private String name;
@@ -28,6 +30,7 @@ public class AddConceptInfoDetailVO {
     /**
      * 术语拼音
      */
+	@CryptField
 	@ApiModelProperty(value="术语拼音")
     private String spell;
 	

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

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
+import com.diagbot.annotation.CryptField;
 import org.hibernate.validator.constraints.Range;
 
 import com.diagbot.entity.Concept;
@@ -33,6 +34,7 @@ public class AddConceptInfoVO {
 	/**
      * 标准术语名称 提示使用
      */
+	@CryptField
 	@ApiModelProperty(value="标准术语名称",required=true)
 	@NotBlank(message="标准术语名称必传")
     private String name;