diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index 77e0da2..38548b6 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -8,15 +8,17 @@ - - + + - + - - + + + + - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -136,10 +60,19 @@ - + - - + + + + + + + + + + + @@ -147,6 +80,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,6 +144,7 @@ utf8mb4_0900_ai_ci utf8mb4 energy + rat2e utf8_general_ci @@ -182,8 +161,6 @@ @@ -262,8 +241,6 @@ - - @@ -297,6 +274,24 @@ + + + + + + + + + + + + + + + + + + @@ -313,6 +308,20 @@ + + + + + + + + + + + + + + @@ -352,17 +361,19 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java new file mode 100644 index 0000000..43c8add --- /dev/null +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java @@ -0,0 +1,23 @@ +package com.oldpeoplehome.service; + +import com.oldpeoplehome.BaseTest; +import com.oldpeoplehome.entity.ChildParent; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * Created By Jiangyuwei on 2019/9/4 21:27 + * Description: + */ +public class ChildParentServiceTest extends BaseTest { + + @Autowired + private ChildParentService childParentService; + + @Test + public void test(){ + ChildParent childParent = new ChildParent(1,1,"父子"); + childParentService.combine(childParent); + } + +} diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java index a77f91c..5eeb90d 100644 --- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java +++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java @@ -17,10 +17,10 @@ public class HeartRateServiceTest extends BaseTest { @Test public void test(){ -// HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3); -// heartRateService.insert(heartRate); - HeartRateFilter heartRateFilter = new HeartRateFilter(1); - System.out.println(heartRateService.findByParent(heartRateFilter)); + HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3, 21,21); + heartRateService.insert(heartRate); +// HeartRateFilter heartRateFilter = new HeartRateFilter(1); +// System.out.println(heartRateService.findByParent(heartRateFilter)); } } diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war index 54a1a68..47385d0 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/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/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml index d667f5c..d8159f9 100644 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml +++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml @@ -25,6 +25,6 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml index d667f5c..d8159f9 100644 --- a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml +++ b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml @@ -25,6 +25,6 @@ insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy}) \ No newline at end of file diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class new file mode 100644 index 0000000..9c0e4fb Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class index cced0c6..c92eff5 100644 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class differ diff --git a/server/README.md b/server/README.md index 9abc1c0..26e0161 100644 --- a/server/README.md +++ b/server/README.md @@ -77,7 +77,7 @@ | Parent | /parent/add | POST | 添加老人 | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 | | Parent | /parent/update/1 | POST | 更新id=1的老人信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | | Parent | /parent/delete/1 | DELETE | 删除id=1的老人 | | -| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） | +| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回）account:jiang,password:123 | | Child | /child/get/1 | GET | 查询id=1的子女 | | | Child | /child/get_longid/111 | GET | 查询身份证=111的child的详细信息 | | | Child | /child/get_name/小蒋 | GET | 查询姓名=小蒋的child的详细信息 | | @@ -85,7 +85,7 @@ | Child | /child/add | POST | | childSex，childPassword，childAccount，childName，childLongId，childPhone | | Child | /child/update/1 | POST | 更新id=1的子女信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName | | Child | /child/delete/1 | DELETE | 删除id=1的子女信息 | | -| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) | +| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 | | ChildAndParent | /child_parent/child/1 | GET | 查看子女id=1对应的老人 | | | ChildAndParent | /child_parent/parent/1 | GET | 查看老人id=1对应的子女 | | | ChildAndParent | /child_parent/add | POST | 添加老人子女对应关系 | 子女id：child，老人id：parent，关系：relation |