同义词修改

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

@@ -27,7 +27,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddTagRetrievalDetailVO;
 import com.diagbot.vo.AddTagRetrievalVO;
-import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.DelRetrievalsByQuesIdVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
 import com.diagbot.vo.RetrievalListVO;
 
@@ -58,23 +58,25 @@ public class RetrievalFacade extends RetrievalServiceImpl {
     /**
      * 根据映射关系删除标签的同义词
      *
-     * @param delRetrievalsByMapsVO
+     * @param delRetrievalsByQuesIdVO
      * @return
      */
-    public Boolean delRetrievalsByMaps(DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
+    public Boolean delRetrievalsByQuesId(DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
     	QueryWrapper<RetrievalMapping> mappingQe = new QueryWrapper<>();
+    	mappingQe.eq("question_id", delRetrievalsByQuesIdVO.getQuestionId());
+    	
 		String userId = UserUtils.getCurrentPrincipleID();
 		RetrievalMapping retrievalMapping = new RetrievalMapping();
 		retrievalMapping.setGmtModified(DateUtil.now());
 		retrievalMapping.setModifier(userId);
 		retrievalMapping.setIsDeleted("Y");
-		mappingQe.in("id", delRetrievalsByMapsVO.getRetrievalMappingIds());
+		
 		retrievalMappingFacade.update(retrievalMapping, mappingQe);
 		return true;
     }
 
     /**
-     * 标签添加同义词
+     * 添加或者编辑标签同义词
      *
      * @param addTagRetrievalVO
      * @return
@@ -132,6 +134,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         
         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());
@@ -140,14 +143,17 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         		retrievalMapping.setGmtModified(now);
         		retrievalMapping.setCreator(userId);
         		retrievalMapping.setModifier(userId);
+        		retrievalMapping.setShowType(detail.getRetrievalType());
+        		addOrUpdateRetrievalMappings.add(retrievalMapping);
         	}else{
-        		if(detailMap.get(i.getName()).getRetrievalType()!=retrievalMapping.getShowType()){
+        		if(detail.getRetrievalType()!=retrievalMapping.getShowType()||retrievalMapping.getIsDeleted().equals("Y")){
         			retrievalMapping.setShowType(detailMap.get(i.getName()).getRetrievalType());
         			retrievalMapping.setGmtModified(now);
         			retrievalMapping.setModifier(userId);
+        			retrievalMapping.setIsDeleted("N");
+        			addOrUpdateRetrievalMappings.add(retrievalMapping);
         		}
         	}
-        	addOrUpdateRetrievalMappings.add(retrievalMapping);
         });
         
         retrievalMappingFacade.saveOrUpdateBatch(addOrUpdateRetrievalMappings);     

icssman-service/src/main/java/com/diagbot/vo/DelRetrievalsByMapsVO.java

@@ -1,30 +0,0 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotEmpty;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:52
- */
-@ApiModel(value="根据映射关系删除标签的同义词接口传参")
-@Getter
-@Setter
-public class DelRetrievalsByMapsVO {
-	
-	/**
-	 * 标签同义词映射关系id集合
-	 */
-	@ApiModelProperty(value="标签同义词映射关系id集合",required=true)
-	@NotEmpty(message="标签同义词映射关系id必传")
-	private List<Long> retrievalMappingIds;
-
-
-}

icssman-service/src/main/java/com/diagbot/vo/DelRetrievalsByQuesIdVO.java

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:52
+ */
+@ApiModel(value="根据标签id删除标签的同义词接口传参")
+@Getter
+@Setter
+public class DelRetrievalsByQuesIdVO {
+	
+	/**
+     * 标签id
+     */
+	@ApiModelProperty(value="标签id",required=true)
+	@NotNull(message="标签id必传")
+    private Long questionId;
+	
+
+}

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

@@ -18,7 +18,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalListDTO;
 import com.diagbot.facade.RetrievalFacade;
 import com.diagbot.vo.AddTagRetrievalVO;
-import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.DelRetrievalsByQuesIdVO;
 import com.diagbot.vo.GetRetrievalsByTagVO;
 import com.diagbot.vo.RetrievalListVO;
 
@@ -49,13 +49,12 @@ public class RetrievalController {
         return RespDTO.onSuc(retrievalFacade.getRetrievalsByTag(getRetrievalsByTagVO));
     }
 
-
-    @ApiOperation(value = "根据映射关系删除标签的同义词[by:rengb]")
-    @PostMapping("/delRetrievalsByMaps")
-    @SysLogger("delRetrievalsByMaps")
+    @ApiOperation(value = "根据标签id删除标签的同义词[by:rengb]")
+    @PostMapping("/delRetrievalsByQuesId")
+    @SysLogger("delRetrievalsByQuesId")
     @Transactional
-    public RespDTO<List<Boolean>> delRetrievalsByMaps(@Valid @RequestBody DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
-        return RespDTO.onSuc(retrievalFacade.delRetrievalsByMaps(delRetrievalsByMapsVO));
+    public RespDTO<Boolean> delRetrievalsByQuesId(@Valid @RequestBody DelRetrievalsByQuesIdVO delRetrievalsByQuesIdVO) {
+        return RespDTO.onSuc(retrievalFacade.delRetrievalsByQuesId(delRetrievalsByQuesIdVO));
     }
 
     @ApiOperation(value = "添加或者编辑标签同义词[by:rengb]")