术语命名列表及删除恢复修改

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

@@ -55,7 +55,11 @@ public class GetAllInformationDTO {
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     
-    
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
     
     
     

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

@@ -160,12 +160,12 @@ public class ConceptFacade extends ConceptServiceImpl {
     }
     
     /**
-     * 医学术语命名删除
+     * 医学术语命名删除或者恢复
      * @param removeConceptInfoVO
      * @return
      */
     public Boolean removeConceptInfo(RemoveConceptInfoVO removeConceptInfoVO) {
-    	StringBuffer sbf = new StringBuffer();
+    	/*StringBuffer sbf = new StringBuffer();
     	
     	QueryWrapper<Medical> medicalQe = new QueryWrapper<Medical>();
     	medicalQe.eq("is_deleted", "N");
@@ -190,12 +190,12 @@ public class ConceptFacade extends ConceptServiceImpl {
     	
     	if(sbf.length()>0){
     		throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
-    	}
+    	}*/
     	
     	String currentUser = UserUtils.getCurrentPrincipleID();
     	Date now = DateUtil.now(); 
     	
-    	QueryWrapper<LibraryInfo> libraryInfoQe1 = new QueryWrapper<>();
+    	/*QueryWrapper<LibraryInfo> libraryInfoQe1 = new QueryWrapper<>();
     	libraryInfoQe1.eq("concept_id", removeConceptInfoVO.getConceptId());
     	libraryInfoQe1.eq("is_concept", 0);
     	libraryinfoFacade.remove(libraryInfoQe1);
@@ -206,13 +206,31 @@ public class ConceptFacade extends ConceptServiceImpl {
     	libraryInfo.setIsDeleted("Y");
     	libraryInfo.setGmtModified(now);
     	libraryInfo.setModifier(currentUser);
-    	libraryinfoFacade.update(libraryInfo, libraryInfoQe2);
-    	
-    	Concept concept = new Concept();
+    	libraryinfoFacade.update(libraryInfo, libraryInfoQe2);*/
+  
+    	/*Concept concept = new Concept();
     	concept.setId(removeConceptInfoVO.getConceptId());
     	concept.setIsDeleted("Y");
     	concept.setModifier(currentUser);
     	concept.setGmtModified(now);
+    	this.updateById(concept);*/
+    	
+    	Concept concept = this.getById(removeConceptInfoVO.getConceptId());
+    	if(concept==null){
+    		throw new CommonException(CommonErrorCode.NOT_EXISTS);
+    	}
+    	if(concept.getIsDeleted().equals(removeConceptInfoVO.getIsDeleted())){
+    		if(removeConceptInfoVO.getIsDeleted().equals("Y")){
+    			throw new CommonException(CommonErrorCode.RPC_ERROR,"该数据已删除！");
+    		}
+    		if(removeConceptInfoVO.getIsDeleted().equals("N")){
+    			throw new CommonException(CommonErrorCode.RPC_ERROR,"该数据已恢复！");
+    		}
+    	}
+    	
+    	concept.setIsDeleted(removeConceptInfoVO.getIsDeleted());
+    	concept.setModifier(currentUser);
+    	concept.setGmtModified(now);
     	this.updateById(concept);
     	
         return true;

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

@@ -85,7 +85,7 @@ public class RelationFacade extends RelationServiceImpl {
     }
     
     /**
-     * 医学术语关系删除
+     * 医学术语关系删除或者恢复
      * @param removeRelationInfoVO
      * @return
      */

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

@@ -28,4 +28,10 @@ public class GetAllInformationVO extends Page {
     @ApiModelProperty(value="术语类型")
     private String type;
     
+    /**
+     * 状态：Y-已删除，N-启用中
+     */
+	@ApiModelProperty(value="状态：Y-已删除，N-启用中")
+	private String isDeleted;
+    
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -21,5 +22,12 @@ public class RemoveConceptInfoVO {
 	@ApiModelProperty(value="概念id",required=true)
 	@NotNull(message="概念id必传")
     private Long conceptId;
+	
+	/**
+     * 状态：Y-删除，N-恢复
+     */
+	@NotBlank(message="状态必填")
+	@ApiModelProperty(value="状态：Y-删除，N-恢复",required=true)
+	private String isDeleted;
     
 }

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

@@ -71,7 +71,7 @@ public class ConceptController {
         return RespDTO.onSuc(conceptFacade.getAllInformation(getAllInformationVO));
     }
     
-    @ApiOperation(value = "医学术语命名删除[by:rengb]")
+    @ApiOperation(value = "医学术语命名删除或者恢复[by:rengb]")
     @PostMapping("/removeConceptInfo")
     @SysLogger("removeConceptInfo")
     @Transactional

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

@@ -29,9 +29,9 @@
 		b.type AS libType,
 		GROUP_CONCAT(b.`name` ORDER BY b.id ASC SEPARATOR '、') as otherNames,
 		a.modifier as operName,
-		a.gmt_modified as operTime
+		a.gmt_modified as operTime,
+		a.is_deleted as isDeleted
 		FROM concept a JOIN library_info b ON a.id=b.concept_id
-		WHERE a.is_deleted='N' AND b.is_deleted='N'
 		GROUP BY a.id) t
 		where 1=1
 		<if test="name!=null and name!=''">
@@ -40,7 +40,10 @@
 		<if test="type!=null and type!=''">
             AND libType = #{type}
         </if>
-		ORDER BY operTime DESC
+        <if test="isDeleted!=null and isDeleted!=''">
+        	AND is_deleted=#{isDeleted}
+        </if>
+		ORDER BY isDeleted ASC,operTime DESC
     </select>
 
 </mapper>