From def208e9d27991e13b6ebc7ac7f720a7ca5bbf99 Mon Sep 17 00:00:00 2001
From: whh <wanghonghui1009@hotmail.com>
Date: Tue, 26 Apr 2016 23:07:22 +0800
Subject: [PATCH] 2

---
 .gitignore                                    |   2 +
 cw/.classpath                                 |  15 +
 cw/WebRoot/cw/BookList.jsp                    |  22 +-
 cw/WebRoot/cw/ImportBookBase.jsp              |   4 +-
 cw/WebRoot/cw/_header.jsp                     |   8 +-
 cw/src/com/wuzhou/config/WZConfig.java        |   2 +
 .../com/wuzhou/controller/BookController.java | 150 +++++++++
 .../controller/ExcelImportController.java     |  66 +++-
 .../wuzhou/controller/IndexController.java    | 308 +++++++++---------
 cw/src/com/wuzhou/model/BookBaseModel.java    |   2 +-
 cw/src/com/wuzhou/service/BookService.java    |  49 +++
 .../wuzhou/service/ExcelImportService.java    |  82 +++++
 cw/src/com/wuzhou/service/IndexService.java   | 172 +++++-----
 13 files changed, 623 insertions(+), 259 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 cw/src/com/wuzhou/controller/BookController.java
 create mode 100644 cw/src/com/wuzhou/service/BookService.java
 create mode 100644 cw/src/com/wuzhou/service/ExcelImportService.java
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aa5f8fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.classpath
+cw/.classpath
\ No newline at end of file
diff --git a/cw/.classpath b/cw/.classpath
index 5073340..066912a 100644
--- a/cw/.classpath
+++ b/cw/.classpath
@@ -19,5 +19,20 @@
 			<attribute name="owner.project.facets" value="jst.web.jstl"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/activation-1.1.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.10.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang3-3.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-logging-1.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cos-26Dec2008.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/druid-0.2.15.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/gimap-1.5.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-2.0-bin-with-src.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsoup-1.8.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.16.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-5.1.20-bin.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/poi-3.13-20150929.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/poi-ooxml-3.13-20150929.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/poi-ooxml-schemas-3.13-20150929.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xmlbeans-2.3.0.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>
diff --git a/cw/WebRoot/cw/BookList.jsp b/cw/WebRoot/cw/BookList.jsp
index 1e529ae..1770575 100644
--- a/cw/WebRoot/cw/BookList.jsp
+++ b/cw/WebRoot/cw/BookList.jsp
@@ -69,7 +69,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
   
   <body>
   	<jsp:include page="_header.jsp"></jsp:include>
-    <div class="container-fluid">
+    <div class="container">
 		<div class="row">
 			<div class="col-sm-8">
 				<select id="excelSel" class="form-control">
@@ -139,7 +139,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
     	mySearchSql = "1=1";
     	getSearchCondition();
 		_page = page;
