diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index f09478f..dce913d 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -6,7 +6,11 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="" />
+    <list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,8 +32,22 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1485">
-              <caret line="45" column="29" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+            <state relative-caret-position="1372">
+              <caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="213">
+              <caret line="77" column="39" lean-forward="true" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -37,7 +55,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1155">
+            <state relative-caret-position="481">
               <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -46,61 +64,43 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="321">
+              <caret line="164" selection-start-line="164" selection-end-line="164" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-14">
+              <caret line="30" column="48" lean-forward="true" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="164" selection-start-line="164" selection-end-line="164" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="32" selection-start-line="32" selection-end-line="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1518">
-              <caret line="62" column="29" selection-start-line="62" selection-start-column="29" selection-end-line="62" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4290">
-              <caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1056">
-              <caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="594">
-              <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+            <state relative-caret-position="319">
+              <caret line="36" column="25" lean-forward="true" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="383">
+              <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -187,14 +187,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/MethodUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/spring/spring-web.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
       </list>
     </option>
@@ -213,11 +213,11 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1911" />
-    <option name="y" value="-9" />
-    <option name="width" value="1938" />
-    <option name="height" value="1048" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-10" />
+    <option name="y" value="-10" />
+    <option name="width" value="1939" />
+    <option name="height" value="1049" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -258,6 +258,15 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -265,6 +274,14 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="spring" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -287,18 +304,29 @@
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="target" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1568018392902" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1568104358041" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -327,22 +355,6 @@
     </option>
   </component>
   <component name="RunManager" selected="Tomcat Server.chuizichui">
-    <configuration name="AdminServiceTest.testLogin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="OldPeopleHome" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.oldpeoplehome.service.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
-      <option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.AdminServiceTest" />
-      <option name="METHOD_NAME" value="testLogin" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="ChildParentServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="OldPeopleHome" />
       <extension name="coverage">
@@ -391,6 +403,22 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="ParentServiceTest.delete" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="OldPeopleHome" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.oldpeoplehome.service.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
+      <option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.ParentServiceTest" />
+      <option name="METHOD_NAME" value="delete" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="RoomServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="OldPeopleHome" />
       <extension name="coverage">
@@ -482,19 +510,19 @@
     </configuration>
     <list>
       <item itemvalue="JUnit.HeartRateServiceTest.test" />
-      <item itemvalue="JUnit.AdminServiceTest.testLogin" />
       <item itemvalue="JUnit.ChildParentServiceTest.test" />
       <item itemvalue="JUnit.LocationServiceTest.test" />
       <item itemvalue="JUnit.RoomServiceTest.test" />
       <item itemvalue="Tomcat Server.chuizichui" />
+      <item itemvalue="JUnit.ParentServiceTest.delete" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.ParentServiceTest.delete" />
         <item itemvalue="JUnit.RoomServiceTest.test" />
         <item itemvalue="JUnit.LocationServiceTest.test" />
         <item itemvalue="JUnit.ChildParentServiceTest.test" />
         <item itemvalue="JUnit.HeartRateServiceTest.test" />
-        <item itemvalue="JUnit.AdminServiceTest.testLogin" />
       </list>
     </recent_temporary>
   </component>
@@ -538,14 +566,12 @@
       <workItem from="1567824861214" duration="7220000" />
       <workItem from="1567907291757" duration="5874000" />
       <workItem from="1567991841988" duration="1149000" />
-      <workItem from="1568017526948" duration="1025000" />
+      <workItem from="1568017526948" duration="1787000" />
+      <workItem from="1568101339445" duration="2643000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 41m 32s.xml">
-      <configuration name="LocationServiceTest.test" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 45m 31s.xml">
       <configuration name="LocationServiceTest.test" configurationId="JUnit" />
     </history-entry>
@@ -573,9 +599,12 @@
     <history-entry file="RoomServiceTest_test - 2019.09.07 at 11h 12m 55s.xml">
       <configuration name="RoomServiceTest.test" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="ParentServiceTest_delete - 2019.09.10 at 15h 51m 27s.xml">
+      <configuration name="ParentServiceTest.delete" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="161421000" />
+    <option name="totallyTimeSpent" value="164826000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -587,10 +616,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24597855" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24932976" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -664,13 +693,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="858">
@@ -814,13 +836,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1551">
@@ -875,13 +890,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="429">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="359">
@@ -968,13 +976,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1287">
-          <caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2244">
@@ -1016,47 +1017,44 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4290">
-          <caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
+        <state relative-caret-position="129">
+          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1056">
+        <state relative-caret-position="1038">
           <caret line="53" column="37" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+        <state relative-caret-position="590">
+          <caret line="194" column="21" selection-start-line="194" selection-start-column="16" selection-end-line="194" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="164" selection-start-line="164" selection-end-line="164" />
+        <state relative-caret-position="383">
+          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1485">
-          <caret line="45" column="29" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+        <state relative-caret-position="213">
+          <caret line="77" column="39" lean-forward="true" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/SimpleCORSFilter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1155">
+        <state relative-caret-position="481">
           <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1064,10 +1062,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/spring/spring-web.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="32" selection-start-line="32" selection-end-line="32" />
+        <state relative-caret-position="-14">
+          <caret line="30" column="48" lean-forward="true" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="321">
+          <caret line="164" selection-start-line="164" selection-end-line="164" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1372">
+          <caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="36" column="25" lean-forward="true" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
         </state>
       </provider>
     </entry>
diff --git a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
index d1f8919..8c6f3b0 100644
--- a/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
+++ b/server/OldPeopleHome/src/main/webapp/WEB-INF/web.xml
@@ -42,6 +42,7 @@
             <param-value>true</param-value>
         </init-param>
     </filter>
