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

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -47,6 +48,7 @@ public class ConceptDetailDTO {
      * 概念名称
      */
     @ApiModelProperty(value="概念名称")
+    @CryptField
     private String libName;
 
     /**

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

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

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.diagbot.annotation.CryptField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -45,6 +46,7 @@ public class GetConceptDetailListDTO {
      * 概念名称
      */
     @ApiModelProperty(value="概念名称")
+    @CryptField
     private String libName;
     
     /**

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

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

knowledgeman-service/src/main/java/com/diagbot/mapper/ConceptMapper.java

@@ -83,8 +83,6 @@ public interface ConceptMapper extends BaseMapper<Concept> {
 
     List<ConceptEnDeDTO> getConceptEnDe();
 
-    void updateById(ConceptEnDeDTO conceptEnDeDTO);
-
     void updateBatchEn(List<ConceptEnDeDTO> conceptEnDeDTOList);
     
 }

knowledgeman-service/src/main/java/com/diagbot/mapper/LibraryInfoMapper.java

@@ -32,6 +32,4 @@ public interface LibraryInfoMapper extends BaseMapper<LibraryInfo> {
     List<LibraryInfoEnDeDTO> getLibraryinfoEnDe();
 
     void updateBatchEn(List<LibraryInfoEnDeDTO> libraryInfoEnDeDTOList);
-
-    void updateById(LibraryInfoEnDeDTO libraryInfoEnDeDTO);
 }

knowledgeman-service/src/main/java/com/diagbot/vo/ConceptIndexVO.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;
@@ -14,6 +15,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class ConceptIndexVO {
+    @CryptField
     @ApiModelProperty(value = "检索名称",required=true)
     @NotBlank(message="名称不能为空")
     private String name;

knowledgeman-service/src/main/java/com/diagbot/vo/GetConceptDetailListVO.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;
@@ -20,6 +21,7 @@ public class GetConceptDetailListVO extends Page {
      * 术语名称
      */
 	@ApiModelProperty(value="术语名称")
+	@CryptField
     private String conceptName;
 	
 	/**

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

@@ -1,6 +1,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;
@@ -17,6 +18,7 @@ public class ScaleContentPageVO extends Page {
     private String status;
 
     @ApiModelProperty(value = "量表名称")
+    @CryptField
     private String name;
 
     @ApiModelProperty(value = "量表类型", hidden = true)

knowledgeman-service/src/main/resources/mapper/ConceptMapper.xml

@@ -332,22 +332,6 @@
         SELECT id, lib_name from kl_concept
     </select>
 
-	<update id="updateById">
-		update kl_concept
-		<set>
-			<if test="libName != null">
-				lib_name = #{libName},
-			</if>
-			<if test="libNameEn != null">
-				lib_name_en = #{libNameEn},
-			</if>
-			<if test="libNameDe != null">
-				lib_name_de = #{libNameDe},
-			</if>
-		</set>
-		where id = #{id}
-	</update>
-
 	<update id="updateBatchEn">
 		<foreach collection="list" item="item"  separator=";">
 			update kl_concept

knowledgeman-service/src/main/resources/mapper/LibraryInfoMapper.xml

@@ -71,30 +71,4 @@
             where id = #{item.id}
         </foreach>
     </update>
-
-    <update id="updateById">
-        update kl_library_info
-        <set>
-            <if test="name != null">
-                name = #{name},
-            </if>
-            <if test="spell != null">
-                spell = #{spell},
-            </if>
-            <if test="nameEn != null">
-                name_en = #{nameEn},
-            </if>
-            <if test="spellEn != null">
-                spell_en = #{spellEn},
-            </if>
-            <if test="nameDe != null">
-                name_de = #{nameDe},
-            </if>
-            <if test="spellDe != null">
-                spell_de = #{spellDe},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
 </mapper>