icssman删除无用代码

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -94,8 +94,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     @Autowired
     DeptVitalFacade deptVitalFacade;
     @Autowired
-    RetrievalMappingFacade retrievalMappingFacade;
-    @Autowired
     DisTypeFacade disTypeFacade;
     @Autowired
     DisScaleFacade disScaleFacade;
@@ -486,43 +484,43 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return res;
     }
 
-    /**
-     * 别名新增标签检索
-     *
-     * @param questionIndexVO
-     * @return
-     */
-    public List<IndexRevDTO> indexRev(QuestionIndexVO questionIndexVO) {
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("age", questionIndexVO.getAge());
-        paramMap.put("sexType", questionIndexVO.getSexType());
-        paramMap.put("tagName", questionIndexVO.getTagName());
-        paramMap.put("type", questionIndexVO.getType());
-        paramMap.put("controlType", questionIndexVO.getControlType());
-        paramMap.put("notIds", questionIndexVO.getNotIds());
-        paramMap.put("tagType", questionIndexVO.getTagType());
-        paramMap.put("existName", questionIndexVO.getExistName());
-        paramMap.put("notTagType", questionIndexVO.getNotTagType());
-        paramMap.put("notControlType", questionIndexVO.getNotControlType());
-        List<QuestionInfo> list = this.index(paramMap);
-        if (ListUtil.isNotEmpty(list)) {
-            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
-            list = list.stream().filter(i -> {
-                if (couMap.get(i.getId()) != null) {
-                    return false;
-                }
-                return true;
-            }).collect(Collectors.toList());
-            if (ListUtil.isNotEmpty(list)) {
-                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
-                indexRevDTOList.forEach(i -> {
-                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
-                });
-                return indexRevDTOList;
-            }
-        }
-        return null;
-    }
+//    /**
+//     * 别名新增标签检索
+//     *
+//     * @param questionIndexVO
+//     * @return
+//     */
+//    public List<IndexRevDTO> indexRev(QuestionIndexVO questionIndexVO) {
+//        Map<String, Object> paramMap = new HashMap<>();
+//        paramMap.put("age", questionIndexVO.getAge());
+//        paramMap.put("sexType", questionIndexVO.getSexType());
+//        paramMap.put("tagName", questionIndexVO.getTagName());
+//        paramMap.put("type", questionIndexVO.getType());
+//        paramMap.put("controlType", questionIndexVO.getControlType());
+//        paramMap.put("notIds", questionIndexVO.getNotIds());
+//        paramMap.put("tagType", questionIndexVO.getTagType());
+//        paramMap.put("existName", questionIndexVO.getExistName());
+//        paramMap.put("notTagType", questionIndexVO.getNotTagType());
+//        paramMap.put("notControlType", questionIndexVO.getNotControlType());
+//        List<QuestionInfo> list = this.index(paramMap);
+//        if (ListUtil.isNotEmpty(list)) {
+//            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
+//            list = list.stream().filter(i -> {
+//                if (couMap.get(i.getId()) != null) {
+//                    return false;
+//                }
+//                return true;
+//            }).collect(Collectors.toList());
+//            if (ListUtil.isNotEmpty(list)) {
+//                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
+//                indexRevDTOList.forEach(i -> {
+//                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
+//                });
+//                return indexRevDTOList;
+//            }
+//        }
+//        return null;
+//    }
 
     /**
      * 根据主标签id 检索子标签

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -1,468 +0,0 @@
-package com.diagbot.facade;
-
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.GetRetrievalsByTagDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.RetrievalExcelImDTO;
-import com.diagbot.dto.RetrievalListDTO;
-import com.diagbot.entity.QuestionInfo;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.entity.RetrievalMapping;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.TagTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.service.RetrievalMappingService;
-import com.diagbot.service.RetrievalService;
-import com.diagbot.service.impl.RetrievalServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.UserUtils;
-import com.diagbot.vo.AddTagRetrievalDetailVO;
-import com.diagbot.vo.AddTagRetrievalVO;
-import com.diagbot.vo.DelRetrievalsByQuesIdVO;
-import com.diagbot.vo.GetRetrievalsByTagVO;
-import com.diagbot.vo.RetrievalListVO;
-
-/**
- * @author rgb
- * @Description
- * @time 2018年12月5日下午4:53:59
- */
-@Component
-public class RetrievalFacade extends RetrievalServiceImpl {
-
-    @Autowired
-    private RetrievalMappingFacade retrievalMappingFacade;
-    @Autowired
-    private QuestionFacade questionFacade;
-    @Autowired
-    private UserServiceClient userServiceClient;
-    @Autowired
-    @Qualifier("retrievalServiceImpl")
-    private RetrievalService retrievalService;
-    @Autowired
-    @Qualifier("retrievalMappingServiceImpl")
-    private RetrievalMappingService retrievalMappingService;
-    
-    /**
-     * 根据标签获取同义词
-     *
-     * @param getRetrievalsByTagVO
-     * @return
-     */
-    public Map<Integer, List<GetRetrievalsByTagDTO>> getRetrievalsByTag(GetRetrievalsByTagVO getRetrievalsByTagVO) {
-        List<GetRetrievalsByTagDTO> retList = baseMapper.getRetrievalsByTag(getRetrievalsByTagVO);
-        if (ListUtil.isEmpty(retList)) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS);
-        }
-        
-        Map<Integer, List<GetRetrievalsByTagDTO>> retMap = retList.stream().collect(Collectors.groupingBy(GetRetrievalsByTagDTO::getRetrievalType));
-        
-        return retMap;
-    }
-
-    /**
-     * 根据映射关系删除标签的同义词
-     *
-     * @param delRetrievalsByQuesIdVO
-     * @return
-     */
-    public Boolean delRetrievalsByQuesId(DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
-        QueryWrapper<RetrievalMapping> mappingQe = new QueryWrapper<>();
-        mappingQe.eq("question_id", delRetrievalsByQuesIdVO.getQuestionId());
-        if (retrievalMappingFacade.count(mappingQe) == 0) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS);
-        }
-        String userId = UserUtils.getCurrentPrincipleID();
-        RetrievalMapping retrievalMapping = new RetrievalMapping();
-        retrievalMapping.setGmtModified(DateUtil.now());
-        retrievalMapping.setModifier(userId);
-        retrievalMapping.setIsDeleted(IsDeleteEnum.Y.getKey());
-
-        retrievalMappingFacade.update(retrievalMapping, mappingQe);
-        return true;
-    }
-    
-    /**
-     * 添加或者编辑标签同义词
-     *
-     * @param addTagRetrievalVO
-     * @return
-     */
-    public Boolean addTagRetrieval(AddTagRetrievalVO addTagRetrievalVO) {
-        if (addTagRetrievalVO.getItemList().stream().distinct().count() != addTagRetrievalVO.getItemList().size()) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "本体/同义/子项名称重复("+addTagRetrievalVO.getQuestionName()+")！");
-        }
-        
-        long typeOneCou = addTagRetrievalVO.getItemList().stream().filter(i->i.getRetrievalType()==1).count();
-        if(typeOneCou==0){
-        	throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "数据不完整("+addTagRetrievalVO.getQuestionName()+")！");
-        }
-        if(typeOneCou>1){
-        	throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "本体类型数据重复("+addTagRetrievalVO.getQuestionName()+")！");
-        }
-
-        Date now = DateUtil.now();
-        String userId = UserUtils.getCurrentPrincipleID();
-
-        Map<String, AddTagRetrievalDetailVO> detailMap = addTagRetrievalVO.getItemList().stream().collect(Collectors.toMap(AddTagRetrievalDetailVO::getRetrievalName, i -> i));
-        List<String> retrievalNames = addTagRetrievalVO.getItemList().stream().map(i -> i.getRetrievalName()).collect(Collectors.toList());
-
-        QueryWrapper<Retrieval> retrievalQe = new QueryWrapper<Retrieval>();
-        retrievalQe.in("name", retrievalNames);
-        retrievalQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        Map<String, Retrieval> retrievalMap = this.list(retrievalQe).stream().collect(Collectors.toMap(Retrieval::getName, i -> i));
-
-        List<Retrieval> saveOrUpdateRetrievals = new ArrayList<>();
-        List<Retrieval> retrievals = new ArrayList<>();
-        addTagRetrievalVO.getItemList().forEach(i -> {
-            Retrieval retrieval = retrievalMap.get(i.getRetrievalName());
-            if (retrieval == null) {
-                retrieval = new Retrieval();
-                retrieval.setName(i.getRetrievalName());
-                retrieval.setSpell(i.getRetrievalSpell());
-                retrieval.setCreator(userId);
-                retrieval.setGmtCreate(now);
-                retrieval.setModifier(userId);
-                retrieval.setGmtModified(now);
-                saveOrUpdateRetrievals.add(retrieval);
-            } else if (!retrieval.getSpell().equals(i.getRetrievalSpell())) {
-                retrieval.setSpell(i.getRetrievalSpell());
-                retrieval.setModifier(userId);
-                retrieval.setGmtModified(now);
-                saveOrUpdateRetrievals.add(retrieval);
-            } else {
-                retrievals.add(retrieval);
-            }
-        });
-        if(saveOrUpdateRetrievals.size()>0){
-        	retrievalService.saveOrUpdateBatch(saveOrUpdateRetrievals);
-        }
-        retrievals.addAll(saveOrUpdateRetrievals);
-        List<Long> retrievalIds = retrievals.stream().map(i -> i.getId()).collect(Collectors.toList());
-
-        QueryWrapper<RetrievalMapping> retrievalMappingQe = new QueryWrapper<RetrievalMapping>();
-        retrievalMappingQe.eq("question_id", addTagRetrievalVO.getQuestionId());
-        List<RetrievalMapping> retrievalMappings = retrievalMappingFacade.list(retrievalMappingQe);
-        Map<Long, RetrievalMapping> retrievalMappingMap = retrievalMappings.stream().collect(Collectors.toMap(RetrievalMapping::getRetrievalId, i -> i));
-
-        List<RetrievalMapping> addOrUpdateRetrievalMappings = new ArrayList<>();
-        retrievalMappings.stream().filter(i ->i.getIsDeleted().equals(IsDeleteEnum.N.getKey())&&!retrievalIds.contains(i.getRetrievalId())).forEach(i -> {
-            i.setIsDeleted(IsDeleteEnum.Y.getKey());
-            i.setGmtModified(now);
-            i.setModifier(userId);
-            addOrUpdateRetrievalMappings.add(i);
-        });
-
-        retrievals.forEach(i -> {
-            RetrievalMapping retrievalMapping = retrievalMappingMap.get(i.getId());
-            AddTagRetrievalDetailVO detail = detailMap.get(i.getName());
-            if (retrievalMapping == null) {
-                retrievalMapping = new RetrievalMapping();
-                retrievalMapping.setQuestionId(addTagRetrievalVO.getQuestionId());
-                retrievalMapping.setRetrievalId(i.getId());
-                retrievalMapping.setGmtCreate(now);
-                retrievalMapping.setGmtModified(now);
-                retrievalMapping.setCreator(userId);
-                retrievalMapping.setModifier(userId);
-                retrievalMapping.setShowType(detail.getRetrievalType());
-                addOrUpdateRetrievalMappings.add(retrievalMapping);
-            } else {
-                if (detail.getRetrievalType() != retrievalMapping.getShowType()
-                        || retrievalMapping.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-                    retrievalMapping.setShowType(detailMap.get(i.getName()).getRetrievalType());
-                    retrievalMapping.setGmtModified(now);
-                    retrievalMapping.setModifier(userId);
-                    retrievalMapping.setIsDeleted(IsDeleteEnum.N.getKey());
-                    addOrUpdateRetrievalMappings.add(retrievalMapping);
-                }
-            }
-        });
-
-        if(ListUtil.isNotEmpty(addOrUpdateRetrievalMappings)){
-        	retrievalMappingService.saveOrUpdateBatch(addOrUpdateRetrievalMappings);
-        }
-        return true;
-    }
-    
-    /**
-     * 获取标签同义词列表
-     *
-     * @param retrievalListVO
-     * @return
-     */
-    public IPage<RetrievalListDTO> retrievalList(RetrievalListVO retrievalListVO) {
-        IPage<RetrievalListDTO> ipage = this.getRetrievalList(retrievalListVO);
-
-        List<RetrievalListDTO> retrievalListDTOList = ipage.getRecords();
-        if (ListUtil.isEmpty(retrievalListDTOList)) {
-            return ipage;
-        }
-
-        List<Long> questionIds = retrievalListDTOList.stream().map(i -> i.getQuestionId()).collect(Collectors.toList());
-        
-        Map<Long,Integer> questionInfoTypeNameMap = questionFacade.listByIds(questionIds).stream().collect(Collectors.toMap(QuestionInfo::getId, i->i.getType()));
-
-        QueryWrapper<RetrievalMapping> retrievalMappingQe = new QueryWrapper<RetrievalMapping>();
-        retrievalMappingQe.in("question_id", questionIds);
-        List<RetrievalMapping> retrievalMappings = retrievalMappingFacade.list(retrievalMappingQe);
-        Map<Long, List<RetrievalMapping>> retrievalMappingListMap = retrievalMappings.stream().collect(Collectors.groupingBy(RetrievalMapping::getQuestionId));
-
-        List<Long> retrievalIds = retrievalMappings.stream().map(i -> i.getRetrievalId()).distinct().collect(Collectors.toList());
-        Map<Long, Retrieval> retrievalMap = this.listByIds(retrievalIds).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(Retrieval::getId, i -> i));
-
-        retrievalListDTOList.forEach(retrievalListDTO -> {
-            List<RetrievalMapping> retrievalMappingList = retrievalMappingListMap.get(retrievalListDTO.getQuestionId());
-            retrievalMappingList = retrievalMappingList.stream().filter(i -> retrievalMap.get(i.getRetrievalId())!=null).sorted((t1, t2) -> t2.getGmtModified().compareTo(t1.getGmtModified())).collect(Collectors.toList());
-            retrievalListDTO.setOperatorName(retrievalMappingList.get(0).getModifier());
-            retrievalListDTO.setRetrievalSelfName(retrievalMappingList.stream().filter(i -> i.getShowType() == 1 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
-            retrievalListDTO.setRetrievalNames(retrievalMappingList.stream().filter(i -> i.getShowType() == 2 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
-            retrievalListDTO.setRetrievalSonNames(retrievalMappingList.stream().filter(i -> i.getShowType() == 3 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
-            
-            retrievalListDTO.setQuestionType(questionInfoTypeNameMap.get(retrievalListDTO.getQuestionId()));
-        });
-
-        List<String> ids = retrievalListDTOList.stream().map(i -> i.getOperatorName()).collect(Collectors.toList());
-        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取用户信息失败");
-        }
-
-        retrievalListDTOList.forEach(i -> i.setOperatorName(respDTO.data.get(i.getOperatorName())));
-        ipage.setRecords(retrievalListDTOList);
-        return ipage;
-    }
-
-    /**
-     * 同义词excel文件导入
-     *
-     * @param file
-     * @return
-     */
-    public RetrievalExcelImDTO retrievalExcelIm(MultipartFile file) {
-        List<AddTagRetrievalVO> addTagRetrievalVOList = new ArrayList<>();
-        List<AddTagRetrievalDetailVO> detailList = new ArrayList<>();
-        List<AddTagRetrievalDetailVO> detailList_ = new ArrayList<>();
-        StringBuffer sbf = new StringBuffer();
-        InputStream inputStream = null;
-        Workbook wb = null;
-        try {
-            if (!file.isEmpty()) {
-                inputStream = file.getInputStream();
-                if (inputStream.available() > 512000) {
-                    sbf.append("文件最大支持500KB！").append("<br/>");
-                } else {
-                    String fileName = file.getOriginalFilename();
-                    if (fileName.lastIndexOf(".") != -1) {
-                        String type = fileName.substring(fileName.lastIndexOf("."));
-                        if (type.equals(".xls")) {
-                            wb = new HSSFWorkbook(inputStream);
-                        } else if (type.equals(".xlsx")) {
-                            wb = new XSSFWorkbook(inputStream);
-                        }
-                        if (wb != null) {
-                            
-                            Sheet sheet = wb.getSheetAt(0);
-                            int count = 0;
-                            String questionName, retrievalName, retrievalSpell, retrievalType;
-                            for (Row row : sheet) {
-                                count++;
-                                if (count == 1 || row == null) {
-                                    continue;
-                                }
-                                questionName = getValue(row.getCell(0)).trim().replace(" ", "");
-                                retrievalName = getValue(row.getCell(1)).trim().replace(" ", "");
-                                retrievalSpell = getValue(row.getCell(2)).trim().replace(" ", "");
-                                retrievalType = getValue(row.getCell(3)).trim().replace(" ", "");
-                                if(StringUtil.isEmpty(questionName) && StringUtil.isEmpty(retrievalName)
-                                        && StringUtil.isEmpty(retrievalSpell) && StringUtil.isEmpty(retrievalType)){
-                                	continue;
-                                }
-                                if (StringUtil.isEmpty(questionName) || StringUtil.isEmpty(retrievalName)
-                                        || StringUtil.isEmpty(retrievalSpell) || StringUtil.isEmpty(retrievalType)) {
-                                    sbf.append("第" + count + "行数据不完整；").append("<br/>");
-                                    continue;
-                                }
-
-                                AddTagRetrievalDetailVO addTagRetrievalDetailVO = new AddTagRetrievalDetailVO();
-                                addTagRetrievalDetailVO.setQuestionName(questionName);
-                                addTagRetrievalDetailVO.setRetrievalName(retrievalName);
-                                addTagRetrievalDetailVO.setRetrievalSpell(retrievalSpell);
-                                addTagRetrievalDetailVO.setRetrievalType(Integer.parseInt(retrievalType));
-                                detailList.add(addTagRetrievalDetailVO);
-                            }
-                        } else {
-                            sbf.append("非excel文件无法解析！").append("<br/>");
-                        }
-                    } else {
-                        sbf.append("未知文件无法解析！").append("<br/>");
-                    }
-                }
-            } else {
-                sbf.append("无文件上传！").append("<br/>");
-            }
-        } catch (Exception e) {
-            sbf.append("解析失败！").append("<br/>");
-        } finally {
-            try {
-                if (wb != null) {
-                    wb.close();
-                }
-                if (inputStream != null) {
-                    inputStream.close();
-                }
-            } catch (Exception e) {
-            }
-        }
-        
-        if(sbf.length()>0){
-        	throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-        }
-        
-        if (detailList.size() > 0) {
-            List<String> questionNames = detailList.stream().map(i -> i.getQuestionName()).distinct().collect(Collectors.toList());
-            QueryWrapper<QuestionInfo> questionInfoQe = new QueryWrapper<>();
-            questionInfoQe.in("tag_name", questionNames);
-            List<QuestionInfo> questionInfos = questionFacade.list(questionInfoQe);
-            
-            
-           /* Map<String,Long> quesCouMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName, Collectors.counting()));
-            for(String key:quesCouMap.keySet()){
-            	if(quesCouMap.get(key)>1){
-            		sbf.append(key).append(" ");
-            	}
-            }
-            if(sbf.length()>0){
-            	sbf.append("数据不规范");
-            	throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-            }*/
-            
-            Map<String, List<QuestionInfo>> questionInfoListMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName));
-            if(questionNames.size()==questionInfoListMap.size()){
-            	List<QuestionInfo> questionInfos_ = questionInfos.stream().filter(p->p.getTagType()==TagTypeEnum.T8.getKey()||p.getTagType()==TagTypeEnum.T10.getKey()||p.getTagType()==TagTypeEnum.T11.getKey()).collect(Collectors.toList());
-            	if(questionInfos_.size()>0){
-            		sbf.append("(");
-            		int index = 0;
-            		for(QuestionInfo p:questionInfos_){
-            			sbf.append(p.getTagName()).append("-").append(TagTypeEnum.getName(p.getTagType()));
-            			if(index<questionNames.size()-1){
-                			sbf.append("、");
-                		}
-                		index++;
-            		}
-            		sbf.append(")");
-            		sbf.append("标签不支持导入！");
-            		throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-            	}
-            	
-            	
-            	detailList.forEach(i -> {
-            		questionInfoListMap.get(i.getQuestionName()).forEach(j->{
-            			AddTagRetrievalDetailVO addTagRetrievalDetailVO = new AddTagRetrievalDetailVO();
-            			BeanUtil.copyProperties(i, addTagRetrievalDetailVO);
-            			addTagRetrievalDetailVO.setQuestionId(j.getId());
-            			detailList_.add(addTagRetrievalDetailVO);
-            		});
-                });
-            	
-            	
-            	
-            	Map<Long, List<AddTagRetrievalDetailVO>> detailMap = detailList_.stream().collect(Collectors.groupingBy(AddTagRetrievalDetailVO::getQuestionId));
-                for (Long key : detailMap.keySet()) {
-                    AddTagRetrievalVO addTagRetrievalVO = new AddTagRetrievalVO();
-                    addTagRetrievalVO.setQuestionId(key);
-                    addTagRetrievalVO.setQuestionName(detailMap.get(key).get(0).getQuestionName());
-                    addTagRetrievalVO.setItemList(detailMap.get(key));
-                    addTagRetrievalVOList.add(addTagRetrievalVO);
-                }
-            }else{
-            	List<String> questionNames_ = questionNames.stream().filter(t->questionInfoListMap.get(t)==null).collect(Collectors.toList());
-            	sbf.append("标签数据不存在(");
-            	int index = 0;
-            	
-            	for(String k:questionNames_){
-            		sbf.append(k);
-            		if(index<questionNames_.size()-1){
-            			sbf.append("、");
-            		}
-            		index++;
-            	}
-            	sbf.append(")；");
-            	throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-            }
-        }
-
-        addTagRetrievalVOList.forEach(i -> {
-            addTagRetrieval(i);
-        });
-
-        RetrievalExcelImDTO retrievalExcelImDTO = new RetrievalExcelImDTO();
-        return retrievalExcelImDTO;
-    }
-    
-    @SuppressWarnings("deprecation")
-    private String getValue(Cell cell) {
-        try {
-            Object obj = null;
-            switch (cell.getCellTypeEnum()) {
-                case BOOLEAN:
-                    obj = cell.getBooleanCellValue();
-                    break;
-                case ERROR:
-                    obj = cell.getErrorCellValue();
-                    break;
-                case NUMERIC:
-                    if (HSSFDateUtil.isCellDateFormatted(cell)) {
-                        Date date = cell.getDateCellValue();
-                        obj = DateFormatUtils.format(date, "yyyy-MM-dd");
-                    } else {
-                        obj = cell.getNumericCellValue();
-                        DecimalFormat df = new DecimalFormat("0");
-                        obj = df.format(obj);
-                    }
-
-                    // obj = cell.getNumericCellValue();
-                    break;
-                case STRING:
-                    obj = cell.getStringCellValue();
-                    break;
-                default:
-                    break;
-            }
-            return obj.toString();
-        } catch (Exception e) {
-            return "";
-        }
-    }
-
-}

icssman-service/src/main/java/com/diagbot/facade/RetrievalMappingFacade.java

@@ -1,40 +0,0 @@
-/**
- *
- */
-package com.diagbot.facade;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
-import com.diagbot.service.impl.RetrievalMappingServiceImpl;
-import com.diagbot.util.ListUtil;
-
-/**
- * @author rgb
- * @Description
- * @time 2018年12月5日下午4:53:59
- */
-@Component
-public class RetrievalMappingFacade extends RetrievalMappingServiceImpl {
-	
-	/**
-	 * 根据标签id集合获取标签别名个数
-	 * @param ids
-	 * @return questionId-标签id，cou-别名个数
-	 */
-	public Map<Long,Long> getMapCouByQuesIds(List<Long> ids){
-		Map<Long,Long> retMap = new HashMap<Long,Long>();
-		if(ListUtil.isEmpty(ids)){
-			return retMap;
-		}
-		this.baseMapper.getMapCouByQuesIds(ids).forEach(i->{
-			retMap.put((Long)(i.get("questionId")), (Long)(i.get("cou")));
-		});
-		return retMap;
-	}
-
-
-}

icssman-service/src/main/java/com/diagbot/mapper/RetrievalMapper.java

@@ -1,37 +0,0 @@
-package com.diagbot.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.GetRetrievalsByTagDTO;
-import com.diagbot.dto.RetrievalListDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.vo.GetRetrievalsByTagVO;
-import com.diagbot.vo.RetrievalListVO;
-
-/**
- * <p>
- * 同义词检索表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface RetrievalMapper extends BaseMapper<Retrieval> {
-	
-	/**
-	 * 根据标签获取同义词
-	 * @param getRetrievalsByTagVO
-	 * @return
-	 */
-	List<GetRetrievalsByTagDTO> getRetrievalsByTag(GetRetrievalsByTagVO getRetrievalsByTagVO);
-	
-	/**
-	 * 获取标签同义词列表
-	 * @param retrievalListVO
-	 * @return
-	 */
-	IPage<RetrievalListDTO> getRetrievalList(RetrievalListVO retrievalListVO);
-
-}

