Merge branch 'master' of http://192.168.1.222:3000/hnsh-smart-steward/smart-steward-api

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgeCategoryController.java

@@ -1,5 +1,6 @@
 package com.smartSteward.web.controller.knowledge;;
 
+import java.util.Arrays;
 import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,23 +44,13 @@ public class KnowledgeCategoryController extends BaseController
     public TableDataInfo list(KnowledgeCategory knowledgeCategory)
     {
         startPage();
-        List<KnowledgeCategory> list = knowledgeCategoryService.selectKnowledgeCategoryList(knowledgeCategory);
-        return getDataTable(list);
-    }
+        // TODO: 可见范围判断
 
-
-    @ApiOperation("导出知识库分类列表")
-    @PreAuthorize("@ss.hasPermi('knowledgeCategory:category:export')")
-    @Log(title = "知识库分类", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, KnowledgeCategory knowledgeCategory)
-    {
+        knowledgeCategory.setDelFlag("0");
         List<KnowledgeCategory> list = knowledgeCategoryService.selectKnowledgeCategoryList(knowledgeCategory);
-        ExcelUtil<KnowledgeCategory> util = new ExcelUtil<KnowledgeCategory>(KnowledgeCategory.class);
-        util.exportExcel(response, list, "知识库分类数据");
+        return getDataTable(list);
     }
 
-
     @ApiOperation("获取知识库分类详细信息")
     @PreAuthorize("@ss.hasPermi('knowledgeCategory:category:query')")
     @GetMapping(value = "/{id}")
@@ -75,6 +66,11 @@ public class KnowledgeCategoryController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody KnowledgeCategory knowledgeCategory)
     {
+        knowledgeCategory.setCreateBy(getLoginUser().getUsername());
+        if (knowledgeCategory.getSortOrder() == null)
+        {
+            knowledgeCategory.setSortOrder(0L);
+        }
         return toAjax(knowledgeCategoryService.insertKnowledgeCategory(knowledgeCategory));
     }
 
@@ -85,6 +81,15 @@ public class KnowledgeCategoryController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody KnowledgeCategory knowledgeCategory)
     {
+        knowledgeCategory.setUpdateBy(getLoginUser().getUsername());
+        if (knowledgeCategory.getSortOrder() == null)
+        {
+            knowledgeCategory.setSortOrder(0L);
+        }
+        if (knowledgeCategory.getDelFlag() == null || knowledgeCategory.getDelFlag() == "")
+        {
+            knowledgeCategory.setDelFlag("0");
+        }
         return toAjax(knowledgeCategoryService.updateKnowledgeCategory(knowledgeCategory));
     }
 
@@ -95,6 +100,18 @@ public class KnowledgeCategoryController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
+        // 获取详情，判断是否有权限删除
+        List<KnowledgeCategory> list = knowledgeCategoryService.selectKnowledgeCategoryListByIds(ids);
+
+        // 检查是否有子分类
+        for (KnowledgeCategory category : list)
+        {
+            if (category.getManagePermission()!="" && category.getManagePermission().contains(getUserId().toString()))
+            {
+                return AjaxResult.error("无权限操作");
+            }
+        }
+
         return toAjax(knowledgeCategoryService.deleteKnowledgeCategoryByIds(ids));
     }
 }

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgeContentController.java

@@ -1,6 +1,15 @@
 package com.smartSteward.web.controller.knowledge;;
 
 import java.util.List;
+
+import com.smartSteward.common.enums.knowledge.PublicStatus;
+import com.smartSteward.common.utils.DateUtils;
+import com.smartSteward.entity.database.knowledge.KnowledgeCategory;
+import com.smartSteward.entity.database.knowledge.KnowledgeDraft;
+import com.smartSteward.entity.database.knowledge.KnowledgePublishRecord;
+import com.smartSteward.service.knowledge.IKnowledgeCategoryService;
+import com.smartSteward.service.knowledge.IKnowledgeDraftService;
+import com.smartSteward.service.knowledge.IKnowledgePublishRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.servlet.http.HttpServletResponse;
@@ -36,29 +45,25 @@ public class KnowledgeContentController extends BaseController
     @Autowired
     private IKnowledgeContentService knowledgeContentService;
 
+    @Autowired
+    private IKnowledgeCategoryService knowledgeCategoryService;
 
-    @ApiOperation("查询知识库内容列表")
-    @PreAuthorize("@ss.hasPermi('knowledgeContent:content:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(KnowledgeContent knowledgeContent)
-    {
-        startPage();
-        List<KnowledgeContent> list = knowledgeContentService.selectKnowledgeContentList(knowledgeContent);
-        return getDataTable(list);
-    }
+    @Autowired
+    private IKnowledgeDraftService knowledgeDraftService;
 
+    @Autowired
+    private IKnowledgePublishRecordService knowledgePublishRecordService;
 
-    @ApiOperation("导出知识库内容列表")
-    @PreAuthorize("@ss.hasPermi('knowledgeContent:content:export')")
-    @Log(title = "知识库内容", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, KnowledgeContent knowledgeContent)
+    @ApiOperation("获取知识库内容目录列表")
+    @PreAuthorize("@ss.hasPermi('knowledgeContent:content:list')")
+    @GetMapping("/list/{categoryId}")
+    public AjaxResult list(@PathVariable("categoryId") Long categoryId)
     {
-        List<KnowledgeContent> list = knowledgeContentService.selectKnowledgeContentList(knowledgeContent);
-        ExcelUtil<KnowledgeContent> util = new ExcelUtil<KnowledgeContent>(KnowledgeContent.class);
-        util.exportExcel(response, list, "知识库内容数据");
-    }
+        boolean isAdmin = knowledgeCategoryService.isAdmin(categoryId, getLoginUser());
 
+        List<KnowledgeContent> list = knowledgeContentService.selectCommCommentsTree(categoryId, isAdmin);
+        return success(list);
+    }
 
     @ApiOperation("获取知识库内容详细信息")
     @PreAuthorize("@ss.hasPermi('knowledgeContent:content:query')")
@@ -75,6 +80,26 @@ public class KnowledgeContentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody KnowledgeContent knowledgeContent)
     {
+
+        // 获取分类信息，看是否有权限操作
+        KnowledgeCategory knowledgeCategory = knowledgeCategoryService.selectKnowledgeCategoryById(knowledgeContent.getCategoryId());
+        if (knowledgeCategory == null)
+        {
+            return AjaxResult.error("分类不存在");
+        }
+
+        boolean isAdmin = knowledgeCategoryService.isAdmin(knowledgeCategory.getId(), getLoginUser());
+        if (!isAdmin) {
+            return AjaxResult.error("您没有权限操作该分类");
+        }
+
+        if (knowledgeContent.getParentId() == null) {
+            knowledgeContent.setParentId(0L);
+        }
+
+        knowledgeContent.setStatus(PublicStatus.UNPUBLISHED.getStatus());
+        knowledgeContent.setCreateBy(getUserId().toString());
+
         return toAjax(knowledgeContentService.insertKnowledgeContent(knowledgeContent));
     }
 
