术语维护修改

knowledgeman-service/pom.xml

@@ -158,6 +158,19 @@
             <artifactId>jxl</artifactId>
             <version>2.6.10</version>
         </dependency>
+        
+        <!-- 文件上传相关架包 -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.4</version>
+		</dependency>
+		
     </dependencies>
 
     <build>

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

@@ -37,7 +37,7 @@ public class GetAllConceptDTO {
 	 * 概念id
 	 */
 	@ApiModelProperty(value="概念id")
-	private Integer conceptId;
+	private Long conceptId;
 	
 	/**
 	 * 是否标准词,1:是,0:否

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

@@ -86,23 +86,38 @@ public class ConceptFacade extends ConceptServiceImpl {
     	if(StringUtil.isNotBlank(getAllConceptVO.getName())){
     		libraryInfoQe.like("name", getAllConceptVO.getName());
     	}
-    	
     	List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
     	
+    	//过滤掉非概念术语
     	if(getAllConceptVO.getIsConcept()!=null&&getAllConceptVO.getIsConcept()==1){
     		QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
     		conceptQe.eq("is_deleted", "N");
     		conceptQe.in("id", libraryInfoList.stream().map(i->i.getConceptId()).distinct().collect(Collectors.toList()));
     		Map<Long,Concept> conceptMap = list(conceptQe).stream().collect(Collectors.toMap(Concept::getId, i->i));
-    		
     		libraryInfoList.forEach(i->{
-    			if(conceptMap.get(i.getConceptId())==null||conceptMap.get(i.getConceptId()).getLibId()!=i.getId()){
+    			if(conceptMap.get(i.getConceptId())==null||conceptMap.get(i.getConceptId()).getLibId().intValue()!=i.getId().intValue()){
     				i.setIsDeleted("Y");
     			}
     		});
+    		libraryInfoList = libraryInfoList.stream().filter(i->i.getIsDeleted().equals("N")).collect(Collectors.toList());
     	}
     	
-    	List<GetAllConceptDTO> getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList.stream().filter(i->i.getIsDeleted().equals("N")).collect(Collectors.toList()), GetAllConceptDTO.class);
+    	//添加过术语医学属性的过滤掉
+    	if(getAllConceptVO.getIsMedical()!=null&&getAllConceptVO.getIsMedical()==1){
+    		QueryWrapper<Medical> medicalQe = new QueryWrapper<>();
+    		medicalQe.eq("is_deleted", "N");
+    		medicalQe.in("concept_id", libraryInfoList.stream().map(i->i.getConceptId()).collect(Collectors.toList()));
+    		Map<Long,Medical> medicalMap =medicalFacade.list(medicalQe).stream().collect(Collectors.toMap(Medical::getConceptId, i->i));
+    		libraryInfoList = libraryInfoList.stream().filter(i->{
+    			if(medicalMap.get(i.getConceptId())!=null){
+    				return true;
+    			}else{
+    				return false;
+    			}
+    		}).collect(Collectors.toList());
+    	}
+    	
+    	List<GetAllConceptDTO> getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
     	getAllConceptDTOList.forEach(i->{
     		i.setNameAndType(i.getName()+"("+i.getType()+")");
     	});
@@ -332,7 +347,6 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @param file
      * @return
      */
-    @SuppressWarnings("unchecked")
 	public Boolean conceptInfoExcelIm(MultipartFile file) {
         List<AddConceptInfoVO> addConceptInfoVOList = new ArrayList<>();
         StringBuffer sbf = new StringBuffer();
@@ -442,25 +456,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         	throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
         }
 
-        /**************校验每一组数据，同时组装*************************/
-        List<LibraryInfo> saveOrUpdateLibraryInfoList = new ArrayList<>();
-    	Map<String,Object> ckMap = null;
-    	Object message = null;
-    	for(AddConceptInfoVO i : addConceptInfoVOList){
-    		ckMap = checkAddConceptInfoVO(i);
-    		message = ckMap.get("message");
-    		if(message!=null){
-    			sbf.append(message.toString()).append("(标准术语：").append(i.getName()).append(")").append("<br/>");
-    		}else{
-    			saveOrUpdateLibraryInfoList.addAll((List<LibraryInfo>)ckMap.get("libraryInfoList"));
-    		}
-    	}
-        if(sbf.length()>0){
-        	throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-        }
         
-        /******************最终保存***************************/
-        saveConceptInfos(saveOrUpdateLibraryInfoList);
         
         return true;
     }

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

