同义词修改

icssman-service/src/main/java/com/diagbot/dto/GetRetrievalsByTagDTO.java

@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package com.diagbot.dto;
+
+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:34
+ */
+@ApiModel(value="根据标签获取同义词接口出参")
+@Getter
+@Setter
+public class GetRetrievalsByTagDTO {
+	
+	/**
+	 * 同义词id
+	 */
+	@ApiModelProperty(value="同义词id")
+	private Long retrievalId;
+	
+	/**
+	 * 同义词映射id
+	 */
+	@ApiModelProperty(value="同义词映射id")
+	private Long retrievalMappingId;
+	
+	/**
+	 * 同义词名称
+	 */
+	@ApiModelProperty(value="同义词名称")
+	private String retrievalName;
+	
+	
+
+}

icssman-service/src/main/java/com/diagbot/entity/Retrieval.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class Retrieval implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -79,18 +80,18 @@ public class Retrieval implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icssman-service/src/main/java/com/diagbot/entity/RetrievalMapping.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class RetrievalMapping implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -84,18 +85,18 @@ public class RetrievalMapping implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

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

@@ -0,0 +1,47 @@
+/**
+ * 
+ */
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.diagbot.dto.GetRetrievalsByTagDTO;
+import com.diagbot.service.impl.RetrievalServiceImpl;
+import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.GetRetrievalsByTagVO;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午4:53:59
+ */
+@Component
+public class RetrievalFacede extends RetrievalServiceImpl {
+	
+	@Autowired
+	private RetrievalMappingFacede retrievalMappingFacede;
+	
+	/**
+	 * 根据标签获取同义词
+	 * @param getRetrievalsByTagVO
+	 * @return
+	 */
+	public List<GetRetrievalsByTagDTO> getRetrievalsByTag(GetRetrievalsByTagVO getRetrievalsByTagVO){
+		
+		return this.baseMapper.getRetrievalsByTag(getRetrievalsByTagVO);
+	}
+
+	/**
+	 * 根据映射关系删除标签的同义词
+	 * @param delRetrievalsByMapsVO
+	 * @return
+	 */
+	public Boolean delRetrievalsByMaps(DelRetrievalsByMapsVO delRetrievalsByMapsVO){
+		retrievalMappingFacede.removeByIds(delRetrievalsByMapsVO.getRetrievalMappingIds());
+		return true;
+	}
+	
+}

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

@@ -0,0 +1,19 @@
+/**
+ * 
+ */
+package com.diagbot.facade;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.service.impl.RetrievalMappingServiceImpl;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午4:53:59
+ */
+@Component
+public class RetrievalMappingFacede extends RetrievalMappingServiceImpl {
+
+	
+}

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

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.Retrieval;
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetRetrievalsByTagDTO;
+import com.diagbot.entity.Retrieval;
+import com.diagbot.vo.GetRetrievalsByTagVO;
 
 /**
  * <p>
@@ -12,5 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-12-03
  */
 public interface RetrievalMapper extends BaseMapper<Retrieval> {
+	
+	/**
+	 * 根据标签获取同义词
+	 * @param getRetrievalsByTagVO
+	 * @return
+	 */
+	List<GetRetrievalsByTagDTO> getRetrievalsByTag(GetRetrievalsByTagVO getRetrievalsByTagVO);
 
 }

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

@@ -0,0 +1,30 @@
+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/GetRetrievalsByTagVO.java

@@ -0,0 +1,34 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+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 GetRetrievalsByTagVO {
+	
+	/**
+     * 标签id
+     */
+	@ApiModelProperty(value="标签id")
+    private Long questionId;
+	
+	/**
+	 * 标签名称
+	 */
+	@ApiModelProperty(value="标签名称",required=true)
+	@NotBlank(message="标签名称必传")
+	private String questionName;
+
+
+}

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

@@ -1,10 +1,25 @@
 package com.diagbot.web;
 
+import java.util.List;
 
-import io.swagger.annotations.Api;
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetRetrievalsByTagDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.RetrievalFacede;
+import com.diagbot.vo.DelRetrievalsByMapsVO;
+import com.diagbot.vo.GetRetrievalsByTagVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * <p>
  * 同义词检索表 前端控制器
@@ -18,5 +33,28 @@ import org.springframework.web.bind.annotation.RestController;
 @SuppressWarnings("unchecked")
 @Api(value = "同义词维护相关API", tags = { "同义词维护相关API" })
 public class RetrievalController {
+	
+	@Autowired
+	private RetrievalFacede retrievalFacede;
+	
+    @ApiOperation(value = "根据标签获取同义词[by:rengb]")
+	@PostMapping("/getRetrievalsByTag")
+	@SysLogger("getRetrievalsByTag")
+	public RespDTO<List<GetRetrievalsByTagDTO>> getRetrievalsByTag(@Valid @RequestBody GetRetrievalsByTagVO getRetrievalsByTagVO) {
+		return RespDTO.onSuc(retrievalFacede.getRetrievalsByTag(getRetrievalsByTagVO));
+	}
+	
+	
+    @ApiOperation(value = "根据映射关系删除标签的同义词[by:rengb]")
+	@PostMapping("/delRetrievalsByMaps")
+	@SysLogger("delRetrievalsByMaps")
+	public RespDTO<List<Boolean>> delRetrievalsByMaps(@Valid @RequestBody DelRetrievalsByMapsVO delRetrievalsByMapsVO) {
+		return RespDTO.onSuc(retrievalFacede.delRetrievalsByMaps(delRetrievalsByMapsVO));
+	}
+	
+	
+	
+	
+	
 
 }

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

@@ -15,4 +15,24 @@
         <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
+		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.`name`=#{questionName}
+		</if>
+	</select>
+
 </mapper>