@@ -85,16 +110,123 @@ public class KnowledgeContentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody KnowledgeContent knowledgeContent)
     {
-        return toAjax(knowledgeContentService.updateKnowledgeContent(knowledgeContent));
+
+        // 判断是否修改内容
+        if (knowledgeContent.getContent() == null || knowledgeContent.getContent().isEmpty()) {
+            return AjaxResult.error("内容不能为空");
+        }
+
+        KnowledgeContent oldKnowledgeContent = knowledgeContentService.selectKnowledgeContentById(knowledgeContent.getId());
+        if (oldKnowledgeContent == null) {
+            return AjaxResult.error("内容不存在");
+        }
+
+
+        boolean isAdmin = knowledgeCategoryService.isAdmin(oldKnowledgeContent.getCategoryId(), getLoginUser());
+        if (!isAdmin) {
+            return AjaxResult.error("您没有权限操作该分类");
+        }
+
+        // 修改对应信息
+        KnowledgeContent newKnowledgeContent = new KnowledgeContent();
+        newKnowledgeContent.setId(knowledgeContent.getId());
+
+        boolean contentChanged = false;
+
+        if (knowledgeContent.getContent() != null && !knowledgeContent.getContent().isEmpty() && knowledgeContent.getContent() != oldKnowledgeContent.getContent()) {
+            newKnowledgeContent.setContent(knowledgeContent.getContent());
+            contentChanged = true;
+        }
+
+        if (knowledgeContent.getTitle() != null && !knowledgeContent.getTitle().isEmpty() && knowledgeContent.getTitle() != oldKnowledgeContent.getTitle()) {
+            newKnowledgeContent.setTitle(knowledgeContent.getTitle());
+        }
+
+        if (knowledgeContent.getParentId() != null && !knowledgeContent.getParentId().equals(oldKnowledgeContent.getParentId())) {
+            newKnowledgeContent.setParentId(knowledgeContent.getParentId());
+        }
+
+        if (knowledgeContent.getAttachment() != null && !knowledgeContent.getAttachment().isEmpty() && knowledgeContent.getAttachment() != oldKnowledgeContent.getAttachment()) {
+            newKnowledgeContent.setAttachment(knowledgeContent.getAttachment());
+            contentChanged = true;
+        }
+
+        // 如果内容改变，需要更新状态
+        if (contentChanged) {
+            if (knowledgeContent.getStatus().equals(PublicStatus.UNPUBLISHED.getStatus())) {
+                newKnowledgeContent.setStatus(PublicStatus.UNPUBLISHED.getStatus());
+
+                // 获取最后一次草稿信息
+                KnowledgeDraft lastDraft = new KnowledgeDraft();
+                if (oldKnowledgeContent.getLastDraftId() != null) {
+                    lastDraft = knowledgeDraftService.selectKnowledgeDraftById(oldKnowledgeContent.getLastDraftId());
+                }
+
+                if (lastDraft.getContent() != null && !lastDraft.getContent().isEmpty() && (lastDraft.getContent() != oldKnowledgeContent.getContent() || lastDraft.getAttachment() != knowledgeContent.getAttachment())) {
+                    // 记录草稿信息
+                    KnowledgeDraft knowledgeDraft = new KnowledgeDraft();
+                    knowledgeDraft.setContentId(newKnowledgeContent.getId());
+                    knowledgeDraft.setContent(newKnowledgeContent.getContent());
+                    knowledgeDraft.setTitle(knowledgeContent.getTitle());
+                    knowledgeDraft.setAttachment(knowledgeContent.getAttachment());
+                    knowledgeDraft.setDelFlag("0");
+
+                    knowledgeDraft.setCreateBy(getUserId().toString());
+
+                    int draftId = knowledgeDraftService.insertKnowledgeDraft(knowledgeDraft);
+
+                    newKnowledgeContent.setLastDraftId((long) draftId);
+                }
+
+            } else if (knowledgeContent.getStatus().equals(PublicStatus.PUBLISHED.getStatus()) && oldKnowledgeContent.getStatus().equals(PublicStatus.PUBLISHED.getStatus())) {
+
+                return AjaxResult.error("已发布不允许操作");
+            }
+        }
+
+        // 如果当前状态跟之前不一样，需要记录发布状态
+        if (!knowledgeContent.getStatus().equals(oldKnowledgeContent.getStatus()) && knowledgeContent.getStatus().equals(PublicStatus.PUBLISHED.getStatus())) {
+            // 版本格式为年月日字符串加三位数字
+            String version = DateUtils.dateTimeNow().replaceAll("[-:.]", "") + "001";
+            // 如果历史版本时间跟现在一样，累加后三位
+            if (oldKnowledgeContent.getVersion().startsWith(version.substring(0, 8))) {
+                version = version.substring(0, 8) + (Integer.parseInt(oldKnowledgeContent.getVersion().substring(8)) + 1);
+            }
+
+            KnowledgePublishRecord knowledgePublishRecord = new KnowledgePublishRecord();
+            knowledgePublishRecord.setContentId(newKnowledgeContent.getId());
+            knowledgePublishRecord.setVersion(version);
+            knowledgePublishRecord.setTitle(knowledgeContent.getTitle());
+            knowledgePublishRecord.setContent(newKnowledgeContent.getContent());
+            knowledgePublishRecord.setPublishBy(getUserId().toString());
+            knowledgePublishRecord.setCreateTime(DateUtils.getNowDate());
+            knowledgePublishRecord.setAttachment(knowledgeContent.getAttachment());
+            knowledgePublishRecord.setDelFlag("0");
+
+            knowledgePublishRecordService.insertKnowledgePublishRecord(knowledgePublishRecord);
+            knowledgeContent.setVersion(version);
+        }
+
+        return toAjax(knowledgeContentService.updateKnowledgeContent(newKnowledgeContent));
     }
 
 
     @ApiOperation("删除知识库内容")
     @PreAuthorize("@ss.hasPermi('knowledgeContent:content:remove')")
     @Log(title = "知识库内容", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+	@DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
     {
-        return toAjax(knowledgeContentService.deleteKnowledgeContentByIds(ids));
+        KnowledgeContent oldKnowledgeContent = knowledgeContentService.selectKnowledgeContentById(id);
+        if (oldKnowledgeContent == null) {
+            return AjaxResult.error("内容不存在");
+        }
+
+        boolean isAdmin = knowledgeCategoryService.isAdmin(oldKnowledgeContent.getCategoryId(), getLoginUser());
+        if (!isAdmin) {
+            return AjaxResult.error("您没有权限删除该分类");
+        }
+
+        return toAjax(knowledgeContentService.deleteKnowledgeContentByIds(new Long[]{id}));
     }
 }

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgeDraftController.java

@@ -0,0 +1,100 @@
+package com.smartSteward.web.controller.knowledge;;
+
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.smartSteward.common.annotation.Log;
+import com.smartSteward.web.controller.BaseController;
+import com.smartSteward.common.core.AjaxResult;
+import com.smartSteward.common.enums.BusinessType;
+import com.smartSteward.entity.database.knowledge.KnowledgeDraft;
+import com.smartSteward.service.knowledge.IKnowledgeDraftService;
+import com.smartSteward.common.utils.poi.ExcelUtil;
+import com.smartSteward.common.core.page.TableDataInfo;
+
+/**
+ * 知识库草稿Controller
+ * 
+ * @author smart-steward
+ */
+@RestController
+@Api(value = "知识库草稿",tags = "知识库草稿")
+@RequestMapping("/knowledgeDraft/draft")
+public class KnowledgeDraftController extends BaseController
+{
+    @Autowired
+    private IKnowledgeDraftService knowledgeDraftService;
+
+
+    @ApiOperation("查询知识库草稿列表")
+    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KnowledgeDraft knowledgeDraft)
+    {
+        startPage();
+        List<KnowledgeDraft> list = knowledgeDraftService.selectKnowledgeDraftList(knowledgeDraft);
+        return getDataTable(list);
+    }
+
+
+//    @ApiOperation("导出知识库草稿列表")
+//    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:export')")
+//    @Log(title = "知识库草稿", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, KnowledgeDraft knowledgeDraft)
+//    {
+//        List<KnowledgeDraft> list = knowledgeDraftService.selectKnowledgeDraftList(knowledgeDraft);
+//        ExcelUtil<KnowledgeDraft> util = new ExcelUtil<KnowledgeDraft>(KnowledgeDraft.class);
+//        util.exportExcel(response, list, "知识库草稿数据");
+//    }
+//
+//
+//    @ApiOperation("获取知识库草稿详细信息")
+//    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(knowledgeDraftService.selectKnowledgeDraftById(id));
+//    }
+//
+//
+//    @ApiOperation("新增知识库草稿")
+//    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:add')")
+//    @Log(title = "知识库草稿", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody KnowledgeDraft knowledgeDraft)
+//    {
+//        return toAjax(knowledgeDraftService.insertKnowledgeDraft(knowledgeDraft));
+//    }
+//
+//
+//    @ApiOperation("修改知识库草稿")
+//    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:edit')")
+//    @Log(title = "知识库草稿", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody KnowledgeDraft knowledgeDraft)
+//    {
+//        return toAjax(knowledgeDraftService.updateKnowledgeDraft(knowledgeDraft));
+//    }
+//
+//
+//    @ApiOperation("删除知识库草稿")
+//    @PreAuthorize("@ss.hasPermi('knowledgeDraft:draft:remove')")
+//    @Log(title = "知识库草稿", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(knowledgeDraftService.deleteKnowledgeDraftByIds(ids));
+//    }
+}

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgePublishRecordController.java

@@ -0,0 +1,100 @@
+package com.smartSteward.web.controller.knowledge;;
+
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.smartSteward.common.annotation.Log;
+import com.smartSteward.web.controller.BaseController;
+import com.smartSteward.common.core.AjaxResult;
+import com.smartSteward.common.enums.BusinessType;
+import com.smartSteward.entity.database.knowledge.KnowledgePublishRecord;
+import com.smartSteward.service.knowledge.IKnowledgePublishRecordService;
+import com.smartSteward.common.utils.poi.ExcelUtil;
+import com.smartSteward.common.core.page.TableDataInfo;
+
+/**
+ * 知识库发布记录Controller
+ * 
+ * @author smart-steward
+ */
+@RestController
+@Api(value = "知识库发布记录",tags = "知识库发布记录")
+@RequestMapping("/knowledgePublishRecord/record")
+public class KnowledgePublishRecordController extends BaseController
+{
+    @Autowired
+    private IKnowledgePublishRecordService knowledgePublishRecordService;
+
+
+    @ApiOperation("查询知识库发布记录列表")
+    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KnowledgePublishRecord knowledgePublishRecord)
+    {
+        startPage();
+        List<KnowledgePublishRecord> list = knowledgePublishRecordService.selectKnowledgePublishRecordList(knowledgePublishRecord);
+        return getDataTable(list);
+    }
+
+
+//    @ApiOperation("导出知识库发布记录列表")
+//    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:export')")
+//    @Log(title = "知识库发布记录", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, KnowledgePublishRecord knowledgePublishRecord)
+//    {
+//        List<KnowledgePublishRecord> list = knowledgePublishRecordService.selectKnowledgePublishRecordList(knowledgePublishRecord);
+//        ExcelUtil<KnowledgePublishRecord> util = new ExcelUtil<KnowledgePublishRecord>(KnowledgePublishRecord.class);
+//        util.exportExcel(response, list, "知识库发布记录数据");
+//    }
+//
+//
+//    @ApiOperation("获取知识库发布记录详细信息")
+//    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(knowledgePublishRecordService.selectKnowledgePublishRecordById(id));
+//    }
+//
+//
+//    @ApiOperation("新增知识库发布记录")
+//    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:add')")
+//    @Log(title = "知识库发布记录", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody KnowledgePublishRecord knowledgePublishRecord)
+//    {
+//        return toAjax(knowledgePublishRecordService.insertKnowledgePublishRecord(knowledgePublishRecord));
+//    }
+//
+//
+//    @ApiOperation("修改知识库发布记录")
+//    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:edit')")
+//    @Log(title = "知识库发布记录", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody KnowledgePublishRecord knowledgePublishRecord)
+//    {
+//        return toAjax(knowledgePublishRecordService.updateKnowledgePublishRecord(knowledgePublishRecord));
+//    }
+//
+//
+//    @ApiOperation("删除知识库发布记录")
+//    @PreAuthorize("@ss.hasPermi('knowledgePublishRecord:record:remove')")
+//    @Log(title = "知识库发布记录", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(knowledgePublishRecordService.deleteKnowledgePublishRecordByIds(ids));
+//    }
+}

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgeViewRecordController.java