+
     <filter-mapping>
     <filter-name>SpringEncodingFilter</filter-name>
     <url-pattern>/*</url-pattern>
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 07bb78f..80ccf3c 100644
--- a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java
@@ -32,4 +32,9 @@ public class ParentServiceTest extends BaseTest {
         System.out.println(parentService.findByLongId("a"));
     }
 
+    @Test
+    public void delete(){
+        parentService.delete(Long.valueOf(22));
+        System.out.println(parentService.findAll());
+    }
 }
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
new file mode 100644
index 0000000..efc14ca
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome.war differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6f7f877
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..87f12c5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/AdminDao.class 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
new file mode 100644
index 0000000..40bd5a1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class 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
new file mode 100644
index 0000000..a47613a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildParentDao.class 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
new file mode 100644
index 0000000..230c7fb
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/HeartRateDao.class 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
new file mode 100644
index 0000000..82d8e4f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/LocationDao.class 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
new file mode 100644
index 0000000..12c0207
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/MotionDao.class 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
new file mode 100644
index 0000000..e3a3326
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class 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
new file mode 100644
index 0000000..15ff3f0
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomDao.class 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
new file mode 100644
index 0000000..1aa6c68
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/RoomStateDao.class 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
new file mode 100644
index 0000000..27df01b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/SleepDao.class 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
new file mode 100644
index 0000000..434de64
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/ChangeRoom.class 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
new file mode 100644
index 0000000..af3f4c3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/HeartRateFilter.class 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
new file mode 100644
index 0000000..49328cb
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/LocationFilter.class 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
new file mode 100644
index 0000000..ba07154
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/MotionFilter.class 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
new file mode 100644
index 0000000..ad89e24
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/RoomStateFilter.class 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
new file mode 100644
index 0000000..9993dc5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dto/SleepFilter.class 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
new file mode 100644
index 0000000..46ead89
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Admin.class 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
new file mode 100644
index 0000000..53b2b83
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Child.class 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
new file mode 100644
index 0000000..2b1a64b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/ChildParent.class 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
new file mode 100644
index 0000000..ef5b169
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class 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
new file mode 100644
index 0000000..8971e9a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Location.class 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
new file mode 100644
index 0000000..ae920b8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class 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
new file mode 100644
index 0000000..74024c6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Parent.class 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
new file mode 100644
index 0000000..93f08a5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Room.class 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
new file mode 100644
index 0000000..654840c
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/RoomState.class 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
new file mode 100644
index 0000000..897f11f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Sleep.class 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
new file mode 100644
index 0000000..82931e6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/AdminService.class 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
new file mode 100644
index 0000000..912131d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildParentService.class 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
new file mode 100644
index 0000000..a17490a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class 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
new file mode 100644
index 0000000..c8ddcee
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/HeartRateService.class 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
new file mode 100644
index 0000000..fd7f9dd
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/LocationService.class 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
new file mode 100644
index 0000000..42056c8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/MotionService.class 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
new file mode 100644
index 0000000..421d057
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class 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
new file mode 100644
index 0000000..4cc356f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomService.class 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
new file mode 100644
index 0000000..e7d116e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/RoomStateService.class 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
new file mode 100644
index 0000000..f2d6a25
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/SleepService.class 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
new file mode 100644
index 0000000..966b3a3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class 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
new file mode 100644
index 0000000..618038a
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class 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
new file mode 100644
index 0000000..b3148e6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class 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
new file mode 100644
index 0000000..d9d5bd2
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class 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
new file mode 100644
index 0000000..5631356
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class 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
new file mode 100644
index 0000000..b9ae282
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class 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
new file mode 100644
index 0000000..284eda1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class 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
new file mode 100644
index 0000000..3926325
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class 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
new file mode 100644
index 0000000..431b748
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class 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
new file mode 100644
index 0000000..57d5fbe
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class 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
new file mode 100644
index 0000000..248039f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/MethodUtil.class 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
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class
new file mode 100644
index 0000000..f7d2687
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class 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
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/utils/StringUtil.class 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
new file mode 100644
index 0000000..4711e23
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/AdminController.class 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
new file mode 100644
index 0000000..1ab1d70
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class 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
new file mode 100644
index 0000000..19bf3dc
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class 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
new file mode 100644
index 0000000..7b4d633
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class 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
new file mode 100644
index 0000000..60088a4
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/LocationController.class 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
new file mode 100644
index 0000000..3ae8aba
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class 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
new file mode 100644
index 0000000..2cb4f65
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class 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
new file mode 100644
index 0000000..377e641
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomController.class 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
new file mode 100644
index 0000000..5417eb5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/RoomStateController.class 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
new file mode 100644
index 0000000..4415246
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/SleepController.class differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
new file mode 100644
index 0000000..e9eb37f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..4480ac6
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ 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
new file mode 100644
index 0000000..b85b118
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/AdminDao.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.AdminDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Admin">
+        <result column="account" property="adminAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="adminPassword" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findByAccount" resultMap="BaseResultMap" parameterType="String">
+        select * from admin where account=#{account}
+    </select>
+
+</mapper>
\ 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
new file mode 100644
index 0000000..298dc84
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.ChildDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Child">
+        <id column="id" property="childId" jdbcType="BIGINT"/>
+        <result column="longid" property="childLongId" jdbcType="CHAR"/>
+        <result column="name" property="childName" jdbcType="VARCHAR"/>
+        <result column="sex" property="childSex" jdbcType="VARCHAR"/>
+        <result column="account" property="childAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="childPassword" jdbcType="VARCHAR"/>
+        <result column="phone" property="childPhone" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findById" resultMap="BaseResultMap" parameterType="long">
+        select * from child where id = #{childId}
+    </select>
+    <select id="findByLongId" resultMap="BaseResultMap" parameterType="String">
+        select * from child where longid = #{childLongId}
+    </select>
+    <select id="findByName" resultMap="BaseResultMap" parameterType="String">
+        select * from child where name = #{childName}
+    </select>
+    <select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
+        select * from child where account = #{childAccount}
+    </select>
+    <select id="findAll" resultMap="BaseResultMap">
+        select * from child
+    </select>
+
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="childId" parameterType="Child">
+        insert into child(longid,name,sex,account,password,phone)
+        values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        delete from child where id = #{childId}
+    </delete>
+
+    <update id="update" parameterType="Child">
+        update child
+        set longid = #{childLongId},
+        name = #{childName},
+        sex = #{childSex},
+        account = #{childAccount},
+        password = #{childPassword},
+        phone = #{childPhone}
+        where id =#{childId}
+    </update>
+</mapper>
\ 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
new file mode 100644
index 0000000..4dafdab
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildParentDao.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.ChildParentDao">
+    <resultMap id="ParentResultMap" type="com.oldpeoplehome.entity.Parent">
+        <id column="id" property="parentId" jdbcType="BIGINT"/>
+        <result column="longid" property="parentLongId" jdbcType="CHAR"/>
+        <result column="name" property="parentName" jdbcType="VARCHAR"/>
+        <result column="sex" property="parentSex" jdbcType="VARCHAR"/>
+        <result column="account" property="parentAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="parentPassword" jdbcType="VARCHAR"/>
+        <result column="height" property="parentHeight" jdbcType="DOUBLE"/>
+        <result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
+        <result column="birth" property="parentBirth" jdbcType="DATE"/>
+        <result column="phone" property="parentPhone" jdbcType="CHAR"/>
+        <association property="child" javaType="Child">
+            <id column="cid" property="childId" jdbcType="BIGINT"/>
+            <result column="clongid" property="childLongId" jdbcType="CHAR"/>
+            <result column="cname" property="childName" jdbcType="VARCHAR"/>
+            <result column="csex" property="childSex" jdbcType="VARCHAR"/>
+            <result column="caccount" property="childAccount" jdbcType="VARCHAR"/>
+            <result column="cpassword" property="childPassword" jdbcType="VARCHAR"/>
+            <result column="cphone" property="childPhone" jdbcType="VARCHAR"/>
+        </association>
+    </resultMap>
+    <resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
+        <id column="id" property="childId" jdbcType="BIGINT"/>
+        <result column="longid" property="childLongId" jdbcType="CHAR"/>
+        <result column="name" property="childName" jdbcType="VARCHAR"/>
+        <result column="sex" property="childSex" jdbcType="VARCHAR"/>
+        <result column="account" property="childAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="childPassword" jdbcType="VARCHAR"/>
+        <result column="phone" property="childPhone" jdbcType="VARCHAR"/>
+        <association property="parent" javaType="Parent">
+            <id column="pid" property="parentId" jdbcType="BIGINT"/>
+            <result column="plongid" property="parentLongId" jdbcType="CHAR"/>
+            <result column="pname" property="parentName" jdbcType="VARCHAR"/>
+            <result column="psex" property="parentSex" jdbcType="VARCHAR"/>
+            <result column="paccount" property="parentAccount" jdbcType="VARCHAR"/>
+            <result column="ppassword" property="parentPassword" jdbcType="VARCHAR"/>
+            <result column="pheight" property="parentHeight" jdbcType="DOUBLE"/>
+            <result column="pweight" property="parentWeight" jdbcType="DOUBLE"/>
+            <result column="pbirth" property="parentBirth" jdbcType="DATE"/>
+            <result column="pphone" property="parentPhone" jdbcType="CHAR"/>
+        </association>
+    </resultMap>
+    <select id="findByChild" resultMap="ParentResultMap" parameterType="long">
+        select c.*, p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
+    </select>
+    <select id="findByParent" resultMap="ChildResultMap" parameterType="long">
+        select c.*, p.* from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
+    </select>
+    <insert id="insert" parameterType="ChildParent">
+        insert into cp(pid, cid, relation)
+        values (#{parentId}, #{childId}, #{relation})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..cc2a7e7
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.HeartRateDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+        <result column="rate" property="rate" jdbcType="DOUBLE"/>
+        <result column="rate1" property="rate1" jdbcType="DOUBLE"/>
+        <result column="rate2" property="rate2" jdbcType="DOUBLE"/>
+        <result column="oxy" property="oxy" jdbcType="DOUBLE"/>
+    </resultMap>
+
+    <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select *
+        from heartrate where pid = #{parentId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select *
+        from heartrate where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d %T') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="HeartRate">
+        insert into heartrate(pid, time,rate, rate1,rate2,oxy)
+        values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..2b0282a
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/LocationDao.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.LocationDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Location">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="longitude" property="longitude" jdbcType="BIGINT"/>
+        <result column="latitude" property="latitude" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select *
+        from location where pid = #{parentId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select *
+        from location where pid = #{parentId} and DATE_FORMAT(time,'%Y-%m-%d %T') between #{startTime} and #{endTime}
+    </select>
+    <select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select l.*, p.* from location l left join parent p on l.pid = p.id where l.pid = #{parentId} and l.date = #{startTime}
+    </select>
+    <insert id="insert" parameterType="Location">
+        insert into location(pid, longitude,latitude, time)
+        values (#{parentId}, #{longitude},#{latitude}, #{time})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..c735e83
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.MotionDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Motion">
+        <id column="pid" property="motionParentId" jdbcType="BIGINT"/>
+        <result column="date" property="motionDate" jdbcType="DATE"/>
+        <result column="count" property="motionCount" jdbcType="BIGINT"/>
+        <result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
+        <result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
+        <result column="time" property="motionTime" jdbcType="TIME"/>
+    </resultMap>
+
+    <select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select m.*
+        from motion m where pid = #{motionParentId}
+    </select>
+    <select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select *
+        from motion where pid = #{motionParentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="Motion">
+        insert into motion(pid, date, count, distance, energy, time)
+        values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..42a628b
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.oldpeoplehome.dao.ParentDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Parent">
+        <id column="id" property="parentId" jdbcType="BIGINT"/>
+        <result column="longid" property="parentLongId" jdbcType="CHAR"/>
+        <result column="name" property="parentName" jdbcType="VARCHAR"/>
+        <result column="sex" property="parentSex" jdbcType="VARCHAR"/>
+        <result column="account" property="parentAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="parentPassword" jdbcType="VARCHAR"/>
+        <result column="height" property="parentHeight" jdbcType="DOUBLE"/>
+        <result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
+        <result column="birth" property="parentBirth" jdbcType="DATE"/>
+        <result column="phone" property="parentPhone" jdbcType="CHAR"/>
+        <association property="parentRoom" javaType="Room">
+            <id column="rid" property="roomId" jdbcType="INTEGER"/>
+            <result column="rlocation" property="roomLocation" jdbcType="VARCHAR"/>
+            <result column="rname" property="roomName" jdbcType="VARCHAR"/>
+        </association>
+    </resultMap>
+
+    <select id="findByID" parameterType="long" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.id=#{parentId}
+    </select>
+    <select id="findByLongId" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.longid=#{parentLongId}
+    </select>
+    <select id="findByRoomId" parameterType="int" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from room r left join parent p on p.id=r.id where r.id=#{r.roomId}
+    </select>
+    <select id="findByName" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.name=#{p.parentName}
+    </select>
+    <select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.account=#{p.parentAccount}
+    </select>
+
+    <select id="findAll"  resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id
+    </select>
+
+    <insert id="insert" parameterType="Parent" useGeneratedKeys="true" keyColumn="id">
+        insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
+        values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
+    </insert>
+
+    <update id="update" keyColumn="id">
+        update parent
+        set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
+        where id=#{parentId}
+    </update>
+
+    <delete id="delete" parameterType="long">
+        delete from parent where id=#{parentId}
+    </delete>
+</mapper>
\ 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
new file mode 100644
index 0000000..bf4a273
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomDao.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.RoomDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
+        <id column="id" property="roomId" jdbcType="INTEGER"/>
+        <result column="location" property="roomLocation" jdbcType="VARCHAR"/>
+        <result column="name" property="roomName" jdbcType="VARCHAR"/>
+        <result column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="temp" property="temp" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <select id="findById" resultMap="BaseResultMap" parameterType="int">
+        select * from room where id = #{roomId}
+    </select>
+
+    <select id="findAll" resultMap="BaseResultMap">
+        select * from room
+    </select>
+
+    <select id="findEmptyRoom" resultMap="BaseResultMap">
+        select * from room where pid is null
+    </select>
+
+    <insert id="insertRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="roomId" parameterType="Room">
+        insert into room(location, name) values (#{roomLocation}, #{roomName})
+    </insert>
+
+    <delete id="deleteRoom" parameterType="int">
+        delete from room where id = #{roomId}
+    </delete>
+    
+    <update id="updateRoom" parameterType="Room">
+        update room
+        set location = #{roomLocation},
+            name = #{roomName},
+            pid = #{parentId},
+            temp = #{temp}
+        where id =#{roomId}
+    </update>
+
+</mapper>
\ 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
new file mode 100644
index 0000000..06c2ac2
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/RoomStateDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.RoomStateDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.RoomState">
+        <id column="rid" property="roomId" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+        <result column="temperature" property="temperature" jdbcType="DOUBLE"/>
+        <result column="humidity" property="humidity" jdbcType="DOUBLE"/>
+        <result column="isin" property="isin" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <select id="findByRoom" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select *
+        from rstate where rid = #{roomId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select *
+        from rstate where rid = #{roomId} and DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s')between #{startDate} and #{endDate}
+    </select>
+    <select id="findByRoomAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select r.*, room.* from rstate r left join room on r.rid = room.id where r.rid = #{roomId} and r.time = #{startDate}
+    </select>
+    <insert id="insert" parameterType="RoomState">
+        insert into rstate(rid, time, temperature, humidity, isin)
+        values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..5d34f26
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/SleepDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.SleepDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Sleep">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="date" property="date" jdbcType="DATE"/>
+        <result column="deep" property="lightTime" jdbcType="TIME"/>
+        <result column="light" property="deepTime" jdbcType="TIME"/>
+        <result column="awake" property="awakeTime" jdbcType="TIME"/>
+    </resultMap>
+
+    <select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select *
+        from sleep where pid = #{parentId}
+    </select>
+    <select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select *
+        from sleep where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select s.*, p.* from sleep s left join parent p on s.pid = p.id where s.pid = #{parentId} and s.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="Sleep">
+        insert into sleep(pid, date, deep, light, awake)
+        values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
+    </insert>
+</mapper>
\ 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
new file mode 100644
index 0000000..4b92325
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mybatis-config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 配置全局属性 -->
+    <settings>
+        <!-- 使用jdbc的getGeneratedKeys获取数据库自增主键值 -->
+        <setting name="useGeneratedKeys" value="true" />
+
+        <!-- 使用列别名替换列名 默认:true -->
+        <setting name="useColumnLabel" value="true" />
+
+        <!-- 开启驼峰命名转换:Table{create_time} -> Entity{createTime} -->
+        <setting name="mapUnderscoreToCamelCase" value="true" />
+    </settings>
+</configuration>
\ 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
new file mode 100644
index 0000000..96c91b2
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-dao.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/context
+	   http://www.springframework.org/schema/context/spring-context.xsd">
+    <!--配置数据库相关参数 -->
+    <context:property-placeholder location="classpath:jdbc.properties"/>
+    <!-- 2.数据库连接池 -->
+    <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+        <!-- 配置连接池属性 -->
+        <property name="driverClass" value="${jdbc.driver}"/>
+        <property name="jdbcUrl" value="${jdbc.url}"/>
+        <property name="user" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+
+        <!-- c3p0连接池的私有属性 -->
+        <property name="maxPoolSize" value="30"/>
+        <property name="minPoolSize" value="10"/>
+        <!-- 关闭连接后不自动commit -->
+        <property name="autoCommitOnClose" value="false"/>
+        <!-- 获取连接超时时间 -->
+        <property name="checkoutTimeout" value="10000"/>
+        <!-- 当获取连接失败重试次数 -->
+        <property name="acquireRetryAttempts" value="2"/>
+    </bean>
+
+    <!-- 3.配置SqlSessionFactory对象 -->
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <!-- 注入数据库连接池 -->
+        <property name="dataSource" ref="dataSource"/>
+        <!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
+        <property name="configLocation" value="classpath:mybatis-config.xml"/>
+        <!-- 扫描entity包 使用别名 -->
+        <property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
+        <!-- 扫描sql配置文件:mapper需要的xml文件 -->
+        <property name="mapperLocations" value="classpath:mapper/*.xml"/>
+    </bean>
+
+    <!-- 4.配置扫描Dao接口包，动态实现Dao接口，注入到spring容器中 -->
+    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <!-- 注入sqlSessionFactory -->
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <!-- 给出需要扫描Dao接口包 -->
+        <property name="basePackage" value="com.oldpeoplehome.dao"/>
+    </bean>
+
+</beans>
\ 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
new file mode 100644
index 0000000..10d4e5f
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-service.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/context
+       http://www.springframework.org/schema/context/spring-context.xsd
+       http://www.springframework.org/schema/tx
+       http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+    <!-- 扫描service包下所有使用注解的类型 -->
+    <context:component-scan base-package="com.oldpeoplehome.service" />
+
+    <!-- 配置事务管理器 -->
+    <bean id="transactionManager"
+          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <!-- 注入数据库连接池 -->
+        <property name="dataSource" ref="dataSource" />
+    </bean>
+
+    <!-- 配置基于注解的声明式事务 -->
+    <tx:annotation-driven transaction-manager="transactionManager" />
+
+</beans>
\ 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
new file mode 100644
index 0000000..87e4caa
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/spring/spring-web.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/mvc
+       http://www.springframework.org/schema/mvc/spring-mvc.xsd
+       http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <!-- 配置SpringMVC -->
+    <!-- 1.开启SpringMVC注解模式 -->
+    <!-- 简化配置：
+        (1)自动注册DefaultAnootationHandlerMapping,AnotationMethodHandlerAdapter
+        (2)提供一些列：数据绑定，数字和日期的format @NumberFormat, @DateTimeFormat, xml,json默认读写支持
+    -->
+    <mvc:annotation-driven />
+    <!-- 2.静态资源默认servlet配置
+		(1)加入对静态资源的处理：js,gif,png
+		(2)允许使用"/"做整体映射
+	 -->
+    <mvc:default-servlet-handler/>
+
+    <!-- 接口跨域配置 -->
+    <mvc:cors>
+        <mvc:mapping path="/**"
+                     allowed-origins="*"
+                     allowed-methods="POST, GET, OPTIONS, DELETE, PUT"
+                     allowed-headers="Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With"
+                     allow-credentials="true" />
+    </mvc:cors>
+
+    <!-- 3.配置jsp 显示ViewResolver -->
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
+        <property name="prefix" value="/WEB-INF/jsp/" />
+        <property name="suffix" value=".jsp" />
+    </bean>
+
+    <!-- 4.扫描web相关的bean -->
+    <context:component-scan base-package="com.oldpeoplehome.web" />
+    <context:component-scan base-package="com.oldpeoplehome">
+        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
+    </context:component-scan>
+
+
+</beans>
\ 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
new file mode 100644
index 0000000..0f42d60
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/c3p0-0.9.1.2.jar 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
new file mode 100644
index 0000000..75580be
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-collections-3.2.jar 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
new file mode 100644
index 0000000..93a3b9f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-logging-1.2.jar 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
new file mode 100644
index 0000000..fdf8b6f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/commons-pool2-2.4.2.jar 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
new file mode 100644
index 0000000..0a18c34
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-annotations-2.6.0.jar 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
new file mode 100644
index 0000000..5ee8d20
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-core-2.6.5.jar 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
new file mode 100644
index 0000000..feb8bba
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jackson-databind-2.6.5.jar 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
new file mode 100644
index 0000000..6b14c3d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/javax.servlet-api-3.1.0.jar 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
new file mode 100644
index 0000000..f4d27d3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jedis-2.9.0.jar 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
new file mode 100644
index 0000000..0fd275e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/jstl-1.2.jar 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
new file mode 100644
index 0000000..39f68c4
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-classic-1.1.1.jar 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
new file mode 100644
index 0000000..893962d
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/logback-core-1.1.1.jar 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
new file mode 100644
index 0000000..1cc5f4e
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-3.3.0.jar 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
new file mode 100644
index 0000000..7ddda85
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mybatis-spring-1.2.3.jar 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
new file mode 100644
index 0000000..7a19168
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/mysql-connector-java-5.1.37.jar 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
new file mode 100644
index 0000000..1c3cfb8
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okhttp-3.10.0.jar 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
new file mode 100644
index 0000000..a0ee347
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/okio-1.14.0.jar 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
new file mode 100644
index 0000000..cd78554
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-api-1.0.8.jar 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
new file mode 100644
index 0000000..c31fa4b
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-collectionschema-1.0.8.jar 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
new file mode 100644
index 0000000..9bbadf3
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-core-1.0.8.jar 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
new file mode 100644
index 0000000..4099308
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/protostuff-runtime-1.0.8.jar 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
new file mode 100644
index 0000000..19aaf37
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/slf4j-api-1.7.6.jar 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
new file mode 100644
index 0000000..e054cf6
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-aop-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..f52417f
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-beans-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..f303583
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-context-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..883ce39
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-core-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..1d6abd1
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-expression-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..a3876b5
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-jdbc-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..cc34fde
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-test-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..379a761
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-tx-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..1f5e468
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-web-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..bfc0bcf
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/spring-webmvc-4.3.16.RELEASE.jar 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
new file mode 100644
index 0000000..bc528ac
Binary files /dev/null and b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/lib/standard-1.1.2.jar differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
new file mode 100644
index 0000000..d1f8919
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/web.xml
@@ -0,0 +1,54 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                      http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1" metadata-complete="true">
+  <!-- 如果是用mvn命令生成的xml，需要修改servlet版本为3.1 -->
+  <!-- 配置DispatcherServlet -->
+  <servlet>
+    <servlet-name>mvc-dispatcher</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <!-- 配置springMVC需要加载的配置文件
+        spring-dao.xml,spring-service.xml,spring-web.xml
+        Mybatis - > spring -> springmvc
+     -->
+    <init-param>
+      <param-name>contextConfigLocation</param-name>
+      <param-value>classpath:spring/spring-*.xml</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>mvc-dispatcher</servlet-name>
+    <!-- 默认匹配所有的请求 -->
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+    <!-- Spring字符集过滤器 -->
+    <filter>
+        <filter-name>SpringEncodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>SimpleCORSFilter</filter-name>
+        <filter-class>com.oldpeoplehome.utils.SimpleCORSFilter</filter-class>
+        <init-param>
+            <param-name>IsCross</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+    <filter-name>SpringEncodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>SimpleCORSFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/OldPeopleHome/index.jsp b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
new file mode 100644
index 0000000..c38169b
--- /dev/null
+++ b/server/OldPeopleHome/target/OldPeopleHome/index.jsp
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class
new file mode 100644
index 0000000..87f12c5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/AdminDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class
new file mode 100644
index 0000000..40bd5a1
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class
new file mode 100644
index 0000000..a47613a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildParentDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class
new file mode 100644
index 0000000..230c7fb
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/HeartRateDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class
new file mode 100644
index 0000000..82d8e4f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/LocationDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class
new file mode 100644
index 0000000..12c0207
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/MotionDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class
new file mode 100644
index 0000000..e3a3326
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class
new file mode 100644
index 0000000..15ff3f0
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class
new file mode 100644
index 0000000..1aa6c68
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/RoomStateDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class
new file mode 100644
index 0000000..27df01b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/SleepDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class
new file mode 100644
index 0000000..434de64
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/ChangeRoom.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class
new file mode 100644
index 0000000..af3f4c3
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/HeartRateFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class
new file mode 100644
index 0000000..49328cb
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/LocationFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class
new file mode 100644
index 0000000..ba07154
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/MotionFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class
new file mode 100644
index 0000000..ad89e24
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/RoomStateFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class
new file mode 100644
index 0000000..9993dc5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dto/SleepFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class
new file mode 100644
index 0000000..46ead89
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Admin.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class
new file mode 100644
index 0000000..53b2b83
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Child.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class
new file mode 100644
index 0000000..2b1a64b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/ChildParent.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class
new file mode 100644
index 0000000..ef5b169
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class
new file mode 100644
index 0000000..8971e9a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Location.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class
new file mode 100644
index 0000000..ae920b8
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Motion.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class
new file mode 100644
index 0000000..74024c6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Parent.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class
new file mode 100644
index 0000000..93f08a5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Room.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class
new file mode 100644
index 0000000..654840c
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/RoomState.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class
new file mode 100644
index 0000000..897f11f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/Sleep.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class
new file mode 100644
index 0000000..82931e6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/AdminService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class
new file mode 100644
index 0000000..912131d
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildParentService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class
new file mode 100644
index 0000000..a17490a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class
new file mode 100644
index 0000000..c8ddcee
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/HeartRateService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class
new file mode 100644
index 0000000..fd7f9dd
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/LocationService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class
new file mode 100644
index 0000000..42056c8
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/MotionService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class
new file mode 100644
index 0000000..421d057
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class
new file mode 100644
index 0000000..4cc356f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class
new file mode 100644
index 0000000..e7d116e
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/RoomStateService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class
new file mode 100644
index 0000000..f2d6a25
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/SleepService.class 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
new file mode 100644
index 0000000..966b3a3
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/AdminServiceImpl.class 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
new file mode 100644
index 0000000..618038a
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildParentServiceImpl.class 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
new file mode 100644
index 0000000..b3148e6
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class 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
new file mode 100644
index 0000000..d9d5bd2
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/HeartRateServiceTest.class 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
new file mode 100644
index 0000000..5631356
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/LocationServiceImpl.class 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
new file mode 100644
index 0000000..b9ae282
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/MotionServiceImpl.class 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
new file mode 100644
index 0000000..284eda1
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class 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
new file mode 100644
index 0000000..3926325
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomServiceImpl.class 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
new file mode 100644
index 0000000..431b748
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/RoomStateServiceImpl.class 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
new file mode 100644
index 0000000..57d5fbe
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/SleepServiceImpl.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class
new file mode 100644
index 0000000..248039f
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/MethodUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class
new file mode 100644
index 0000000..e0e2a2b
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/Result.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class
new file mode 100644
index 0000000..f7d2687
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/SimpleCORSFilter.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class
new file mode 100644
index 0000000..6b211bf
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/utils/StringUtil.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class
new file mode 100644
index 0000000..4711e23
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/AdminController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class
new file mode 100644
index 0000000..1ab1d70
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class
new file mode 100644
index 0000000..19bf3dc
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildParentController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class
new file mode 100644
index 0000000..7b4d633
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class
new file mode 100644
index 0000000..60088a4
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/LocationController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class
new file mode 100644
index 0000000..3ae8aba
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/MotionController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class
new file mode 100644
index 0000000..2cb4f65
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class
new file mode 100644
index 0000000..377e641
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class
new file mode 100644
index 0000000..5417eb5
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/RoomStateController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class
new file mode 100644
index 0000000..4415246
Binary files /dev/null and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/SleepController.class differ
diff --git a/server/OldPeopleHome/target/classes/jdbc.properties b/server/OldPeopleHome/target/classes/jdbc.properties
new file mode 100644
index 0000000..e9eb37f
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/jdbc.properties
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..4480ac6
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="debug">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/AdminDao.xml b/server/OldPeopleHome/target/classes/mapper/AdminDao.xml
new file mode 100644
index 0000000..b85b118
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/AdminDao.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.AdminDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Admin">
+        <result column="account" property="adminAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="adminPassword" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findByAccount" resultMap="BaseResultMap" parameterType="String">
+        select * from admin where account=#{account}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/ChildDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
new file mode 100644
index 0000000..298dc84
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.ChildDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Child">
+        <id column="id" property="childId" jdbcType="BIGINT"/>
+        <result column="longid" property="childLongId" jdbcType="CHAR"/>
+        <result column="name" property="childName" jdbcType="VARCHAR"/>
+        <result column="sex" property="childSex" jdbcType="VARCHAR"/>
+        <result column="account" property="childAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="childPassword" jdbcType="VARCHAR"/>
+        <result column="phone" property="childPhone" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="findById" resultMap="BaseResultMap" parameterType="long">
+        select * from child where id = #{childId}
+    </select>
+    <select id="findByLongId" resultMap="BaseResultMap" parameterType="String">
+        select * from child where longid = #{childLongId}
+    </select>
+    <select id="findByName" resultMap="BaseResultMap" parameterType="String">
+        select * from child where name = #{childName}
+    </select>
+    <select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
+        select * from child where account = #{childAccount}
+    </select>
+    <select id="findAll" resultMap="BaseResultMap">
+        select * from child
+    </select>
+
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="childId" parameterType="Child">
+        insert into child(longid,name,sex,account,password,phone)
+        values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
+    </insert>
+
+    <delete id="delete" parameterType="long">
+        delete from child where id = #{childId}
+    </delete>
+
+    <update id="update" parameterType="Child">
+        update child
+        set longid = #{childLongId},
+        name = #{childName},
+        sex = #{childSex},
+        account = #{childAccount},
+        password = #{childPassword},
+        phone = #{childPhone}
+        where id =#{childId}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml
new file mode 100644
index 0000000..4dafdab
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ChildParentDao.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.ChildParentDao">
+    <resultMap id="ParentResultMap" type="com.oldpeoplehome.entity.Parent">
+        <id column="id" property="parentId" jdbcType="BIGINT"/>
+        <result column="longid" property="parentLongId" jdbcType="CHAR"/>
+        <result column="name" property="parentName" jdbcType="VARCHAR"/>
+        <result column="sex" property="parentSex" jdbcType="VARCHAR"/>
+        <result column="account" property="parentAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="parentPassword" jdbcType="VARCHAR"/>
+        <result column="height" property="parentHeight" jdbcType="DOUBLE"/>
+        <result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
+        <result column="birth" property="parentBirth" jdbcType="DATE"/>
+        <result column="phone" property="parentPhone" jdbcType="CHAR"/>
+        <association property="child" javaType="Child">
+            <id column="cid" property="childId" jdbcType="BIGINT"/>
+            <result column="clongid" property="childLongId" jdbcType="CHAR"/>
+            <result column="cname" property="childName" jdbcType="VARCHAR"/>
+            <result column="csex" property="childSex" jdbcType="VARCHAR"/>
+            <result column="caccount" property="childAccount" jdbcType="VARCHAR"/>
+            <result column="cpassword" property="childPassword" jdbcType="VARCHAR"/>
+            <result column="cphone" property="childPhone" jdbcType="VARCHAR"/>
+        </association>
+    </resultMap>
+    <resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
+        <id column="id" property="childId" jdbcType="BIGINT"/>
+        <result column="longid" property="childLongId" jdbcType="CHAR"/>
+        <result column="name" property="childName" jdbcType="VARCHAR"/>
+        <result column="sex" property="childSex" jdbcType="VARCHAR"/>
+        <result column="account" property="childAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="childPassword" jdbcType="VARCHAR"/>
+        <result column="phone" property="childPhone" jdbcType="VARCHAR"/>
+        <association property="parent" javaType="Parent">
+            <id column="pid" property="parentId" jdbcType="BIGINT"/>
+            <result column="plongid" property="parentLongId" jdbcType="CHAR"/>
+            <result column="pname" property="parentName" jdbcType="VARCHAR"/>
+            <result column="psex" property="parentSex" jdbcType="VARCHAR"/>
+            <result column="paccount" property="parentAccount" jdbcType="VARCHAR"/>
+            <result column="ppassword" property="parentPassword" jdbcType="VARCHAR"/>
+            <result column="pheight" property="parentHeight" jdbcType="DOUBLE"/>
+            <result column="pweight" property="parentWeight" jdbcType="DOUBLE"/>
+            <result column="pbirth" property="parentBirth" jdbcType="DATE"/>
+            <result column="pphone" property="parentPhone" jdbcType="CHAR"/>
+        </association>
+    </resultMap>
+    <select id="findByChild" resultMap="ParentResultMap" parameterType="long">
+        select c.*, p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
+    </select>
+    <select id="findByParent" resultMap="ChildResultMap" parameterType="long">
+        select c.*, p.* from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
+    </select>
+    <insert id="insert" parameterType="ChildParent">
+        insert into cp(pid, cid, relation)
+        values (#{parentId}, #{childId}, #{relation})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
new file mode 100644
index 0000000..cc2a7e7
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.HeartRateDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+        <result column="rate" property="rate" jdbcType="DOUBLE"/>
+        <result column="rate1" property="rate1" jdbcType="DOUBLE"/>
+        <result column="rate2" property="rate2" jdbcType="DOUBLE"/>
+        <result column="oxy" property="oxy" jdbcType="DOUBLE"/>
+    </resultMap>
+
+    <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select *
+        from heartrate where pid = #{parentId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select *
+        from heartrate where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d %T') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
+        select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="HeartRate">
+        insert into heartrate(pid, time,rate, rate1,rate2,oxy)
+        values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/LocationDao.xml b/server/OldPeopleHome/target/classes/mapper/LocationDao.xml
new file mode 100644
index 0000000..2b0282a
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/LocationDao.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.LocationDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Location">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="longitude" property="longitude" jdbcType="BIGINT"/>
+        <result column="latitude" property="latitude" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select *
+        from location where pid = #{parentId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select *
+        from location where pid = #{parentId} and DATE_FORMAT(time,'%Y-%m-%d %T') between #{startTime} and #{endTime}
+    </select>
+    <select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.LocationFilter">
+        select l.*, p.* from location l left join parent p on l.pid = p.id where l.pid = #{parentId} and l.date = #{startTime}
+    </select>
+    <insert id="insert" parameterType="Location">
+        insert into location(pid, longitude,latitude, time)
+        values (#{parentId}, #{longitude},#{latitude}, #{time})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml
new file mode 100644
index 0000000..c735e83
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/MotionDao.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.MotionDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Motion">
+        <id column="pid" property="motionParentId" jdbcType="BIGINT"/>
+        <result column="date" property="motionDate" jdbcType="DATE"/>
+        <result column="count" property="motionCount" jdbcType="BIGINT"/>
+        <result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
+        <result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
+        <result column="time" property="motionTime" jdbcType="TIME"/>
+    </resultMap>
+
+    <select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select m.*
+        from motion m where pid = #{motionParentId}
+    </select>
+    <select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select *
+        from motion where pid = #{motionParentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
+        select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="Motion">
+        insert into motion(pid, date, count, distance, energy, time)
+        values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
new file mode 100644
index 0000000..42a628b
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.oldpeoplehome.dao.ParentDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Parent">
+        <id column="id" property="parentId" jdbcType="BIGINT"/>
+        <result column="longid" property="parentLongId" jdbcType="CHAR"/>
+        <result column="name" property="parentName" jdbcType="VARCHAR"/>
+        <result column="sex" property="parentSex" jdbcType="VARCHAR"/>
+        <result column="account" property="parentAccount" jdbcType="VARCHAR"/>
+        <result column="password" property="parentPassword" jdbcType="VARCHAR"/>
+        <result column="height" property="parentHeight" jdbcType="DOUBLE"/>
+        <result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
+        <result column="birth" property="parentBirth" jdbcType="DATE"/>
+        <result column="phone" property="parentPhone" jdbcType="CHAR"/>
+        <association property="parentRoom" javaType="Room">
+            <id column="rid" property="roomId" jdbcType="INTEGER"/>
+            <result column="rlocation" property="roomLocation" jdbcType="VARCHAR"/>
+            <result column="rname" property="roomName" jdbcType="VARCHAR"/>
+        </association>
+    </resultMap>
+
+    <select id="findByID" parameterType="long" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.id=#{parentId}
+    </select>
+    <select id="findByLongId" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.longid=#{parentLongId}
+    </select>
+    <select id="findByRoomId" parameterType="int" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from room r left join parent p on p.id=r.id where r.id=#{r.roomId}
+    </select>
+    <select id="findByName" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.name=#{p.parentName}
+    </select>
+    <select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id where p.account=#{p.parentAccount}
+    </select>
+
+    <select id="findAll"  resultMap="BaseResultMap">
+        select p.*,r.id rid,r.name rname, r.location rlocation  from parent p left join room r on p.id=r.id
+    </select>
+
+    <insert id="insert" parameterType="Parent" useGeneratedKeys="true" keyColumn="id">
+        insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
+        values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
+    </insert>
+
+    <update id="update" keyColumn="id">
+        update parent
+        set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
+        where id=#{parentId}
+    </update>
+
+    <delete id="delete" parameterType="long">
+        delete from parent where id=#{parentId}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/RoomDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
new file mode 100644
index 0000000..bf4a273
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/RoomDao.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.RoomDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
+        <id column="id" property="roomId" jdbcType="INTEGER"/>
+        <result column="location" property="roomLocation" jdbcType="VARCHAR"/>
+        <result column="name" property="roomName" jdbcType="VARCHAR"/>
+        <result column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="temp" property="temp" jdbcType="FLOAT"/>
+    </resultMap>
+
+    <select id="findById" resultMap="BaseResultMap" parameterType="int">
+        select * from room where id = #{roomId}
+    </select>
+
+    <select id="findAll" resultMap="BaseResultMap">
+        select * from room
+    </select>
+
+    <select id="findEmptyRoom" resultMap="BaseResultMap">
+        select * from room where pid is null
+    </select>
+
+    <insert id="insertRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="roomId" parameterType="Room">
+        insert into room(location, name) values (#{roomLocation}, #{roomName})
+    </insert>
+
+    <delete id="deleteRoom" parameterType="int">
+        delete from room where id = #{roomId}
+    </delete>
+    
+    <update id="updateRoom" parameterType="Room">
+        update room
+        set location = #{roomLocation},
+            name = #{roomName},
+            pid = #{parentId},
+            temp = #{temp}
+        where id =#{roomId}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml b/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml
new file mode 100644
index 0000000..06c2ac2
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/RoomStateDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.RoomStateDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.RoomState">
+        <id column="rid" property="roomId" jdbcType="BIGINT"/>
+        <result column="time" property="time" jdbcType="TIMESTAMP"/>
+        <result column="temperature" property="temperature" jdbcType="DOUBLE"/>
+        <result column="humidity" property="humidity" jdbcType="DOUBLE"/>
+        <result column="isin" property="isin" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <select id="findByRoom" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select *
+        from rstate where rid = #{roomId}
+    </select>
+    <select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select *
+        from rstate where rid = #{roomId} and DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s')between #{startDate} and #{endDate}
+    </select>
+    <select id="findByRoomAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
+        select r.*, room.* from rstate r left join room on r.rid = room.id where r.rid = #{roomId} and r.time = #{startDate}
+    </select>
+    <insert id="insert" parameterType="RoomState">
+        insert into rstate(rid, time, temperature, humidity, isin)
+        values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mapper/SleepDao.xml b/server/OldPeopleHome/target/classes/mapper/SleepDao.xml
new file mode 100644
index 0000000..5d34f26
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mapper/SleepDao.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oldpeoplehome.dao.SleepDao">
+    <resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Sleep">
+        <id column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="date" property="date" jdbcType="DATE"/>
+        <result column="deep" property="lightTime" jdbcType="TIME"/>
+        <result column="light" property="deepTime" jdbcType="TIME"/>
+        <result column="awake" property="awakeTime" jdbcType="TIME"/>
+    </resultMap>
+
+    <select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select *
+        from sleep where pid = #{parentId}
+    </select>
+    <select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select *
+        from sleep where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
+    </select>
+    <select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
+        select s.*, p.* from sleep s left join parent p on s.pid = p.id where s.pid = #{parentId} and s.date = #{startDate}
+    </select>
+    <insert id="insert" parameterType="Sleep">
+        insert into sleep(pid, date, deep, light, awake)
+        values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/target/classes/mybatis-config.xml b/server/OldPeopleHome/target/classes/mybatis-config.xml
new file mode 100644
index 0000000..4b92325
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/mybatis-config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 配置全局属性 -->
+    <settings>
+        <!-- 使用jdbc的getGeneratedKeys获取数据库自增主键值 -->
+        <setting name="useGeneratedKeys" value="true" />
+
+        <!-- 使用列别名替换列名 默认:true -->
+        <setting name="useColumnLabel" value="true" />
+
+        <!-- 开启驼峰命名转换:Table{create_time} -> Entity{createTime} -->
+        <setting name="mapUnderscoreToCamelCase" value="true" />
+    </settings>
+</configuration>
\ 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
new file mode 100644
index 0000000..96c91b2
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-dao.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/context
+	   http://www.springframework.org/schema/context/spring-context.xsd">
+    <!--配置数据库相关参数 -->
+    <context:property-placeholder location="classpath:jdbc.properties"/>
+    <!-- 2.数据库连接池 -->
+    <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+        <!-- 配置连接池属性 -->
+        <property name="driverClass" value="${jdbc.driver}"/>
+        <property name="jdbcUrl" value="${jdbc.url}"/>
+        <property name="user" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+
+        <!-- c3p0连接池的私有属性 -->
+        <property name="maxPoolSize" value="30"/>
+        <property name="minPoolSize" value="10"/>
+        <!-- 关闭连接后不自动commit -->
+        <property name="autoCommitOnClose" value="false"/>
+        <!-- 获取连接超时时间 -->
+        <property name="checkoutTimeout" value="10000"/>
+        <!-- 当获取连接失败重试次数 -->
+        <property name="acquireRetryAttempts" value="2"/>
+    </bean>
+
+    <!-- 3.配置SqlSessionFactory对象 -->
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <!-- 注入数据库连接池 -->
+        <property name="dataSource" ref="dataSource"/>
+        <!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
+        <property name="configLocation" value="classpath:mybatis-config.xml"/>
+        <!-- 扫描entity包 使用别名 -->
+        <property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
+        <!-- 扫描sql配置文件:mapper需要的xml文件 -->
+        <property name="mapperLocations" value="classpath:mapper/*.xml"/>
+    </bean>
+
+    <!-- 4.配置扫描Dao接口包，动态实现Dao接口，注入到spring容器中 -->
+    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <!-- 注入sqlSessionFactory -->
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+        <!-- 给出需要扫描Dao接口包 -->
+        <property name="basePackage" value="com.oldpeoplehome.dao"/>
+    </bean>
+
+</beans>
\ 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
new file mode 100644
index 0000000..10d4e5f
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-service.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/context
+       http://www.springframework.org/schema/context/spring-context.xsd
+       http://www.springframework.org/schema/tx
+       http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+    <!-- 扫描service包下所有使用注解的类型 -->
+    <context:component-scan base-package="com.oldpeoplehome.service" />
+
+    <!-- 配置事务管理器 -->
+    <bean id="transactionManager"
+          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <!-- 注入数据库连接池 -->
+        <property name="dataSource" ref="dataSource" />
+    </bean>
+
+    <!-- 配置基于注解的声明式事务 -->
+    <tx:annotation-driven transaction-manager="transactionManager" />
+
+</beans>
\ 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
new file mode 100644
index 0000000..87e4caa
--- /dev/null
+++ b/server/OldPeopleHome/target/classes/spring/spring-web.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/mvc
+       http://www.springframework.org/schema/mvc/spring-mvc.xsd
+       http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <!-- 配置SpringMVC -->
+    <!-- 1.开启SpringMVC注解模式 -->
+    <!-- 简化配置：
+        (1)自动注册DefaultAnootationHandlerMapping,AnotationMethodHandlerAdapter
+        (2)提供一些列：数据绑定，数字和日期的format @NumberFormat, @DateTimeFormat, xml,json默认读写支持
+    -->
+    <mvc:annotation-driven />
+    <!-- 2.静态资源默认servlet配置
+		(1)加入对静态资源的处理：js,gif,png
+		(2)允许使用"/"做整体映射
+	 -->
+    <mvc:default-servlet-handler/>
+
+    <!-- 接口跨域配置 -->
+    <mvc:cors>
+        <mvc:mapping path="/**"
+                     allowed-origins="*"
+                     allowed-methods="POST, GET, OPTIONS, DELETE, PUT"
+                     allowed-headers="Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With"
+                     allow-credentials="true" />
+    </mvc:cors>
+
+    <!-- 3.配置jsp 显示ViewResolver -->
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
+        <property name="prefix" value="/WEB-INF/jsp/" />
+        <property name="suffix" value=".jsp" />
+    </bean>
+
+    <!-- 4.扫描web相关的bean -->
+    <context:component-scan base-package="com.oldpeoplehome.web" />
+    <context:component-scan base-package="com.oldpeoplehome">
+        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
+    </context:component-scan>
+
+
+</beans>
\ 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
new file mode 100644
index 0000000..e322610
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/BaseTest.class 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
new file mode 100644
index 0000000..63ee2ed
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildDaoTest.class 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
new file mode 100644
index 0000000..16831a4
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ChildParentDaoTest.class 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
new file mode 100644
index 0000000..27fe6cc
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class 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
new file mode 100644
index 0000000..94442cd
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/ParentDaoTest.class 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
new file mode 100644
index 0000000..98d5a30
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/RoomDaoTest.class 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
new file mode 100644
index 0000000..9d0f221
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/AdminServiceTest.class 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
new file mode 100644
index 0000000..9c0e4fb
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class differ
diff --git a/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class
new file mode 100644
index 0000000..1aeb125
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class 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
new file mode 100644
index 0000000..173f98d
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/LocationServiceTest.class 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
new file mode 100644
index 0000000..207ca8f
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ParentServiceTest.class 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
new file mode 100644
index 0000000..396d647
Binary files /dev/null and b/server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/RoomServiceTest.class differ