diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index 70357de..a3cd406 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -7,15 +7,26 @@
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -35,56 +46,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -92,44 +58,136 @@
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -153,6 +211,8 @@
energy
rat2e
longtitude
+ mySet
+ myset
utf8_general_ci
@@ -170,9 +230,6 @@
@@ -239,10 +299,10 @@
-
-
-
-
+
+
+
+
@@ -250,6 +310,7 @@
+
@@ -301,6 +362,15 @@
+
+
+
+
+
+
+
+
+
@@ -339,39 +409,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
@@ -558,8 +608,8 @@
-
+
@@ -608,7 +658,8 @@
-
+
+
@@ -645,7 +696,7 @@
-
+
@@ -658,8 +709,9 @@
+
-
+
@@ -669,7 +721,7 @@
-
+
@@ -733,27 +785,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -798,13 +829,6 @@
-
-
-
-
-
-
-
@@ -900,16 +924,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -995,13 +1009,6 @@
-
-
-
-
-
-
-
@@ -1009,13 +1016,6 @@
-
-
-
-
-
-
-
@@ -1036,13 +1036,6 @@
-
-
-
-
-
-
-
@@ -1098,68 +1091,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1167,10 +1098,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
index a83c3eb..c63c756 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Child.java
@@ -52,6 +52,9 @@ public class Child {
public void setChildLongId(String childLongId) {
this.childLongId = childLongId;
}
+ public void mySetChildLongId(String childLongId) {
+ this.childLongId = childLongId;
+ }
public String getChildName() {
return childName;
@@ -60,6 +63,9 @@ public class Child {
public void setChildName(String childName) {
this.childName = childName;
}
+ public void mySetChildName(String childName) {
+ this.childName = childName;
+ }
public String getChildSex() {
return childSex;
@@ -68,6 +74,9 @@ public class Child {
public void setChildSex(String childSex) {
this.childSex = childSex;
}
+ public void mySetChildSex(String childSex) {
+ this.childSex = childSex;
+ }
public String getChildAccount() {
return childAccount;
@@ -76,6 +85,9 @@ public class Child {
public void setChildAccount(String childAccount) {
this.childAccount = childAccount;
}
+ public void mySetChildAccount(String childAccount) {
+ this.childAccount = childAccount;
+ }
public String getChildPassword() {
return childPassword;
@@ -84,6 +96,9 @@ public class Child {
public void setChildPassword(String childPassword) {
this.childPassword = childPassword;
}
+ public void mySetChildPassword(String childPassword) {
+ this.childPassword = childPassword;
+ }
public String getChildPhone() {
return childPhone;
@@ -92,6 +107,9 @@ public class Child {
public void setChildPhone(String childPhone) {
this.childPhone = childPhone;
}
+ public void mySetChildPhone(String childPhone) {
+ this.childPhone = childPhone;
+ }
@Override
public String toString() {
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
index 8d59542..113a3d7 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
@@ -49,6 +49,7 @@ public class Parent {
this.parentBirth = parentBirth;
this.parentPhone = parentPhone;
}
+
public Parent(Long parentId, String parentLongId, String parentName, String parentSex, String parentAccount, String parentPassword, Double parentHeight, Double parentWeight, Date parentBirth, String parentPhone) {
this.parentId = parentId;
this.parentLongId = parentLongId;
@@ -70,6 +71,10 @@ public class Parent {
this.parentId = parentId;
}
+ public void mySetParentId(String parentId) {
+ this.parentId = Long.valueOf(parentId);
+ }
+
public String getParentLongId() {
return parentLongId;
}
@@ -78,6 +83,10 @@ public class Parent {
this.parentLongId = parentLongId;
}
+ public void mySetParentLongId(String parentLongId) {
+ this.parentLongId = parentLongId;
+ }
+
public String getParentName() {
return parentName;
}
@@ -86,6 +95,10 @@ public class Parent {
this.parentName = parentName;
}
+ public void mySetParentName(String parentName) {
+ this.parentName = parentName;
+ }
+
public String getParentSex() {
return parentSex;
}
@@ -94,6 +107,10 @@ public class Parent {
this.parentSex = parentSex;
}
+ public void mySetParentSex(String parentSex) {
+ this.parentSex = parentSex;
+ }
+
public String getParentAccount() {
return parentAccount;
}
@@ -102,6 +119,10 @@ public class Parent {
this.parentAccount = parentAccount;
}
+ public void mySetParentAccount(String parentAccount) {
+ this.parentAccount = parentAccount;
+ }
+
public String getParentPassword() {
return parentPassword;
}
@@ -110,6 +131,10 @@ public class Parent {
this.parentPassword = parentPassword;
}
+ public void mySetParentPassword(String parentPassword) {
+ this.parentPassword = parentPassword;
+ }
+
public double getParentHeight() {
return parentHeight;
}
@@ -117,7 +142,8 @@ public class Parent {
public void setParentHeight(Double parentHeight) {
this.parentHeight = parentHeight;
}
- public void setParentHeight(String parentHeight) {
+
+ public void mySetParentHeight(String parentHeight) {
this.parentHeight = Double.valueOf(parentHeight);
}
@@ -128,10 +154,12 @@ public class Parent {
public void setParentWeight(Double parentWeight) {
this.parentWeight = parentWeight;
}
- public void setParentWeight(String parentWeight) {
+
+ public void mySetParentWeight(String parentWeight) {
this.parentWeight = Double.valueOf(parentWeight);
}
+
public Date getParentBirth() {
return parentBirth;
}
@@ -139,7 +167,8 @@ public class Parent {
public void setParentBirth(Date parentBirth) {
this.parentBirth = parentBirth;
}
- public void setParentBirth(String parentBirth) {
+
+ public void mySetParentBirth(String parentBirth) {
this.parentBirth = Date.valueOf(parentBirth);
}
@@ -151,6 +180,10 @@ public class Parent {
this.parentPhone = parentPhone;
}
+ public void mySetParentPhone(String parentPhone) {
+ this.parentPhone = parentPhone;
+ }
+
public int getParentRoomId() {
return parentRoomId;
}
@@ -158,10 +191,12 @@ public class Parent {
public void setParentRoomId(Integer parentRoomId) {
this.parentRoomId = parentRoomId;
}
- public void setParentRoomId(String parentRoomId) {
+
+ public void mySetParentRoomId(String parentRoomId) {
this.parentRoomId = Integer.valueOf(parentRoomId);
}
+
public Room getParentRoom() {
return parentRoom;
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
index 18b1aa3..c1a7faa 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
@@ -73,9 +73,6 @@ public class Room {
public void setParentId(Long parentId) {
this.parentId = parentId;
}
- public void setParentId(String parentId) {
- this.parentId = Long.valueOf(parentId);
- }
public float getTemp() {
return temp;
@@ -84,10 +81,21 @@ public class Room {
public void setTemp(float temp) {
this.temp = temp;
}
- public void setTemp(String temp) {
+ public void mySetTemp(String temp) {
this.temp = Float.valueOf(temp);
}
+ public void mySetRoomName(String roomName){
+ this.roomName = roomName;
+ }
+ public void mySetRoomLocation(String roomLocation) {
+ this.roomLocation = roomLocation;
+ }
+
+ public void mySetParentId(String parentId) {
+ this.parentId = Long.valueOf(parentId);
+ }
+
@Override
public String toString() {
return "Room{" +
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
index 0919c61..befa785 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/utils/MethodUtil.java
@@ -13,7 +13,7 @@ public class MethodUtil {
public static void updateFields(Object obj, Map params)throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
Class> pClass = obj.getClass();
for (Map.Entry entry: params.entrySet()){
- Method method = pClass.getMethod("set" + StringUtil.capital(entry.getKey()), entry.getValue().getClass());
+ Method method = pClass.getMethod("mySet" + StringUtil.capital(entry.getKey()), entry.getValue().getClass());
method.invoke(obj, entry.getValue());
}
}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
index 7ea8d0f..f788bdb 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
@@ -56,7 +56,7 @@ public class ParentController {
parent.setParentPassword(String.valueOf(params.get("parentPassword")));
parent.setParentAccount(String.valueOf(params.get("parentAccount")));
parent.setParentName(String.valueOf(params.get("parentName")));
- parent.setParentBirth(String.valueOf(params.get("parentBirth")));
+ parent.mySetParentBirth(String.valueOf(params.get("parentBirth")));
parent.setParentLongId(String.valueOf(params.get("parentLongId")));
parentService.insert(parent);
return parentService.findByLongId(parent.getParentLongId());
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java
index 4426ce6..7c5c43d 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java
@@ -50,8 +50,8 @@ public class ParentDaoTest extends BaseTest {
parent.setParentBirth(Date.valueOf("1927-4-5"));
parent.setParentName("当当娃");
parent.setParentAccount("dang");
- parent.setParentHeight(12.1);
- parent.setParentWeight(3112.1);
+ parent.setParentHeight(123.2);
+ parent.setParentWeight(1123.2);
parent.setParentPassword("123");
parent.setParentSex("女");
parent.setParentPhone("12312312312");
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
index e575ec9..07bb78f 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
@@ -26,7 +26,7 @@ public class ParentServiceTest extends BaseTest {
parent.setParentPassword("a");
parent.setParentAccount("a");
parent.setParentName("a");
- parent.setParentBirth("2011-2-2");
+ parent.mySetParentBirth("2011-2-2");
parent.setParentLongId("a");
parentService.insert(parent);
System.out.println(parentService.findByLongId("a"));
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
deleted file mode 100644
index b44e630..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/LocationDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class
deleted file mode 100644
index 82d8e4f..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.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/LocationFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class
deleted file mode 100644
index 49328cb..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.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 ef5b169..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/Location.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class
deleted file mode 100644
index 8971e9a..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.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 8ef2d54..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 6c0226d..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/LocationService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class
deleted file mode 100644
index fd7f9dd..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.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/LocationServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class
deleted file mode 100644
index 5631356..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.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 19bf3dc..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 7b4d633..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/LocationController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class
deleted file mode 100644
index 60088a4..0000000
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.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 a33e43a..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/oldpeople?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 cc2a7e7..0000000
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml
deleted file mode 100644
index 2b0282a..0000000
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into location(pid, longitude,latitude, time)
- values (#{parentId}, #{longitude},#{latitude}, #{time})
-
-
\ 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 bf4a273..0000000
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
+++ /dev/null
@@ -1,44 +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},
- temp = #{temp}
- 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/LocationDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class
deleted file mode 100644
index 82d8e4f..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.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/LocationFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class
deleted file mode 100644
index 49328cb..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.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 ef5b169..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/Location.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class
deleted file mode 100644
index 8971e9a..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.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 8ef2d54..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 6c0226d..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/LocationService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class
deleted file mode 100644
index fd7f9dd..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.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/LocationServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class
deleted file mode 100644
index 5631356..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.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 19bf3dc..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 7b4d633..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/LocationController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class
deleted file mode 100644
index 60088a4..0000000
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.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 a33e43a..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/oldpeople?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 cc2a7e7..0000000
--- a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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/target/classes/mapper/LocationDao.xml b/server/OldPeopleHome/target/classes/mapper/LocationDao.xml
deleted file mode 100644
index 2b0282a..0000000
--- a/server/OldPeopleHome/target/classes/mapper/LocationDao.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- insert into location(pid, longitude,latitude, time)
- values (#{parentId}, #{longitude},#{latitude}, #{time})
-
-
\ 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 bf4a273..0000000
--- a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
+++ /dev/null
@@ -1,44 +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},
- temp = #{temp}
- 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/ChildParentServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class
deleted file mode 100644
index 9c0e4fb..0000000
Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.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 1aeb125..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/LocationServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.class
deleted file mode 100644
index 173f98d..0000000
Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.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/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class
deleted file mode 100644
index 396d647..0000000
Binary files a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class and /dev/null differ