icssman-service/src/main/java/com/diagbot/mapper/RetrievalMappingMapper.java

@@ -1,26 +0,0 @@
-package com.diagbot.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.RetrievalMapping;
-
-/**
- * <p>
- * 同义词检索映射表 Mapper 接口
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface RetrievalMappingMapper extends BaseMapper<RetrievalMapping> {
-	
-	/**
-	 * 根据标签id集合获取标签别名个数
-	 * @param ids
-	 * @return map中questionId-标签id，cou-别名个数
-	 */
-	List<Map<String,Object>> getMapCouByQuesIds(List<Long> ids);
-
-}

icssman-service/src/main/java/com/diagbot/service/RetrievalMappingService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.RetrievalMapping;
-
-/**
- * <p>
- * 同义词检索映射表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface RetrievalMappingService extends IService<RetrievalMapping> {
-
-}

icssman-service/src/main/java/com/diagbot/service/RetrievalService.java

@@ -1,21 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.RetrievalListDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.vo.RetrievalListVO;
-
-/**
- * <p>
- * 同义词检索表 服务类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-public interface RetrievalService extends IService<Retrieval> {
-	
-	IPage<RetrievalListDTO> getRetrievalList(RetrievalListVO retrievalListVO);
-
-}

icssman-service/src/main/java/com/diagbot/service/impl/RetrievalMappingServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.RetrievalMapping;
-import com.diagbot.mapper.RetrievalMappingMapper;
-import com.diagbot.service.RetrievalMappingService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 同义词检索映射表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@Service
-public class RetrievalMappingServiceImpl extends ServiceImpl<RetrievalMappingMapper, RetrievalMapping> implements RetrievalMappingService {
-
-}

icssman-service/src/main/java/com/diagbot/service/impl/RetrievalServiceImpl.java

@@ -1,30 +0,0 @@
-package com.diagbot.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.RetrievalListDTO;
-import com.diagbot.entity.Retrieval;
-import com.diagbot.mapper.RetrievalMapper;
-import com.diagbot.service.RetrievalService;
-import com.diagbot.vo.RetrievalListVO;
-
-/**
- * <p>
- * 同义词检索表 服务实现类
- * </p>
- *
- * @author wangyu
- * @since 2018-12-03
- */
-@Service
-public class RetrievalServiceImpl extends ServiceImpl<RetrievalMapper, Retrieval> implements RetrievalService {
-	
-	@Override
-	public IPage<RetrievalListDTO> getRetrievalList(RetrievalListVO retrievalListVO) {
-		return this.baseMapper.getRetrievalList(retrievalListVO);
-	}
-
-
-}