@@ -48,14 +48,16 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     public IPage<GetLibraryDetailListDTO> getLibraryDetailList(GetLibraryDetailListVO getLibraryDetailListVO) {
     	IPage<GetLibraryDetailListDTO> ipage = this.baseMapper.getLibraryDetailList(getLibraryDetailListVO);
     	List<String> ids = ipage.getRecords().stream().map(i->i.getModifier()).distinct().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,
-                    "获取用户信息失败");
-        }
-    	ipage.getRecords().forEach(i->{
-    		i.setModifier(respDTO.data.get(i.getModifier()));
-    	});
+    	if(ids.size()>0){
+    		RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+        	if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "获取用户信息失败");
+            }
+        	ipage.getRecords().forEach(i->{
+        		i.setModifier(respDTO.data.get(i.getModifier()));
+        	});	
+    	}
         return ipage;
     }
     
@@ -127,7 +129,6 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
 		
 		if(libraryDetail==null){
 			libraryDetail = new LibraryDetail();
-			BeanUtil.copyProperties(addLibraryDetailVO, libraryDetail);
 			libraryDetail.setGmtCreated(now);
 			libraryDetail.setCreator(currentUser);
 		}else{
@@ -136,6 +137,7 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
 		
 		libraryDetail.setGmtModified(now);
 		libraryDetail.setModifier(currentUser);
+		BeanUtil.copyProperties(addLibraryDetailVO, libraryDetail);
 		
 		return saveOrUpdate(libraryDetail);
     }

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

@@ -72,11 +72,16 @@ public class RelationFacade extends RelationServiceImpl {
     public IPage<GetRelationInfoListDTO> getRelationInfoList(GetRelationInfoListVO getRelationInfoListVO) {
     	IPage<GetRelationInfoListDTO> ipage = this.baseMapper.getRelationInfoList(getRelationInfoListVO);
     	List<String> ids = ipage.getRecords().stream().map(i->i.getOperName()).distinct().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,
-                    "获取用户信息失败");
-        }
+    	if(ids.size()>0){
+    		RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+        	if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "获取用户信息失败");
+            }
+        	ipage.getRecords().forEach(i->{
+        		i.setOperName(respDTO.data.get(i.getOperName()));
+        	});
+    	}
     	
     	List<Long> conceptIds = new ArrayList<>();
     	conceptIds.addAll(ipage.getRecords().stream().map(i->i.getStartId()).collect(Collectors.toList()));
