Browse Source

关联维护列表、多层关联维护列表、辅检多层列表修改

rengb 5 years ago
parent
commit
2a1e96d7ea

+ 4 - 3
knowledgeman-service/src/main/java/com/diagbot/dto/OnlyByRootListDTO.java

@@ -1,13 +1,13 @@
 package com.diagbot.dto;
 
-import java.util.Date;
-
+import com.diagbot.annotation.CryptField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @Description
  * @author rgb
@@ -49,6 +49,7 @@ public class OnlyByRootListDTO {
     /**
      * 关联术语
      */
+	@CryptField
 	@ApiModelProperty(value="关联术语")
     private String otherNames;
     

+ 2 - 0
knowledgeman-service/src/main/java/com/diagbot/dto/PacsSonContactListDTO.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;
@@ -48,6 +49,7 @@ public class PacsSonContactListDTO {
     /**
      * 操作人
      */
+    @CryptField
     @ApiModelProperty(value="操作人")
     private String operName;
 

+ 4 - 3
knowledgeman-service/src/main/java/com/diagbot/dto/SingleRelationListDTO.java

@@ -1,13 +1,13 @@
 package com.diagbot.dto;
 
-import java.util.Date;
-
+import com.diagbot.annotation.CryptField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * @Description
  * @author rgb
@@ -61,6 +61,7 @@ public class SingleRelationListDTO {
     /**
      * 关联术语
      */
+	@CryptField
 	@ApiModelProperty(value="关联术语")
     private String otherNames;
     

+ 5 - 0
knowledgeman-service/src/main/java/com/diagbot/facade/MultContactFacade.java

@@ -2,10 +2,12 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.OnlyByRootListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
@@ -27,6 +29,8 @@ public class MultContactFacade extends RelationServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 医学术语多层关联维护-列表
@@ -39,6 +43,7 @@ public class MultContactFacade extends RelationServiceImpl {
 
         if (ListUtil.isNotEmpty(ipage.getRecords())) {
             ipage.getRecords().forEach(i -> {
+                i.setLibName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getLibName()) : i.getLibName());
                 i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
                 i.setLibNameType(i.getLibName() + "(" + i.getLibType() + ")");
             });

+ 4 - 0
knowledgeman-service/src/main/java/com/diagbot/facade/PacsSonContactFacade.java

@@ -2,9 +2,11 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.PacsSonContactListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.PacsSonContactListVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ public class PacsSonContactFacade extends RelationServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 辅检项目维护-列表

+ 5 - 0
knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.RelationNodeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SingleRelationListDTO;
@@ -17,6 +18,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
 import com.diagbot.service.impl.RelationOrderServiceImpl;
 import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
@@ -58,6 +60,8 @@ public class RelationContactFacade extends RelationServiceImpl {
     private RelationOrderServiceImpl relationOrderServiceImpl;
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 医学术语关联维护-列表
@@ -76,6 +80,7 @@ public class RelationContactFacade extends RelationServiceImpl {
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             ipage.getRecords().forEach(i -> {
+                i.setLibName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getLibName()) : i.getLibName());
                 i.setOperName(respDTO.data.get(i.getOperName()));
                 i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
                 i.setLibNameType(i.getLibName() + "(" + i.getLibType() + ")");

+ 2 - 0
knowledgeman-service/src/main/java/com/diagbot/vo/OnlyByRootListVO.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,6 +25,7 @@ public class OnlyByRootListVO extends Page {
     /**
      * 标准术语名称
      */
+    @CryptField
     @ApiModelProperty(value="标准术语名称")
     private String name;
     

+ 2 - 0
knowledgeman-service/src/main/java/com/diagbot/vo/PacsSonContactListVO.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 PacsSonContactListVO  extends Page {
     /**
      * 术语名称
      */
+    @CryptField
     @ApiModelProperty(value="术语名称")
     private String name;
 

+ 2 - 0
knowledgeman-service/src/main/java/com/diagbot/vo/SingleRelationListVO.java

@@ -5,6 +5,7 @@ import javax.validation.constraints.NotNull;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,6 +23,7 @@ public class SingleRelationListVO extends Page {
     /**
      * 标准术语名称
      */
+    @CryptField
     @ApiModelProperty(value="标准术语名称")
     private String name;