diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml index 77e0da2..2faa744 100644 --- a/server/OldPeopleHome/.idea/workspace.xml +++ b/server/OldPeopleHome/.idea/workspace.xml @@ -6,18 +6,7 @@ - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + @@ -57,8 +40,8 @@ - - + + @@ -66,10 +49,14 @@ - - + + + + + + @@ -88,10 +75,10 @@ - + - - + + @@ -99,50 +86,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -166,6 +150,7 @@ utf8mb4_0900_ai_ci utf8mb4 energy + rat2e utf8_general_ci @@ -182,8 +167,6 @@ @@ -262,8 +247,6 @@ - - @@ -317,52 +300,33 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - + + - insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) + insert into heartrate(pid, time,rate, rate1,rate2,oxy) + values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy}) \ 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 e7daf30..3f81b62 100644 --- a/server/OldPeopleHome/src/main/sql/add_table.sql +++ b/server/OldPeopleHome/src/main/sql/add_table.sql @@ -65,6 +65,9 @@ CHANGE COLUMN `rate` `rate1` double NULL DEFAULT NULL COMMENT '收缩压' AFTER ADD COLUMN `rate2` double NULL COMMENT '舒张压' AFTER `rate1`, ADD COLUMN `oxy` double NULL AFTER `rate2`; +ALTER TABLE `heartrate` +ADD COLUMN `rate` double NULL COMMENT '心率' AFTER `time`; + CREATE TABLE `motion` ( `pid` bigint(20) DEFAULT NULL COMMENT 'parent id', `date` date DEFAULT NULL COMMENT '当日日期', 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 deleted file mode 100644 index 54a1a68..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome.war and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF deleted file mode 100644 index 6f7f877..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: Jiangyuwei -Created-By: IntelliJ IDEA -Build-Jdk: 1.8.0_161 - diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class deleted file mode 100644 index 87f12c5..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class deleted file mode 100644 index 40bd5a1..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class deleted file mode 100644 index a47613a..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class deleted file mode 100644 index 230c7fb..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class deleted file mode 100644 index 12c0207..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class deleted file mode 100644 index e3a3326..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class deleted file mode 100644 index 15ff3f0..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class deleted file mode 100644 index 1aa6c68..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class deleted file mode 100644 index 27df01b..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class deleted file mode 100644 index 434de64..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class deleted file mode 100644 index af3f4c3..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class deleted file mode 100644 index ba07154..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class deleted file mode 100644 index ad89e24..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class deleted file mode 100644 index 9993dc5..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class deleted file mode 100644 index 46ead89..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class deleted file mode 100644 index 27c1363..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class deleted file mode 100644 index 2b1a64b..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class deleted file mode 100644 index 2fab708..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class deleted file mode 100644 index ae920b8..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class deleted file mode 100644 index 5aff069..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class deleted file mode 100644 index d1800b4..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class deleted file mode 100644 index 654840c..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class deleted file mode 100644 index 897f11f..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class deleted file mode 100644 index 82931e6..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class deleted file mode 100644 index 912131d..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class deleted file mode 100644 index a17490a..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class deleted file mode 100644 index c8ddcee..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class deleted file mode 100644 index 42056c8..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class deleted file mode 100644 index 421d057..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class deleted file mode 100644 index 4cc356f..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class deleted file mode 100644 index e7d116e..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class deleted file mode 100644 index f2d6a25..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class deleted file mode 100644 index 966b3a3..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class deleted file mode 100644 index 618038a..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class deleted file mode 100644 index b3148e6..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class deleted file mode 100644 index d9d5bd2..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class deleted file mode 100644 index b9ae282..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class deleted file mode 100644 index 284eda1..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class deleted file mode 100644 index 3926325..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class deleted file mode 100644 index 431b748..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class deleted file mode 100644 index 57d5fbe..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class deleted file mode 100644 index e2bd4b0..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class deleted file mode 100644 index e0e2a2b..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class deleted file mode 100644 index 6b211bf..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class deleted file mode 100644 index 4711e23..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class deleted file mode 100644 index 1ab1d70..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class deleted file mode 100644 index 60d8421..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class deleted file mode 100644 index 6f8367e..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class deleted file mode 100644 index 3ae8aba..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class deleted file mode 100644 index 0b12582..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class deleted file mode 100644 index 377e641..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class deleted file mode 100644 index 5417eb5..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class deleted file mode 100644 index 4415246..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class 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 deleted file mode 100644 index e9eb37f..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 -jdbc.username=root -jdbc.password=root diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml deleted file mode 100644 index 4480ac6..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml deleted file mode 100644 index b85b118..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml deleted file mode 100644 index 298dc84..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - insert into child(longid,name,sex,account,password,phone) - values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone}) - - - - delete from child where id = #{childId} - - - - update child - set longid = #{childLongId}, - name = #{childName}, - sex = #{childSex}, - account = #{childAccount}, - password = #{childPassword}, - phone = #{childPhone} - where id =#{childId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml deleted file mode 100644 index 4dafdab..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into cp(pid, cid, relation) - values (#{parentId}, #{childId}, #{relation}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml deleted file mode 100644 index d667f5c..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml deleted file mode 100644 index c735e83..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - 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/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml deleted file mode 100644 index 42a628b..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into parent(longid,name,sex,account,password,height,weight,birth,phone) - values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone}) - - - - update parent - set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone} - where id=#{parentId} - - - - delete from parent where id=#{parentId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml deleted file mode 100644 index 5e3820a..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - insert into room(location, name) values (#{roomLocation}, #{roomName}) - - - - delete from room where id = #{roomId} - - - - update room - set location = #{roomLocation}, - name = #{roomName}, - pid = #{parentId} - where id =#{roomId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml deleted file mode 100644 index 06c2ac2..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into rstate(rid, time, temperature, humidity, isin) - values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml deleted file mode 100644 index 5d34f26..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into sleep(pid, date, deep, light, awake) - values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml deleted file mode 100644 index 4b92325..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml deleted file mode 100644 index 96c91b2..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml deleted file mode 100644 index 10d4e5f..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml deleted file mode 100644 index f7feb12..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar deleted file mode 100644 index 0f42d60..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar deleted file mode 100644 index 75580be..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar deleted file mode 100644 index 93a3b9f..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar deleted file mode 100644 index fdf8b6f..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar deleted file mode 100644 index 0a18c34..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar deleted file mode 100644 index 5ee8d20..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar deleted file mode 100644 index feb8bba..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar deleted file mode 100644 index 6b14c3d..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar deleted file mode 100644 index f4d27d3..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar deleted file mode 100644 index 0fd275e..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar deleted file mode 100644 index 39f68c4..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar deleted file mode 100644 index 893962d..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar deleted file mode 100644 index 1cc5f4e..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar deleted file mode 100644 index 7ddda85..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar deleted file mode 100644 index 7a19168..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar deleted file mode 100644 index 1c3cfb8..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar deleted file mode 100644 index a0ee347..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar deleted file mode 100644 index cd78554..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar deleted file mode 100644 index c31fa4b..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar deleted file mode 100644 index 9bbadf3..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar deleted file mode 100644 index 4099308..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar deleted file mode 100644 index 19aaf37..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar deleted file mode 100644 index e054cf6..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar deleted file mode 100644 index f52417f..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar deleted file mode 100644 index f303583..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar deleted file mode 100644 index 883ce39..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar deleted file mode 100644 index 1d6abd1..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar deleted file mode 100644 index a3876b5..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar deleted file mode 100644 index cc34fde..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar deleted file mode 100644 index 379a761..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar deleted file mode 100644 index 1f5e468..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar deleted file mode 100644 index bfc0bcf..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar deleted file mode 100644 index bc528ac..0000000 Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar and /dev/null differ diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml deleted file mode 100644 index 41174cb..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - mvc-dispatcher - org.springframework.web.servlet.DispatcherServlet - - - contextConfigLocation - classpath:spring/spring-*.xml - - - - mvc-dispatcher - - / - - - - SpringEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - SpringEncodingFilter - /* - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/OldPeopleHome/index.jsp b/server/OldPeopleHome/target/OldPeopleHome/index.jsp deleted file mode 100644 index c38169b..0000000 --- a/server/OldPeopleHome/target/OldPeopleHome/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -

