Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -11,7 +11,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LibraryDetailDTO {
+public class ConceptDetailDTO {
 	
 	/**
      * id

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

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LibraryIndexDTO {
+public class ConceptIndexDTO {
 
     /**
      * 名称

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

@@ -1,55 +1,55 @@
-package com.diagbot.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年12月5日下午5:00:34
- */
-@Getter
-@Setter
-public class GetLibraryDetailListDTO {
-
-    /**
-     * 操作时间
-     */
-    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
-    @ApiModelProperty(value="操作时间")
-    private Date gmtModified;
-
-    /**
-     * 操作人
-     */
-    @ApiModelProperty(value="操作人")
-    private String modifier;
-
-    /**
-     * 概念id
-     */
-    @ApiModelProperty(value="概念id")
-    private Long conceptId;
-
-    /**
-     * 标题
-     */
-    @ApiModelProperty(value="标题")
-    private String title;
-
-    /**
-     * 概念名称
-     */
-    @ApiModelProperty(value="概念名称")
-    private String libName;
-
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-}
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetConceptDetailListDTO {
+
+    /**
+     * 操作时间
+     */
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value="操作时间")
+    private Date gmtModified;
+
+    /**
+     * 操作人
+     */
+    @ApiModelProperty(value="操作人")
+    private String modifier;
+
+    /**
+     * 概念id
+     */
+    @ApiModelProperty(value="概念id")
+    private Long conceptId;
+
+    /**
+     * 标题
+     */
+    @ApiModelProperty(value="标题")
+    private String title;
+
+    /**
+     * 概念名称
+     */
+    @ApiModelProperty(value="概念名称")
+    private String libName;
+
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+}

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

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.GetLibraryDetailListDTO;
-import com.diagbot.dto.LibraryDetailDTO;
-import com.diagbot.dto.LibraryIndexDTO;
+import com.diagbot.dto.GetConceptDetailListDTO;
+import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptIndexDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LibraryDetail;
 import com.diagbot.enums.IsDeleteEnum;
@@ -17,11 +17,11 @@ import com.diagbot.service.impl.LibraryDetailServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.AddLibraryDetailVO;
-import com.diagbot.vo.GetLibraryDetailListVO;
-import com.diagbot.vo.GetLibraryDetailVO;
-import com.diagbot.vo.LibraryIndexVO;
-import com.diagbot.vo.RemoveLibraryDetailVO;
+import com.diagbot.vo.AddConceptDetailVO;
+import com.diagbot.vo.GetConceptDetailListVO;
+import com.diagbot.vo.GetConceptDetailVO;
+import com.diagbot.vo.ConceptIndexVO;
+import com.diagbot.vo.RemoveConceptDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * @time: 2019/1/16 14:17
  */
 @Component
-public class LibraryDetailFacade extends LibraryDetailServiceImpl {
+public class ConceptDetailFacade extends LibraryDetailServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
@@ -49,11 +49,11 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     /**
      * 获取医学术语命名列表
      *
-     * @param getLibraryDetailListVO
+     * @param getConceptDetailListVO
      * @return
      */
-    public IPage<GetLibraryDetailListDTO> getLibraryDetailList(GetLibraryDetailListVO getLibraryDetailListVO) {
-        IPage<GetLibraryDetailListDTO> ipage = this.baseMapper.getLibraryDetailList(getLibraryDetailListVO);
+    public IPage<GetConceptDetailListDTO> getListFac(GetConceptDetailListVO getConceptDetailListVO) {
+        IPage<GetConceptDetailListDTO> ipage = this.baseMapper.getLibraryDetailList(getConceptDetailListVO);
         List<String> ids = ipage.getRecords().stream().map(i -> i.getModifier()).distinct().collect(Collectors.toList());
         if (ids.size() > 0) {
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
@@ -71,49 +71,49 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     /**
      * 医学术语静态知识删除
      *
-     * @param removeLibraryDetailVO
+     * @param removeConceptDetailVO
      * @return
      */
-    public Boolean removeLibraryDetail(RemoveLibraryDetailVO removeLibraryDetailVO) {
-        if (!(IsDeleteEnum.N.getKey().equals(removeLibraryDetailVO.getStatus())
-                || IsDeleteEnum.Y.getKey().equals(removeLibraryDetailVO.getStatus()))) {
+    public Boolean delete(RemoveConceptDetailVO removeConceptDetailVO) {
+        if (!(IsDeleteEnum.N.getKey().equals(removeConceptDetailVO.getStatus())
+                || IsDeleteEnum.Y.getKey().equals(removeConceptDetailVO.getStatus()))) {
             throw new CommonException(CommonErrorCode.STATUS_IS_ERROR, "状态值错误【Y】或【N】");
         }
         String person = UserUtils.getCurrentPrincipleID();
-        List<Long> ids = removeLibraryDetailVO.getConceptId();
+        List<Long> ids = removeConceptDetailVO.getConceptId();
         Date now = DateUtil.now();
         this.update(new LibraryDetail(), new UpdateWrapper<LibraryDetail>()
                 .in("concept_id", ids)
                 .set("gmt_modified", now)
                 .set("modifier", person)
-                .set("is_deleted", removeLibraryDetailVO.getStatus()));
+                .set("is_deleted", removeConceptDetailVO.getStatus()));
         return true;
     }
 
     /**
      * 获取医学术语静态知识详情
      *
-     * @param getLibraryDetailVO
+     * @param getConceptDetailVO
      * @return
      */
-    public List<LibraryDetailDTO> getLibraryDetail(GetLibraryDetailVO getLibraryDetailVO) {
-        return this.getByParam(getLibraryDetailVO.getConceptId());
+    public List<ConceptDetailDTO> getByConceptId(GetConceptDetailVO getConceptDetailVO) {
+        return this.getByParam(getConceptDetailVO.getConceptId());
     }
 
     /**
      * 医学术语静态知识添加或者编辑
      *
-     * @param libraryDetailVOList
+     * @param addConceptDetailVOList
      * @return
      */
-    public Boolean addLibraryDetail(List<AddLibraryDetailVO> libraryDetailVOList) {
-        if (ListUtil.isEmpty(libraryDetailVOList)) {
+    public Boolean insertOrUpdate(List<AddConceptDetailVO> addConceptDetailVOList) {
+        if (ListUtil.isEmpty(addConceptDetailVOList)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "静态知识明细内容不能为空");
         }
 
         // 删除原明细信息
-        Long conceptId = libraryDetailVOList.get(0).getConceptId();
+        Long conceptId = addConceptDetailVOList.get(0).getConceptId();
         if (conceptId != null) {
             this.remove(new QueryWrapper<LibraryDetail>()
                     .eq("concept_id", conceptId));
@@ -123,7 +123,7 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
 		String currentUser = UserUtils.getCurrentPrincipleID();
         Date now = DateUtil.now();
         List<LibraryDetail> list = new ArrayList<>();
-        for (AddLibraryDetailVO detailVO : libraryDetailVOList) {
+        for (AddConceptDetailVO detailVO : addConceptDetailVOList) {
             LibraryDetail bean = new LibraryDetail();
             bean.setConceptId(detailVO.getConceptId());
             bean.setGmtModified(now);
@@ -147,11 +147,11 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     /**
      * 检索
      *
-     * @param libraryIndexVO
+     * @param conceptIndexVO
      * @return
      */
-    public List<LibraryIndexDTO> indexFac(LibraryIndexVO libraryIndexVO) {
-        return this.index(libraryIndexVO);
+    public List<ConceptIndexDTO> indexFac(ConceptIndexVO conceptIndexVO) {
+        return this.index(conceptIndexVO);
     }
 
 }

knowledgeman-service/src/main/java/com/diagbot/mapper/LibraryDetailMapper.java

@@ -2,12 +2,12 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.GetLibraryDetailListDTO;
-import com.diagbot.dto.LibraryDetailDTO;
-import com.diagbot.dto.LibraryIndexDTO;
+import com.diagbot.dto.GetConceptDetailListDTO;
+import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptIndexDTO;
 import com.diagbot.entity.LibraryDetail;
-import com.diagbot.vo.GetLibraryDetailListVO;
-import com.diagbot.vo.LibraryIndexVO;
+import com.diagbot.vo.GetConceptDetailListVO;
+import com.diagbot.vo.ConceptIndexVO;
 
 import java.util.List;
 
@@ -21,16 +21,16 @@ import java.util.List;
  */
 public interface LibraryDetailMapper extends BaseMapper<LibraryDetail> {
 
-	IPage<GetLibraryDetailListDTO> getLibraryDetailList(GetLibraryDetailListVO getLibraryDetailListVO);
+	IPage<GetConceptDetailListDTO> getLibraryDetailList(GetConceptDetailListVO getConceptDetailListVO);
 
-	public List<LibraryDetailDTO> getByParam(Long conceptId);
+	public List<ConceptDetailDTO> getByParam(Long conceptId);
 
 	/**
 	 * 检索
 	 *
-	 * @param libraryIndexVO
+	 * @param conceptIndexVO
 	 * @return
 	 */
-	public List<LibraryIndexDTO> index(LibraryIndexVO libraryIndexVO);
+	public List<ConceptIndexDTO> index(ConceptIndexVO conceptIndexVO);
    
 }

knowledgeman-service/src/main/java/com/diagbot/service/LibraryDetailService.java

@@ -1,10 +1,10 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.LibraryDetailDTO;
-import com.diagbot.dto.LibraryIndexDTO;
+import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptIndexDTO;
 import com.diagbot.entity.LibraryDetail;
-import com.diagbot.vo.LibraryIndexVO;
+import com.diagbot.vo.ConceptIndexVO;
 
 import java.util.List;
 
@@ -24,14 +24,14 @@ public interface LibraryDetailService extends IService<LibraryDetail> {
      * @param conceptId
      * @return
      */
-    public List<LibraryDetailDTO> getByParam(Long conceptId);
+    public List<ConceptDetailDTO> getByParam(Long conceptId);
 
 
     /**
      * 检索
      *
-     * @param libraryIndexVO
+     * @param conceptIndexVO
      * @return
      */
-    public List<LibraryIndexDTO> index(LibraryIndexVO libraryIndexVO);
+    public List<ConceptIndexDTO> index(ConceptIndexVO conceptIndexVO);
 }

knowledgeman-service/src/main/java/com/diagbot/service/impl/LibraryDetailServiceImpl.java

@@ -1,8 +1,8 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.dto.LibraryDetailDTO;
-import com.diagbot.dto.LibraryIndexDTO;
-import com.diagbot.vo.LibraryIndexVO;
+import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptIndexDTO;
+import com.diagbot.vo.ConceptIndexVO;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,12 +25,12 @@ public class LibraryDetailServiceImpl extends ServiceImpl<LibraryDetailMapper, L
 
 
     @Override
-    public List<LibraryDetailDTO> getByParam(Long conceptId) {
+    public List<ConceptDetailDTO> getByParam(Long conceptId) {
         return baseMapper.getByParam(conceptId);
     }
 
     @Override
-    public List<LibraryIndexDTO> index(LibraryIndexVO libraryIndexVO) {
-        return baseMapper.index(libraryIndexVO);
+    public List<ConceptIndexDTO> index(ConceptIndexVO conceptIndexVO) {
+        return baseMapper.index(conceptIndexVO);
     }
 }

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

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class AddLibraryDetailVO {
+public class AddConceptDetailVO {
 	
 	/**
      * 概念id

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

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class LibraryIndexVO {
+public class ConceptIndexVO {
     @ApiModelProperty(value = "检索名称")
     @NotBlank(message="名称不能为空")
     private String name;

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

@@ -14,7 +14,7 @@ import lombok.Setter;
 @SuppressWarnings({ "serial", "rawtypes" })
 @Getter
 @Setter
-public class GetLibraryDetailListVO extends Page {
+public class GetConceptDetailListVO extends Page {
     
 	/**
      * 术语名称

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

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class GetLibraryDetailVO {
+public class GetConceptDetailVO {
     
     /**
      * 医学术语静态知识id

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

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class RemoveLibraryDetailVO {
+public class RemoveConceptDetailVO {
     
     /**
      * 医学术语静态知识id

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

@@ -0,0 +1,82 @@
+package com.diagbot.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetConceptDetailListDTO;
+import com.diagbot.dto.ConceptDetailDTO;
+import com.diagbot.dto.ConceptIndexDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.ConceptDetailFacade;
+import com.diagbot.vo.AddConceptDetailVO;
+import com.diagbot.vo.GetConceptDetailListVO;
+import com.diagbot.vo.GetConceptDetailVO;
+import com.diagbot.vo.ConceptIndexVO;
+import com.diagbot.vo.RemoveConceptDetailVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-16
+ */
+@RestController
+@RequestMapping("/libraryDetail")
+@SuppressWarnings("unchecked")
+@Api(value = "知识库标准化-医学术语静态知识维护相关API", tags = { "知识库标准化-医学术语静态知识维护相关API" })
+public class ConceptDetailController {
+	
+    @Autowired
+    private ConceptDetailFacade conceptDetailFacade;
+    
+    @ApiOperation(value = "知识库标准化-获取医学术语静态知识列表[by:rengb]")
+    @PostMapping("/page")
+    @SysLogger("page")
+    public RespDTO<IPage<GetConceptDetailListDTO>> page(@RequestBody GetConceptDetailListVO getConceptDetailListVO) {
+        return RespDTO.onSuc(conceptDetailFacade.getListFac(getConceptDetailListVO));
+    }
+    
+    @ApiOperation(value = "知识库标准化-医学术语静态知识删除|恢复[by:rengb]")
+    @PostMapping("/delete")
+    @SysLogger("delete")
+    @Transactional
+    public RespDTO<Boolean> delete(@Valid @RequestBody RemoveConceptDetailVO removeConceptDetailVO) {
+        return RespDTO.onSuc(conceptDetailFacade.delete(removeConceptDetailVO));
+    }
+    
+    @ApiOperation(value = "知识库标准化-获取医学术语静态知识详情[by:rengb]")
+    @PostMapping("/getByConceptId")
+    @SysLogger("getByConceptId")
+    public RespDTO<ConceptDetailDTO> getByConceptId(@Valid @RequestBody GetConceptDetailVO getConceptDetailVO) {
+        return RespDTO.onSuc(conceptDetailFacade.getByConceptId(getConceptDetailVO));
+    }
+    
+    @ApiOperation(value = "知识库标准化-医学术语静态知识添加或者编辑[by:rengb]")
+    @PostMapping("/insertOrUpdate")
+    @SysLogger("insertOrUpdate")
+    @Transactional
+    public RespDTO<Boolean> insertOrUpdate(@Valid @RequestBody List<AddConceptDetailVO> addConceptDetailVOList) {
+        return RespDTO.onSuc(conceptDetailFacade.insertOrUpdate(addConceptDetailVOList));
+    }
+
+
+    @ApiOperation(value = "知识库标准化-内容检索[by:zhoutg]", notes = "")
+    @PostMapping("/index")
+    @SysLogger("index")
+    public RespDTO<List<ConceptIndexDTO>> index(@Valid @RequestBody ConceptIndexVO conceptIndexVO) {
+        List<ConceptIndexDTO> data = conceptDetailFacade.indexFac(conceptIndexVO);
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -1,82 +0,0 @@
-package com.diagbot.web;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetLibraryDetailListDTO;
-import com.diagbot.dto.LibraryDetailDTO;
-import com.diagbot.dto.LibraryIndexDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.LibraryDetailFacade;
-import com.diagbot.vo.AddLibraryDetailVO;
-import com.diagbot.vo.GetLibraryDetailListVO;
-import com.diagbot.vo.GetLibraryDetailVO;
-import com.diagbot.vo.LibraryIndexVO;
-import com.diagbot.vo.RemoveLibraryDetailVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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 javax.validation.Valid;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-16
- */
-@RestController
-@RequestMapping("/libraryDetail")
-@SuppressWarnings("unchecked")
-@Api(value = "知识库标准化-医学术语静态知识维护相关API", tags = { "知识库标准化-医学术语静态知识维护相关API" })
-public class LibraryDetailController {
-	
-    @Autowired
-    private LibraryDetailFacade libraryDetailFacade;
-    
-    @ApiOperation(value = "知识库标准化-获取医学术语静态知识列表[by:rengb]")
-    @PostMapping("/getLibraryDetailList")
-    @SysLogger("getLibraryDetailList")
-    public RespDTO<IPage<GetLibraryDetailListDTO>> getLibraryDetailList(@RequestBody GetLibraryDetailListVO getLibraryDetailListVO) {
-        return RespDTO.onSuc(libraryDetailFacade.getLibraryDetailList(getLibraryDetailListVO));
-    }
-    
-    @ApiOperation(value = "知识库标准化-医学术语静态知识删除|恢复[by:rengb]")
-    @PostMapping("/removeLibraryDetail")
-    @SysLogger("removeLibraryDetail")
-    @Transactional
-    public RespDTO<Boolean> removeLibraryDetail(@Valid @RequestBody RemoveLibraryDetailVO removeLibraryDetailVO) {
-        return RespDTO.onSuc(libraryDetailFacade.removeLibraryDetail(removeLibraryDetailVO));
-    }
-    
-    @ApiOperation(value = "知识库标准化-获取医学术语静态知识详情[by:rengb]")
-    @PostMapping("/getLibraryDetail")
-    @SysLogger("getLibraryDetail")
-    public RespDTO<LibraryDetailDTO> getLibraryDetail(@Valid @RequestBody GetLibraryDetailVO getLibraryDetailVO) {
-        return RespDTO.onSuc(libraryDetailFacade.getLibraryDetail(getLibraryDetailVO));
-    }
-    
-    @ApiOperation(value = "知识库标准化-医学术语静态知识添加或者编辑[by:rengb]")
-    @PostMapping("/addLibraryDetail")
-    @SysLogger("addLibraryDetail")
-    @Transactional
-    public RespDTO<Boolean> addLibraryDetail(@Valid @RequestBody List<AddLibraryDetailVO> libraryDetailVOList) {
-        return RespDTO.onSuc(libraryDetailFacade.addLibraryDetail(libraryDetailVOList));
-    }
-
-
-    @ApiOperation(value = "知识库标准化-内容检索[by:zhoutg]", notes = "")
-    @PostMapping("/index")
-    @SysLogger("index")
-    public RespDTO<List<LibraryIndexDTO>> index(@Valid @RequestBody LibraryIndexVO libraryIndexVO) {
-        List<LibraryIndexDTO> data = libraryDetailFacade.indexFac(libraryIndexVO);
-        return RespDTO.onSuc(data);
-    }
-}

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

@@ -19,7 +19,7 @@
         <result column="is_reason" property="isReason" />
     </resultMap>
 
-   	<select id="getLibraryDetailList" resultType="com.diagbot.dto.GetLibraryDetailListDTO">
+   	<select id="getLibraryDetailList" resultType="com.diagbot.dto.GetConceptDetailListDTO">
    		SELECT b.id concept_id, b.lib_name, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
 		FROM kl_concept_detail a ,kl_concept b
 		WHERE   b.is_deleted='N' and a.concept_id=b.id
@@ -34,7 +34,7 @@
    	</select>
 
 
-	<select id="getByParam" resultType="com.diagbot.dto.LibraryDetailDTO">
+	<select id="getByParam" resultType="com.diagbot.dto.ConceptDetailDTO">
         SELECT a.*,b.lib_name FROM `kl_concept_detail` a, `kl_concept` b
         where  a.is_deleted = 'N' and b.is_deleted = 'N' and b.id = a.concept_id
         and a.concept_id = #{conceptId}
@@ -42,7 +42,7 @@
     </select>
 
 
-    <select id="index" resultType="com.diagbot.dto.LibraryIndexDTO">
+    <select id="index" resultType="com.diagbot.dto.ConceptIndexDTO">
         SELECT a.lib_name name, a.id concept_id FROM `kl_concept` a
         where a.is_deleted = 'N'
         <if test="name != null and name != ''">