icssman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -80,14 +80,14 @@ public class QuestionInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "别名新增标签检索[by:rengb]",
-            notes = "")
-    @PostMapping("/indexRev")
-    @SysLogger("indexRev")
-    public RespDTO<List<IndexRevDTO>> indexRev(@RequestBody QuestionIndexVO questionIndexVO) {
-        List<IndexRevDTO> data = questionFacade.indexRev(questionIndexVO);
-        return RespDTO.onSuc(data);
-    }
+//    @ApiOperation(value = "别名新增标签检索[by:rengb]",
+//            notes = "")
+//    @PostMapping("/indexRev")
+//    @SysLogger("indexRev")
+//    public RespDTO<List<IndexRevDTO>> indexRev(@RequestBody QuestionIndexVO questionIndexVO) {
+//        List<IndexRevDTO> data = questionFacade.indexRev(questionIndexVO);
+//        return RespDTO.onSuc(data);
+//    }
 
     @ApiOperation(value = "子标签检索[by:zhaops]",
             notes = "")

icssman-service/src/main/resources/mapper/RetrievalMapper.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.RetrievalMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Retrieval">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="name" property="name" />
-        <result column="spell" property="spell" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-	<select id="getRetrievalsByTag" parameterType="com.diagbot.vo.GetRetrievalsByTagVO"
-		resultType="com.diagbot.dto.GetRetrievalsByTagDTO">
-		SELECT
-			c.id as retrievalId,
-			b.id as retrievalMappingId,
-			c.`name` as retrievalName,
-			c.spell as retrievalSpell,
-			b.show_type as retrievalType
-		FROM icss_question_info a 
-		JOIN icss_retrieval_mapping b
-		ON a.id=b.question_id
-		JOIN icss_retrieval c 
-		ON b.retrieval_id=c.id
-		WHERE a.is_deleted='N' AND b.is_deleted='N' AND c.is_deleted='N'
-		<if test="questionId!=null">
-			AND a.id=#{questionId}
-		</if>
-		<if test="questionName!=null">
-			AND a.tag_name=#{questionName}
-		</if>
-	</select>
-	
-	<select id="getRetrievalList" parameterType="com.diagbot.vo.RetrievalListVO" 
-		resultType="com.diagbot.dto.RetrievalListDTO">
-		SELECT
-		a.id as questionId,
-		a.tag_name as questionName,
-		MAX(b.gmt_modified) as gmtOperate,
-		sum(case when b.is_deleted='N' then 1 else 0 end) as delSum
-		FROM icss_question_info a JOIN icss_retrieval_mapping b ON a.id=b.question_id
-		JOIN icss_retrieval c ON b.retrieval_id=c.id
-		WHERE a.is_deleted='N' AND c.is_deleted='N'
-		AND a.tag_name LIKE CONCAT('%',#{questionName},'%')
-		GROUP BY a.id
-		HAVING delSum>0
-		ORDER BY gmtOperate DESC
-	</select>
-
-</mapper>

icssman-service/src/main/resources/mapper/RetrievalMappingMapper.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.RetrievalMappingMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.RetrievalMapping">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="retrieval_id" property="retrievalId" />
-        <result column="question_id" property="questionId" />
-        <result column="show_type" property="showType" />
-        <result column="remark" property="remark" />
-    </resultMap>
-    
-    <select id="getMapCouByQuesIds" parameterType="list" resultType="map">
-    	select 
-    	a.question_id as questionId,
-    	count(1) as cou
-		from icss_retrieval_mapping a
-		join icss_retrieval b on a.retrieval_id=b.id
-		where a.is_deleted = 'N' and b.is_deleted = 'N'
-		and a.question_id in
-		<foreach collection="list" open="(" close=")" separator="," item="quid">
-			#{quid}
-		</foreach>
-		group by a.question_id
-    </select>
-
-</mapper>