Hello World!

- - diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class deleted file mode 100644 index 87f12c5..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class deleted file mode 100644 index 40bd5a1..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class deleted file mode 100644 index a47613a..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class deleted file mode 100644 index 230c7fb..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class deleted file mode 100644 index 12c0207..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class deleted file mode 100644 index e3a3326..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class deleted file mode 100644 index 15ff3f0..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class deleted file mode 100644 index 1aa6c68..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class deleted file mode 100644 index 27df01b..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class deleted file mode 100644 index 434de64..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class deleted file mode 100644 index af3f4c3..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class deleted file mode 100644 index ba07154..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class deleted file mode 100644 index ad89e24..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class deleted file mode 100644 index 9993dc5..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class deleted file mode 100644 index 46ead89..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class deleted file mode 100644 index 27c1363..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class deleted file mode 100644 index 2b1a64b..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class deleted file mode 100644 index 2fab708..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class 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 deleted file mode 100644 index ae920b8..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class deleted file mode 100644 index 5aff069..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class deleted file mode 100644 index d1800b4..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class deleted file mode 100644 index 654840c..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class deleted file mode 100644 index 897f11f..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class deleted file mode 100644 index 82931e6..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class deleted file mode 100644 index 912131d..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class deleted file mode 100644 index a17490a..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class deleted file mode 100644 index c8ddcee..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class deleted file mode 100644 index 42056c8..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class deleted file mode 100644 index 421d057..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class deleted file mode 100644 index 4cc356f..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class deleted file mode 100644 index e7d116e..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class deleted file mode 100644 index f2d6a25..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class deleted file mode 100644 index 966b3a3..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class deleted file mode 100644 index 618038a..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class deleted file mode 100644 index b3148e6..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class deleted file mode 100644 index d9d5bd2..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class deleted file mode 100644 index b9ae282..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class deleted file mode 100644 index 284eda1..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class deleted file mode 100644 index 3926325..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class deleted file mode 100644 index 431b748..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class deleted file mode 100644 index 57d5fbe..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class deleted file mode 100644 index e2bd4b0..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class deleted file mode 100644 index e0e2a2b..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class deleted file mode 100644 index 6b211bf..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class deleted file mode 100644 index 4711e23..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class deleted file mode 100644 index 1ab1d70..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class deleted file mode 100644 index 60d8421..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class deleted file mode 100644 index 6f8367e..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class deleted file mode 100644 index 3ae8aba..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class deleted file mode 100644 index 0b12582..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class deleted file mode 100644 index 377e641..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class deleted file mode 100644 index 5417eb5..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class deleted file mode 100644 index 4415246..0000000 Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class and /dev/null differ diff --git a/server/OldPeopleHome/target/classes/jdbc.properties b/server/OldPeopleHome/target/classes/jdbc.properties deleted file mode 100644 index e9eb37f..0000000 --- a/server/OldPeopleHome/target/classes/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 -jdbc.username=root -jdbc.password=root diff --git a/server/OldPeopleHome/target/classes/logback.xml b/server/OldPeopleHome/target/classes/logback.xml deleted file mode 100644 index 4480ac6..0000000 --- a/server/OldPeopleHome/target/classes/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/AdminDao.xml b/server/OldPeopleHome/target/classes/mapper/AdminDao.xml deleted file mode 100644 index b85b118..0000000 --- a/server/OldPeopleHome/target/classes/mapper/AdminDao.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/ChildDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml deleted file mode 100644 index 298dc84..0000000 --- a/server/OldPeopleHome/target/classes/mapper/ChildDao.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - insert into child(longid,name,sex,account,password,phone) - values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone}) - - - - delete from child where id = #{childId} - - - - update child - set longid = #{childLongId}, - name = #{childName}, - sex = #{childSex}, - account = #{childAccount}, - password = #{childPassword}, - phone = #{childPhone} - where id =#{childId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml deleted file mode 100644 index 4dafdab..0000000 --- a/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into cp(pid, cid, relation) - values (#{parentId}, #{childId}, #{relation}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml deleted file mode 100644 index d667f5c..0000000 --- a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into heartrate(pid, time, rate1,rate2,oxy) - values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml deleted file mode 100644 index c735e83..0000000 --- a/server/OldPeopleHome/target/classes/mapper/MotionDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - 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/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml deleted file mode 100644 index 42a628b..0000000 --- a/server/OldPeopleHome/target/classes/mapper/ParentDao.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into parent(longid,name,sex,account,password,height,weight,birth,phone) - values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone}) - - - - update parent - set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone} - where id=#{parentId} - - - - delete from parent where id=#{parentId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml deleted file mode 100644 index 5e3820a..0000000 --- a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - insert into room(location, name) values (#{roomLocation}, #{roomName}) - - - - delete from room where id = #{roomId} - - - - update room - set location = #{roomLocation}, - name = #{roomName}, - pid = #{parentId} - where id =#{roomId} - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml deleted file mode 100644 index 06c2ac2..0000000 --- a/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into rstate(rid, time, temperature, humidity, isin) - values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mapper/SleepDao.xml b/server/OldPeopleHome/target/classes/mapper/SleepDao.xml deleted file mode 100644 index 5d34f26..0000000 --- a/server/OldPeopleHome/target/classes/mapper/SleepDao.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - insert into sleep(pid, date, deep, light, awake) - values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime}) - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/mybatis-config.xml b/server/OldPeopleHome/target/classes/mybatis-config.xml deleted file mode 100644 index 4b92325..0000000 --- a/server/OldPeopleHome/target/classes/mybatis-config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/spring/spring-dao.xml b/server/OldPeopleHome/target/classes/spring/spring-dao.xml deleted file mode 100644 index 96c91b2..0000000 --- a/server/OldPeopleHome/target/classes/spring/spring-dao.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/spring/spring-service.xml b/server/OldPeopleHome/target/classes/spring/spring-service.xml deleted file mode 100644 index 10d4e5f..0000000 --- a/server/OldPeopleHome/target/classes/spring/spring-service.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/classes/spring/spring-web.xml b/server/OldPeopleHome/target/classes/spring/spring-web.xml deleted file mode 100644 index f7feb12..0000000 --- a/server/OldPeopleHome/target/classes/spring/spring-web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class deleted file mode 100644 index e322610..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class deleted file mode 100644 index 63ee2ed..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class deleted file mode 100644 index 16831a4..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class 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 deleted file mode 100644 index 27fe6cc..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class deleted file mode 100644 index 02ba7ec..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class deleted file mode 100644 index 98d5a30..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class deleted file mode 100644 index 9d0f221..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class and /dev/null 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 deleted file mode 100644 index cced0c6..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class and /dev/null differ diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class deleted file mode 100644 index 7f81919..0000000 Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class and /dev/null differ diff --git a/zigbee/README.md b/zigbee/README.md index 3a34225..8767183 100644 --- a/zigbee/README.md +++ b/zigbee/README.md @@ -40,7 +40,7 @@ * 传感器：温、湿度传感器两个，人体红外传感器两个，运动手环两个，执行器三个 * 角色：终端，协调器，网关，后台主机 * 协议：zigbee，TCP/IP，BLE 4.0 -* +* wifitricker连通内外网 #### 手环功能 * 步数 diff --git a/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c b/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c index 7d22340..852b207 100644 --- a/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c +++ b/zigbee/ZStack-CC2530-r200/Projects/zstack/ZMain/TI2530DB/ZMain.c @@ -88,6 +88,10 @@ int main(void) zmain_vdd_check(); // Initialize board I/O + + + + A InitBoard( OB_COLD ); // Initialze HAL drivers