@@ -89,7 +94,6 @@ public class RelationFacade extends RelationServiceImpl {
     	Map<Long,LibraryInfo> libraryInfoMap = libraryInfoFacade.list(libraryInfoQe).stream().collect(Collectors.toMap(LibraryInfo::getConceptId, i->i));
     	
     	ipage.getRecords().forEach(i->{
-    		i.setOperName(respDTO.data.get(i.getOperName()));
     		if(libraryInfoMap.get(i.getStartId())!=null){
     			i.setStartType(libraryInfoMap.get(i.getStartId()).getType());
     		}
@@ -204,7 +208,7 @@ public class RelationFacade extends RelationServiceImpl {
 			return retMap;
 		}
 		Concept startConcept = conceptFacade.getById(startLibraryInfo.getConceptId());
-		if(startConcept==null||startConcept.getIsDeleted().equals("Y")||startConcept.getLibId()!=startLibraryInfo.getId()){
+		if(startConcept==null||startConcept.getIsDeleted().equals("Y")||startConcept.getLibId().intValue()!=startLibraryInfo.getId().intValue()){
 			retMap.put("message", "关系起点术语不存在");
 			return retMap;
 		}
@@ -220,7 +224,7 @@ public class RelationFacade extends RelationServiceImpl {
 			return retMap;
 		}
 		Concept endConcept = conceptFacade.getById(endLibraryInfo.getConceptId());
-		if(endConcept==null||endConcept.getIsDeleted().equals("Y")||endConcept.getLibId()!=endLibraryInfo.getId()){
+		if(endConcept==null||endConcept.getIsDeleted().equals("Y")||endConcept.getLibId().intValue()!=endLibraryInfo.getId().intValue()){
 			retMap.put("message", "关系终点术语不存在");
 			return retMap;
 		}
@@ -247,8 +251,8 @@ public class RelationFacade extends RelationServiceImpl {
 		Date now = DateUtil.now();
 		if(relation==null){
 			relation = new Relation();
-			relation.setStartId(startLibraryInfo.getId());
-			relation.setEndId(endLibraryInfo.getId());
+			relation.setStartId(startConcept.getId());
+			relation.setEndId(endConcept.getId());
 			relation.setRelationId(lexiconRelationship.getId());
 			relation.setCreator(currentUser);
 			relation.setGmtCreated(now);

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

@@ -25,4 +25,10 @@ public class GetAllConceptVO {
     @ApiModelProperty(value="是否标准词,1:是,0:否")
     private Integer isConcept;
     
+    /**
+     * 是否过滤添加过术语属性的概念,1:是,0:否
+     */
+    @ApiModelProperty(value="是否过滤添加过术语属性的概念,1:是,0:否")
+    private Integer isMedical;
+    
 }

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

@@ -29,5 +29,11 @@ public class GetLibraryDetailListVO extends Page {
 	@ApiModelProperty(value="术语类型")
     private String conceptType;
 	
+	/**
+     * 标题
+     */
+	@ApiModelProperty(value="标题")
+    private String title;
+	
 
 }

knowledgeman-service/src/main/java/com/diagbot/web/BodypartController.java

@@ -26,7 +26,7 @@ import io.swagger.annotations.ApiOperation;
  * @since 2019-01-30
  */
 @RestController
-@RequestMapping("bodypart")
+@RequestMapping("/bodypart")
 @SuppressWarnings("unchecked")
 @Api(value = "部位维护相关API", tags = { "部位维护相关API" })
 public class BodypartController {

knowledgeman-service/src/main/java/com/diagbot/web/MedicalController.java

@@ -76,7 +76,6 @@ public class MedicalController {
     
     @ApiOperation(value = "术语医学属性excel文件导入[by:rengb]")
     @PostMapping("/medicalInfoExcelIm")
-    @SysLogger("medicalInfoExcelIm")
     @Transactional
     public RespDTO<Boolean> medicalInfoExcelIm(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
         return RespDTO.onSuc(medicalFacade.medicalInfoExcelIm(file));

knowledgeman-service/src/main/java/com/diagbot/web/RelationController.java

@@ -75,7 +75,6 @@ public class RelationController {
     
     @ApiOperation(value = "医学术语关系excel文件导入[by:rengb]")
     @PostMapping("/relationInfoExcelIm")
-    @SysLogger("relationInfoExcelIm")
     @Transactional
     public RespDTO<Boolean> relationInfoExcelIm(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
         return RespDTO.onSuc(relationFacade.relationInfoExcelIm(file));

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

@@ -45,6 +45,9 @@
 		<if test="conceptType!=null and conceptType!=''">
 			and c.type=#{conceptType}
 		</if>
+		<if test="title!=null and title!=''">
+			and a.title like concat('%',#{title},'%')
+		</if>
 		order by a.gmt_modified desc
    	</select>
 

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "bodypart"}); // 需要生成的表
+        strategy.setInclude(new String[] { "dept_info"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);