diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index 7ca57c6..b2a8e97 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -7,7 +7,19 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -100,17 +42,118 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,7 +173,15 @@ setRoomName *** + utf8mb4_0900_ai_ci + utf8mb4 + energy + + utf8_general_ci + utf8 + motionEnergy + E:\课设\OldPeopleHome\server\OldPeopleHome\src\main\java\com\oldpeoplehome\service\impl @@ -156,9 +207,6 @@ @@ -210,10 +261,10 @@ - @@ -222,7 +273,6 @@ - @@ -241,6 +291,21 @@ + + + + + + + + + + + + + + + @@ -248,22 +313,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - insert into motion(pid, date, count, distance, time) - values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime}) + insert into motion(pid, date, count, distance, energy, time) + values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime}) \ No newline at end of file diff --git a/server/OldPeopleHome/src/main/sql/add_table.sql b/server/OldPeopleHome/src/main/sql/add_table.sql index cfb20aa..34e985e 100644 --- a/server/OldPeopleHome/src/main/sql/add_table.sql +++ b/server/OldPeopleHome/src/main/sql/add_table.sql @@ -10,10 +10,10 @@ DROP TABLE IF EXISTS `sleep`; CREATE TABLE `parent` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '老人id', `longid` char(18) NOT NULL COMMENT '老人身份证', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '姓名', - `sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '性别', - `account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '账号', - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码', + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '姓名', + `sex` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '性别', + `account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '账号', + `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码', `height` double DEFAULT NULL COMMENT '身高', `weight` double DEFAULT NULL COMMENT '体重', `birth` date NOT NULL COMMENT '生日', @@ -21,16 +21,16 @@ CREATE TABLE `parent` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `index_longid` (`longid`) USING BTREE, KEY `index_name` (`name`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC; CREATE TABLE `room` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '房间id', - `location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间位置', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间名称(房间号)', + `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间位置', + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间名称(房间号)', `pid` bigint(20) DEFAULT NULL COMMENT '房间住人id', PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `index` (`pid`) USING BTREE, CONSTRAINT `room_fk_1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC; CREATE TABLE `child` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', @@ -43,14 +43,14 @@ CREATE TABLE `child` ( PRIMARY KEY (`id`), UNIQUE KEY `index _longid` (`longid`) USING BTREE, KEY `index_name` (`name`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `cp` ( `pid` bigint(20) DEFAULT NULL, `cid` bigint(20) DEFAULT NULL, `relation` varchar(255) DEFAULT NULL, KEY `index_pid` (`pid`) USING BTREE, KEY `index_cid` (`cid`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `heartrate` ( `pid` bigint(20) DEFAULT NULL, `time` datetime DEFAULT NULL, @@ -58,7 +58,7 @@ CREATE TABLE `heartrate` ( KEY `index_pid` (`pid`) USING BTREE, KEY `time` (`time`) USING BTREE, CONSTRAINT `fk_pid2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `motion` ( `pid` bigint(20) DEFAULT NULL COMMENT 'parent id', `date` date DEFAULT NULL COMMENT '当日日期', @@ -68,7 +68,7 @@ CREATE TABLE `motion` ( KEY `index_date` (`date`) USING BTREE, KEY `index_pid` (`pid`) USING BTREE, CONSTRAINT `fk_pid` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `rstate` ( `rid` int(11) DEFAULT NULL, @@ -79,7 +79,7 @@ CREATE TABLE `rstate` ( KEY `index_rid` (`rid`) USING BTREE, KEY `index_time` (`time`) USING BTREE, CONSTRAINT `fk_rid1` FOREIGN KEY (`rid`) REFERENCES `room` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; CREATE TABLE `sleep` ( `pid` bigint(20) DEFAULT NULL COMMENT 'parent id', `date` date DEFAULT NULL COMMENT '当天日期', @@ -90,5 +90,5 @@ CREATE TABLE `sleep` ( KEY `index_pid` (`pid`) USING BTREE, KEY `index_pid_date` (`pid`,`date`) USING BTREE, CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ; diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java index 4209222..bfd3b38 100644 --- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java @@ -30,8 +30,9 @@ public class MotionDaoTest extends BaseTest { @Test public void testInsert(){ - Motion motion = new Motion(2, "2019-2-2", 1239, 11, "1:1:1"); + Motion motion = new Motion(2, "2019-2-2", 1239, 11,22, "1:1:1"); motionDao.insert(motion); + System.out.println(motionDao.findByParentId(new MotionFilter(1))); } } diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war index 01dbdab..66c3f98 100644 Binary files a/server/OldPeopleHome/target/OldPeopleHome.war and b/server/OldPeopleHome/target/OldPeopleHome.war differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb6019..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties index e9eb37f..a33e43a 100644 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties +++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties @@ -1,4 +1,4 @@ jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +jdbc.url=jdbc:mysql://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 jdbc.username=root jdbc.password=root diff --git a/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb6019..0000000 Binary files a/server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class index 3160ad7..ae920b8 100644 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class index 7ecb67c..3ae8aba 100644 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class differ diff --git a/server/OldPeopleHome/target/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml index bc37178..c735e83 100644 --- a/server/OldPeopleHome/target/classes/mapper/MotionDao.xml +++ b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml @@ -9,6 +9,7 @@ + @@ -24,7 +25,7 @@ select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate} - insert into motion(pid, date, count, distance, time) - values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime}) + insert into motion(pid, date, count, distance, energy, time) + values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module b/server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module deleted file mode 100644 index 8fb6019..0000000 Binary files a/server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class index 5b2b4a4..27fe6cc 100644 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class differ diff --git a/server/README.md b/server/README.md index 525c719..6a60a5c 100644 --- a/server/README.md +++ b/server/README.md @@ -56,6 +56,8 @@ ### 接口格式 +使用实例：http://39.105.65.209:8080/parent/list + 基本的业务接口已经完成，如下 | 实体 | url示例 | 请求方式 | 功能概述 | 参数格式 | @@ -91,4 +93,4 @@ | Sleep | /sleep/get/1 | GET | 查找id=1的老人睡眠信息 | 参数格式：yyyy-mm-dd 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | | Sleep | /sleep/add | POST | 添加老人睡眠信息 | parent，date，deep，light，awake | | HeartRate | /heartrate/get/1 | GET | 查找id=1的心率信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 | -| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate | \ No newline at end of file +| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate | diff --git a/web/firstPage.html b/web/firstPage.html new file mode 100644 index 0000000..6fabc9f --- /dev/null +++ b/web/firstPage.html @@ -0,0 +1,15 @@ + + + + + + + 首页 + + + + + + \ No newline at end of file diff --git a/web/firstPage_style.css b/web/firstPage_style.css new file mode 100644 index 0000000..e69de29 diff --git a/web/oldPeopleHome.html b/web/login.html similarity index 65% rename from web/oldPeopleHome.html rename to web/login.html index 7207c0d..dfab637 100644 --- a/web/oldPeopleHome.html +++ b/web/login.html @@ -5,7 +5,7 @@ oldPeopleHome - +
@@ -15,9 +15,9 @@
- 用户名：

- 密码：

- +


+


+
diff --git a/web/style.css b/web/login_style.css similarity index 52% rename from web/style.css rename to web/login_style.css index 38c6e45..dfb010a 100644 --- a/web/style.css +++ b/web/login_style.css @@ -8,8 +8,7 @@ body { font-style: italic; font-family: sans-serif; font-size: 125px; - text-align: center; - position: absolute; + position: relative; top: 120px; /* background-color: yellow; */ @@ -20,29 +19,44 @@ body { font-family: youyuan; font-size: 30px; text-align: center; - position: relative; - top: 140px; + position: absolute; + top: 100px; } #name { - width: 120px; + /* width: 120px; */ + width: 100%; color: slategray; font-family: youyuan; font-size: 24px; - position: relative; - left: 490px; - top: 150px; + text-align: center; + position: absolute; + /* left: 490px; */ + top: 230px; } input[name] { - height: 27px; - border: none; - position: absolute; - left: 150px; + background-color: rgba(240, 248, 255, 0); + height: 30px; + border: 0.5px solid rgba(128, 128, 128, 0.5); + border-radius: 15px; + position: relative; font-family: youyuan; + text-align: center; + font-size: 18px; + outline: none; } -input[password] { - height: 27px; +#submit { + background-color: rgba(255, 239, 213); + height: 40px; + width: 40px; border: none; - position: absolute; - left: 150px; - font-family: youyuan; + border-radius: 100%; + font-size: 22px; + color: white; + padding: 0; + outline: none; +} +#submit:hover { + width: 45px; + height: 45px; + background-color: rgba(255, 239, 213, 0.582); } diff --git a/web/图标/LOGO.png b/web/图标/LOGO.png new file mode 100644 index 0000000..26c2b1d Binary files /dev/null and b/web/图标/LOGO.png differ diff --git a/web/图标/箭头01.png b/web/图标/箭头01.png new file mode 100644 index 0000000..15a3b9a Binary files /dev/null and b/web/图标/箭头01.png differ