Commit 7a835d00 authored by alex yao's avatar alex yao

feat: 获取知识库详情

parent 6f853c91
...@@ -7,7 +7,7 @@ import cn.com.poc.knowledge.dto.BizKnowledgeInfoDto; ...@@ -7,7 +7,7 @@ import cn.com.poc.knowledge.dto.BizKnowledgeInfoDto;
public class BizKnowledgeInfoConvert { public class BizKnowledgeInfoConvert {
public static BizKnowledgeInfoEntity modelToEntity(BizKnowledgeInfoModel model){ public static BizKnowledgeInfoEntity modelToEntity(BizKnowledgeInfoModel model) {
BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity(); BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity();
entity.setId(model.getId()); entity.setId(model.getId());
entity.setKnowledgeName(model.getKnowledgeName()); entity.setKnowledgeName(model.getKnowledgeName());
...@@ -15,6 +15,7 @@ public class BizKnowledgeInfoConvert { ...@@ -15,6 +15,7 @@ public class BizKnowledgeInfoConvert {
entity.setKdIds(model.getKdIds()); entity.setKdIds(model.getKdIds());
entity.setTrainStatus(model.getTrainStatus()); entity.setTrainStatus(model.getTrainStatus());
entity.setKnowledgeDesc(model.getKnowledgeDesc()); entity.setKnowledgeDesc(model.getKnowledgeDesc());
entity.setIsOpen(model.getIsOpen());
entity.setIsDeleted(model.getIsDeleted()); entity.setIsDeleted(model.getIsDeleted());
entity.setCreator(model.getCreator()); entity.setCreator(model.getCreator());
entity.setCreatedTime(model.getCreatedTime()); entity.setCreatedTime(model.getCreatedTime());
...@@ -24,7 +25,7 @@ public class BizKnowledgeInfoConvert { ...@@ -24,7 +25,7 @@ public class BizKnowledgeInfoConvert {
return entity; return entity;
} }
public static BizKnowledgeInfoModel entityToModel(BizKnowledgeInfoEntity entity){ public static BizKnowledgeInfoModel entityToModel(BizKnowledgeInfoEntity entity) {
BizKnowledgeInfoModel model = new BizKnowledgeInfoModel(); BizKnowledgeInfoModel model = new BizKnowledgeInfoModel();
model.setId(entity.getId()); model.setId(entity.getId());
model.setKnowledgeName(entity.getKnowledgeName()); model.setKnowledgeName(entity.getKnowledgeName());
...@@ -32,6 +33,7 @@ public class BizKnowledgeInfoConvert { ...@@ -32,6 +33,7 @@ public class BizKnowledgeInfoConvert {
model.setKdIds(entity.getKdIds()); model.setKdIds(entity.getKdIds());
model.setTrainStatus(entity.getTrainStatus()); model.setTrainStatus(entity.getTrainStatus());
model.setKnowledgeDesc(entity.getKnowledgeDesc()); model.setKnowledgeDesc(entity.getKnowledgeDesc());
model.setIsOpen(entity.getIsOpen());
model.setIsDeleted(entity.getIsDeleted()); model.setIsDeleted(entity.getIsDeleted());
model.setCreator(entity.getCreator()); model.setCreator(entity.getCreator());
model.setCreatedTime(entity.getCreatedTime()); model.setCreatedTime(entity.getCreatedTime());
...@@ -41,23 +43,26 @@ public class BizKnowledgeInfoConvert { ...@@ -41,23 +43,26 @@ public class BizKnowledgeInfoConvert {
return model; return model;
} }
public static BizKnowledgeInfoDto entityToDto(BizKnowledgeInfoEntity entity){ public static BizKnowledgeInfoDto entityToDto(BizKnowledgeInfoEntity entity) {
BizKnowledgeInfoDto dto = new BizKnowledgeInfoDto(); BizKnowledgeInfoDto dto = new BizKnowledgeInfoDto();
dto.setId(entity.getId()); dto.setId(entity.getId());
dto.setKnowledgeName(entity.getKnowledgeName()); dto.setKnowledgeName(entity.getKnowledgeName());
dto.setMemberId(entity.getMemberId()); dto.setMemberId(entity.getMemberId());
dto.setIsOpen(entity.getIsOpen());
dto.setKdIds(entity.getKdIds()); dto.setKdIds(entity.getKdIds());
dto.setTrainStatus(entity.getTrainStatus()); dto.setTrainStatus(entity.getTrainStatus());
dto.setDesc(entity.getKnowledgeDesc()); dto.setDesc(entity.getKnowledgeDesc());
dto.setModifiedTime(entity.getModifiedTime());
return dto; return dto;
} }
public static BizKnowledgeInfoEntity dtoToEntity(BizKnowledgeInfoDto dto){ public static BizKnowledgeInfoEntity dtoToEntity(BizKnowledgeInfoDto dto) {
BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity(); BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity();
entity.setId(dto.getId()); entity.setId(dto.getId());
entity.setKnowledgeName(dto.getKnowledgeName()); entity.setKnowledgeName(dto.getKnowledgeName());
entity.setMemberId(dto.getMemberId()); entity.setMemberId(dto.getMemberId());
entity.setKdIds(dto.getKdIds()); entity.setKdIds(dto.getKdIds());
entity.setIsOpen(dto.getIsOpen());
entity.setTrainStatus(dto.getTrainStatus()); entity.setTrainStatus(dto.getTrainStatus());
entity.setKnowledgeDesc(dto.getDesc()); entity.setKnowledgeDesc(dto.getDesc());
return entity; return entity;
......
package cn.com.poc.knowledge.dto; package cn.com.poc.knowledge.dto;
import javax.persistence.Column;
public class BizKnowledgeInfoDto { public class BizKnowledgeInfoDto {
/** /**
...@@ -85,4 +87,32 @@ public class BizKnowledgeInfoDto { ...@@ -85,4 +87,32 @@ public class BizKnowledgeInfoDto {
this.desc = desc; this.desc = desc;
} }
/**
* isOpen
*/
private java.lang.String isOpen;
public String getIsOpen() {
return isOpen;
}
public void setIsOpen(String isOpen) {
this.isOpen = isOpen;
}
/**
* MODIFIED_TIME
* MODIFIED_TIME
*/
private java.util.Date modifiedTime;
@Column(name = "MODIFIED_TIME")
public java.util.Date getModifiedTime() {
return this.modifiedTime;
}
public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime;
}
} }
\ No newline at end of file
...@@ -77,6 +77,19 @@ public class BizKnowledgeInfoEntity { ...@@ -77,6 +77,19 @@ public class BizKnowledgeInfoEntity {
this.knowledgeDesc = knowledgeDesc; this.knowledgeDesc = knowledgeDesc;
} }
/**
* is_open
*/
private String isOpen;
public String getIsOpen() {
return isOpen;
}
public void setIsOpen(String isOpen) {
this.isOpen = isOpen;
}
/** is_deleted /** is_deleted
*是否删除 Y 是 N 否 *是否删除 Y 是 N 否
*/ */
......
package cn.com.poc.knowledge.model; package cn.com.poc.knowledge.model;
import java.io.Serializable; import java.io.Serializable;
import cn.com.yict.framemax.data.model.BaseModelClass; import cn.com.yict.framemax.data.model.BaseModelClass;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Id; import javax.persistence.Id;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Version; import javax.persistence.Version;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
...@@ -25,195 +29,222 @@ public class BizKnowledgeInfoModel extends BaseModelClass implements Serializabl ...@@ -25,195 +29,222 @@ public class BizKnowledgeInfoModel extends BaseModelClass implements Serializabl
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id /**
* * id
*/ */
private java.lang.Integer id; private java.lang.Integer id;
@Column(name = "id",length = 10) @Column(name = "id", length = 10)
@Id @GeneratedValue(strategy = GenerationType.AUTO) @Id
public java.lang.Integer getId(){ @GeneratedValue(strategy = GenerationType.AUTO)
public java.lang.Integer getId() {
return this.id; return this.id;
} }
public void setId(java.lang.Integer id){ public void setId(java.lang.Integer id) {
this.id = id; this.id = id;
super.addValidField("id"); super.addValidField("id");
} }
/** knowledge_name /**
*知识库名字 * knowledge_name
* 知识库名字
*/ */
private java.lang.String knowledgeName; private java.lang.String knowledgeName;
@Column(name = "knowledge_name",length = 100) @Column(name = "knowledge_name", length = 100)
public java.lang.String getKnowledgeName(){ public java.lang.String getKnowledgeName() {
return this.knowledgeName; return this.knowledgeName;
} }
public void setKnowledgeName(java.lang.String knowledgeName){ public void setKnowledgeName(java.lang.String knowledgeName) {
this.knowledgeName = knowledgeName; this.knowledgeName = knowledgeName;
super.addValidField("knowledgeName"); super.addValidField("knowledgeName");
} }
/** member_id /**
*用户ID * member_id
* 用户ID
*/ */
private java.lang.String memberId; private java.lang.String memberId;
@Column(name = "member_id",length = 100) @Column(name = "member_id", length = 100)
public java.lang.String getMemberId(){ public java.lang.String getMemberId() {
return this.memberId; return this.memberId;
} }
public void setMemberId(java.lang.String memberId){ public void setMemberId(java.lang.String memberId) {
this.memberId = memberId; this.memberId = memberId;
super.addValidField("memberId"); super.addValidField("memberId");
} }
/** kd_ids /**
*关联的文件ID * kd_ids
* 关联的文件ID
*/ */
private java.lang.String kdIds; private java.lang.String kdIds;
@Column(name = "kd_ids",length = 1073741824) @Column(name = "kd_ids", length = 1073741824)
public java.lang.String getKdIds(){ public java.lang.String getKdIds() {
return this.kdIds; return this.kdIds;
} }
public void setKdIds(java.lang.String kdIds){ public void setKdIds(java.lang.String kdIds) {
this.kdIds = kdIds; this.kdIds = kdIds;
super.addValidField("kdIds"); super.addValidField("kdIds");
} }
/** train_status /**
*状态:未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail * train_status
* 状态:未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
*/ */
private java.lang.String trainStatus; private java.lang.String trainStatus;
@Column(name = "train_status",length = 15) @Column(name = "train_status", length = 15)
public java.lang.String getTrainStatus(){ public java.lang.String getTrainStatus() {
return this.trainStatus; return this.trainStatus;
} }
public void setTrainStatus(java.lang.String trainStatus){ public void setTrainStatus(java.lang.String trainStatus) {
this.trainStatus = trainStatus; this.trainStatus = trainStatus;
super.addValidField("trainStatus"); super.addValidField("trainStatus");
} }
/** knowledge_desc /**
* * knowledge_desc
*/ */
private java.lang.String knowledgeDesc; private java.lang.String knowledgeDesc;
@Column(name = "knowledge_desc",length = 500) @Column(name = "knowledge_desc", length = 500)
public java.lang.String getKnowledgeDesc(){ public java.lang.String getKnowledgeDesc() {
return this.knowledgeDesc; return this.knowledgeDesc;
} }
public void setKnowledgeDesc(java.lang.String knowledgeDesc){ public void setKnowledgeDesc(java.lang.String knowledgeDesc) {
this.knowledgeDesc = knowledgeDesc; this.knowledgeDesc = knowledgeDesc;
super.addValidField("knowledgeDesc"); super.addValidField("knowledgeDesc");
} }
/**
* is_open
* 是否开启 Y 是 N 否
*/
private java.lang.String isOpen;
@Column(name = "is_open", length = 1)
public java.lang.String getIsOpen() {
return this.isOpen;
}
public void setIsOpen(java.lang.String isOpen) {
this.isOpen = isOpen;
super.addValidField("isOpen");
}
/** is_deleted /**
*是否删除 Y 是 N 否 * is_deleted
* 是否删除 Y 是 N 否
*/ */
private java.lang.String isDeleted; private java.lang.String isDeleted;
@Column(name = "is_deleted",length = 1) @Column(name = "is_deleted", length = 1)
public java.lang.String getIsDeleted(){ public java.lang.String getIsDeleted() {
return this.isDeleted; return this.isDeleted;
} }
public void setIsDeleted(java.lang.String isDeleted){ public void setIsDeleted(java.lang.String isDeleted) {
this.isDeleted = isDeleted; this.isDeleted = isDeleted;
super.addValidField("isDeleted"); super.addValidField("isDeleted");
} }
/** CREATOR /**
*创建人 * CREATOR
* 创建人
*/ */
private java.lang.String creator; private java.lang.String creator;
@Column(name = "CREATOR",length = 50) @Column(name = "CREATOR", length = 50)
public java.lang.String getCreator(){ public java.lang.String getCreator() {
return this.creator; return this.creator;
} }
public void setCreator(java.lang.String creator){ public void setCreator(java.lang.String creator) {
this.creator = creator; this.creator = creator;
super.addValidField("creator"); super.addValidField("creator");
} }
/** CREATED_TIME /**
*创建时间 * CREATED_TIME
* 创建时间
*/ */
private java.util.Date createdTime; private java.util.Date createdTime;
@Column(name = "CREATED_TIME",length = 19) @Column(name = "CREATED_TIME", length = 19)
public java.util.Date getCreatedTime(){ public java.util.Date getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
public void setCreatedTime(java.util.Date createdTime){ public void setCreatedTime(java.util.Date createdTime) {
this.createdTime = createdTime; this.createdTime = createdTime;
super.addValidField("createdTime"); super.addValidField("createdTime");
} }
/** MODIFIER /**
*修改人 * MODIFIER
* 修改人
*/ */
private java.lang.String modifier; private java.lang.String modifier;
@Column(name = "MODIFIER",length = 50) @Column(name = "MODIFIER", length = 50)
public java.lang.String getModifier(){ public java.lang.String getModifier() {
return this.modifier; return this.modifier;
} }
public void setModifier(java.lang.String modifier){ public void setModifier(java.lang.String modifier) {
this.modifier = modifier; this.modifier = modifier;
super.addValidField("modifier"); super.addValidField("modifier");
} }
/** MODIFIED_TIME /**
*修改时间 * MODIFIED_TIME
* 修改时间
*/ */
private java.util.Date modifiedTime; private java.util.Date modifiedTime;
@Column(name = "MODIFIED_TIME",length = 19) @Column(name = "MODIFIED_TIME", length = 19)
public java.util.Date getModifiedTime(){ public java.util.Date getModifiedTime() {
return this.modifiedTime; return this.modifiedTime;
} }
public void setModifiedTime(java.util.Date modifiedTime){ public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime; this.modifiedTime = modifiedTime;
super.addValidField("modifiedTime"); super.addValidField("modifiedTime");
} }
/** SYS_VERSION /**
*乐观锁,版本号 * SYS_VERSION
* 乐观锁,版本号
*/ */
private java.lang.Integer sysVersion; private java.lang.Integer sysVersion;
@Column(name = "SYS_VERSION",length = 10) @Column(name = "SYS_VERSION", length = 10)
@Version @Version
public java.lang.Integer getSysVersion(){ public java.lang.Integer getSysVersion() {
return this.sysVersion; return this.sysVersion;
} }
public void setSysVersion(java.lang.Integer sysVersion){ public void setSysVersion(java.lang.Integer sysVersion) {
this.sysVersion = sysVersion; this.sysVersion = sysVersion;
super.addValidField("sysVersion"); super.addValidField("sysVersion");
} }
......
...@@ -5,6 +5,7 @@ select ...@@ -5,6 +5,7 @@ select
kd_ids, kd_ids,
train_status, train_status,
knowledge_desc, knowledge_desc,
is_open,
is_deleted, is_deleted,
CREATOR, CREATOR,
CREATED_TIME, CREATED_TIME,
...@@ -15,6 +16,6 @@ from ...@@ -15,6 +16,6 @@ from
where where
is_deleted = 'N' is_deleted = 'N'
<< and member_id = :memberId>> << and member_id = :memberId>>
<< and (LOCATE(:search ,knowledge_name) >> << and LOCATE(:query ,knowledge_name) >>
<< and train_status = :trainStatus>> << and train_status = :trainStatus>>
order by MODIFIED_TIME order by MODIFIED_TIME
\ No newline at end of file
...@@ -21,17 +21,16 @@ public class KnowledgeInfosQueryCondition implements Serializable{ ...@@ -21,17 +21,16 @@ public class KnowledgeInfosQueryCondition implements Serializable{
} }
private java.lang.String search; private java.lang.String query;
public java.lang.String getSearch(){ public String getQuery() {
return this.search; return query;
} }
public void setSearch(java.lang.String search){ public void setQuery(String query) {
this.search = search; this.query = query;
} }
private java.lang.String trainStatus; private java.lang.String trainStatus;
public java.lang.String getTrainStatus(){ public java.lang.String getTrainStatus(){
......
...@@ -3,167 +3,194 @@ package cn.com.poc.knowledge.query; ...@@ -3,167 +3,194 @@ package cn.com.poc.knowledge.query;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import cn.com.yict.framemax.data.model.BaseItemClass; import cn.com.yict.framemax.data.model.BaseItemClass;
/** /**
* Query Item class for KnowledgeInfosQuery * Query Item class for KnowledgeInfosQuery
*/ */
@Entity @Entity
public class KnowledgeInfosQueryItem extends BaseItemClass implements Serializable{ public class KnowledgeInfosQueryItem extends BaseItemClass implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id /**
*id * id
* id
*/ */
private java.lang.Integer id; private java.lang.Integer id;
@Column(name = "id") @Column(name = "id")
public java.lang.Integer getId(){ public java.lang.Integer getId() {
return this.id; return this.id;
} }
public void setId(java.lang.Integer id){ public void setId(java.lang.Integer id) {
this.id = id; this.id = id;
} }
/** knowledge_name /**
*knowledge_name * knowledge_name
* knowledge_name
*/ */
private java.lang.String knowledgeName; private java.lang.String knowledgeName;
@Column(name = "knowledge_name") @Column(name = "knowledge_name")
public java.lang.String getKnowledgeName(){ public java.lang.String getKnowledgeName() {
return this.knowledgeName; return this.knowledgeName;
} }
public void setKnowledgeName(java.lang.String knowledgeName){ public void setKnowledgeName(java.lang.String knowledgeName) {
this.knowledgeName = knowledgeName; this.knowledgeName = knowledgeName;
} }
/** member_id /**
*member_id * member_id
* member_id
*/ */
private java.lang.String memberId; private java.lang.String memberId;
@Column(name = "member_id") @Column(name = "member_id")
public java.lang.String getMemberId(){ public java.lang.String getMemberId() {
return this.memberId; return this.memberId;
} }
public void setMemberId(java.lang.String memberId){ public void setMemberId(java.lang.String memberId) {
this.memberId = memberId; this.memberId = memberId;
} }
/** kd_ids /**
*kd_ids * kd_ids
* kd_ids
*/ */
private java.lang.String kdIds; private java.lang.String kdIds;
@Column(name = "kd_ids") @Column(name = "kd_ids")
public java.lang.String getKdIds(){ public java.lang.String getKdIds() {
return this.kdIds; return this.kdIds;
} }
public void setKdIds(java.lang.String kdIds){ public void setKdIds(java.lang.String kdIds) {
this.kdIds = kdIds; this.kdIds = kdIds;
} }
/** train_status /**
*train_status * train_status
* train_status
*/ */
private java.lang.String trainStatus; private java.lang.String trainStatus;
@Column(name = "train_status") @Column(name = "train_status")
public java.lang.String getTrainStatus(){ public java.lang.String getTrainStatus() {
return this.trainStatus; return this.trainStatus;
} }
public void setTrainStatus(java.lang.String trainStatus){ public void setTrainStatus(java.lang.String trainStatus) {
this.trainStatus = trainStatus; this.trainStatus = trainStatus;
} }
/** desc /**
*desc * knowledge_desc
* knowledge_desc
*/ */
private java.lang.String knowledgeDesc; private java.lang.String knowledgeDesc;
@Column(name = "knowledge_desc") @Column(name = "knowledge_desc")
public java.lang.String getKnowledgeDesc(){ public java.lang.String getKnowledgeDesc() {
return this.knowledgeDesc; return this.knowledgeDesc;
} }
public void setKnowledgeDesc(java.lang.String knowledgeDesc){ public void setKnowledgeDesc(java.lang.String knowledgeDesc) {
this.knowledgeDesc = knowledgeDesc; this.knowledgeDesc = knowledgeDesc;
} }
/** is_deleted /**
*is_deleted * is_open
*/
private java.lang.String isOpen;
@Column(name = "is_open")
public java.lang.String getIsOpen() {
return isOpen;
}
public void setIsOpen(java.lang.String isOpen) {
this.isOpen = isOpen;
}
/**
* is_deleted
* is_deleted
*/ */
private java.lang.String isDeleted; private java.lang.String isDeleted;
@Column(name = "is_deleted") @Column(name = "is_deleted")
public java.lang.String getIsDeleted(){ public java.lang.String getIsDeleted() {
return this.isDeleted; return this.isDeleted;
} }
public void setIsDeleted(java.lang.String isDeleted){ public void setIsDeleted(java.lang.String isDeleted) {
this.isDeleted = isDeleted; this.isDeleted = isDeleted;
} }
/** CREATOR /**
*CREATOR * CREATOR
* CREATOR
*/ */
private java.lang.String creator; private java.lang.String creator;
@Column(name = "CREATOR") @Column(name = "CREATOR")
public java.lang.String getCreator(){ public java.lang.String getCreator() {
return this.creator; return this.creator;
} }
public void setCreator(java.lang.String creator){ public void setCreator(java.lang.String creator) {
this.creator = creator; this.creator = creator;
} }
/** CREATED_TIME /**
*CREATED_TIME * CREATED_TIME
* CREATED_TIME
*/ */
private java.util.Date createdTime; private java.util.Date createdTime;
@Column(name = "CREATED_TIME") @Column(name = "CREATED_TIME")
public java.util.Date getCreatedTime(){ public java.util.Date getCreatedTime() {
return this.createdTime; return this.createdTime;
} }
public void setCreatedTime(java.util.Date createdTime){ public void setCreatedTime(java.util.Date createdTime) {
this.createdTime = createdTime; this.createdTime = createdTime;
} }
/** MODIFIER /**
*MODIFIER * MODIFIER
* MODIFIER
*/ */
private java.lang.String modifier; private java.lang.String modifier;
@Column(name = "MODIFIER") @Column(name = "MODIFIER")
public java.lang.String getModifier(){ public java.lang.String getModifier() {
return this.modifier; return this.modifier;
} }
public void setModifier(java.lang.String modifier){ public void setModifier(java.lang.String modifier) {
this.modifier = modifier; this.modifier = modifier;
} }
/** MODIFIED_TIME /**
*MODIFIED_TIME * MODIFIED_TIME
* MODIFIED_TIME
*/ */
private java.util.Date modifiedTime; private java.util.Date modifiedTime;
@Column(name = "MODIFIED_TIME") @Column(name = "MODIFIED_TIME")
public java.util.Date getModifiedTime(){ public java.util.Date getModifiedTime() {
return this.modifiedTime; return this.modifiedTime;
} }
public void setModifiedTime(java.util.Date modifiedTime){ public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime; this.modifiedTime = modifiedTime;
} }
......
...@@ -67,7 +67,7 @@ public interface KnowledgeRest extends BaseRest { ...@@ -67,7 +67,7 @@ public interface KnowledgeRest extends BaseRest {
/** /**
* 获取知识库 * 获取知识库的文档列表
* *
* @param kdIds * @param kdIds
* @return * @return
...@@ -75,6 +75,11 @@ public interface KnowledgeRest extends BaseRest { ...@@ -75,6 +75,11 @@ public interface KnowledgeRest extends BaseRest {
*/ */
List<BizKnowledgeDocumentDto> getListByKdIds(@RequestBody List<Integer> kdIds); List<BizKnowledgeDocumentDto> getListByKdIds(@RequestBody List<Integer> kdIds);
/**
* 获取知识库详情
*/
BizKnowledgeInfoDto getKnowledgeDetail(@RequestParam Integer knowledgeInfoId) throws Exception;
/** /**
* 获取用户知识库列表 * 获取用户知识库列表
* *
...@@ -93,6 +98,16 @@ public interface KnowledgeRest extends BaseRest { ...@@ -93,6 +98,16 @@ public interface KnowledgeRest extends BaseRest {
*/ */
BizKnowledgeInfoDto updateKnowledgeInfo(@RequestBody BizKnowledgeInfoDto dto) throws Exception; BizKnowledgeInfoDto updateKnowledgeInfo(@RequestBody BizKnowledgeInfoDto dto) throws Exception;
/**
* 开启关闭知识库
*/
void enableKnowledgeInfo(@RequestParam Integer knowledgeInfoId, @RequestParam String isOpen) throws Exception;
/**
* 删除知识库
*/
void deleteKnowledgeInfo(@RequestParam Integer knowledgeInfoId) throws Exception;
/** /**
* 开关知识库分片 * 开关知识库分片
*/ */
......
package cn.com.poc.knowledge.rest.impl; package cn.com.poc.knowledge.rest.impl;
import cn.com.poc.common.constant.CommonConstant;
import cn.com.poc.common.utils.BlContext; import cn.com.poc.common.utils.BlContext;
import cn.com.poc.knowledge.aggregate.KnowledgeService; import cn.com.poc.knowledge.aggregate.KnowledgeService;
import cn.com.poc.knowledge.constant.KnowledgeConstant; import cn.com.poc.knowledge.constant.KnowledgeConstant;
...@@ -113,6 +114,13 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -113,6 +114,13 @@ public class KnowledgeRestImpl implements KnowledgeRest {
return res; return res;
} }
@Override
public BizKnowledgeInfoDto getKnowledgeDetail(Integer knowledgeInfoId) throws Exception {
Assert.notNull(knowledgeInfoId);
BizKnowledgeInfoEntity bizKnowledgeInfoEntity = bizKnowledgeInfoService.get(knowledgeInfoId);
return BizKnowledgeInfoConvert.entityToDto(bizKnowledgeInfoEntity);
}
@Override @Override
public List<BizKnowledgeInfoDto> getKnowledgeList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception { public List<BizKnowledgeInfoDto> getKnowledgeList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception {
List<BizKnowledgeInfoDto> result = new ArrayList<>(); List<BizKnowledgeInfoDto> result = new ArrayList<>();
...@@ -120,7 +128,7 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -120,7 +128,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
KnowledgeInfosQueryCondition condition = new KnowledgeInfosQueryCondition(); KnowledgeInfosQueryCondition condition = new KnowledgeInfosQueryCondition();
condition.setMemberId(userBaseEntity.getUserId().toString()); condition.setMemberId(userBaseEntity.getUserId().toString());
if (StringUtils.isNoneBlank(search)) { if (StringUtils.isNoneBlank(search)) {
condition.setSearch(search); condition.setQuery(search);
} }
if (StringUtils.isNoneBlank(trainStatus)) { if (StringUtils.isNoneBlank(trainStatus)) {
condition.setTrainStatus(trainStatus); condition.setTrainStatus(trainStatus);
...@@ -161,6 +169,23 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -161,6 +169,23 @@ public class KnowledgeRestImpl implements KnowledgeRest {
return BizKnowledgeInfoConvert.entityToDto(entity); return BizKnowledgeInfoConvert.entityToDto(entity);
} }
@Override
public void enableKnowledgeInfo(Integer knowledgeInfoId, String isOpen) throws Exception {
Assert.notNull(knowledgeInfoId);
Assert.notBlank(isOpen);
Assert.isTrue(isOpen.equals(CommonConstant.IsDeleted.N) || isOpen.equals(CommonConstant.IsDeleted.Y), "isOpen must Y or N");
BizKnowledgeInfoEntity bizKnowledgeInfoEntity = new BizKnowledgeInfoEntity();
bizKnowledgeInfoEntity.setId(knowledgeInfoId);
bizKnowledgeInfoEntity.setIsOpen(isOpen);
bizKnowledgeInfoService.update(bizKnowledgeInfoEntity);
}
@Override
public void deleteKnowledgeInfo(Integer knowledgeInfoId) throws Exception {
Assert.notNull(knowledgeInfoId);
bizKnowledgeInfoService.deletedById(knowledgeInfoId);
}
@Override @Override
public void openKnowledgeChunk(UpsertChunkInfoDto dto) { public void openKnowledgeChunk(UpsertChunkInfoDto dto) {
Assert.notNull(dto.getIsOpen()); Assert.notNull(dto.getIsOpen());
......
...@@ -90,6 +90,9 @@ public class BizKnowledgeInfoServiceImpl extends BaseServiceImpl ...@@ -90,6 +90,9 @@ public class BizKnowledgeInfoServiceImpl extends BaseServiceImpl
if (entity.getIsDeleted() != null) { if (entity.getIsDeleted() != null) {
model.setIsDeleted(entity.getIsDeleted()); model.setIsDeleted(entity.getIsDeleted());
} }
if (entity.getIsOpen() != null) {
model.setIsOpen(entity.getIsOpen());
}
if (entity.getSysVersion() != null) { if (entity.getSysVersion() != null) {
model.setSysVersion(entity.getSysVersion()); model.setSysVersion(entity.getSysVersion());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment