|
@@ -5,26 +5,32 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.redxun.common.base.db.BaseDao;
|
|
|
import com.redxun.common.base.db.BaseService;
|
|
|
+import com.redxun.common.model.JPaasUser;
|
|
|
import com.redxun.common.tool.IdGenerator;
|
|
|
import com.redxun.common.service.impl.SuperServiceImpl;
|
|
|
+import com.redxun.knowledge.common.UserService;
|
|
|
import com.redxun.knowledge.entity.dao.Knowledge;
|
|
|
import com.redxun.knowledge.entity.dto.knowledgeDto;
|
|
|
import com.redxun.knowledge.mapper.KnowledgeMapper;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
/**
|
|
|
-* [业务--知识表]业务服务类
|
|
|
-*/
|
|
|
+ * [业务--知识表]业务服务类
|
|
|
+ */
|
|
|
@Service
|
|
|
public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Knowledge> implements BaseService<Knowledge> {
|
|
|
|
|
|
@Resource
|
|
|
private KnowledgeMapper knowledgeMapper;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
@Override
|
|
|
public BaseDao<Knowledge> getRepository() {
|
|
|
return knowledgeMapper;
|
|
@@ -33,13 +39,13 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
|
|
|
/**
|
|
|
* 查询全部维基知识
|
|
|
*/
|
|
|
- public List<Knowledge> findAllWiki(String categoryId){
|
|
|
+ public List<Knowledge> findAllWiki(String categoryId) {
|
|
|
//List<Knowledge> knowledges = knowledgeMapper.selectList(null);
|
|
|
//List<Knowledge> knowledgeWikiList = knowledges.stream().
|
|
|
// filter(knowledge -> knowledge.getType() == 2).collect(Collectors.toList());
|
|
|
QueryWrapper<Knowledge> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("CATEGORY_ID", categoryId);
|
|
|
- queryWrapper.eq("TYPE",2);
|
|
|
+ queryWrapper.eq("TYPE", 2);
|
|
|
List<Knowledge> knowledgeWikiList = knowledgeMapper.selectList(queryWrapper);
|
|
|
return knowledgeWikiList;
|
|
|
}
|
|
@@ -48,6 +54,18 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
|
|
|
if (knowledgeDto != null) {
|
|
|
Knowledge knowledge = new Knowledge();
|
|
|
knowledge.setPkId(IdGenerator.getIdStr());
|
|
|
+ knowledge.setTitle(knowledgeDto.getTitle());
|
|
|
+ knowledge.setCategoryId(knowledgeDto.getCategoryId());
|
|
|
+ knowledge.setType(knowledgeDto.getType());
|
|
|
+ knowledge.setSummary(knowledgeDto.getSummary());
|
|
|
+ knowledge.setAttachment(knowledgeDto.getAttachment());
|
|
|
+ knowledge.setAttachmentType(knowledgeDto.getAttachmentType());
|
|
|
+ knowledge.setContent(knowledgeDto.getContent());
|
|
|
+
|
|
|
+ JPaasUser user = userService.queryUser(userService.queryLoginUser());
|
|
|
+ if (user != null) {
|
|
|
+ knowledge.setAuthor(user.getFullName());
|
|
|
+ }
|
|
|
|
|
|
insert(knowledge);
|
|
|
return knowledge.getPkId();
|