From a58626f03c141e59bdd1be40d75d5236b7dac5b0 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Tue, 7 Aug 2018 14:20:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=A0=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tiku/service/IChapterService.java    |  3 +++
 .../tiku/service/impl/ChapterServiceImpl.java    | 16 ++++++++++++++++
 .../modules/tiku/web/ChapterController.java      | 11 +++++++++++
 .../templates/modules/tiku/chapter/list.html     |  6 ++++--
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java
index 9cdd2a8..89975b0 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java
@@ -24,4 +24,7 @@ public interface IChapterService extends IService<ChapterEntity>{
 	// 修改章节
 	public void update(ChapterEntity chapter);
 
+	// 删除章节
+	public void delete(String id);
+
 }
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java
index 202ceda..2b15bb3 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java
@@ -163,4 +163,20 @@ public class ChapterServiceImpl extends ServiceImpl<ChapterMapper, ChapterEntity
 		}
 		chapterMapper.updateById(entity);
 	}
+
+	@Transactional(readOnly=false)
+	@SuppressWarnings("unchecked")
+	@Override
+	public void delete(String id) {
+		ChapterEntity chapter = chapterMapper.selectById(id);
+		chapter.setStatus(ChapterStatusEnum.DELETE);
+		chapterMapper.updateById(chapter);
+		// 删除子章节
+		List<ChapterEntity> childs = chapterMapper.selectList(Condition.create().like("parent_codes", id));
+		for(int i=0 ; i<childs.size() ; i++) {
+			ChapterEntity child = childs.get(i);
+			child.setStatus(ChapterStatusEnum.DELETE);
+			chapterMapper.updateById(child);
+		}
+	}
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java
index 9d68a3c..706fab4 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/ChapterController.java
@@ -76,4 +76,15 @@ public class ChapterController {
 			return ExceptionSupport.resolverResult("修改章节", this.getClass(), e);
 		}
 	}
+	
+	@RequestMapping(path="delete" , method=RequestMethod.POST)
+	@ResponseBody
+	public Result delete(String id) {
+		try {
+			iChapterService.delete(id);
+			return Result.result(0, null, "章节删除成功！");
+		} catch (Exception e) {
+			return ExceptionSupport.resolverResult("删除章节", this.getClass(), e);
+		}
+	}
 }
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/chapter/list.html b/tamguo-oms/src/main/resources/templates/modules/tiku/chapter/list.html
index f73c46d..36fe4b9 100644
--- a/tamguo-oms/src/main/resources/templates/modules/tiku/chapter/list.html
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/chapter/list.html
@@ -81,7 +81,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <script th:src="${setting.domain + 'common/jeesite.js'}"></script>
 <script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
 <script th:src="${setting.domain + 'common/common.js'}"></script>
-<script>
+<script th:inline="javascript">
 // 初始化DataGrid对象
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
@@ -96,6 +96,8 @@ $('#dataGrid').dataGrid({
 				return '正常';
 			}else if(val == "disabled"){
 				return '<span style="color:red;">停用</span>';
+			}else if(val == "delete"){
+				return '<span style="color:red;">删除</span>';
 			}else{
 				return '<span style="color:red;">未知</span>';
 			}
@@ -103,7 +105,7 @@ $('#dataGrid').dataGrid({
 		{header:'操作', name:'actions', width:100, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
 				actions.push('<a href="tiku/chapter/update?id='+row.id+'" class="btnList" title="编辑章节"><i class="fa fa-pencil"></i></a>&nbsp;');
-				actions.push('<a href="tiku/chapter/delete?id='+row.id+'" class="btnList" title="删除章节" data-confirm="确认要删除该章节及所有子章节吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="'+ctx+'tiku/chapter/delete?id='+row.id+'" class="btnList" title="删除章节" data-confirm="确认要删除该章节及所有子章节吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="tiku/chapter/add?parentChapterId='+row.id+'" class="btnList" title="新增下级章节"><i class="fa fa-plus-square"></i></a>&nbsp;');
 			return actions.join('');
 		}}