-		$.post("${ctx}/getBookList", {mySearchSql:mySearchSql, page:_page}, function(data) {
+		$.post("${ctx}/book/getBookList", {mySearchSql:mySearchSql, page:_page}, function(data) {
 			var content="";
 			if(data&&data.list.length) {
 				for(var i = 0; i < data.list.length; i++) {
@@ -149,13 +149,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 					content+="<td>"+data.list[i].book_name+"</td>";
 					content+="<td>"+data.list[i].book_lang+"</td>";
 					content+="<td>"+data.list[i].book_author+"</td>";
-					content+="<td>"+data.list[i].epub_price+"</td>";
-					content+="<td>"+data.list[i].pdf_price+"</td>";
-					content+="<td>"+data.list[i].ad_price+"</td>";
-					content+="<td>"+(data.list[i].epub_price+data.list[i].pdf_price+data.list[i].ad_price)+"</td>";
-					content+="<td>"+data.list[i].author_royalty+"</td>";
+					content+="<td>"+data.list[i].epub_price.toFixed(2)+"</td>";
+					content+="<td>"+data.list[i].pdf_price.toFixed(2)+"</td>";
+					content+="<td>"+data.list[i].ad_price.toFixed(2)+"</td>";
+					content+="<td>"+(data.list[i].epub_price+data.list[i].pdf_price+data.list[i].ad_price).toFixed(2)+"</td>";
+					content+="<td>"+data.list[i].author_royalty.toFixed(2)+"</td>";
 					content+="<td>"+data.list[i].trans_time+"</td>";
-					content+="<td><a href=\"${ctx}/bookInfo?id="+data.list[i].id+"\" title='修改'><span class='glyphicon glyphicon-pencil' style='color:blue'></span></a>&nbsp;&nbsp;&nbsp;<a href=\"javascript:updateBook('"+data.list[i].id+"')\" title='删除'><span class='glyphicon glyphicon-trash' style='color:red'></span></a></td>";
+					content+="<td><a href=\"${ctx}/book/bookInfo?id="+data.list[i].id+"\" title='修改'><span class='glyphicon glyphicon-pencil' style='color:blue'></span></a>&nbsp;&nbsp;&nbsp;<a href=\"javascript:updateBook('"+data.list[i].id+"')\" title='删除'><span class='glyphicon glyphicon-trash' style='color:red'></span></a></td>";
 					content+="</tr>";
 				}
 				initPage(data.pageNumber, data.totalPage, data.totalRow);
@@ -168,7 +168,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
     //初始化批次映射
     function initExcelMap() {
 		$.ajax({
-			url:"${ctx}/getExcelList",
+			url:"${ctx}/book/getExcelList",
 			method:"POST",
 			beforeSend:function() {
 				$("#excelSel").html("<option value='0'>暂无数据</option>");
@@ -236,7 +236,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
     //总结统计
     function getSummary() {
 		$.ajax({
-			url:"${ctx}/getSummary",
+			url:"${ctx}/book/getSummary",
 			data:{mySearchSql:mySearchSql},
 			method:"POST",
 			success:function(data) {
@@ -308,7 +308,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 	//
 	function updateBook(bId) {
 		if(confirm("确定要删除吗？")) {
-			$.post("${ctx}/updateBookById", {bookId:bId}, function(data) {
+			$.post("${ctx}/book/updateBookById", {bookId:bId}, function(data) {
 				if(data=="1") {
 					alert("删除成功");
 					initSearch(_page);
diff --git a/cw/WebRoot/cw/ImportBookBase.jsp b/cw/WebRoot/cw/ImportBookBase.jsp
index 6ebd66b..7c763e8 100644
--- a/cw/WebRoot/cw/ImportBookBase.jsp
+++ b/cw/WebRoot/cw/ImportBookBase.jsp
@@ -38,14 +38,14 @@
 	
 	$("#file").fileinput({
         language: "zh",
-        uploadUrl: "${ctx }/uploadBaseBookExcel",
+        uploadUrl: "${ctx }/import/uploadBaseBookExcel",
         maxFilesNum: 1,
         allowedFileExtensions : ["xlsx"],
     });
 	$(function() {
 		$("#file").on("fileuploaded", function(event, data, previewId, index) {
 			$.ajax({
-				url:"${ctx }/saveBaseBookExcel",
+				url:"${ctx }/import/saveBaseBookExcel",
 				type:"post",
 				dataType:"json",
 				beforeSend: function () {
diff --git a/cw/WebRoot/cw/_header.jsp b/cw/WebRoot/cw/_header.jsp
index 3c5e769..24bfae4 100644
--- a/cw/WebRoot/cw/_header.jsp
+++ b/cw/WebRoot/cw/_header.jsp
@@ -110,7 +110,7 @@ $(function() {
 </script>
 <!-- http://work.smarchal.com/twbscolor/css/e74c3cc0392becf0f1ffbbbc0 -->
 	<nav class="navbar navbar-default" role="navigation">
-		<!-- <div class="container"> -->
+		<div class="container">
 			<!-- Brand and toggle get grouped for better mobile display -->
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
@@ -125,12 +125,12 @@ $(function() {
 					<li class="active"><a href="${ctx }/">首页 <span class="sr-only">(current)</span></a></li>
 					<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">数据导入 <span class="caret"></span></a>
 						<ul class="dropdown-menu">
-							<li><a href="${ctx }/importBaseBookPage"><i class='glyphicon glyphicon-import'></i>&nbsp;图书基本信息导入</a></li>
+							<li><a href="${ctx }/import/importBaseBookPage"><i class='glyphicon glyphicon-import'></i>&nbsp;图书基本信息导入</a></li>
 							<li><a href="${ctx }/importBaseBookPage"><i class='glyphicon glyphicon-import'></i>&nbsp;亚马逊（中国）导入</a></li>
 							<li><a href="${ctx }/importBaseBookPage"><i class='glyphicon glyphicon-import'></i>&nbsp;亚马逊（美国）导入</a></li>
 						</ul>
 					</li>
-					<li><a href="${ctx }/bookList"><i class='glyphicon glyphicon-tasks'></i>&nbsp;图书列表</a></li>
+					<li><a href="${ctx }/book/bookList"><i class='glyphicon glyphicon-tasks'></i>&nbsp;图书列表</a></li>
 					<%-- <li><a href="${ctx }/importBaseBookPage">图书基本信息导入</a></li> --%>
 				</ul>
 				<!-- 
@@ -150,6 +150,6 @@ $(function() {
 				
 			</div>
 			<!-- /.navbar-collapse -->
-		<!-- </div> -->
+		</div>
 		<!-- /.container-fluid -->
 	</nav>
diff --git a/cw/src/com/wuzhou/config/WZConfig.java b/cw/src/com/wuzhou/config/WZConfig.java
index dd4948e..c57afb4 100644
--- a/cw/src/com/wuzhou/config/WZConfig.java
+++ b/cw/src/com/wuzhou/config/WZConfig.java
@@ -13,6 +13,7 @@
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.render.ViewType;
 import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import com.wuzhou.controller.BookController;
 import com.wuzhou.controller.ExcelImportController;
 import com.wuzhou.controller.IndexController;
 import com.wuzhou.controller.UserController;
@@ -37,6 +38,7 @@ public void configRoute(Routes me) {
 		me.add("/", IndexController.class);
 		me.add("/import", ExcelImportController.class);
 		me.add("/user", UserController.class);
+		me.add("/book", BookController.class);
 	}
 
 	@Override
diff --git a/cw/src/com/wuzhou/controller/BookController.java b/cw/src/com/wuzhou/controller/BookController.java
new file mode 100644
index 0000000..620e529
--- /dev/null
+++ b/cw/src/com/wuzhou/controller/BookController.java
@@ -0,0 +1,150 @@
+package com.wuzhou.controller;
+
+import org.apache.log4j.Logger;
+
+import com.jfinal.aop.Enhancer;
+import com.jfinal.core.Controller;
+import com.jfinal.kit.JsonKit;
+import com.wuzhou.bean.BookBaseBean;
+import com.wuzhou.service.BookService;
+import com.wuzhou.service.ExcelMapService;
+import com.wuzhou.service.UserService;
+
+/**
+ * 
+ * @author wanghonghui
+ *
+ */
+public class BookController extends Controller {
+	Logger log = Logger.getLogger(BookController.class);
+	UserService userService = Enhancer.enhance(UserService.class);
+	BookService service = Enhancer.enhance(BookService.class);
+	ExcelMapService excelMapService = Enhancer.enhance(ExcelMapService.class);
+	/**
+	 * 书号检索列表页面
+	 */
+	public void bookList() {
+		setAttr("searchConditionJson", JsonKit.toJson(BookBaseBean.getInstence().searchConditionMap));
+		render("/cw/BookList.jsp");
+	}
+	
+	public void bookInfo() {
+		int id = getParaToInt("id", 0);
+		if(id==0) {
+			setAttr("bookBaseModel", "");
+		} else {
+			try{
+				setAttr("bookBaseModel", service.getBookInfo(id));
+			} catch(Exception ex) {
+				setAttr("bookBaseModel", "");
+				ex.printStackTrace();
+				log.error(ex);
+			}
+		}
+		render("/cw/EditBook.jsp");
+	}
+	
+	/**
+	 * 书号列表
+	 */
+	public void getBookList() {
+		String mySearchSql = getPara("mySearchSql", "1=1");
+		int pageNumber = getParaToInt("page", 1);
+		try {
+			renderJson(service.getBookList(pageNumber, mySearchSql, 1));
+		} catch(Exception ex) {
+			renderJson("-1");
+			ex.printStackTrace();
+			log.error(ex);
+		}
+	}
+	
+	public void getSummary() {
+		String mySearchSql = getPara("mySearchSql", "1=1");
+		try {
+			renderJson(service.getSummary(mySearchSql));
+		} catch(Exception ex) {
+			renderJson("-1");
+			ex.printStackTrace();
+			log.error(ex);
+		}
+	}
+	
+	public void getExcelList() {
+		renderJson(excelMapService.getExcelList());
+	}
+	
+	/**
+	 * 被“删除”的图书
+	 */
+	public void bookDelPage() {
+		setAttr("userJson", JsonKit.toJson(userService.getUserList()));
+		render("/cw/DelBookList.jsp");
+	}
+	
+	/**
+	 * 假删除图书
+	 */
+	public void updateBookById() {
+		int bookId = getParaToInt("bookId", 0);
+		if(bookId==0) {
+			renderJson("0");
+			return;
+		}
+		try {
+			if(service.updateBookById(bookId, 0)) {
+				renderJson("1");
+			} else {
+				renderJson("2");
+			}
+		} catch(Exception ex) {
+			renderJson("-1");
+			ex.printStackTrace();
+			log.error(ex);
+		}
+	}
+	
+	/**
+	 * 恢复图书
+	 */
+	public void recoveryBookById() {
+//		int bookId = getParaToInt("bookId", 0);
+//		if(bookId==0) {
+//			renderJson("0");
+//			return;
+//		}
+//		try {
+//			if(service.updateBookById(bookId, 1)) {
+//				renderJson("1");
+//			} else {
+//				renderJson("2");
+//			}
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+	}
+	
+	/**
+	 * 删除图书
+	 */
+	public void deleteBookById() {
+		int bookId = getParaToInt("bookId", 0);
+		if(bookId==0) {
+			renderJson("0");
+			return;
+		}
+		try {
+			if(service.deleteBookById(bookId)) {
+				renderJson("1");
+			} else {
+				renderJson("2");
+			}
+		} catch(Exception ex) {
+			renderJson("-1");
+			ex.printStackTrace();
+			log.error(ex);
+		}
+	}
+}
diff --git a/cw/src/com/wuzhou/controller/ExcelImportController.java b/cw/src/com/wuzhou/controller/ExcelImportController.java
index 850ef40..580a215 100644
--- a/cw/src/com/wuzhou/controller/ExcelImportController.java
+++ b/cw/src/com/wuzhou/controller/ExcelImportController.java
@@ -1,6 +1,18 @@
 package com.wuzhou.controller;
 
+import java.io.File;
+import java.util.Date;
+
+import org.apache.log4j.Logger;
+
+import com.jfinal.aop.Enhancer;
 import com.jfinal.core.Controller;
+import com.jfinal.kit.PathKit;
+import com.jfinal.upload.UploadFile;
+import com.wuzhou.Result;
+import com.wuzhou.service.ExcelImportService;
+import com.wuzhou.service.ExcelMapService;
+import com.wuzhou.service.UserService;
 
 /**
  * excel导入控制
@@ -8,11 +20,61 @@
  *
  */
 public class ExcelImportController extends Controller{
+	Logger log = Logger.getLogger(ExcelImportController.class);
+	
+	UserService userService = Enhancer.enhance(UserService.class);
+	ExcelMapService excelMapService = Enhancer.enhance(ExcelMapService.class);
+	ExcelImportService service = Enhancer.enhance(ExcelImportService.class);
+	
+	Result result = new Result();
 	
 	/**
 	 * 图书基本信息导入页面
 	 */
-	public void baseBookImportPage() {
-		render("");
+	public void importBaseBookPage() {
+		render("/cw/ImportBookBase.jsp");
+	}
+	
+	/**
+	 * 上传excel
+	 */
+	public void uploadBaseBookExcel() {
+		UploadFile file = getFile("file");
+		String uploadExcelName = file.getOriginalFileName();
+		String serverExcelName = new Date().getTime()+".xlsx";
+		String filePath = PathKit.getWebRootPath()+File.separator+"uploadFiles"+File.separator+serverExcelName;
+		file.getFile().renameTo(new File(filePath));
+		try{
+			excelMapService.addExcelMap(uploadExcelName, serverExcelName);
+			setSessionAttr("excelPath", filePath);
+			renderJson("0");
+		} catch(Exception ex) {
+			ex.printStackTrace();
+			renderJson(ex.getMessage());
+			log.error(ex);
+		}
+	}
+	
+	/**
+	 * 解析excel并返回
+	 */
+	public void saveBaseBookExcel() {
+		Object excelPath = getSessionAttr("excelPath");
+		if(excelPath==null) {
+			result.setStatus(false);
+			result.setMessage("未加载到EXCEL");
+			return;
+		}
+		try{
+			int out = service.parserBookBaseExcel(excelPath.toString());
+			result.setStatus(true);
+			result.setMessage("共入库["+out+"]本");
+		} catch(Exception ex) {
+			ex.printStackTrace();
+			result.setStatus(false);
+			result.setMessage(ex.getMessage());
+			log.error(ex);
+		}
+		renderJson(result);
 	}
 }
diff --git a/cw/src/com/wuzhou/controller/IndexController.java b/cw/src/com/wuzhou/controller/IndexController.java
index 3db2fed..b7d08ad 100644
--- a/cw/src/com/wuzhou/controller/IndexController.java
+++ b/cw/src/com/wuzhou/controller/IndexController.java
@@ -33,114 +33,114 @@ public void index() {
 	/**
 	 * 书号检索列表页面
 	 */
-	public void bookList() {
-		setAttr("searchConditionJson", JsonKit.toJson(BookBaseBean.getInstence().searchConditionMap));
-		render("/cw/BookList.jsp");
-	}
+//	public void bookList() {
+//		setAttr("searchConditionJson", JsonKit.toJson(BookBaseBean.getInstence().searchConditionMap));
+//		render("/cw/BookList.jsp");
+//	}
 	
-	public void bookInfo() {
-		int id = getParaToInt("id", 0);
-		if(id==0) {
-			setAttr("bookBaseModel", "");
-		} else {
-			try{
-				setAttr("bookBaseModel", service.getBookInfo(id));
-			} catch(Exception ex) {
-				setAttr("bookBaseModel", "");
-				ex.printStackTrace();
-				log.error(ex);
-			}
-		}
-		render("/cw/EditBook.jsp");
-	}
+//	public void bookInfo() {
+//		int id = getParaToInt("id", 0);
+//		if(id==0) {
+//			setAttr("bookBaseModel", "");
+//		} else {
+//			try{
+//				setAttr("bookBaseModel", service.getBookInfo(id));
+//			} catch(Exception ex) {
+//				setAttr("bookBaseModel", "");
+//				ex.printStackTrace();
+//				log.error(ex);
+//			}
+//		}
+//		render("/cw/EditBook.jsp");
+//	}
 	
 	/**
 	 * 书号列表
 	 */
-	public void getBookList() {
-		String mySearchSql = getPara("mySearchSql", "1=1");
-		int pageNumber = getParaToInt("page", 1);
-		try {
-			renderJson(service.getBookList(pageNumber, mySearchSql, 1));
-		} catch(Exception ex) {
-			renderJson("-1");
-			ex.printStackTrace();
-			log.error(ex);
-		}
-	}
-	
-	public void getSummary() {
-		String mySearchSql = getPara("mySearchSql", "1=1");
-		try {
-			renderJson(service.getSummary(mySearchSql));
-		} catch(Exception ex) {
-			renderJson("-1");
-			ex.printStackTrace();
-			log.error(ex);
-		}
-	}
-	
-	public void getExcelList() {
-		renderJson(excelMapService.getExcelList());
-	}
+//	public void getBookList() {
+//		String mySearchSql = getPara("mySearchSql", "1=1");
+//		int pageNumber = getParaToInt("page", 1);
+//		try {
+//			renderJson(service.getBookList(pageNumber, mySearchSql, 1));
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+//	}
+//	
+//	public void getSummary() {
+//		String mySearchSql = getPara("mySearchSql", "1=1");
+//		try {
+//			renderJson(service.getSummary(mySearchSql));
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+//	}
+//	
+//	public void getExcelList() {
+//		renderJson(excelMapService.getExcelList());
+//	}
 	
 	/**
 	 * 上传excel页面
 	 */
-	public void importBaseBookPage() {
-		render("/cw/ImportBookBase.jsp");
-	}
+//	public void importBaseBookPage() {
+//		render("/cw/ImportBookBase.jsp");
+//	}
 	
 	/**
 	 * 上传excel
 	 */
-	public void uploadBaseBookExcel() {
-		UploadFile file = getFile("file");
-		String uploadExcelName = file.getOriginalFileName();
-		String serverExcelName = new Date().getTime()+".xlsx";
-		String filePath = PathKit.getWebRootPath()+File.separator+"uploadFiles"+File.separator+serverExcelName;
-		file.getFile().renameTo(new File(filePath));
-		try{
-			excelMapService.addExcelMap(uploadExcelName, serverExcelName);
-			setSessionAttr("excelPath", filePath);
-			renderJson("0");
-		} catch(Exception ex) {
-			ex.printStackTrace();
-			renderJson(ex.getMessage());
-			log.error(ex);
-		}
-	}
+//	public void uploadBaseBookExcel() {
+//		UploadFile file = getFile("file");
+//		String uploadExcelName = file.getOriginalFileName();
+//		String serverExcelName = new Date().getTime()+".xlsx";
+//		String filePath = PathKit.getWebRootPath()+File.separator+"uploadFiles"+File.separator+serverExcelName;
+//		file.getFile().renameTo(new File(filePath));
+//		try{
+//			excelMapService.addExcelMap(uploadExcelName, serverExcelName);
+//			setSessionAttr("excelPath", filePath);
+//			renderJson("0");
+//		} catch(Exception ex) {
+//			ex.printStackTrace();
+//			renderJson(ex.getMessage());
+//			log.error(ex);
+//		}
+//	}
 	
 	/**
 	 * 解析excel并返回
 	 */
-	public void saveBaseBookExcel() {
-		Object excelPath = getSessionAttr("excelPath");
-		if(excelPath==null) {
-			result.setStatus(false);
-			result.setMessage("未加载到EXCEL");
-			return;
-		}
-		try{
-			int out = service.parserExcel(excelPath.toString());
-			result.setStatus(true);
-			result.setMessage("共入库["+out+"]本");
-		} catch(Exception ex) {
-			ex.printStackTrace();
-			result.setStatus(false);
-			result.setMessage(ex.getMessage());
-			log.error(ex);
-		}
-		renderJson(result);
-	}
+//	public void saveBaseBookExcel() {
+//		Object excelPath = getSessionAttr("excelPath");
+//		if(excelPath==null) {
+//			result.setStatus(false);
+//			result.setMessage("未加载到EXCEL");
+//			return;
+//		}
+//		try{
+//			int out = service.parserExcel(excelPath.toString());
+//			result.setStatus(true);
+//			result.setMessage("共入库["+out+"]本");
+//		} catch(Exception ex) {
+//			ex.printStackTrace();
+//			result.setStatus(false);
+//			result.setMessage(ex.getMessage());
+//			log.error(ex);
+//		}
+//		renderJson(result);
+//	}
 	
 	/**
 	 * 被“删除”的图书
 	 */
-	public void bookDelPage() {
-		setAttr("userJson", JsonKit.toJson(userService.getUserList()));
-		render("/cw/DelBookList.jsp");
-	}
+//	public void bookDelPage() {
+//		setAttr("userJson", JsonKit.toJson(userService.getUserList()));
+//		render("/cw/DelBookList.jsp");
+//	}
 	
 	
 	
@@ -168,7 +168,7 @@ public void saveBookNum() {
 	/**
 	 * 被“删除”的图书列表
 	 */
-	public void getDelBookList() {
+//	public void getDelBookList() {
 //		String searchCondition = getPara("searchCondition", "");
 //		String searchVal = getPara("searchVal", "");
 //		int pageNumber = getParaToInt("page", 1);
@@ -178,73 +178,73 @@ public void getDelBookList() {
 //			renderJson("-1");
 //			ex.printStackTrace();
 //		}
-	}
-	
-	/**
-	 * 假删除图书
-	 */
-	public void updateBookById() {
-		int bookId = getParaToInt("bookId", 0);
-		if(bookId==0) {
-			renderJson("0");
-			return;
-		}
-		try {
-			if(service.updateBookById(bookId, 0)) {
-				renderJson("1");
-			} else {
-				renderJson("2");
-			}
-		} catch(Exception ex) {
-			renderJson("-1");
-			ex.printStackTrace();
-			log.error(ex);
-		}
-	}
+//	}
 	
-	/**
-	 * 恢复图书
-	 */
-	public void recoveryBookById() {
-		int bookId = getParaToInt("bookId", 0);
-		if(bookId==0) {
-			renderJson("0");
-			return;
-		}
-		try {
-			if(service.updateBookById(bookId, 1)) {
-				renderJson("1");
-			} else {
-				renderJson("2");
-			}
-		} catch(Exception ex) {
-			renderJson("-1");
-			ex.printStackTrace();
-			log.error(ex);
-		}
-	}
-	
-	/**
-	 * 删除图书
-	 */
-	public void deleteBookById() {
-		int bookId = getParaToInt("bookId", 0);
-		if(bookId==0) {
-			renderJson("0");
-			return;
-		}
-		try {
-			if(service.deleteBookById(bookId)) {
-				renderJson("1");
-			} else {
-				renderJson("2");
-			}
-		} catch(Exception ex) {
-			renderJson("-1");
-			ex.printStackTrace();
-			log.error(ex);
-		}
-	}
+//	/**
+//	 * 假删除图书
+//	 */
+//	public void updateBookById() {
+//		int bookId = getParaToInt("bookId", 0);
+//		if(bookId==0) {
+//			renderJson("0");
+//			return;
+//		}
+//		try {
+//			if(service.updateBookById(bookId, 0)) {
+//				renderJson("1");
+//			} else {
+//				renderJson("2");
+//			}
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+//	}
+//	
+//	/**
+//	 * 恢复图书
+//	 */
+//	public void recoveryBookById() {
+//		int bookId = getParaToInt("bookId", 0);
+//		if(bookId==0) {
+//			renderJson("0");
+//			return;
+//		}
+//		try {
+//			if(service.updateBookById(bookId, 1)) {
+//				renderJson("1");
+//			} else {
+//				renderJson("2");
+//			}
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+//	}
+//	
+//	/**
+//	 * 删除图书
+//	 */
+//	public void deleteBookById() {
+//		int bookId = getParaToInt("bookId", 0);
+//		if(bookId==0) {
+//			renderJson("0");
+//			return;
+//		}
+//		try {
+//			if(service.deleteBookById(bookId)) {
+//				renderJson("1");
+//			} else {
+//				renderJson("2");
+//			}
+//		} catch(Exception ex) {
+//			renderJson("-1");
+//			ex.printStackTrace();
+//			log.error(ex);
+//		}
+//	}
 	
 	/**
 	 * 添加excel入库
diff --git a/cw/src/com/wuzhou/model/BookBaseModel.java b/cw/src/com/wuzhou/model/BookBaseModel.java
index 76f24a8..ce86170 100644
--- a/cw/src/com/wuzhou/model/BookBaseModel.java
+++ b/cw/src/com/wuzhou/model/BookBaseModel.java
@@ -30,7 +30,7 @@ public Page<BookBaseModel> getBookList(int pageNumber, String condition) {
 	 * @return
 	 */
 	public boolean updateBookById(int bookId, int bookStatus) {
-		int flag = Db.update("update booknum set book_status = ? where id = ?", bookStatus, bookId);
+		int flag = Db.update("update book_base set book_status = ? where id = ?", bookStatus, bookId);
 		if(flag == 1) return true;
 		else return false;
 	}
diff --git a/cw/src/com/wuzhou/service/BookService.java b/cw/src/com/wuzhou/service/BookService.java
new file mode 100644
index 0000000..135023d
--- /dev/null
+++ b/cw/src/com/wuzhou/service/BookService.java
@@ -0,0 +1,49 @@
+package com.wuzhou.service;
+
+import com.jfinal.plugin.activerecord.Page;
+import com.wuzhou.model.BookBaseModel;
+
+public class BookService {
+
+	public BookBaseModel getBookInfo(int id) {
+		return BookBaseModel.dao.getBookInfo(id);
+	}
+	
+	/**
+	 * 获取图书列表
+	 * 
+	 * @return
+	 */
+	public Page<BookBaseModel> getBookList(int pageNumber, String mySearchSql, int bookStatus) {
+		mySearchSql += " and book_status=1 order by id desc";
+		return BookBaseModel.dao.getBookList(pageNumber, mySearchSql);
+	}
+	
+	/**
+	 * 计算求和
+	 * @param mySearchSql
+	 * @return
+	 */
+	public Object getSummary(String mySearchSql) {
+		String sql = "select sum(epub_price) epub, sum(pdf_price) pdf, sum(ad_price) ad, sum(yz_price) yz,sum(ext_price1) ext1,sum(ext_price2) ext2,sum(ext_price3) ext3,sum(ext_price4) ext4,sum(ext_price5) ext5,sum(epub_price)+sum(pdf_price)+sum(ad_price)+sum(yz_price)+sum(ext_price1)+sum(ext_price2)+sum(ext_price3)+sum(ext_price4)+sum(ext_price5) as mytotal from book_base where "+mySearchSql;
+		return BookBaseModel.dao.getSumary(sql);
+	}
+	
+	/**
+	 * 更新图书状态
+	 * @param bookId
+	 * @return
+	 */
+	public boolean updateBookById(int bookId, int bookStatus) {
+		return BookBaseModel.dao.updateBookById(bookId, bookStatus);
+	}
+	
+	/**
+	 * 删除图书
+	 * @param bookId
+	 * @return
+	 */
+	public boolean deleteBookById(int bookId) {
+		return BookBaseModel.dao.deleteBookById(bookId);
+	}
+}
diff --git a/cw/src/com/wuzhou/service/ExcelImportService.java b/cw/src/com/wuzhou/service/ExcelImportService.java
new file mode 100644
index 0000000..4c701b7
--- /dev/null
+++ b/cw/src/com/wuzhou/service/ExcelImportService.java
@@ -0,0 +1,82 @@
+package com.wuzhou.service;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+
+import com.wuzhou.model.BookBaseModel;
+import com.wuzhou.tool.FileUtil;
+import com.wuzhou.tool.POITools;
+import com.wuzhou.tool.StringUtil;
+
+public class ExcelImportService {
+
+	
+	/**
+	 * 解析excel
+	 * @param excelPath
+	 * @return
+	 * @throws Exception
+	 */
+	public int parserBookBaseExcel(String excelPath) throws Exception {
+		String name = new File(excelPath).getName().replace(".xlsx", "");
+		List<String> sqlList = new ArrayList<String>();
+		Workbook wb = POITools.getWorkbook(excelPath);
+		Sheet sheet = POITools.getSheet("Sheet1", wb); //读Sheet1表
+		String transTime = ""; //
+		String transCompany = "";
+		String isSelf = "";
+		String isbn = "";
+		String bookName = "";
+		String wz = "";
+		String zb = "";
+		String epubPrice ="0.0";
+		String pdfPrice = "0.0";
+		String adPrice = "0.0";
+		String yzPrice = "0.0";
+		String extPrice1="0.0";
+		String extPrice2="0.0";
+		String extPrice3="0.0";
+		String extPrice4="0.0";
+		String extPrice5="0.0";
+		Date date= new Date();
+		for(int rowNumber = 1; rowNumber<POITools.getRowCount(sheet);rowNumber++) { //第一行标题行，从第二行开始
+			Row row = POITools.getRow(sheet, rowNumber);
+			transTime = POITools.getCellValue(row.getCell(0)); //转码时间
+			transCompany = POITools.getCellValue(row.getCell(1)); //转码公司
+			isSelf = "".equals(POITools.getCellValue(row.getCell(2)))?"五洲":POITools.getCellValue(row.getCell(2)); //本社或第三方
+			isbn = POITools.getCellValue(row.getCell(3)).replace("-", "").replace(" ","").replace(".00","").trim(); //ISBN
+			bookName = POITools.getCellValue(row.getCell(4)).replace("'", "’").replaceAll("[\r\n]+", "").trim(); //书名
+			wz = POITools.getCellValue(row.getCell(5));
+			zb = POITools.getCellValue(row.getCell(6));
+			epubPrice = formatFloat(POITools.getCellValue(row.getCell(7)));
+			pdfPrice = formatFloat(POITools.getCellValue(row.getCell(8)));
+			adPrice = formatFloat(POITools.getCellValue(row.getCell(9)));
+			yzPrice = formatFloat(POITools.getCellValue(row.getCell(10)));
+			extPrice1 = formatFloat(POITools.getCellValue(row.getCell(11)));
+			extPrice2 = formatFloat(POITools.getCellValue(row.getCell(12)));
+			extPrice3 = formatFloat(POITools.getCellValue(row.getCell(13)));
+			extPrice4 = formatFloat(POITools.getCellValue(row.getCell(14)));
+			extPrice5 = formatFloat(POITools.getCellValue(row.getCell(15)));
+			sqlList.add("insert into book_base (server_excel_name, is_self, book_isbn, book_name, book_lang, book_author, epub_price, pdf_price, ad_price, author_royalty, insert_time, trans_time, trans_company, yz_price, ext_price1, ext_price2, ext_price3, ext_price4, ext_price5) values" +
+					"('"+name+"', '"+isSelf+"', '"+isbn+"', '"+bookName+"', '"+wz+"', '"+zb+"', "+epubPrice+", "+pdfPrice+", "+adPrice+", "+0.0+", '"+StringUtil.dataFormat(date, "yyyy-MM-dd")+"', '"+transTime+"', '"+transCompany+"', "+yzPrice+", "+extPrice1+", "+extPrice2+", "+extPrice3+", "+extPrice4+", "+extPrice5+")");
+		}
+		wb.close();
+		FileUtil.deleteSubFiles(new File(excelPath).getParentFile());
+		if(sqlList==null||sqlList.isEmpty()) return 0;
+		return BookBaseModel.dao.addExcelData(sqlList).length;
+	}
+	
+	private String formatFloat(String str) {
+		if("".equals(str)||null==str) {
+			return "0.0";
+		} else {
+			return str;
+		}
+	}
+}
diff --git a/cw/src/com/wuzhou/service/IndexService.java b/cw/src/com/wuzhou/service/IndexService.java
index 0d5349a..9f8a05e 100644
--- a/cw/src/com/wuzhou/service/IndexService.java
+++ b/cw/src/com/wuzhou/service/IndexService.java
@@ -6,6 +6,7 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Row;
@@ -26,7 +27,7 @@
 
 public class IndexService {
 	
-	
+	Logger log = Logger.getLogger(IndexService.class);
 	/**
 	 * 图书书号入库
 	 * @param bookName
@@ -39,6 +40,7 @@ public int saveBookNum(String bookName, String bookNum, UserModel user) {
 		Date date = new Date();
 		for(String bn : bookNum.split(",")) {
 			String sql = "insert into booknum (book_name, book_num, add_time, uid) values ('"+bookName+"', '"+bn+"', '"+StringUtil.dataFormat(date, "yyyy-MM-dd hh:mm:ss")+"', "+user.getLong("user_id")+");";
+			log.warn("saveBookNum--sql:"+sql);
 			sqlList.add(sql);
 		}
 		int [] result = BookBaseModel.dao.saveBookNum(sqlList);
@@ -50,15 +52,15 @@ public int saveBookNum(String bookName, String bookNum, UserModel user) {
 	 * 
 	 * @return
 	 */
-	public Page<BookBaseModel> getBookList(int pageNumber, String mySearchSql, int bookStatus) {
-		mySearchSql += " and book_status=1 order by id desc";
-		return BookBaseModel.dao.getBookList(pageNumber, mySearchSql);
-	}
-	
-	public Object getSummary(String mySearchSql) {
-		String sql = "select sum(epub_price) epub, sum(pdf_price) pdf, sum(ad_price) ad, sum(yz_price) yz,sum(ext_price1) ext1,sum(ext_price2) ext2,sum(ext_price3) ext3,sum(ext_price4) ext4,sum(ext_price5) ext5,sum(epub_price)+sum(pdf_price)+sum(ad_price)+sum(yz_price)+sum(ext_price1)+sum(ext_price2)+sum(ext_price3)+sum(ext_price4)+sum(ext_price5) as mytotal from book_base where "+mySearchSql;
-		return BookBaseModel.dao.getSumary(sql);
-	}
+//	public Page<BookBaseModel> getBookList(int pageNumber, String mySearchSql, int bookStatus) {
+//		mySearchSql += " and book_status=1 order by id desc";
+//		return BookBaseModel.dao.getBookList(pageNumber, mySearchSql);
+//	}
+//	
+//	public Object getSummary(String mySearchSql) {
+//		String sql = "select sum(epub_price) epub, sum(pdf_price) pdf, sum(ad_price) ad, sum(yz_price) yz,sum(ext_price1) ext1,sum(ext_price2) ext2,sum(ext_price3) ext3,sum(ext_price4) ext4,sum(ext_price5) ext5,sum(epub_price)+sum(pdf_price)+sum(ad_price)+sum(yz_price)+sum(ext_price1)+sum(ext_price2)+sum(ext_price3)+sum(ext_price4)+sum(ext_price5) as mytotal from book_base where "+mySearchSql;
+//		return BookBaseModel.dao.getSumary(sql);
+//	}
 	
 	
 	
@@ -68,81 +70,81 @@ public Object getSummary(String mySearchSql) {
 	 * @return
 	 * @throws Exception
 	 */
-	public int parserExcel(String excelPath) throws Exception {
-		String name = new File(excelPath).getName().replace(".xlsx", "");
-		List<String> sqlList = new ArrayList<String>();
-		Workbook wb = POITools.getWorkbook(excelPath);
-		Sheet sheet = POITools.getSheet("Sheet1", wb); //读Sheet1表
-		String transTime = ""; //
-		String transCompany = "";
-		String isSelf = "";
-		String isbn = "";
-		String bookName = "";
-		String wz = "";
-		String zb = "";
-		String epubPrice ="0.0";
-		String pdfPrice = "0.0";
-		String adPrice = "0.0";
-		String yzPrice = "0.0";
-		String extPrice1="0.0";
-		String extPrice2="0.0";
-		String extPrice3="0.0";
-		String extPrice4="0.0";
-		String extPrice5="0.0";
-		Date date= new Date();
-		for(int rowNumber = 1; rowNumber<POITools.getRowCount(sheet);rowNumber++) { //第一行标题行，从第二行开始
-			Row row = POITools.getRow(sheet, rowNumber);
-			transTime = POITools.getCellValue(row.getCell(0)); //转码时间
-			transCompany = POITools.getCellValue(row.getCell(1)); //转码公司
-			isSelf = "".equals(POITools.getCellValue(row.getCell(2)))?"五洲":POITools.getCellValue(row.getCell(2)); //本社或第三方
-			isbn = POITools.getCellValue(row.getCell(3)).replace("-", "").replace(" ","").replace(".00","").trim(); //ISBN
-			bookName = POITools.getCellValue(row.getCell(4)).replace("'", "’").replaceAll("[\r\n]+", "").trim(); //书名
-			wz = POITools.getCellValue(row.getCell(5));
-			zb = POITools.getCellValue(row.getCell(6));
-			epubPrice = formatFloat(POITools.getCellValue(row.getCell(7)));
-			pdfPrice = formatFloat(POITools.getCellValue(row.getCell(8)));
-			adPrice = formatFloat(POITools.getCellValue(row.getCell(9)));
-			yzPrice = formatFloat(POITools.getCellValue(row.getCell(10)));
-			extPrice1 = formatFloat(POITools.getCellValue(row.getCell(11)));
-			extPrice2 = formatFloat(POITools.getCellValue(row.getCell(12)));
-			extPrice3 = formatFloat(POITools.getCellValue(row.getCell(13)));
-			extPrice4 = formatFloat(POITools.getCellValue(row.getCell(14)));
-			extPrice5 = formatFloat(POITools.getCellValue(row.getCell(15)));
-			sqlList.add("insert into book_base (server_excel_name, is_self, book_isbn, book_name, book_lang, book_author, epub_price, pdf_price, ad_price, author_royalty, insert_time, trans_time, trans_company, yz_price, ext_price1, ext_price2, ext_price3, ext_price4, ext_price5) values" +
-					"('"+name+"', '"+isSelf+"', '"+isbn+"', '"+bookName+"', '"+wz+"', '"+zb+"', "+epubPrice+", "+pdfPrice+", "+adPrice+", "+0.0+", '"+StringUtil.dataFormat(date, "yyyy-MM-dd")+"', '"+transTime+"', '"+transCompany+"', "+yzPrice+", "+extPrice1+", "+extPrice2+", "+extPrice3+", "+extPrice4+", "+extPrice5+")");
-		}
-		wb.close();
-		FileUtil.deleteSubFiles(new File(excelPath).getParentFile());
-		if(sqlList==null||sqlList.isEmpty()) return 0;
-		return BookBaseModel.dao.addExcelData(sqlList).length;
-	}
-	
-	private String formatFloat(String str) {
-		if("".equals(str)||null==str) {
-			return "0.0";
-		} else {
-			return str;
-		}
-	}
-	
-	
-	/**
-	 * 更新图书状态
-	 * @param bookId
-	 * @return
-	 */
-	public boolean updateBookById(int bookId, int bookStatus) {
-		return BookBaseModel.dao.updateBookById(bookId, bookStatus);
-	}
-	
-	/**
-	 * 删除图书
-	 * @param bookId
-	 * @return
-	 */
-	public boolean deleteBookById(int bookId) {
-		return BookBaseModel.dao.deleteBookById(bookId);
-	}
+//	public int parserExcel(String excelPath) throws Exception {
+//		String name = new File(excelPath).getName().replace(".xlsx", "");
+//		List<String> sqlList = new ArrayList<String>();
+//		Workbook wb = POITools.getWorkbook(excelPath);
+//		Sheet sheet = POITools.getSheet("Sheet1", wb); //读Sheet1表
+//		String transTime = ""; //
+//		String transCompany = "";
+//		String isSelf = "";
+//		String isbn = "";
+//		String bookName = "";
+//		String wz = "";
+//		String zb = "";
+//		String epubPrice ="0.0";
+//		String pdfPrice = "0.0";
+//		String adPrice = "0.0";
+//		String yzPrice = "0.0";
+//		String extPrice1="0.0";
+//		String extPrice2="0.0";
+//		String extPrice3="0.0";
+//		String extPrice4="0.0";
+//		String extPrice5="0.0";
+//		Date date= new Date();
+//		for(int rowNumber = 1; rowNumber<POITools.getRowCount(sheet);rowNumber++) { //第一行标题行，从第二行开始
+//			Row row = POITools.getRow(sheet, rowNumber);
+//			transTime = POITools.getCellValue(row.getCell(0)); //转码时间
+//			transCompany = POITools.getCellValue(row.getCell(1)); //转码公司
+//			isSelf = "".equals(POITools.getCellValue(row.getCell(2)))?"五洲":POITools.getCellValue(row.getCell(2)); //本社或第三方
+//			isbn = POITools.getCellValue(row.getCell(3)).replace("-", "").replace(" ","").replace(".00","").trim(); //ISBN
+//			bookName = POITools.getCellValue(row.getCell(4)).replace("'", "’").replaceAll("[\r\n]+", "").trim(); //书名
+//			wz = POITools.getCellValue(row.getCell(5));
+//			zb = POITools.getCellValue(row.getCell(6));
+//			epubPrice = formatFloat(POITools.getCellValue(row.getCell(7)));
+//			pdfPrice = formatFloat(POITools.getCellValue(row.getCell(8)));
+//			adPrice = formatFloat(POITools.getCellValue(row.getCell(9)));
+//			yzPrice = formatFloat(POITools.getCellValue(row.getCell(10)));
+//			extPrice1 = formatFloat(POITools.getCellValue(row.getCell(11)));
+//			extPrice2 = formatFloat(POITools.getCellValue(row.getCell(12)));
+//			extPrice3 = formatFloat(POITools.getCellValue(row.getCell(13)));
+//			extPrice4 = formatFloat(POITools.getCellValue(row.getCell(14)));
+//			extPrice5 = formatFloat(POITools.getCellValue(row.getCell(15)));
+//			sqlList.add("insert into book_base (server_excel_name, is_self, book_isbn, book_name, book_lang, book_author, epub_price, pdf_price, ad_price, author_royalty, insert_time, trans_time, trans_company, yz_price, ext_price1, ext_price2, ext_price3, ext_price4, ext_price5) values" +
+//					"('"+name+"', '"+isSelf+"', '"+isbn+"', '"+bookName+"', '"+wz+"', '"+zb+"', "+epubPrice+", "+pdfPrice+", "+adPrice+", "+0.0+", '"+StringUtil.dataFormat(date, "yyyy-MM-dd")+"', '"+transTime+"', '"+transCompany+"', "+yzPrice+", "+extPrice1+", "+extPrice2+", "+extPrice3+", "+extPrice4+", "+extPrice5+")");
+//		}
+//		wb.close();
+//		FileUtil.deleteSubFiles(new File(excelPath).getParentFile());
+//		if(sqlList==null||sqlList.isEmpty()) return 0;
+//		return BookBaseModel.dao.addExcelData(sqlList).length;
+//	}
+	
+//	private String formatFloat(String str) {
+//		if("".equals(str)||null==str) {
+//			return "0.0";
+//		} else {
+//			return str;
+//		}
+//	}
+	
+	
+//	/**
+//	 * 更新图书状态
+//	 * @param bookId
+//	 * @return
+//	 */
+//	public boolean updateBookById(int bookId, int bookStatus) {
+//		return BookBaseModel.dao.updateBookById(bookId, bookStatus);
+//	}
+//	
+//	/**
+//	 * 删除图书
+//	 * @param bookId
+//	 * @return
+//	 */
+//	public boolean deleteBookById(int bookId) {
+//		return BookBaseModel.dao.deleteBookById(bookId);
+//	}
 	
 	/**
 	 * 添加excel中的数据到数据库
