From cdde2c015413b8357331fb71a53614c4f8fcc1d3 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Mon, 6 Aug 2018 13:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E7=B1=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tamguo/modules/tiku/model/BookEntity.java |  30 ++-
 .../tiku/model/enums/BookStatusEnum.java      |  34 +++
 .../modules/tiku/service/IBookService.java    |   2 +
 .../tiku/service/impl/BookServiceImpl.java    |  15 ++
 .../modules/tiku/web/BookController.java      |  13 +-
 .../templates/modules/tiku/book/add.html      | 217 ++++++++++++++++++
 .../templates/modules/tiku/book/list.html     |   2 +-
 7 files changed, 299 insertions(+), 14 deletions(-)
 create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/BookStatusEnum.java
 create mode 100644 tamguo-oms/src/main/resources/templates/modules/tiku/book/add.html

diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java
index 22a0581..b43d078 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java
@@ -1,14 +1,13 @@
 package com.tamguo.modules.tiku.model;
 
 import java.util.Date;
-
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.FieldFill;
-import com.tamguo.modules.tiku.model.enums.CourseStatusEnum;
+import com.tamguo.modules.tiku.model.enums.BookStatusEnum;
 
 @TableName(value="tiku_book")
 public class BookEntity {
@@ -22,6 +21,7 @@ public class BookEntity {
 	private Integer questionNum;
 	private Integer pointNum;
 	private Integer sort;
+	private String remarks;
 	
 	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String createBy;
@@ -33,7 +33,7 @@ public class BookEntity {
 	private Date updateDate;
 	
 	@JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString)
-	private CourseStatusEnum status;
+	private BookStatusEnum status;
 
 	@TableField(exist=false)
 	private String subjectName;
@@ -129,14 +129,6 @@ public class BookEntity {
 		this.updateDate = updateDate;
 	}
 
-	public CourseStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(CourseStatusEnum status) {
-		this.status = status;
-	}
-
 	public String getSubjectName() {
 		return subjectName;
 	}
@@ -160,5 +152,21 @@ public class BookEntity {
 	public void setId(String id) {
 		this.id = id;
 	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public BookStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(BookStatusEnum status) {
+		this.status = status;
+	}
 	
 }
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/BookStatusEnum.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/BookStatusEnum.java
new file mode 100644
index 0000000..b623c55
--- /dev/null
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/enums/BookStatusEnum.java
@@ -0,0 +1,34 @@
+package com.tamguo.modules.tiku.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 类型状态
+ */
+public enum BookStatusEnum implements IEnum {
+	NORMAL("normal", "正常"),
+	DELETE("delete", "删除"),
+	DISABLED("disabled" , "停用");
+
+    private String value;
+    private String desc;
+
+    BookStatusEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Serializable getValue() {
+        return this.value;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+    
+    @Override
+    public String toString() {
+    	return this.value;
+    }
+}
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IBookService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IBookService.java
index 802c618..07dd78d 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IBookService.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IBookService.java
@@ -9,4 +9,6 @@ public interface IBookService extends IService<BookEntity>{
 
 	Page<BookEntity> listData(BookCondition condition);
 
+	void save(BookEntity book);
+
 }
diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/BookServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/BookServiceImpl.java
index e8d4e27..818dcd4 100644
--- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/BookServiceImpl.java
+++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/BookServiceImpl.java
@@ -7,8 +7,11 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.tamguo.modules.tiku.dao.BookMapper;
+import com.tamguo.modules.tiku.dao.CourseMapper;
 import com.tamguo.modules.tiku.model.BookEntity;
+import com.tamguo.modules.tiku.model.CourseEntity;
 import com.tamguo.modules.tiku.model.condition.BookCondition;
+import com.tamguo.modules.tiku.model.enums.BookStatusEnum;
 import com.tamguo.modules.tiku.service.IBookService;
 
 @Service
@@ -16,6 +19,8 @@ public class BookServiceImpl extends ServiceImpl<BookMapper, BookEntity> impleme
 
 	@Autowired
 	BookMapper bookMapper;
+	@Autowired
+	CourseMapper courseMapper;
 	
 	@Transactional(readOnly=false)
 	@Override
@@ -24,4 +29,14 @@ public class BookServiceImpl extends ServiceImpl<BookMapper, BookEntity> impleme
 		return page.setRecords(bookMapper.listData(page, condition));
 	}
 
+	@Transactional(readOnly=false)
+	@Override
+	public void save(BookEntity book) {
+		CourseEntity course = courseMapper.selectById(book.getCourseId());
+		
+		book.setStatus(BookStatusEnum.NORMAL);
+		book.setSubjectId(course.getSubjectId());
+		bookMapper.insert(book);
+	}
+
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/BookController.java b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/BookController.java
index b2f4805..1fe5d42 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/BookController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/tiku/web/BookController.java
@@ -1,7 +1,6 @@
 package com.tamguo.modules.tiku.web;
 
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +10,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.common.utils.ExceptionSupport;
 import com.tamguo.common.utils.Result;
 import com.tamguo.modules.tiku.model.BookEntity;
 import com.tamguo.modules.tiku.model.condition.BookCondition;
@@ -45,5 +45,14 @@ public class BookController {
 		return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
 	}
 
-	
+	@RequestMapping(path="save",method=RequestMethod.POST)
+	@ResponseBody
+	public Result save(BookEntity book) {
+		try {
+			iBookService.save(book);
+			return Result.result(0, null, "保存书籍【"+book.getName()+"】成功");
+		} catch (Exception e) {
+			return ExceptionSupport.resolverResult("保存书籍", this.getClass(), e);
+		}
+	}
 }
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/book/add.html b/tamguo-oms/src/main/resources/templates/modules/tiku/book/add.html
new file mode 100644
index 0000000..de8255e
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/book/add.html
@@ -0,0 +1,217 @@
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
+content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
+content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
+content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
+content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+<title>书籍管理 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
+<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
+<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'static/common/common.css'}">
+</head><body class="hold-transition ">
+<div class="wrapper"><div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-trophy"></i> 新增书籍
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+<form id="inputForm" th:action="${setting.domain + 'tiku/book/save'}" method="post" class="form-horizontal">
+			<div class="box-body">
+				<div class="form-unit">基本信息</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 书籍名称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="name" name="name" value="" maxlength="100" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 出版社：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="publishingHouse" name="publishingHouse" value="" maxlength="64" class="form-control required"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required">*</span> 归属科目：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+							<div class="input-group treeselect" id="companyDiv" data-url="tiku/course/treeData?">
+								<input id="courseId" type="hidden" name="courseId" value="" class="isReset"/>
+								<input id="courseName" type="text" name="courseName" value=""
+									class="form-control  " readonly="readonly"
+								/><span class="input-group-btn"><a id="companyButton" href="javascript:"
+									class="btn btn-default "><i class="fa fa-search"></i></a>
+								</span>
+							</div>
+							<script>
+							$("#companyButton,#courseName").click(function(){
+								if ($("#companyButton").hasClass("disabled")){
+									return true;
+								}
+								var options = {
+									type: 2,
+									maxmin: true,
+									shadeClose: true,
+									title: '公司选择',
+									area: ['300px', '400px'],
+									content: 'sys/treeselect',
+									contentFormData: {
+										url: $('#companyDiv').attr('data-url'),
+										checkbox: 'false',
+										expandLevel: '-1',
+										selectCodes: $("#courseId").val(),
+										isReturnValue: 'false'
+									},
+									success: function(layero, index){
+										if ($(js.layer.window).width() < 300
+											|| $(js.layer.window).height() < 400){
+											js.layer.full(index);
+										}
+									},
+									btn: ['<i class="fa fa-check"></i> 确定'],
+									btn1: function(index, layero){
+										var win = js.layer.iframeWindow(index);
+										win.$('#keyword').val('').change(); 			var codes = [], names = [], nodes;
+										if ("false" == "true"){
+											nodes = win.tree.getCheckedNodes(true);
+										}else{
+											nodes = win.tree.getSelectedNodes();
+										}
+										for(var i=0; i<nodes.length; i++) {
+											if (nodes[i].level == 0 && nodes[i].isParent){
+												js.showMessage("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+												return false;
+											}
+											if (nodes[i].isParent){
+												js.showMessage("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+												return false;
+											}
+											var code = nodes[i]['false'=='true'?'value':'id'], name = nodes[i]['name'];
+											codes.push(code.replace(/^u_/g,''));
+											names.push(name.replace(/\([0-9]*\)/g,''));
+											break;
+										}
+										if(typeof treeselectCheck == 'function'){
+											if (!treeselectCheck('course', nodes)){
+												return false;
+											}
+										}
+										$("#courseId").val(codes.join(',')).change();
+										$("#courseName").val(names.join(',')).change();
+										try { $('#courseId,#courseName').valid(); }catch(e){}
+										if(typeof treeselectCallback == 'function'){
+											treeselectCallback('course', 'ok', index, layero, nodes);
+										}
+									}
+								};
+								options.btn.push('<i class="fa fa-eraser"></i> 清除');
+								options['btn'+options.btn.length] = function(index, layero){
+									$("#courseId").val('').change();
+									$("#courseName").val('').change();
+									if(typeof treeselectCallback == 'function'){
+										treeselectCallback('course', 'clear', index, layero);
+									}
+								};
+								options.btn.push('<i class="fa fa-close"></i> 关闭');
+								options['btn'+options.btn.length] = function(index, layero){
+									if(typeof treeselectCallback == 'function'){
+										treeselectCallback('course', 'cancel', index, layero);
+									}
+								};
+								js.layer.open(options);
+							});
+							</script>							</div>
+													</div>
+												</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 问题数量：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="questionNum" name="questionNum" value="" maxlength="64" class="form-control required abc"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 知识点数量：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<input type="text" id="pointNum" name="pointNum" value="" maxlength="10" class="form-control digits"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+								<textarea id="remarks" name="remarks" rows="4" maxlength="500" class="form-control "></textarea>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
+					</div>
+				</div>
+			</div>
+</form>
+	</div>
+</div>
+</div>
+
+<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
+<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
+<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.js'}"></script>
+<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>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.code == 0){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+</script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/tiku/book/list.html b/tamguo-oms/src/main/resources/templates/modules/tiku/book/list.html
index ffecc6a..51a6c6d 100644
--- a/tamguo-oms/src/main/resources/templates/modules/tiku/book/list.html
+++ b/tamguo-oms/src/main/resources/templates/modules/tiku/book/list.html
@@ -25,7 +25,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
-					<a href="sys/user/add" class="btn btn-default btnTool" title="新增用户"><i class="fa fa-plus"></i> 新增</a>
+					<a href="tiku/book/add" class="btn btn-default btnTool" title="新增书籍"><i class="fa fa-plus"></i> 新增</a>
 				<div class="btn-group">
 					<a href="javascript:" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 						<i class="fa fa-navicon"></i> <span class="caret"></span>