@@ -0,0 +1,62 @@
+package com.smartSteward.web.controller.knowledge;;
+
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.smartSteward.common.annotation.Log;
+import com.smartSteward.web.controller.BaseController;
+import com.smartSteward.common.core.AjaxResult;
+import com.smartSteward.common.enums.BusinessType;
+import com.smartSteward.entity.database.knowledge.KnowledgeViewRecord;
+import com.smartSteward.service.knowledge.IKnowledgeViewRecordService;
+import com.smartSteward.common.utils.poi.ExcelUtil;
+import com.smartSteward.common.core.page.TableDataInfo;
+
+/**
+ * 知识库查看记录Controller
+ * 
+ * @author smart-steward
+ */
+@RestController
+@Api(value = "知识库查看记录",tags = "知识库查看记录")
+@RequestMapping("/knowledgeViewRecord/record")
+public class KnowledgeViewRecordController extends BaseController
+{
+    @Autowired
+    private IKnowledgeViewRecordService knowledgeViewRecordService;
+
+
+    @ApiOperation("查询知识库查看记录列表")
+    @PreAuthorize("@ss.hasPermi('knowledgeViewRecord:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(KnowledgeViewRecord knowledgeViewRecord)
+    {
+        startPage();
+        List<KnowledgeViewRecord> list = knowledgeViewRecordService.selectKnowledgeViewRecordList(knowledgeViewRecord);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("新增知识库查看记录")
+    @PreAuthorize("@ss.hasPermi('knowledgeViewRecord:record:add')")
+    @Log(title = "知识库查看记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody KnowledgeViewRecord knowledgeViewRecord)
+    {
+        knowledgeViewRecord.setUserId(getUserId().toString());
+        knowledgeViewRecord.setUserName(getUsername());
+        knowledgeViewRecord.setUserAvatar(getUserAvatar());
+        knowledgeViewRecord.setCreateBy(getUserId().toString());
+        return toAjax(knowledgeViewRecordService.insertKnowledgeViewRecord(knowledgeViewRecord));
+    }
+}

smart-steward-common/src/main/java/com/smartSteward/common/enums/knowledge/PublicStatus.java

@@ -0,0 +1,47 @@
+package com.smartSteward.common.enums.knowledge;
+
+/**
+ * 工单延时状态枚举类
+ * @author smartSteward
+ */
+
+public enum PublicStatus {
+    /**
+     * 已发布
+     */
+    PUBLISHED(1L, "已发布"),
+    /**
+     * 未发布
+     */
+    UNPUBLISHED(2L, "未发布");
+
+    /**
+     * 延时状态
+     */
+    private final Long status;
+    /**
+     * 描述
+     */
+    private final String desc;
+
+    PublicStatus(Long status, String desc) {
+        this.status = status;
+        this.desc = desc;
+    }
+
+    /**
+     * 获取延时状态
+     * @return 延时状态
+     */
+    public Long getStatus() {
+        return status;
+    }
+
+    /**
+     * 获取描述
+     * @return 描述
+     */
+    public String getDesc() {
+        return desc;
+    }
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/database/comm/CommComments.java

@@ -1,5 +1,6 @@
 package com.smartSteward.entity.database.comm;
 
+import com.smartSteward.common.annotation.FilePathField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -76,6 +77,7 @@ public class CommComments extends BaseEntity
     /** 评论图片（图片路径，多个逗号分割） */
     @Excel(name = "评论图片", readConverterExp = "图=片路径，多个逗号分割")
     @ApiModelProperty("评论图片")
+    @FilePathField()
     private String attachments;
 
 

smart-steward-entity/src/main/java/com/smartSteward/entity/database/knowledge/KnowledgeCategory.java

@@ -1,5 +1,6 @@
 package com.smartSteward.entity.database.knowledge;;
 
+import com.smartSteward.common.annotation.FilePathField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import com.smartSteward.common.annotation.Excel;
 import com.smartSteward.common.core.BaseEntity;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 知识库分类对象 knowledge_category
  *
@@ -26,6 +29,7 @@ public class KnowledgeCategory extends BaseEntity
     /** 知识库名称 */
     @Excel(name = "知识库名称")
     @ApiModelProperty("知识库名称")
+    @NotBlank
     private String name;
 
     /** 知识库描述 */
@@ -36,6 +40,7 @@ public class KnowledgeCategory extends BaseEntity
     /** 知识库图标 */
     @Excel(name = "知识库图标")
     @ApiModelProperty("知识库图标")
+    @FilePathField()
     private String icon;
 
     /** 管理权限 */
@@ -66,7 +71,7 @@ public class KnowledgeCategory extends BaseEntity
     /** 删除标记(0:正常 1:删除) */
     @Excel(name = "删除标记(0:正常 1:删除)")
     @ApiModelProperty("删除标记(0:正常 1:删除)")
-    private Long isDeleted;
+    private String delFlag;
 
 
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/database/knowledge/KnowledgeContent.java

@@ -1,5 +1,10 @@
-package com.smartSteward.entity.database.knowledge;;
+package com.smartSteward.entity.database.knowledge;
 
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.smartSteward.common.annotation.FilePathField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,45 +12,88 @@ import lombok.EqualsAndHashCode;
 import com.smartSteward.common.annotation.Excel;
 import com.smartSteward.common.core.BaseEntity;
 
+import javax.validation.constraints.*;
+
 /**
- * 知识库内容对象 knowledge_content
- *
- * @author smart-steward
- */
+* 知识库内容(已发布内容)对象 knowledge_content
+*
+* @author smart-steward
+*/
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel("知识库内容")
+@ApiModel("知识库内容(已发布内容)")
 public class KnowledgeContent extends BaseEntity
 {
-    private static final long serialVersionUID = 1L;
+   private static final long serialVersionUID = 1L;
+
+   /** 主键ID */
+   @ApiModelProperty(value = "主键id")
+   private Long id;
+
+   /** 知识库分类ID */
+   @Excel(name = "知识库分类ID")
+   @ApiModelProperty("知识库分类ID")
+   @NotNull(message = "知识库分类ID不能为空")
+   private Long categoryId;
+
+   /** 父级ID(0:根目录) */
+   @Excel(name = "父级ID(0:根目录)")
+   @ApiModelProperty("父级ID(0:根目录)")
+   private Long parentId;
+
+   /** 内容标题 */
+   @Excel(name = "内容标题")
+   @ApiModelProperty("内容标题")
+   @NotBlank(message = "内容标题不能为空")
+   private String title;
+
+   /** 内容 */
+   @Excel(name = "内容")
+   @ApiModelProperty("内容")
+   private String content;
+
+   /** 版本号 */
+   @Excel(name = "版本号")
+   @ApiModelProperty("版本号")
+   private String version;
+
+   /** 状态: 1-已发布 2-已下线 */
+   @Excel(name = "状态: 1-已发布 2-未发布")
+   @ApiModelProperty("状态: 1-已发布 2-未发布")
+   @NotNull(message = "状态: 1-已发布 2-未发布不能为空")
+   private Long status;
 
-    /** 主键ID */
-    @ApiModelProperty(value = "主键id")
-    private Long id;
+   /** 发布时间 */
+   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+   @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+   @ApiModelProperty("发布时间")
+   private Date publishTime;
 
-    /** 知识库分类ID */
-    @Excel(name = "知识库分类ID")
-    @ApiModelProperty("知识库分类ID")
-    private Long categoryId;
+   /** 发布人 */
+   @Excel(name = "发布人")
+   @ApiModelProperty("发布人")
+   private String publishBy;
 
-    /** 父级ID(0:根目录) */
-    @Excel(name = "父级ID(0:根目录)")
-    @ApiModelProperty("父级ID(0:根目录)")
-    private Long parentId;
+   /** 最后一次草稿ID */
+   @Excel(name = "最后一次草稿ID")
+   @ApiModelProperty("最后一次草稿ID")
+   private Long lastDraftId;
 
-    /** 内容标题 */
-    @Excel(name = "内容标题")
-    @ApiModelProperty("内容标题")
-    private String title;
+   /** 浏览次数 */
+   @Excel(name = "浏览次数")
+   @ApiModelProperty("浏览次数")
+   private Long viewCount;
 
-    /** 内容 */
-    @Excel(name = "内容")
-    @ApiModelProperty("内容")
-    private String content;
+   /** 知识库附件 */
+   @Excel(name = "知识库附件")
+   @ApiModelProperty("知识库附件")
+   @FilePathField()
+   private String attachment;
 
-    /** 删除标记(0:正常 1:删除) */
-    @Excel(name = "删除标记(0:正常 1:删除)")
-    @ApiModelProperty("删除标记(0:正常 1:删除)")
-    private Long isDeleted;
+   /** 删除标记(0:正常 1:删除) */
+   @Excel(name = "删除标记(0:正常 1:删除)")
+   @ApiModelProperty("删除标记(0:正常 1:删除)")
+   private String delFlag;
 
+   private List<KnowledgeContent> children;
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/database/knowledge/KnowledgeDraft.java

@@ -0,0 +1,66 @@
+package com.smartSteward.entity.database.knowledge;
+
+import com.smartSteward.common.annotation.FilePathField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.smartSteward.common.annotation.Excel;
+import com.smartSteward.common.core.BaseEntity;
+
+import javax.validation.constraints.*;
+
+/**
+* 知识库草稿对象 knowledge_draft
+*
+* @author smart-steward
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("知识库草稿")
+public class KnowledgeDraft extends BaseEntity
+{
+   private static final long serialVersionUID = 1L;
+
+   /** 主键ID */
+   @ApiModelProperty(value = "主键id")
+   private Long id;
+
+   /** 关联的内容ID(新建时为null) */
+   @Excel(name = "关联的内容ID(新建时为null)")
+   @ApiModelProperty("关联的内容ID(新建时为null)")
+   private Long contentId;
+
+   /** 知识库分类ID */
+   @Excel(name = "知识库分类ID")
+   @ApiModelProperty("知识库分类ID")
+   @NotNull(message = "知识库分类ID不能为空")
+   private Long categoryId;
+
+   /** 父级ID(0:根目录) */
+   @Excel(name = "父级ID(0:根目录)")
+   @ApiModelProperty("父级ID(0:根目录)")
+   private Long parentId;
+
+   /** 草稿标题 */
+   @Excel(name = "草稿标题")
+   @ApiModelProperty("草稿标题")
+   @NotBlank(message = "草稿标题不能为空")
+   private String title;
+
+   /** 草稿内容 */
+   @Excel(name = "草稿内容")
+   @ApiModelProperty("草稿内容")
+   private String content;
+
+   /** 知识库附件 */
+   @Excel(name = "知识库附件")
+   @ApiModelProperty("知识库附件")
+   @FilePathField()
+   private String attachment;
+
+   /** 删除标记(0:正常 1:删除) */
+   @Excel(name = "删除标记(0:正常 1:删除)")
+   @ApiModelProperty("删除标记(0:正常 1:删除)")
+   private String delFlag;
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/database/knowledge/KnowledgePublishRecord.java

@@ -0,0 +1,69 @@
+package com.smartSteward.entity.database.knowledge;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.smartSteward.common.annotation.FilePathField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.smartSteward.common.annotation.Excel;
+import com.smartSteward.common.core.BaseEntity;
+
+import javax.validation.constraints.*;
+
+/**
+* 知识库发布记录对象 knowledge_publish_record
+*
+* @author smart-steward
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("知识库发布记录")
+public class KnowledgePublishRecord extends BaseEntity
+{
+   private static final long serialVersionUID = 1L;
+
+   /** 主键ID */
+   @ApiModelProperty(value = "主键id")
+   private Long id;
+
+   /** 内容ID */
+   @Excel(name = "内容ID")
+   @ApiModelProperty("内容ID")
+   @NotNull(message = "内容ID不能为空")
+   private Long contentId;
+
+   /** 内容标题 */
+   @Excel(name = "内容标题")
+   @ApiModelProperty("内容标题")
+   @NotBlank(message = "内容标题不能为空")
+   private String title;
+
+   /** 内容 */
+   @Excel(name = "内容")
+   @ApiModelProperty("内容")
+   private String content;
+
+   /** 发布版本号 */
+   @Excel(name = "发布版本号")
+   @ApiModelProperty("发布版本号")
+   @NotNull(message = "发布版本号不能为空")
+   private String version;
+
+   /** 发布人 */
+   @Excel(name = "发布人")
+   @ApiModelProperty("发布人")
+   private String publishBy;
+
+   /** 知识库附件 */
+   @Excel(name = "知识库附件")
+   @ApiModelProperty("知识库附件")
+   @FilePathField()
+   private String attachment;
+
+   /** 删除标记(0:正常 1:删除) */
+   @Excel(name = "删除标记(0:正常 1:删除)")
+   @ApiModelProperty("删除标记(0:正常 1:删除)")
+   private String delFlag;
+}

smart-steward-entity/src/main/java/com/smartSteward/entity/database/knowledge/KnowledgeViewRecord.java

@@ -0,0 +1,53 @@
+package com.smartSteward.entity.database.knowledge;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.smartSteward.common.annotation.Excel;
+import com.smartSteward.common.core.BaseEntity;
+
+import javax.validation.constraints.*;
+
+/**
+* 知识库查看记录对象 knowledge_view_record
+*
+* @author smart-steward
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("知识库查看记录")
+public class KnowledgeViewRecord extends BaseEntity
+{
+   private static final long serialVersionUID = 1L;
+
+   /** 主键ID */
+   @ApiModelProperty(value = "主键id")
+   private Long id;
+
+   /** 知识内容ID */
+   @Excel(name = "知识内容ID")
+   @ApiModelProperty("知识内容ID")
+   @NotNull(message = "知识内容ID不能为空")
+   private Long contentId;
+
+   /** 用户ID */
+   @Excel(name = "用户ID")
+   @ApiModelProperty("用户ID")
+   @NotBlank(message = "用户ID不能为空")
+   private String userId;
+
+   /** 用户名 */
+   @Excel(name = "用户名")
+   @ApiModelProperty("用户名")
+   private String userName;
+
+   /** 用户头像 */
+   @Excel(name = "用户头像")
+   @ApiModelProperty("用户头像")
+   private String userAvatar;
+
+   /** 删除标记(0:正常 1:删除) */
+   @ApiModelProperty("删除标记(0:正常 1:删除)")
+   private String delFlag;
+}

smart-steward-mapper/src/main/java/com/smartSteward/mapper/knowledge/KnowledgeCategoryMapper.java

@@ -57,4 +57,13 @@ public interface KnowledgeCategoryMapper
      * @return 结果
      */
     public int deleteKnowledgeCategoryByIds(Long[] ids);
+
+
+    /**
+     * 根据ID查询知识库分类列表
+     *
+     * @param ids 知识库分类主键集合
+     * @return 知识库分类集合
+     */
+    public List<KnowledgeCategory> selectKnowledgeCategoryListByIds(Long[] ids);
 }

smart-steward-mapper/src/main/java/com/smartSteward/mapper/knowledge/KnowledgeContentMapper.java

@@ -4,54 +4,54 @@ import java.util.List;
 import com.smartSteward.entity.database.knowledge.KnowledgeContent;
 
 /**
- * 知识库内容Mapper接口
+ * 知识库内容(已发布内容)Mapper接口
  * 
  * @author smart-steward
  */
 public interface KnowledgeContentMapper 
 {
     /**
-     * 查询知识库内容
+     * 查询知识库内容(已发布内容)
      * 
-     * @param id 知识库内容主键
-     * @return 知识库内容
+     * @param id 知识库内容(已发布内容)主键
+     * @return 知识库内容(已发布内容)
      */
     public KnowledgeContent selectKnowledgeContentById(Long id);
 
     /**
-     * 查询知识库内容列表
+     * 查询知识库内容(已发布内容)列表
      * 
-     * @param knowledgeContent 知识库内容
-     * @return 知识库内容集合
+     * @param knowledgeContent 知识库内容(已发布内容)
+     * @return 知识库内容(已发布内容)集合
      */
     public List<KnowledgeContent> selectKnowledgeContentList(KnowledgeContent knowledgeContent);
 
     /**
-     * 新增知识库内容
+     * 新增知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     public int insertKnowledgeContent(KnowledgeContent knowledgeContent);
 
     /**
-     * 修改知识库内容
+     * 修改知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     public int updateKnowledgeContent(KnowledgeContent knowledgeContent);
 
     /**
-     * 删除知识库内容
+     * 删除知识库内容(已发布内容)
      * 
-     * @param id 知识库内容主键
+     * @param id 知识库内容(已发布内容)主键
      * @return 结果
      */
     public int deleteKnowledgeContentById(Long id);
 
     /**
-     * 批量删除知识库内容
+     * 批量删除知识库内容(已发布内容)
      * 
      * @param ids 需要删除的数据主键集合
      * @return 结果

smart-steward-mapper/src/main/java/com/smartSteward/mapper/knowledge/KnowledgeDraftMapper.java

@@ -0,0 +1,60 @@
+package com.smartSteward.mapper.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgeDraft;
+
+/**
+ * 知识库草稿Mapper接口
+ * 
+ * @author smart-steward
+ */
+public interface KnowledgeDraftMapper 
+{
+    /**
+     * 查询知识库草稿
+     * 
+     * @param id 知识库草稿主键
+     * @return 知识库草稿
+     */
+    public KnowledgeDraft selectKnowledgeDraftById(Long id);
+
+    /**
+     * 查询知识库草稿列表
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 知识库草稿集合
+     */
+    public List<KnowledgeDraft> selectKnowledgeDraftList(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 新增知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    public int insertKnowledgeDraft(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 修改知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    public int updateKnowledgeDraft(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 删除知识库草稿
+     * 
+     * @param id 知识库草稿主键
+     * @return 结果
+     */
+    public int deleteKnowledgeDraftById(Long id);
+
+    /**
+     * 批量删除知识库草稿
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgeDraftByIds(Long[] ids);
+}

smart-steward-mapper/src/main/java/com/smartSteward/mapper/knowledge/KnowledgePublishRecordMapper.java

@@ -0,0 +1,60 @@
+package com.smartSteward.mapper.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgePublishRecord;
+
+/**
+ * 知识库发布记录Mapper接口
+ * 
+ * @author smart-steward
+ */
+public interface KnowledgePublishRecordMapper 
+{
+    /**
+     * 查询知识库发布记录
+     * 
+     * @param id 知识库发布记录主键
+     * @return 知识库发布记录
+     */
+    public KnowledgePublishRecord selectKnowledgePublishRecordById(Long id);
+
+    /**
+     * 查询知识库发布记录列表
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 知识库发布记录集合
+     */
+    public List<KnowledgePublishRecord> selectKnowledgePublishRecordList(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 新增知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    public int insertKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 修改知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    public int updateKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 删除知识库发布记录
+     * 
+     * @param id 知识库发布记录主键
+     * @return 结果
+     */
+    public int deleteKnowledgePublishRecordById(Long id);
+
+    /**
+     * 批量删除知识库发布记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgePublishRecordByIds(Long[] ids);
+}

smart-steward-mapper/src/main/java/com/smartSteward/mapper/knowledge/KnowledgeViewRecordMapper.java

@@ -0,0 +1,60 @@
+package com.smartSteward.mapper.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgeViewRecord;
+
+/**
+ * 知识库查看记录Mapper接口
+ * 
+ * @author smart-steward
+ */
+public interface KnowledgeViewRecordMapper 
+{
+    /**
+     * 查询知识库查看记录
+     * 
+     * @param id 知识库查看记录主键
+     * @return 知识库查看记录
+     */
+    public KnowledgeViewRecord selectKnowledgeViewRecordById(Long id);
+
+    /**
+     * 查询知识库查看记录列表
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 知识库查看记录集合
+     */
+    public List<KnowledgeViewRecord> selectKnowledgeViewRecordList(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 新增知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    public int insertKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 修改知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    public int updateKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 删除知识库查看记录
+     * 
+     * @param id 知识库查看记录主键
+     * @return 结果
+     */
+    public int deleteKnowledgeViewRecordById(Long id);
+
+    /**
+     * 批量删除知识库查看记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgeViewRecordByIds(Long[] ids);
+}

smart-steward-mapper/src/main/resources/mapper/knowledge/KnowledgeCategoryMapper.xml

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
-        <result property="isDeleted"    column="is_deleted"    />
+        <result property="delFlag"    column="is_deleted"    />
     </resultMap>
 
     <sql id="selectKnowledgeCategoryVo">
@@ -36,7 +36,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visibleRole != null  and visibleRole != ''"> and visible_role = #{visibleRole}</if>
             <if test="associationIds != null  and associationIds != ''"> and association_ids = #{associationIds}</if>
             <if test="sortOrder != null "> and sort_order = #{sortOrder}</if>
-            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
+            <if test="delFlag != null "> and is_deleted = #{delFlag}</if>
+        </where>
+    </select>
+
+    <select id="selectKnowledgeCategoryListByIds" parameterType="KnowledgeCategory" resultMap="KnowledgeCategoryResult">
+        <include refid="selectKnowledgeCategoryVo"/>
+        <where>
+            id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
         </where>
     </select>
     
@@ -60,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="isDeleted != null">is_deleted,</if>
+            <if test="delFlag != null">is_deleted,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">#{name},</if>
@@ -75,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="isDeleted != null">#{isDeleted},</if>
+            <if test="delFlag != null">#{delFlag},</if>
          </trim>
     </insert>
 
@@ -94,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where id = #{id}
     </update>
@@ -104,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKnowledgeCategoryByIds" parameterType="String">
-        delete from knowledge_category where id in 
+        update knowledge_category set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

smart-steward-mapper/src/main/resources/mapper/knowledge/KnowledgeContentMapper.xml

@@ -10,25 +10,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="parentId"    column="parent_id"    />
         <result property="title"    column="title"    />
         <result property="content"    column="content"    />
+        <result property="version"    column="version"    />
+        <result property="status"    column="status"    />
+        <result property="publishTime"    column="publish_time"    />
+        <result property="publishBy"    column="publish_by"    />
+        <result property="lastDraftId"    column="last_draft_id"    />
+        <result property="viewCount"    column="view_count"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
-        <result property="isDeleted"    column="is_deleted"    />
+        <result property="delFlag"    column="is_deleted"    />
+        <result property="attachment"    column="attachment"    />
     </resultMap>
 
     <sql id="selectKnowledgeContentVo">
-        select id, category_id, parent_id, title, content, create_time, update_time, create_by, update_by, is_deleted from knowledge_content
+        select id, category_id, parent_id, title, content, version, status, publish_time, publish_by, last_draft_id, view_count, attachment, create_time, update_time, create_by, update_by, is_deleted from knowledge_content
     </sql>
 
     <select id="selectKnowledgeContentList" parameterType="KnowledgeContent" resultMap="KnowledgeContentResult">
         <include refid="selectKnowledgeContentVo"/>
-        <where>  
+        <where>
             <if test="categoryId != null "> and category_id = #{categoryId}</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
+            <if test="version != null "> and version = #{version}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="publishTime != null "> and publish_time = #{publishTime}</if>
+            <if test="publishBy != null  and publishBy != ''"> and publish_by = #{publishBy}</if>
+            <if test="lastDraftId != null "> and last_draft_id = #{lastDraftId}</if>
+            <if test="viewCount != null "> and view_count = #{viewCount}</if>
+            <if test="delFlag != null "> and is_deleted = #{delFlag}</if>
+            <!-- 如果有station_id字段，则增加站点集合查询条件 -->
         </where>
     </select>
     
@@ -44,22 +58,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id,</if>
             <if test="title != null and title != ''">title,</if>
             <if test="content != null">content,</if>
+            <if test="version != null">version,</if>
+            <if test="status != null">status,</if>
+            <if test="publishTime != null">publish_time,</if>
+            <if test="publishBy != null">publish_by,</if>
+            <if test="lastDraftId != null">last_draft_id,</if>
+            <if test="viewCount != null">view_count,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-            <if test="isDeleted != null">is_deleted,</if>
+            <if test="delFlag != null">is_deleted,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="categoryId != null">#{categoryId},</if>
             <if test="parentId != null">#{parentId},</if>
             <if test="title != null and title != ''">#{title},</if>
             <if test="content != null">#{content},</if>
+            <if test="version != null">#{version},</if>
+            <if test="status != null">#{status},</if>
+            <if test="publishTime != null">#{publishTime},</if>
+            <if test="publishBy != null">#{publishBy},</if>
+            <if test="lastDraftId != null">#{lastDraftId},</if>
+            <if test="viewCount != null">#{viewCount},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="isDeleted != null">#{isDeleted},</if>
+            <if test="delFlag != null">#{delFlag},</if>
          </trim>
     </insert>
 
@@ -70,21 +96,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="title != null and title != ''">title = #{title},</if>
             <if test="content != null">content = #{content},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="publishTime != null">publish_time = #{publishTime},</if>
+            <if test="publishBy != null">publish_by = #{publishBy},</if>
+            <if test="lastDraftId != null">last_draft_id = #{lastDraftId},</if>
+            <if test="viewCount != null">view_count = #{viewCount},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteKnowledgeContentById" parameterType="Long">
-        delete from knowledge_content where id = #{id}
+        update knowledge_content set del_flag = '1' where id = #{id}
     </delete>
 
     <delete id="deleteKnowledgeContentByIds" parameterType="String">
-        delete from knowledge_content where id in 
+        update knowledge_content set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

smart-steward-mapper/src/main/resources/mapper/knowledge/KnowledgeDraftMapper.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.smartSteward.mapper.knowledge.KnowledgeDraftMapper">
+    
+    <resultMap type="KnowledgeDraft" id="KnowledgeDraftResult">
+        <result property="id"    column="id"    />
+        <result property="contentId"    column="content_id"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="is_deleted"    />
+        <result column="attachment" property="attachment" />
+    </resultMap>
+
+    <sql id="selectKnowledgeDraftVo">
+        select id, content_id, title, content, create_time, update_time, create_by, update_by, del_flag, attachment from knowledge_draft
+    </sql>
+
+    <select id="selectKnowledgeDraftList" parameterType="KnowledgeDraft" resultMap="KnowledgeDraftResult">
+        <include refid="selectKnowledgeDraftVo"/>
+        <where>
+            <if test="contentId != null "> and content_id = #{contentId}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <!-- 如果有station_id字段，则增加站点集合查询条件 -->
+        </where>
+    </select>
+    
+    <select id="selectKnowledgeDraftById" parameterType="Long" resultMap="KnowledgeDraftResult">
+        <include refid="selectKnowledgeDraftVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKnowledgeDraft" parameterType="KnowledgeDraft" useGeneratedKeys="true" keyProperty="id">
+        insert into knowledge_draft
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">content_id,</if>
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null">content,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="attachment != null">attachment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">#{contentId},</if>
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateKnowledgeDraft" parameterType="KnowledgeDraft">
+        update knowledge_draft
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contentId != null">content_id = #{contentId},</if>
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKnowledgeDraftById" parameterType="Long">
+        update knowledge_draft set del_flag = '1' where id = #{id}
+    </delete>
+
+    <delete id="deleteKnowledgeDraftByIds" parameterType="String">
+        update knowledge_draft set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

smart-steward-mapper/src/main/resources/mapper/knowledge/KnowledgePublishRecordMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.smartSteward.mapper.knowledge.KnowledgePublishRecordMapper">
+    
+    <resultMap type="KnowledgePublishRecord" id="KnowledgePublishRecordResult">
+        <result property="id"    column="id"    />
+        <result property="contentId"    column="content_id"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="version"    column="version"    />
+        <result property="publishBy"    column="publish_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="attachment"    column="attachment"    />
+    </resultMap>
+
+    <sql id="selectKnowledgePublishRecordVo">
+        select id, content_id, title, content, version, publish_by, create_time, del_flag, attachment from knowledge_publish_record
+    </sql>
+
+    <select id="selectKnowledgePublishRecordList" parameterType="KnowledgePublishRecord" resultMap="KnowledgePublishRecordResult">
+        <include refid="selectKnowledgePublishRecordVo"/>
+        <where>
+            <if test="contentId != null "> and content_id = #{contentId}</if>
+            <if test="publishBy != null  and publishBy != ''"> and publish_by = #{publishBy}</if>
+            <if test="delFlag != null "> and del_flag = #{delFlag}</if>
+            <!-- 如果有station_id字段，则增加站点集合查询条件 -->
+        </where>
+    </select>
+    
+    <select id="selectKnowledgePublishRecordById" parameterType="Long" resultMap="KnowledgePublishRecordResult">
+        <include refid="selectKnowledgePublishRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKnowledgePublishRecord" parameterType="KnowledgePublishRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into knowledge_publish_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">content_id,</if>
+            <if test="version != null">version,</if>
+            <if test="title != null">title,</if>
+            <if test="content != null">content,</if>
+            <if test="publishBy != null">publish_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="attachment != null">attachment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">#{contentId},</if>
+            <if test="version != null">#{version},</if>
+            <if test="title != null">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="publishBy != null">#{publishBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="attachment != null">#{attachment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateKnowledgePublishRecord" parameterType="KnowledgePublishRecord">
+        update knowledge_publish_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contentId != null">content_id = #{contentId},</if>
+            <if test="version != null">version = #{version},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="publishBy != null">publish_by = #{publishBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="attachment != null">attachment = #{attachment},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKnowledgePublishRecordById" parameterType="Long">
+        update knowledge_publish_record set del_flag = '1' where id = #{id}
+    </delete>
+
+    <delete id="deleteKnowledgePublishRecordByIds" parameterType="String">
+        update knowledge_publish_record set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

smart-steward-mapper/src/main/resources/mapper/knowledge/KnowledgeViewRecordMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.smartSteward.mapper.knowledge.KnowledgeViewRecordMapper">
+    
+    <resultMap type="KnowledgeViewRecord" id="KnowledgeViewRecordResult">
+        <result property="id"    column="id"    />
+        <result property="contentId"    column="content_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userAvatar"    column="user_avatar"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectKnowledgeViewRecordVo">
+        select id, content_id, user_id, user_name, user_avatar, create_time, update_time, del_flag from knowledge_view_record
+    </sql>
+
+    <select id="selectKnowledgeViewRecordList" parameterType="KnowledgeViewRecord" resultMap="KnowledgeViewRecordResult">
+        <include refid="selectKnowledgeViewRecordVo"/>
+        <where>
+            <if test="contentId != null "> and content_id = #{contentId}</if>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userAvatar != null  and userAvatar != ''"> and user_avatar = #{userAvatar}</if>
+            <!-- 如果有station_id字段，则增加站点集合查询条件 -->
+        </where>
+    </select>
+    
+    <select id="selectKnowledgeViewRecordById" parameterType="Long" resultMap="KnowledgeViewRecordResult">
+        <include refid="selectKnowledgeViewRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKnowledgeViewRecord" parameterType="KnowledgeViewRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into knowledge_view_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">content_id,</if>
+            <if test="userId != null and userId != ''">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="userAvatar != null">user_avatar,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contentId != null">#{contentId},</if>
+            <if test="userId != null and userId != ''">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userAvatar != null">#{userAvatar},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateKnowledgeViewRecord" parameterType="KnowledgeViewRecord">
+        update knowledge_view_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contentId != null">content_id = #{contentId},</if>
+            <if test="userId != null and userId != ''">user_id = #{userId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userAvatar != null">user_avatar = #{userAvatar},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKnowledgeViewRecordById" parameterType="Long">
+        delete from knowledge_view_record where id = #{id}
+    </delete>
+
+    <delete id="deleteKnowledgeViewRecordByIds" parameterType="String">
+        delete from knowledge_view_record where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/IKnowledgeCategoryService.java

@@ -1,6 +1,8 @@
 package com.smartSteward.service.knowledge;
 
 import java.util.List;
+
+import com.smartSteward.common.core.model.LoginUser;
 import com.smartSteward.entity.database.knowledge.KnowledgeCategory;
 
 /**
@@ -57,4 +59,23 @@ public interface IKnowledgeCategoryService
      * @return 结果
      */
     public int deleteKnowledgeCategoryById(Long id);
+
+     /**
+      * 根据ID查询知识库分类列表
+      *
+      * @param ids 知识库分类主键集合
+      * @return 知识库分类集合
+      */
+    public List<KnowledgeCategory> selectKnowledgeCategoryListByIds(Long[] ids);
+
+
+    /**
+     * 判断是否为管理员
+     *
+     * @param categoryId 知识库分类主键
+     * @param loginUser 登录用户
+     * @return 是否为管理员
+     */
+    public boolean isAdmin(Long categoryId, LoginUser  loginUser);
+
 }

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/IKnowledgeContentService.java

@@ -1,60 +1,71 @@
 package com.smartSteward.service.knowledge;
 
 import java.util.List;
+
+import com.smartSteward.common.core.model.LoginUser;
 import com.smartSteward.entity.database.knowledge.KnowledgeContent;
 
 /**
- * 知识库内容Service接口
+ * 知识库内容(已发布内容)Service接口
  * 
  * @author smart-steward
  */
 public interface IKnowledgeContentService 
 {
     /**
-     * 查询知识库内容
+     * 查询知识库内容(已发布内容)
      * 
-     * @param id 知识库内容主键
-     * @return 知识库内容
+     * @param id 知识库内容(已发布内容)主键
+     * @return 知识库内容(已发布内容)
      */
     public KnowledgeContent selectKnowledgeContentById(Long id);
 
     /**
-     * 查询知识库内容列表
+     * 查询知识库内容(已发布内容)列表
      * 
-     * @param knowledgeContent 知识库内容
-     * @return 知识库内容集合
+     * @param knowledgeContent 知识库内容(已发布内容)
+     * @return 知识库内容(已发布内容)集合
      */
     public List<KnowledgeContent> selectKnowledgeContentList(KnowledgeContent knowledgeContent);
 
     /**
-     * 新增知识库内容
+     * 新增知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     public int insertKnowledgeContent(KnowledgeContent knowledgeContent);
 
     /**
-     * 修改知识库内容
+     * 修改知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     public int updateKnowledgeContent(KnowledgeContent knowledgeContent);
 
     /**
-     * 批量删除知识库内容
+     * 批量删除知识库内容(已发布内容)
      * 
-     * @param ids 需要删除的知识库内容主键集合
+     * @param ids 需要删除的知识库内容(已发布内容)主键集合
      * @return 结果
      */
     public int deleteKnowledgeContentByIds(Long[] ids);
 
     /**
-     * 删除知识库内容信息
+     * 删除知识库内容(已发布内容)信息
      * 
-     * @param id 知识库内容主键
+     * @param id 知识库内容(已发布内容)主键
      * @return 结果
      */
     public int deleteKnowledgeContentById(Long id);
+
+     /**
+     * 查询知识库分类下的所有内容(已发布内容)
+     *
+     * @param categoryId 知识库分类主键
+     * @return 知识库内容(已发布内容)集合
+     */
+    public List<KnowledgeContent> selectCommCommentsTree(Long categoryId, boolean isAdmin);
+
 }

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/IKnowledgeDraftService.java

@@ -0,0 +1,60 @@
+package com.smartSteward.service.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgeDraft;
+
+/**
+ * 知识库草稿Service接口
+ * 
+ * @author smart-steward
+ */
+public interface IKnowledgeDraftService 
+{
+    /**
+     * 查询知识库草稿
+     * 
+     * @param id 知识库草稿主键
+     * @return 知识库草稿
+     */
+    public KnowledgeDraft selectKnowledgeDraftById(Long id);
+
+    /**
+     * 查询知识库草稿列表
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 知识库草稿集合
+     */
+    public List<KnowledgeDraft> selectKnowledgeDraftList(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 新增知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    public int insertKnowledgeDraft(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 修改知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    public int updateKnowledgeDraft(KnowledgeDraft knowledgeDraft);
+
+    /**
+     * 批量删除知识库草稿
+     * 
+     * @param ids 需要删除的知识库草稿主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgeDraftByIds(Long[] ids);
+
+    /**
+     * 删除知识库草稿信息
+     * 
+     * @param id 知识库草稿主键
+     * @return 结果
+     */
+    public int deleteKnowledgeDraftById(Long id);
+}

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/IKnowledgePublishRecordService.java

@@ -0,0 +1,60 @@
+package com.smartSteward.service.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgePublishRecord;
+
+/**
+ * 知识库发布记录Service接口
+ * 
+ * @author smart-steward
+ */
+public interface IKnowledgePublishRecordService 
+{
+    /**
+     * 查询知识库发布记录
+     * 
+     * @param id 知识库发布记录主键
+     * @return 知识库发布记录
+     */
+    public KnowledgePublishRecord selectKnowledgePublishRecordById(Long id);
+
+    /**
+     * 查询知识库发布记录列表
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 知识库发布记录集合
+     */
+    public List<KnowledgePublishRecord> selectKnowledgePublishRecordList(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 新增知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    public int insertKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 修改知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    public int updateKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord);
+
+    /**
+     * 批量删除知识库发布记录
+     * 
+     * @param ids 需要删除的知识库发布记录主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgePublishRecordByIds(Long[] ids);
+
+    /**
+     * 删除知识库发布记录信息
+     * 
+     * @param id 知识库发布记录主键
+     * @return 结果
+     */
+    public int deleteKnowledgePublishRecordById(Long id);
+}

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/IKnowledgeViewRecordService.java

@@ -0,0 +1,60 @@
+package com.smartSteward.service.knowledge;
+
+import java.util.List;
+import com.smartSteward.entity.database.knowledge.KnowledgeViewRecord;
+
+/**
+ * 知识库查看记录Service接口
+ * 
+ * @author smart-steward
+ */
+public interface IKnowledgeViewRecordService 
+{
+    /**
+     * 查询知识库查看记录
+     * 
+     * @param id 知识库查看记录主键
+     * @return 知识库查看记录
+     */
+    public KnowledgeViewRecord selectKnowledgeViewRecordById(Long id);
+
+    /**
+     * 查询知识库查看记录列表
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 知识库查看记录集合
+     */
+    public List<KnowledgeViewRecord> selectKnowledgeViewRecordList(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 新增知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    public int insertKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 修改知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    public int updateKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord);
+
+    /**
+     * 批量删除知识库查看记录
+     * 
+     * @param ids 需要删除的知识库查看记录主键集合
+     * @return 结果
+     */
+    public int deleteKnowledgeViewRecordByIds(Long[] ids);
+
+    /**
+     * 删除知识库查看记录信息
+     * 
+     * @param id 知识库查看记录主键
+     * @return 结果
+     */
+    public int deleteKnowledgeViewRecordById(Long id);
+}

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/impl/KnowledgeCategoryServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.smartSteward.common.core.SecurityUtils;
 
+import com.smartSteward.common.core.model.LoginUser;
 import com.smartSteward.common.utils.DateUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,6 +100,39 @@ public class KnowledgeCategoryServiceImpl implements IKnowledgeCategoryService
     {
         return knowledgeCategoryMapper.deleteKnowledgeCategoryById(id);
     }
+    /**
+     * 根据ID查询知识库分类列表
+     *
+     * @param ids 知识库分类主键集合
+     * @return 知识库分类集合
+     */
+    @Override
+    public List<KnowledgeCategory> selectKnowledgeCategoryListByIds(Long[] ids)
+    {
+        return knowledgeCategoryMapper.selectKnowledgeCategoryListByIds(ids);
+    }
+
+    /**
+     * 判断是否为知识库管理员
+     *
+     * @param categoryId 知识库分类主键
+     * @param loginUser 登录用户
+     * @return 是否为管理员
+     */
+    @Override
+    public boolean isAdmin(Long categoryId, LoginUser loginUser)
+    {
+       KnowledgeCategory knowledgeCategory = knowledgeCategoryMapper.selectKnowledgeCategoryById(categoryId);
+       if (knowledgeCategory == null){
+           return false;
+       }
+
+//       if (knowledgeCategory.getManagePermission().equals(loginUser.getUser())){
+//           return true;
+//       }
+
+       return true;
+    }
 
 
 }

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/impl/KnowledgeContentServiceImpl.java

@@ -1,7 +1,17 @@
 package com.smartSteward.service.knowledge.impl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.smartSteward.common.core.SecurityUtils;
+import com.smartSteward.common.core.model.LoginUser;
+import com.smartSteward.common.enums.knowledge.PublicStatus;
 import com.smartSteward.common.utils.DateUtils;
+import com.smartSteward.common.utils.StringUtils;
+import com.smartSteward.entity.database.comm.CommComments;
+import com.smartSteward.entity.input.comm.CommentInput;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartSteward.mapper.knowledge.KnowledgeContentMapper;
@@ -9,21 +19,21 @@ import com.smartSteward.entity.database.knowledge.KnowledgeContent;
 import com.smartSteward.service.knowledge.IKnowledgeContentService;
 
 /**
- * 知识库内容Service业务层处理
- * 
+ * 知识库内容(已发布内容)Service业务层处理
+ *
  * @author smart-steward
  */
 @Service
-public class KnowledgeContentServiceImpl implements IKnowledgeContentService 
+public class KnowledgeContentServiceImpl implements IKnowledgeContentService
 {
     @Autowired
     private KnowledgeContentMapper knowledgeContentMapper;
 
     /**
-     * 查询知识库内容
-     * 
-     * @param id 知识库内容主键
-     * @return 知识库内容
+     * 查询知识库内容(已发布内容)
+     *
+     * @param id 知识库内容(已发布内容)主键
+     * @return 知识库内容(已发布内容)
      */
     @Override
     public KnowledgeContent selectKnowledgeContentById(Long id)
@@ -32,10 +42,10 @@ public class KnowledgeContentServiceImpl implements IKnowledgeContentService
     }
 
     /**
-     * 查询知识库内容列表
-     * 
-     * @param knowledgeContent 知识库内容
-     * @return 知识库内容
+     * 查询知识库内容(已发布内容)列表
+     *
+     * @param knowledgeContent 知识库内容(已发布内容)
+     * @return 知识库内容(已发布内容)
      */
     @Override
     public List<KnowledgeContent> selectKnowledgeContentList(KnowledgeContent knowledgeContent)
@@ -44,9 +54,91 @@ public class KnowledgeContentServiceImpl implements IKnowledgeContentService
     }
 
     /**
-     * 新增知识库内容
+     * 查询公共评论列表
+     *
+     * @return 公共评论
+     */
+    @Override
+    public List<KnowledgeContent> selectCommCommentsTree(Long categoryId, boolean isAdmin)
+    {
+        // 获取到所有数据
+        KnowledgeContent query = new KnowledgeContent();
+        query.setCategoryId(categoryId);
+        query.setDelFlag("0");
+        if (!isAdmin) {
+            query.setStatus(PublicStatus.PUBLISHED.getStatus());
+        }
+        List<KnowledgeContent> list = knowledgeContentMapper.selectKnowledgeContentList(query);
+        return buildTree(list);
+    }
+
+    public List<KnowledgeContent> buildTree(List<KnowledgeContent> list)
+    {
+        List<KnowledgeContent> returnList = new ArrayList<KnowledgeContent>();
+        List<Long> tempList = list.stream().map(KnowledgeContent::getId).collect(Collectors.toList());
+        for (KnowledgeContent info : list)
+        {
+            // 如果是顶级节点, 遍历该父节点的所有子节点
+            if (!tempList.contains(info.getParentId()))
+            {
+                recursionFn(list, info);
+                returnList.add(info);
+            }
+        }
+        if (returnList.isEmpty())
+        {
+            returnList = list;
+        }
+        return returnList;
+    }
+
+    /**
+     * 递归列表
+     */
+    private void recursionFn(List<KnowledgeContent> list, KnowledgeContent t)
+    {
+        // 得到子节点列表
+        List<KnowledgeContent> childList = getChildList(list, t);
+        t.setChildren(childList);
+        for (KnowledgeContent tChild : childList)
+        {
+            if (hasChild(list, tChild))
+            {
+                recursionFn(list, tChild);
+            }
+        }
+    }
+
+    /**
+     * 得到子节点列表
+     */
+    private List<KnowledgeContent> getChildList(List<KnowledgeContent> list, KnowledgeContent t)
+    {
+        List<KnowledgeContent> tlist = new ArrayList<KnowledgeContent>();
+        Iterator<KnowledgeContent> it = list.iterator();
+        while (it.hasNext())
+        {
+            KnowledgeContent n = (KnowledgeContent) it.next();
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
+            {
+                tlist.add(n);
+            }
+        }
+        return tlist;
+    }
+
+    /**
+     * 判断是否有子节点
+     */
+    private boolean hasChild(List<KnowledgeContent> list, KnowledgeContent t)
+    {
+        return getChildList(list, t).size() > 0;
+    }
+
+    /**
+     * 新增知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     @Override
@@ -58,9 +150,9 @@ public class KnowledgeContentServiceImpl implements IKnowledgeContentService
     }
 
     /**
-     * 修改知识库内容
+     * 修改知识库内容(已发布内容)
      * 
-     * @param knowledgeContent 知识库内容
+     * @param knowledgeContent 知识库内容(已发布内容)
      * @return 结果
      */
     @Override
@@ -72,9 +164,9 @@ public class KnowledgeContentServiceImpl implements IKnowledgeContentService
     }
 
     /**
-     * 批量删除知识库内容
+     * 批量删除知识库内容(已发布内容)
      * 
-     * @param ids 需要删除的知识库内容主键
+     * @param ids 需要删除的知识库内容(已发布内容)主键
      * @return 结果
      */
     @Override
@@ -84,9 +176,9 @@ public class KnowledgeContentServiceImpl implements IKnowledgeContentService
     }
 
     /**
-     * 删除知识库内容信息
+     * 删除知识库内容(已发布内容)信息
      * 
-     * @param id 知识库内容主键
+     * @param id 知识库内容(已发布内容)主键
      * @return 结果
      */
     @Override

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/impl/KnowledgeDraftServiceImpl.java

@@ -0,0 +1,98 @@
+package com.smartSteward.service.knowledge.impl;
+import java.util.Date;
+import java.util.List;
+import com.smartSteward.common.core.SecurityUtils;
+import com.smartSteward.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.smartSteward.mapper.knowledge.KnowledgeDraftMapper;
+import com.smartSteward.entity.database.knowledge.KnowledgeDraft;
+import com.smartSteward.service.knowledge.IKnowledgeDraftService;
+
+/**
+ * 知识库草稿Service业务层处理
+ * 
+ * @author smart-steward
+ */
+@Service
+public class KnowledgeDraftServiceImpl implements IKnowledgeDraftService 
+{
+    @Autowired
+    private KnowledgeDraftMapper knowledgeDraftMapper;
+
+    /**
+     * 查询知识库草稿
+     * 
+     * @param id 知识库草稿主键
+     * @return 知识库草稿
+     */
+    @Override
+    public KnowledgeDraft selectKnowledgeDraftById(Long id)
+    {
+        return knowledgeDraftMapper.selectKnowledgeDraftById(id);
+    }
+
+    /**
+     * 查询知识库草稿列表
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 知识库草稿
+     */
+    @Override
+    public List<KnowledgeDraft> selectKnowledgeDraftList(KnowledgeDraft knowledgeDraft)
+    {
+        return knowledgeDraftMapper.selectKnowledgeDraftList(knowledgeDraft);
+    }
+
+    /**
+     * 新增知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    @Override
+    public int insertKnowledgeDraft(KnowledgeDraft knowledgeDraft)
+    {
+        knowledgeDraft.setCreateTime(DateUtils.getNowDate());
+        knowledgeDraft.setCreateBy(SecurityUtils.getUsername());
+        return knowledgeDraftMapper.insertKnowledgeDraft(knowledgeDraft);
+    }
+
+    /**
+     * 修改知识库草稿
+     * 
+     * @param knowledgeDraft 知识库草稿
+     * @return 结果
+     */
+    @Override
+    public int updateKnowledgeDraft(KnowledgeDraft knowledgeDraft)
+    {
+        knowledgeDraft.setUpdateTime(DateUtils.getNowDate());
+        knowledgeDraft.setUpdateBy(SecurityUtils.getUsername());
+        return knowledgeDraftMapper.updateKnowledgeDraft(knowledgeDraft);
+    }
+
+    /**
+     * 批量删除知识库草稿
+     * 
+     * @param ids 需要删除的知识库草稿主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgeDraftByIds(Long[] ids)
+    {
+        return knowledgeDraftMapper.deleteKnowledgeDraftByIds(ids);
+    }
+
+    /**
+     * 删除知识库草稿信息
+     * 
+     * @param id 知识库草稿主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgeDraftById(Long id)
+    {
+        return knowledgeDraftMapper.deleteKnowledgeDraftById(id);
+    }
+}

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/impl/KnowledgePublishRecordServiceImpl.java

@@ -0,0 +1,95 @@
+package com.smartSteward.service.knowledge.impl;
+import java.util.Date;
+import java.util.List;
+import com.smartSteward.common.core.SecurityUtils;
+import com.smartSteward.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.smartSteward.mapper.knowledge.KnowledgePublishRecordMapper;
+import com.smartSteward.entity.database.knowledge.KnowledgePublishRecord;
+import com.smartSteward.service.knowledge.IKnowledgePublishRecordService;
+
+/**
+ * 知识库发布记录Service业务层处理
+ * 
+ * @author smart-steward
+ */
+@Service
+public class KnowledgePublishRecordServiceImpl implements IKnowledgePublishRecordService 
+{
+    @Autowired
+    private KnowledgePublishRecordMapper knowledgePublishRecordMapper;
+
+    /**
+     * 查询知识库发布记录
+     * 
+     * @param id 知识库发布记录主键
+     * @return 知识库发布记录
+     */
+    @Override
+    public KnowledgePublishRecord selectKnowledgePublishRecordById(Long id)
+    {
+        return knowledgePublishRecordMapper.selectKnowledgePublishRecordById(id);
+    }
+
+    /**
+     * 查询知识库发布记录列表
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 知识库发布记录
+     */
+    @Override
+    public List<KnowledgePublishRecord> selectKnowledgePublishRecordList(KnowledgePublishRecord knowledgePublishRecord)
+    {
+        return knowledgePublishRecordMapper.selectKnowledgePublishRecordList(knowledgePublishRecord);
+    }
+
+    /**
+     * 新增知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    @Override
+    public int insertKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord)
+    {
+        knowledgePublishRecord.setCreateTime(DateUtils.getNowDate());
+        return knowledgePublishRecordMapper.insertKnowledgePublishRecord(knowledgePublishRecord);
+    }
+
+    /**
+     * 修改知识库发布记录
+     * 
+     * @param knowledgePublishRecord 知识库发布记录
+     * @return 结果
+     */
+    @Override
+    public int updateKnowledgePublishRecord(KnowledgePublishRecord knowledgePublishRecord)
+    {
+        return knowledgePublishRecordMapper.updateKnowledgePublishRecord(knowledgePublishRecord);
+    }
+
+    /**
+     * 批量删除知识库发布记录
+     * 
+     * @param ids 需要删除的知识库发布记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgePublishRecordByIds(Long[] ids)
+    {
+        return knowledgePublishRecordMapper.deleteKnowledgePublishRecordByIds(ids);
+    }
+
+    /**
+     * 删除知识库发布记录信息
+     * 
+     * @param id 知识库发布记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgePublishRecordById(Long id)
+    {
+        return knowledgePublishRecordMapper.deleteKnowledgePublishRecordById(id);
+    }
+}

smart-steward-service/src/main/java/com/smartSteward/service/knowledge/impl/KnowledgeViewRecordServiceImpl.java

@@ -0,0 +1,96 @@
+package com.smartSteward.service.knowledge.impl;
+import java.util.Date;
+import java.util.List;
+import com.smartSteward.common.core.SecurityUtils;
+import com.smartSteward.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.smartSteward.mapper.knowledge.KnowledgeViewRecordMapper;
+import com.smartSteward.entity.database.knowledge.KnowledgeViewRecord;
+import com.smartSteward.service.knowledge.IKnowledgeViewRecordService;
+
+/**
+ * 知识库查看记录Service业务层处理
+ * 
+ * @author smart-steward
+ */
+@Service
+public class KnowledgeViewRecordServiceImpl implements IKnowledgeViewRecordService 
+{
+    @Autowired
+    private KnowledgeViewRecordMapper knowledgeViewRecordMapper;
+
+    /**
+     * 查询知识库查看记录
+     * 
+     * @param id 知识库查看记录主键
+     * @return 知识库查看记录
+     */
+    @Override
+    public KnowledgeViewRecord selectKnowledgeViewRecordById(Long id)
+    {
+        return knowledgeViewRecordMapper.selectKnowledgeViewRecordById(id);
+    }
+
+    /**
+     * 查询知识库查看记录列表
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 知识库查看记录
+     */
+    @Override
+    public List<KnowledgeViewRecord> selectKnowledgeViewRecordList(KnowledgeViewRecord knowledgeViewRecord)
+    {
+        return knowledgeViewRecordMapper.selectKnowledgeViewRecordList(knowledgeViewRecord);
+    }
+
+    /**
+     * 新增知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    @Override
+    public int insertKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord)
+    {
+        knowledgeViewRecord.setCreateTime(DateUtils.getNowDate());
+        return knowledgeViewRecordMapper.insertKnowledgeViewRecord(knowledgeViewRecord);
+    }
+
+    /**
+     * 修改知识库查看记录
+     * 
+     * @param knowledgeViewRecord 知识库查看记录
+     * @return 结果
+     */
+    @Override
+    public int updateKnowledgeViewRecord(KnowledgeViewRecord knowledgeViewRecord)
+    {
+        knowledgeViewRecord.setUpdateTime(DateUtils.getNowDate());
+        return knowledgeViewRecordMapper.updateKnowledgeViewRecord(knowledgeViewRecord);
+    }
+
+    /**
+     * 批量删除知识库查看记录
+     * 
+     * @param ids 需要删除的知识库查看记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgeViewRecordByIds(Long[] ids)
+    {
+        return knowledgeViewRecordMapper.deleteKnowledgeViewRecordByIds(ids);
+    }
+
+    /**
+     * 删除知识库查看记录信息
+     * 
+     * @param id 知识库查看记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteKnowledgeViewRecordById(Long id)
+    {
+        return knowledgeViewRecordMapper.deleteKnowledgeViewRecordById(id);
+    }
+}