|
@@ -2,14 +2,12 @@ package com.diagbot.facade;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
-import com.diagbot.client.ICSSManServiceClient;
|
|
|
|
import com.diagbot.client.UserServiceClient;
|
|
import com.diagbot.client.UserServiceClient;
|
|
import com.diagbot.config.CryptConfiguer;
|
|
import com.diagbot.config.CryptConfiguer;
|
|
import com.diagbot.dto.LisMappingPageDTO;
|
|
import com.diagbot.dto.LisMappingPageDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.entity.Concept;
|
|
import com.diagbot.entity.Concept;
|
|
import com.diagbot.entity.LisMapping;
|
|
import com.diagbot.entity.LisMapping;
|
|
-import com.diagbot.entity.QuestionInfo;
|
|
|
|
import com.diagbot.entity.wrapper.LisMappingWrapper;
|
|
import com.diagbot.entity.wrapper.LisMappingWrapper;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
@@ -19,11 +17,9 @@ import com.diagbot.service.impl.LisMappingServiceImpl;
|
|
import com.diagbot.util.CryptUtil;
|
|
import com.diagbot.util.CryptUtil;
|
|
import com.diagbot.util.DateUtil;
|
|
import com.diagbot.util.DateUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
-import com.diagbot.util.RespDTOUtil;
|
|
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.util.UserUtils;
|
|
import com.diagbot.util.UserUtils;
|
|
import com.diagbot.vo.GetUniqueNameVO;
|
|
import com.diagbot.vo.GetUniqueNameVO;
|
|
-import com.diagbot.vo.IdListVO;
|
|
|
|
import com.diagbot.vo.IdVO;
|
|
import com.diagbot.vo.IdVO;
|
|
import com.diagbot.vo.KLQuestionVO;
|
|
import com.diagbot.vo.KLQuestionVO;
|
|
import com.diagbot.vo.LisMappingPageVO;
|
|
import com.diagbot.vo.LisMappingPageVO;
|
|
@@ -52,9 +48,9 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
@Autowired
|
|
@Autowired
|
|
private UserServiceClient userServiceClient;
|
|
private UserServiceClient userServiceClient;
|
|
@Autowired
|
|
@Autowired
|
|
- private ICSSManServiceClient icssManServiceClient;
|
|
|
|
- @Autowired
|
|
|
|
CryptConfiguer cryptConfiguer;
|
|
CryptConfiguer cryptConfiguer;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IcssManRpcFacade icssManRpcFacade;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 化验公表映射分页信息
|
|
* 化验公表映射分页信息
|
|
@@ -167,19 +163,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
List<Integer> tagTypes = Lists.newArrayList();
|
|
List<Integer> tagTypes = Lists.newArrayList();
|
|
tagTypes.add(7);
|
|
tagTypes.add(7);
|
|
klQuestionVO.setTagType(tagTypes);
|
|
klQuestionVO.setTagType(tagTypes);
|
|
- RespDTO<List<QuestionInfo>> respDTO = icssManServiceClient.indexForkl(klQuestionVO);
|
|
|
|
- if (RespDTOUtil.respIsOK(respDTO)) {
|
|
|
|
- List<QuestionInfo> questionInfoList = respDTO.data;
|
|
|
|
- if (ListUtil.isNotEmpty(questionInfoList)) {
|
|
|
|
- IdListVO idListVO = new IdListVO();
|
|
|
|
- List<Long> idList = questionInfoList
|
|
|
|
- .stream()
|
|
|
|
- .map(i -> i.getId())
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
- idListVO.setIdList(idList);
|
|
|
|
- RespDTO<Boolean> cacheRespDTO = icssManServiceClient.clearCache(idListVO);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ icssManRpcFacade.questionclearCache(klQuestionVO);
|
|
return state;
|
|
return state;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -237,19 +221,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
List<Integer> tagTypes = Lists.newArrayList();
|
|
List<Integer> tagTypes = Lists.newArrayList();
|
|
tagTypes.add(7);
|
|
tagTypes.add(7);
|
|
klQuestionVO.setTagType(tagTypes);
|
|
klQuestionVO.setTagType(tagTypes);
|
|
- RespDTO<List<QuestionInfo>> respDTO = icssManServiceClient.indexForkl(klQuestionVO);
|
|
|
|
- if (RespDTOUtil.respIsOK(respDTO)) {
|
|
|
|
- List<QuestionInfo> questionInfoList = respDTO.data;
|
|
|
|
- if (ListUtil.isNotEmpty(questionInfoList)) {
|
|
|
|
- IdListVO idListVO = new IdListVO();
|
|
|
|
- List<Long> idList = questionInfoList
|
|
|
|
- .stream()
|
|
|
|
- .map(i -> i.getId())
|
|
|
|
- .collect(Collectors.toList());
|
|
|
|
- idListVO.setIdList(idList);
|
|
|
|
- RespDTO<Boolean> cacheRespDTO = icssManServiceClient.clearCache(idListVO);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ icssManRpcFacade.questionclearCache(klQuestionVO);
|
|
return state;
|
|
return state;
|
|
}
|
|
}
|
|
|
|
|