From 15c31a48d35c64d00ad345db5bda1565aabee0c7 Mon Sep 17 00:00:00 2001 From: you <284908631@qq.com> Date: Wed, 10 Jun 2020 09:54:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/admin/cardborrow.jsp | 2 +- src/javabean/TestConnection.java | 48 -------------------------------- src/servlet/admin/CardList.java | 2 +- src/servlet/admin/SortList.java | 2 +- 4 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 src/javabean/TestConnection.java diff --git a/WebContent/admin/cardborrow.jsp b/WebContent/admin/cardborrow.jsp index ca00f39..3255d2e 100644 --- a/WebContent/admin/cardborrow.jsp +++ b/WebContent/admin/cardborrow.jsp @@ -1,6 +1,6 @@ <%@page import="javabean.Util"%> <%@page import="java.sql.PreparedStatement"%> -<%@page import="com.mysql.jdbc.Connection"%> +<%@page import="java.sql.Connection"%> <%@page import="javabean.Base"%> <%@page import="java.sql.ResultSet"%> <%@page import="javabean.JDBCBean"%> diff --git a/src/javabean/TestConnection.java b/src/javabean/TestConnection.java deleted file mode 100644 index 5aaba76..0000000 --- a/src/javabean/TestConnection.java +++ /dev/null @@ -1,48 +0,0 @@ -package javabean; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import java.sql.Connection; - -public class TestConnection { - public static void main(String[] args) throws ClassNotFoundException, SQLException { - // 获取rule - Connection connection = null; - PreparedStatement pstmt = null; - ResultSet resultSet = null; - int result = 0; - String password = "1234"; - String reader = "1234"; - String rule_id = "1"; - String status = "1"; - connection = (Connection) Base.getConnection(); - String sql = "insert into borrow_card(password, reader, rule_id, status) values(?,?,?,?)"; - pstmt = connection.prepareStatement(sql); - pstmt.setString(1, password); - pstmt.setString(2, reader); - pstmt.setString(3, rule_id); - pstmt.setString(4, status); - result = pstmt.executeUpdate(); - System.out.println(result); - //获取id - //connection1= (Connection) Base.getConnection(); - String findIdSql = "select id from borrow_card where password=? and reader=? and rule_id=? and status=? limit 1"; - pstmt = connection.prepareStatement(findIdSql); - pstmt.setString(1, password); - pstmt.setString(2, reader); - pstmt.setString(3, rule_id); - pstmt.setString(4, status); -// pstmt1 = connection.prepareStatement(findIdSql); -// pstmt1.setString(1, password); -// pstmt1.setString(2, reader); -// pstmt1.setString(3, rule_id); -// pstmt1.setString(4, status); - resultSet = pstmt.executeQuery(); - while(resultSet.next()) { - System.out.println(resultSet.getString("id")); - } - - } -} diff --git a/src/servlet/admin/CardList.java b/src/servlet/admin/CardList.java index 592094f..ad11013 100644 --- a/src/servlet/admin/CardList.java +++ b/src/servlet/admin/CardList.java @@ -25,7 +25,7 @@ import net.sf.json.JSONObject; public class CardList extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.setContentType("application/json; charset:utf8"); + resp.setContentType("application/json; charset=utf8"); // 接收参数 String limit = req.getParameter("limit"); String page = req.getParameter("page"); diff --git a/src/servlet/admin/SortList.java b/src/servlet/admin/SortList.java index e0e014e..584930b 100644 --- a/src/servlet/admin/SortList.java +++ b/src/servlet/admin/SortList.java @@ -23,7 +23,7 @@ import net.sf.json.JSONObject; public class SortList extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.setContentType("application/json; charset:utf8"); + resp.setContentType("application/json; charset=utf8"); // 接受参数 // 准备参数 From a69f14fad730f19f810b341f8d5b5141347d16ed Mon Sep 17 00:00:00 2001 From: you <284908631@qq.com> Date: Wed, 10 Jun 2020 12:02:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E4=B9=A6?= =?UTF-8?q?=E5=80=9F=E9=98=85=E6=8A=98=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/admin/data1.json | 1 + WebContent/admin/index.jsp | 4 +- WebContent/admin/librarydata.jsp | 62 +++++++++++++++++++++ WebContent/public/js/echarts.min.js | 12 +++++ src/javabean/DateTime.java | 36 +++++++++++++ src/servlet/admin/LibraryData.java | 84 +++++++++++++++++++++++++++++ src/servlet/admin/RuleEdit.java | 1 - 7 files changed, 197 insertions(+), 3 deletions(-) create mode 100644 WebContent/admin/data1.json create mode 100644 WebContent/admin/librarydata.jsp create mode 100644 WebContent/public/js/echarts.min.js create mode 100644 src/servlet/admin/LibraryData.java diff --git a/WebContent/admin/data1.json b/WebContent/admin/data1.json new file mode 100644 index 0000000..4f1245f --- /dev/null +++ b/WebContent/admin/data1.json @@ -0,0 +1 @@ +{"data":[1,1,2,3,4,5],"days":["3号","4号","5号","前天","昨天","今天"]} \ No newline at end of file diff --git a/WebContent/admin/index.jsp b/WebContent/admin/index.jsp index 02b9910..390ceff 100644 --- a/WebContent/admin/index.jsp +++ b/WebContent/admin/index.jsp @@ -54,14 +54,14 @@