diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index b2a8e97..f3192ba 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -7,19 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <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/java/com/oldpeoplehome/entity/Motion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/jdbc.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -31,119 +28,61 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.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="891">
-              <caret line="27" column="25" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
+            <state relative-caret-position="132">
+              <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1880">
-              <caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
+            <state relative-caret-position="121">
+              <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="220">
+              <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="118">
+              <caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
+            </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="165">
+              <caret line="15" column="11" lean-forward="true" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="33">
-              <caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="99">
-              <caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
+              <caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
               <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1246#1247#0" expanded="true" />
-                <element signature="e#1283#1284#0" expanded="true" />
-                <element signature="e#1335#1336#0" expanded="true" />
-                <element signature="e#1381#1382#0" expanded="true" />
-                <element signature="e#1416#1417#0" expanded="true" />
-                <element signature="e#1449#1450#0" expanded="true" />
-                <element signature="e#1499#1500#0" expanded="true" />
-                <element signature="e#1543#1544#0" expanded="true" />
-                <element signature="e#1594#1595#0" expanded="true" />
-                <element signature="e#1652#1653#0" expanded="true" />
-                <element signature="e#1688#1689#0" expanded="true" />
-                <element signature="e#1722#1723#0" expanded="true" />
-                <element signature="e#1774#1775#0" expanded="true" />
-                <element signature="e#1820#1821#0" expanded="true" />
-                <element signature="e#1861#1862#0" expanded="true" />
-                <element signature="e#1898#1899#0" expanded="true" />
-                <element signature="e#1958#1959#0" expanded="true" />
-                <element signature="e#2010#2011#0" expanded="true" />
-                <element signature="e#2045#2046#0" expanded="true" />
-                <element signature="e#2078#2079#0" expanded="true" />
-                <element signature="e#2128#2129#0" expanded="true" />
-                <element signature="e#2172#2173#0" expanded="true" />
-                <element signature="e#2211#2212#0" expanded="true" />
-                <element signature="e#2246#2247#0" expanded="true" />
-                <element signature="e#2302#2303#0" expanded="true" />
-                <element signature="e#2350#2351#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="383">
-              <caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </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="226">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="141">
-              <caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="248">
-              <caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
-              <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#1451#1452#0" expanded="true" />
+                <element signature="e#1478#1479#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -152,8 +91,39 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="4" selection-start-line="4" selection-end-line="4" />
+            <state relative-caret-position="264">
+              <caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-465">
+              <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+              <folding>
+                <element signature="e#1248#1249#0" expanded="true" />
+                <element signature="e#1303#1304#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -164,6 +134,7 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Kotlin File" />
+        <option value="FxmlFile" />
         <option value="Interface" />
         <option value="Class" />
       </list>
@@ -192,25 +163,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildParentServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ChildParentDaoTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/MotionFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/MotionService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/MotionServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepServiceImpl.java" />
@@ -237,12 +189,31 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
-        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
+        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/AdminController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" />
       </list>
     </option>
   </component>
@@ -272,7 +243,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -306,6 +276,43 @@
               <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="dao" 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="service" 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="service" type="462c0819:PsiDirectoryNode" />
+              <item name="impl" 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="web" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -334,47 +341,19 @@
               <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="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" 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" />
-              <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="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
-              <item name="dao" 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="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="1566912018885" />
-    <property name="last_opened_file_path" value="E:/新建文件夹 (2)/TestDemo" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567145246914" />
+    <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" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -401,7 +380,23 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.MotionDaoTest.testInsert">
+  <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="HeartRateServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="OldPeopleHome" />
       <extension name="coverage">
@@ -466,22 +461,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="RoomDaoTest.testFindAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="OldPeopleHome" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.oldpeoplehome.dao.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
-      <option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.RoomDaoTest" />
-      <option name="METHOD_NAME" value="testFindAll" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="chuizichui" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.22" ALTERNATIVE_JRE_ENABLED="false">
       <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8090/" />
       <option name="UPDATING_POLICY" value="restart-server" />
@@ -557,19 +536,19 @@
     </configuration>
     <list>
       <item itemvalue="JUnit.MotionDaoTest.test" />
-      <item itemvalue="JUnit.RoomDaoTest.testFindAll" />
       <item itemvalue="JUnit.MotionDaoTest.testInsert" />
       <item itemvalue="JUnit.RoomDaoTest.testA" />
       <item itemvalue="JUnit.HeartRateServiceTest.test" />
       <item itemvalue="Tomcat Server.chuizichui" />
+      <item itemvalue="JUnit.AdminServiceTest.testLogin" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.AdminServiceTest.testLogin" />
         <item itemvalue="JUnit.MotionDaoTest.testInsert" />
         <item itemvalue="JUnit.HeartRateServiceTest.test" />
         <item itemvalue="JUnit.RoomDaoTest.testA" />
         <item itemvalue="JUnit.MotionDaoTest.test" />
-        <item itemvalue="JUnit.RoomDaoTest.testFindAll" />
       </list>
     </recent_temporary>
   </component>
@@ -600,23 +579,13 @@
       <workItem from="1566533277465" duration="598000" />
       <workItem from="1566536292540" duration="37000" />
       <workItem from="1566536413587" duration="7748000" />
-      <workItem from="1566876393093" duration="4610000" />
+      <workItem from="1566876393093" duration="5679000" />
+      <workItem from="1567043814685" duration="630000" />
+      <workItem from="1567134555969" duration="5745000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MotionDaoTest_testInsert - 2019.08.22 at 14h 28m 43s.xml">
-      <configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="RoomDaoTest_testA - 2019.08.22 at 17h 27m 02s.xml">
-      <configuration name="RoomDaoTest.testA" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 37m 36s.xml">
-      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 38m 42s.xml">
-      <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 40m 15s.xml">
       <configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
     </history-entry>
@@ -635,9 +604,21 @@
     <history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 18m 44s.xml">
       <configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 54m 19s.xml">
+      <configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 54m 53s.xml">
+      <configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 55m 46s.xml">
+      <configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 56m 27s.xml">
+      <configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="123376000" />
+    <option name="totallyTimeSpent" value="130820000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -650,9 +631,8 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20509383" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21045576" />
       <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" />
@@ -662,7 +642,7 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.41501418" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.41501418" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -726,237 +706,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="15" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ChildParentDaoTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://E:/Java/jdk1.8.0_161/src.zip!/java/sql/Time.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-452">
-          <caret line="91" column="23" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="54" column="38" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="-462">
-          <caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="51" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="15" column="22" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/MotionServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="38" column="33" lean-forward="true" selection-start-line="38" selection-start-column="33" selection-end-line="38" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#612#613#0" expanded="true" />
-            <element signature="e#644#645#0" expanded="true" />
-            <element signature="e#898#899#0" expanded="true" />
-            <element signature="e#933#934#0" expanded="true" />
-            <element signature="e#1033#1034#0" expanded="true" />
-            <element signature="e#1057#1058#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="15" column="26" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#951#952#0" expanded="true" />
-            <element signature="e#978#979#0" expanded="true" />
-            <element signature="e#1016#1017#0" expanded="true" />
-            <element signature="e#1048#1049#0" expanded="true" />
-            <element signature="e#1080#1081#0" expanded="true" />
-            <element signature="e#1112#1113#0" expanded="true" />
-            <element signature="e#1082#1083#0" expanded="true" />
-            <element signature="e#1114#1115#0" expanded="true" />
-            <element signature="e#1162#1163#0" expanded="true" />
-            <element signature="e#1204#1205#0" expanded="true" />
-            <element signature="e#1336#1337#0" expanded="true" />
-            <element signature="e#1390#1391#0" expanded="true" />
-            <element signature="e#1237#1238#0" expanded="true" />
-            <element signature="e#1268#1269#0" expanded="true" />
-            <element signature="e#1314#1315#0" expanded="true" />
-            <element signature="e#1354#1355#0" expanded="true" />
-            <element signature="e#1488#1489#0" expanded="true" />
-            <element signature="e#1544#1545#0" expanded="true" />
-            <element signature="e#1388#1389#0" expanded="true" />
-            <element signature="e#1420#1421#0" expanded="true" />
-            <element signature="e#1468#1469#0" expanded="true" />
-            <element signature="e#1510#1511#0" expanded="true" />
-            <element signature="e#1637#1638#0" expanded="true" />
-            <element signature="e#1679#1680#0" expanded="true" />
-            <element signature="e#955#956#0" expanded="true" />
-            <element signature="e#986#987#0" expanded="true" />
-            <element signature="e#1032#1033#0" expanded="true" />
-            <element signature="e#1072#1073#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/MotionService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="392">
-          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/MotionFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="20" column="11" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
-          <folding>
-            <element signature="e#319#320#0" expanded="true" />
-            <element signature="e#371#372#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://E:/Java/jdk1.8.0_161/src.zip!/java/sql/Timestamp.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-572">
-          <caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="78" column="60" lean-forward="true" selection-start-line="78" selection-start-column="60" selection-end-line="78" selection-end-column="60" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1934#1935#0" expanded="true" />
-            <element signature="e#1993#1994#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/SleepServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="226">
-          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomStateService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomStateServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1085#1086#0" expanded="true" />
-            <element signature="e#1114#1115#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/SleepController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="46" column="30" selection-start-line="46" selection-start-column="30" selection-end-line="46" selection-end-column="30" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/SleepDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="29" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/SleepFilter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="33">
@@ -1005,13 +754,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SleepDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="8" column="57" selection-start-line="8" selection-start-column="57" selection-end-line="8" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/ChangeRoom.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
@@ -1117,16 +859,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="99">
@@ -1151,23 +883,9 @@
         </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="132">
-          <caret line="4" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1880">
-          <caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
+        <state relative-caret-position="429">
           <caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1201,10 +919,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="891">
+          <caret line="27" column="68" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="383">
-          <caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+        <state relative-caret-position="495">
+          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1213,14 +938,14 @@
     </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="226">
+        <state relative-caret-position="264">
           <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
+        <state relative-caret-position="891">
           <caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1228,16 +953,6 @@
         </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="248">
-          <caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="33">
@@ -1245,10 +960,224 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
+        <state relative-caret-position="421">
+          <caret line="93" column="13" selection-start-line="93" selection-start-column="13" selection-end-line="93" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <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="-3351">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+      <provider editor-type-id="JavaFX-Scene-Builder" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SleepDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="12" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="491">
+          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
+          <folding>
+            <element signature="e#412#413#0" expanded="true" />
+            <element signature="e#447#448#0" expanded="true" />
+            <element signature="e#503#504#0" expanded="true" />
+            <element signature="e#551#552#0" expanded="true" />
+            <element signature="e#591#592#0" expanded="true" />
+            <element signature="e#627#628#0" expanded="true" />
+            <element signature="e#685#686#0" expanded="true" />
+            <element signature="e#735#736#0" expanded="true" />
+          </folding>
+        </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="590">
+          <caret line="57" column="57" selection-start-line="57" selection-start-column="57" selection-end-line="57" selection-end-column="57" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="10" column="30" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <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/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="15" column="14" lean-forward="true" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#433#434#0" expanded="true" />
+            <element signature="e#487#488#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/AdminController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="23" column="8" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="91" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="38" />
+        </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="165">
+          <caret line="15" column="11" lean-forward="true" 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/web/ParentController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
+        </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="264">
+          <caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-465">
+          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="33">
+          <caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
+          <folding>
+            <element signature="e#1451#1452#0" expanded="true" />
+            <element signature="e#1478#1479#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="118">
+          <caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="121">
+          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+          <folding>
+            <element signature="e#1248#1249#0" expanded="true" />
+            <element signature="e#1303#1304#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/AdminDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/AdminDao.java
new file mode 100644
index 0000000..43e8f58
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/AdminDao.java
@@ -0,0 +1,13 @@
+package com.oldpeoplehome.dao;
+
+import com.oldpeoplehome.entity.Admin;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:25
+ * Description:
+ */
+public interface AdminDao {
+
+    Admin findByAccount(String account);
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ChildDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ChildDao.java
index 998a92b..ce43f83 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ChildDao.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ChildDao.java
@@ -13,6 +13,7 @@ public interface ChildDao {
     Child findById(long childId);
     Child findByLongId(String childLongId);
     Child findByName(String childName);
+    Child findByAccount(String account);
     List<Child> findAll();
     void delete(long childId);
     void update(Child child);
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
index 1a2108e..7423e21 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
@@ -15,6 +15,7 @@ public interface ParentDao {
     Parent findByLongId(String longId);
     Parent findByRoomId(int roomId);
     Parent findByName(String name);
+    Parent findByAccount(String name);
     List<Parent> findAll();
     void insert(Parent parent);
     void update(Parent parent);
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Admin.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Admin.java
new file mode 100644
index 0000000..53a185a
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Admin.java
@@ -0,0 +1,43 @@
+package com.oldpeoplehome.entity;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:10
+ * Description:
+ */
+public class Admin {
+
+    private String adminAccount;
+    private String adminPassword;
+
+    public Admin() {
+    }
+
+    public Admin(String adminAccount, String adminPassword) {
+        this.adminAccount = adminAccount;
+        this.adminPassword = adminPassword;
+    }
+
+    public String getAdminAccount() {
+        return adminAccount;
+    }
+
+    public void setAdminAccount(String adminAccount) {
+        this.adminAccount = adminAccount;
+    }
+
+    public String getAdminPassword() {
+        return adminPassword;
+    }
+
+    public void setAdminPassword(String adminPassword) {
+        this.adminPassword = adminPassword;
+    }
+
+    @Override
+    public String toString() {
+        return "Admin{" +
+                "adminAccount='" + adminAccount + '\'' +
+                ", adminPassword='" + adminPassword + '\'' +
+                '}';
+    }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/AdminService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/AdminService.java
new file mode 100644
index 0000000..eb120e8
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/AdminService.java
@@ -0,0 +1,13 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.entity.Admin;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:31
+ * Description:
+ */
+public interface AdminService {
+
+    Admin login(String account);
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ChildService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ChildService.java
index ab2c930..79e36b8 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ChildService.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ChildService.java
@@ -13,6 +13,7 @@ public interface ChildService {
     Child findById(long childId);
     Child findByLongId(String childLongId);
     Child findByName(String childName);
+    Child login(String account);
     List<Child> findAll();
     void delete(long childId);
     void update(Child child);
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
index 617eb4b..2314d63 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
@@ -13,6 +13,7 @@ public interface ParentService {
     Parent findByLongId(String longId);
     Parent findByRoomId(int roomId);
     Parent findByName(String name);
+    Parent login(String account);
     List<Parent> findAll();
     void insert(Parent parent);
     void update(Parent parent);
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java
new file mode 100644
index 0000000..2229f06
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java
@@ -0,0 +1,23 @@
+package com.oldpeoplehome.service.impl;
+
+import com.oldpeoplehome.dao.AdminDao;
+import com.oldpeoplehome.entity.Admin;
+import com.oldpeoplehome.service.AdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:31
+ * Description:
+ */
+@Service
+public class AdminServiceImpl implements AdminService {
+
+    @Autowired
+    private AdminDao adminDao;
+
+    @Override
+    public Admin login(String account) {
+        return adminDao.findByAccount(account);
+    }
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java
index 9e63082..98a8160 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java
@@ -52,4 +52,8 @@ public class ChildServiceImpl implements ChildService {
     public void insert(Child child) {
         childDao.insert(child);
     }
+    @Override
+    public Child login(String account) {
+        return childDao.findByAccount(account);
+    }
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
index e1507b8..3f0f723 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
@@ -15,6 +15,8 @@ import java.util.List;
 @Service
 public class ParentServiceImpl implements ParentService {
 
+
+
     @Autowired
     private ParentDao parentDao;
 
@@ -62,4 +64,8 @@ public class ParentServiceImpl implements ParentService {
     public void delete(long id) {
         parentDao.delete(id);
     }
+    @Override
+    public Parent login(String account) {
+        return parentDao.findByAccount(account);
+    }
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/AdminController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/AdminController.java
new file mode 100644
index 0000000..ed93ac1
--- /dev/null
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/AdminController.java
@@ -0,0 +1,28 @@
+package com.oldpeoplehome.web;
+
+import com.oldpeoplehome.entity.Admin;
+import com.oldpeoplehome.service.AdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:57
+ * Description:
+ */
+@RestController
+@RequestMapping("/admin")
+public class AdminController {
+
+    @Autowired
+    private AdminService adminService;
+
+    @RequestMapping(value = "/login",method = RequestMethod.POST)
+    @ResponseBody
+    public Admin login(@RequestParam Map<String, Object> params){
+        Admin res = adminService.login(params.get("account").toString());
+        return res.getAdminPassword().equals(params.get("password").toString()) ? res:null;
+    }
+
+}
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ChildController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ChildController.java
index 77eb2fe..de67700 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ChildController.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ChildController.java
@@ -72,4 +72,10 @@ public class ChildController {
         childService.delete(Long.valueOf(id));
         return childService.findAll();
     }
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    @ResponseBody
+    public Child login(@RequestParam Map<String, Object> params){
+        Child res = childService.login(params.get("account").toString());
+        return res.getChildPassword().equals(params.get("password").toString()) ? res:null;
+    }
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
index edf9b87..7ea8d0f 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
@@ -1,5 +1,6 @@
 package com.oldpeoplehome.web;
 
+import com.oldpeoplehome.entity.Admin;
 import com.oldpeoplehome.entity.Parent;
 import com.oldpeoplehome.service.ParentService;
 import com.oldpeoplehome.utils.MethodUtil;
@@ -76,4 +77,11 @@ public class ParentController {
         parentService.delete(Long.valueOf(id));
         return parentService.findAll();
     }
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    @ResponseBody
+    public Parent login(@RequestParam Map<String, Object> params){
+        Parent res = parentService.login(params.get("account").toString());
+        return res.getParentPassword().equals(params.get("password").toString()) ? res:null;
+    }
 }
diff --git a/server/OldPeopleHome/src/main/resources/jdbc.properties b/server/OldPeopleHome/src/main/resources/jdbc.properties
index a33e43a..e9eb37f 100644
--- a/server/OldPeopleHome/src/main/resources/jdbc.properties
+++ b/server/OldPeopleHome/src/main/resources/jdbc.properties
@@ -1,4 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+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/src/main/resources/mapper/AdminDao.xml b/server/OldPeopleHome/src/main/resources/mapper/AdminDao.xml
new file mode 100644
index 0000000..b85b118
--- /dev/null
+++ b/server/OldPeopleHome/src/main/resources/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/src/main/resources/mapper/ChildDao.xml b/server/OldPeopleHome/src/main/resources/mapper/ChildDao.xml
index 4c72e77..298dc84 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/ChildDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/ChildDao.xml
@@ -23,7 +23,9 @@
     <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>
diff --git a/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml b/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
index 760187c..42a628b 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
@@ -33,6 +33,9 @@
     <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
diff --git a/server/OldPeopleHome/src/main/sql/add_table.sql b/server/OldPeopleHome/src/main/sql/add_table.sql
index 34e985e..6331b37 100644
--- a/server/OldPeopleHome/src/main/sql/add_table.sql
+++ b/server/OldPeopleHome/src/main/sql/add_table.sql
@@ -91,4 +91,10 @@ CREATE TABLE `sleep` (
   KEY `index_pid_date` (`pid`,`date`) USING BTREE,
   CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
+CREATE TABLE `Untitled`  (
+  `account` varchar(255) NOT NULL COMMENT '管理员账号',
+  `password` varchar(255) NULL COMMENT '管理员密码',
+  PRIMARY KEY (`account`),
+  UNIQUE INDEX `index_acc`(`account`) USING BTREE
+);
 
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java
new file mode 100644
index 0000000..c212b81
--- /dev/null
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java
@@ -0,0 +1,23 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.BaseTest;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Created By Jiangyuwei on 2019/8/30 11:33
+ * Description:
+ */
+public class AdminServiceTest extends BaseTest {
+
+    @Autowired
+    private AdminService adminService;
+
+    @Test
+    public void testLogin(){
+
+        System.out.println(adminService.login("root"));
+
+    }
+
+}
diff --git a/server/OldPeopleHome/target/OldPeopleHome.war b/server/OldPeopleHome/target/OldPeopleHome.war
index 66c3f98..315e4c2 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome.war and b/server/OldPeopleHome/target/OldPeopleHome.war differ
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/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
index d01d9af..40bd5a1 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class 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/ParentDao.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class
index afdcd23..e3a3326 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class 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/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/Motion.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class
index 3160ad7..ae920b8 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class 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/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/ChildService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class
index 3e28a99..a17490a 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class 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/ParentService.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class
index 36e9f58..421d057 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class 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/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/ChildServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
index 61410fa..b3148e6 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class 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/ParentServiceImpl.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
index c9227c5..284eda1 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class 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/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
index c5af0a4..1ab1d70 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildController.class 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/MotionController.class b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class
index 7ecb67c..3ae8aba 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class 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
index bf3e5eb..0b12582 100644
Binary files a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ParentController.class 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/jdbc.properties b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
index a33e43a..e9eb37f 100644
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/jdbc.properties
@@ -1,4 +1,4 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+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/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
index 4c72e77..298dc84 100644
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
@@ -23,7 +23,9 @@
     <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>
diff --git a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
index bc37178..c735e83 100644
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml
@@ -9,6 +9,7 @@
         <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>
 
@@ -24,7 +25,7 @@
         select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
     </select>
     <insert id="insert" parameterType="Motion">
-        insert into motion(pid, date, count, distance, time)
-        values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime})
+        insert into motion(pid, date, count, distance, energy, time)
+        values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
     </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
index 760187c..42a628b 100644
--- a/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
+++ b/server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
@@ -33,6 +33,9 @@
     <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
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
index d01d9af..40bd5a1 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class
index afdcd23..e3a3326 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.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/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/ChildService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class
index 3e28a99..a17490a 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class
index 36e9f58..421d057 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.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/ChildServiceImpl.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
index 61410fa..b3148e6 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.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
index c9227c5..284eda1 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.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
index c5af0a4..1ab1d70 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ChildController.class differ
diff --git a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class
index bf3e5eb..0b12582 100644
Binary files a/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class and b/server/OldPeopleHome/target/classes/com/oldpeoplehome/web/ParentController.class differ
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
index 4c72e77..298dc84 100644
--- a/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
+++ b/server/OldPeopleHome/target/classes/mapper/ChildDao.xml
@@ -23,7 +23,9 @@
     <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>
diff --git a/server/OldPeopleHome/target/classes/mapper/ParentDao.xml b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
index 760187c..42a628b 100644
--- a/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
+++ b/server/OldPeopleHome/target/classes/mapper/ParentDao.xml
@@ -33,6 +33,9 @@
     <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
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/README.md b/server/README.md
index 6a60a5c..5d3a652 100644
--- a/server/README.md
+++ b/server/README.md
@@ -62,6 +62,7 @@
 
 | 实体           | url示例                | 请求方式 | 功能概述                                  | 参数格式                                                     |
 | -------------- | ---------------------- | -------- | ----------------------------------------- | ------------------------------------------------------------ |
+| Admin          | /admin/login           | POST     | 后台管理员账号                            | account:root,password:root                                   |
 | Room           | /room/get/1            | GET      | 查询id=1的room的详细信息                  |                                                              |
 | Room           | /room/list             | GET      | 查询所有的room信息                        |                                                              |
 | Room           | /room/list/empty       | GET      | 查询所有空置room信息(web端给老人分配房间) |                                                              |
@@ -76,6 +77,7 @@
 | Parent         | /parent/add            | POST     | 添加老人                                  | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 |
 | Parent         | /parent/update/1       | POST     | 更新id=1的老人信息                        | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
 | Parent         | /parent/delete/1       | DELETE   | 删除id=1的老人                            |                                                              |
+| Parent         | /parent/login          | POST     | 老人登陆                                  | 登陆成功返回老人的所有信息，登陆失败返回null（不返回）       |
 | Child          | /child/get/1           | GET      | 查询id=1的子女                            |                                                              |
 | Child          | /child/get_longid/111  | GET      | 查询身份证=111的child的详细信息           |                                                              |
 | Child          | /child/get_name/小蒋   | GET      | 查询姓名=小蒋的child的详细信息            |                                                              |
@@ -83,6 +85,7 @@
 | Child          | /child/add             | POST     |                                           | childSex，childPassword，childAccount，childName，childLongId，childPhone |
 | Child          | /child/update/1        | POST     | 更新id=1的子女信息                        | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
 | Child          | /child/delete/1        | DELETE   | 删除id=1的子女信息                        |                                                              |
+| Child          | /child/login           | POST     | 登陆子女                                  | 登陆成功返回子女信息，失败返回空(不返回)                     |
 | ChildAndParent | /child_parent/child/1  | GET      | 查看子女id=1对应的老人                    |                                                              |
 | ChildAndParent | /child_parent/parent/1 | GET      | 查看老人id=1对应的子女                    |                                                              |
 | ChildAndParent | /child_parent/add      | POST     | 添加老人子女对应关系                      | 子女id：child，老人id：parent，关系：relation                |
diff --git a/web/firstPage.html b/web/firstPage.html
index f5db7ed..a3bf9a1 100644
--- a/web/firstPage.html
+++ b/web/firstPage.html
@@ -4,13 +4,10 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>首页</title>
+    <title>Old People Home</title>
+    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon.png">
     <link rel="stylesheet" href="firstPage_style.css">
 </head>
-<!-- <frameset cols="100,*">
-    <frame src="frame_contents.html" noresize="noresize">
-    <frame src="frame_rooms.html" name="showFrame" noresize="noresize">
-</frameset> -->
 <body>
     <div class="box1">
         <span class="upper">O</span>
@@ -20,11 +17,59 @@
         <span class="upper">H</span>
         <span class="lower">ome</span>
     </div>
-    <div class="leftGuide">
+    <div class="menu">
         <ul>
-            <li><a href="#" id="rooms" class="guide">房间</a></li><br><br>
-            <li><a href="#" id="people" class="guide">老人</a></li>
-        </ul>       
+            <li>
+                <a href="firstPage.html" id="firstPage">首页</a>
+            </li>
+            <li id="self">
+                <a href="personal.html" id="my">个人</a>
+            </li>
+        </ul>
+    </div>
+    <div class="box2">
+        <table>
+            <tr>
+                <td><a href="#">001</a></td>
+                <td><a href="#">002</a></td>
+                <td><a href="#">003</a></td>
+                <td><a href="#">004</a></td>
+            </tr>
+            <tr>
+                <td><a href="#">005</a></td>
+                <td><a href="#">006</a></td>
+                <td><a href="#">007</a></td>
+                <td><a href="#">008</a></td>
+            </tr>
+            <tr>
+                <td><a href="#">009</a></td>
+                <td><a href="#">010</a></td>
+                <td><a href="#">011</a></td>
+                <td><a href="#">012</a></td>
+            </tr>
+            <tr>
+                <td><a href="#">013</a></td>
+                <td><a href="#">014</a></td>
+                <td><a href="#">015</a></td>
+                <td><a href="#">016</a></td>
+            </tr>
+            <tr>
+                <td><a href="#">017</a></td>
+                <td><a href="#">018</a></td>
+                <td><a href="#">019</a></td>
+                <td><a href="#">020</a></td>
+            </tr>
+        </table>
+    </div>
+    <div class="guide">
+        <ul>
+            <li>
+                <a href="#">老人注册</a><br>
+            </li>
+            <li id="delete">
+                <a href="#">老人注销</a>
+            </li>
+        </ul>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/web/firstPage_style.css b/web/firstPage_style.css
index e56fc0a..6e50a2f 100644
--- a/web/firstPage_style.css
+++ b/web/firstPage_style.css
@@ -1,13 +1,18 @@
 body {
-    background-color: aliceblue;
+    background-color: papayawhip;
     margin: 0px;
 }
+
+/* LOGO */
 .box1 {
     text-align: left;
     position: absolute;
     top: 30px;
-    left: 100px;
-
+    left: 10px;
+    user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
 }
 .upper {
     color: rgb(255, 115, 0);
@@ -18,36 +23,99 @@ body {
 }
 .lower {
     color: rgb(255, 183, 124);
-    /* font-weight: bold; */
     font-family: sans-serif;
     font-size: 45px; 
     letter-spacing: -5px;
 }
-span {
-    user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    -webkit-user-select: none;
-}
-.leftGuide {
-    position: absolute;
-    top: 140px;
-    left: 100px;
-    /* border-left: 0.5px solid lightgray; */
-    border-right: 0.5px solid rgba(255, 183, 124, 0.411);
-    padding-right: 50px;
-}
-.guide {
-    text-decoration-line: none;
-    font-size: 28px;
-    font-family: youyuan;
-    font-weight: 900;
-    color: rgb(255, 183, 124);
+
+/* 横向菜单栏 */
+.menu {
+    width: auto;
+    height: 50px;
+    background-color: rgb(255, 183, 124);
+    margin-top: 100px;
 }
 ul {
-    list-style: none;
+    width: auto;
+    list-style-type: none;
+    white-space: nowrap;
     padding: 0;
 }
-.guide:hover {
-    color: rgba(211, 211, 211, 0.651);
+.menu li {
+    float: left;
+}
+.menu li#self {
+    margin: 0 0 0 979px;
+}
+.menu li a {
+    color: white;
+    text-decoration-line: none;
+    display: block;
+    padding: 14px 40px 15px 70px;
+}
+.menu li a:hover {
+    background-color: rgba(248, 148, 66, 0.7);
+}
+.menu ul li a#firstPage {
+    background-image: url("icons/首页.png");
+    background-repeat: no-repeat;
+    background-size: 12%;
+    background-position: 35px 16px;
+    
+}
+.menu ul li a#my {
+    background-image: url("icons/管理员.png");
+    background-repeat: no-repeat;
+    background-size: 12%;
+    background-position: 35px 16px;
+}
+
+/* 操作界面 */
+.box2 {
+    width: auto;
+    height: auto;
+    /* background-color: yellow; */
+    margin: 0 0 0 210px;
+}
+.box2 table tr td {
+    padding: 150px 50px 90px 0;
+    /* background-color: yellow; */
+}
+.box2 table tr td a {
+    color: papayawhip;
+    text-decoration-line: none;
+    font-size: 14px;
+    background-image: url("icons/房间.png");
+    background-repeat: no-repeat;
+    padding: 100px 90px 20px 115px;
+    background-position: 80px 30px;
+    background-size: 40%;
+}
+.box2 table tr td a:hover {
+    background-image: url("icons/房间light.png");
+}
+
+/* 纵向导航栏 */
+.guide {
+    width: 190px;
+    height: 1400px;
+    background-color: rgba(255, 183, 124, 0.3);
+    position: absolute;
+    top: 150px;
+}
+.guide li {
+    margin: 50px 0 0 0;
+}
+.guide li#delete {
+    margin: 60px 0;
+    /* background-color: yellow; */
+}
+.guide li a {
+    text-decoration-line: none;
+    color: white;
+    padding: 16px 76px 20px 50px;
+    /* background-color: yellow; */
+}
+.guide li a:hover {
+    background-color: rgba(248, 148, 66, 0.7);
 }
\ No newline at end of file
diff --git a/web/frame_contents.html b/web/frame_contents.html
deleted file mode 100644
index 753c596..0000000
--- a/web/frame_contents.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
-</head>
-<body>
-    <div class="leftGuide">
-        <ul>
-            <li><a href="frame_rooms.html" id="rooms" class="guide">房间</a></li><br><br>
-            <li><a href="frame_people.html" id="people" class="guide">老人</a></li>
-        </ul>       
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/frame_people.html b/web/frame_people.html
deleted file mode 100644
index 2f9ba09..0000000
--- a/web/frame_people.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
-</head>
-<body>
-    <p>people</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/frame_rooms.html b/web/frame_rooms.html
deleted file mode 100644
index 06a68f7..0000000
--- a/web/frame_rooms.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
-</head>
-<body>
-    <p>rooms</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/icons/favicon.png b/web/icons/favicon.png
new file mode 100644
index 0000000..159907a
Binary files /dev/null and b/web/icons/favicon.png differ
diff --git a/web/icons/房间.png b/web/icons/房间.png
new file mode 100644
index 0000000..d01f850
Binary files /dev/null and b/web/icons/房间.png differ
diff --git a/web/icons/房间light.png b/web/icons/房间light.png
new file mode 100644
index 0000000..96bc524
Binary files /dev/null and b/web/icons/房间light.png differ
diff --git a/web/icons/管理员.png b/web/icons/管理员.png
new file mode 100644
index 0000000..5004104
Binary files /dev/null and b/web/icons/管理员.png differ
diff --git a/web/icons/管理员头像.png b/web/icons/管理员头像.png
new file mode 100644
index 0000000..60612b4
Binary files /dev/null and b/web/icons/管理员头像.png differ
diff --git a/web/icons/老人.png b/web/icons/老人.png
new file mode 100644
index 0000000..3642999
Binary files /dev/null and b/web/icons/老人.png differ
diff --git a/web/icons/首页.png b/web/icons/首页.png
new file mode 100644
index 0000000..46097a8
Binary files /dev/null and b/web/icons/首页.png differ
diff --git a/web/login_style.css b/web/login_style.css
index 2b6dd62..d89fb02 100644
--- a/web/login_style.css
+++ b/web/login_style.css
@@ -1,10 +1,10 @@
 body {
-    background-color: aliceblue;
+    background-color: papayawhip;
     margin: 0px;
 }
 .background_text {
     width: 100%;
-    color: rgba(255, 239, 213, 0.3);
+    color: rgb(255, 183, 124,0.3);
     font-style: italic;
     font-family: sans-serif;
     font-size: 125px;
@@ -49,7 +49,7 @@ input[name] {
     outline: none;
 }
 #submit {
-    background-color: rgba(255, 239, 213);
+    background-color: rgb(255, 183, 124);
     height: 40px;
     width: 40px;
     border: none;
@@ -60,7 +60,13 @@ input[name] {
     outline: none;
 }
 #submit:hover {
-    width: 45px;
-    height: 45px;
-    background-color: rgba(255, 239, 213, 0.582);
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 3px 3px 3px rgba(192, 192, 192, 0.801);
+}
+#submit:active {
+    background-color: rgba(255, 183, 124, 0.5);
 }
diff --git a/web/personal.html b/web/personal.html
new file mode 100644
index 0000000..a719a05
--- /dev/null
+++ b/web/personal.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Old People Home - 个人中心</title>
+    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon.png">
+    <link rel="stylesheet" href="personal_style.css">
+</head>
+<body>
+    <div class="box1">
+        <span class="upper">O</span>
+        <span class="lower">ld</span>
+        <span class="upper">P</span>
+        <span class="lower">eople</span>
+        <span class="upper">H</span>
+        <span class="lower">ome</span>
+    </div>
+    <div class="menu">
+        <ul>
+            <li>
+                <a href="firstPage.html" id="firstPage">首页</a>
+            </li>
+            <li id="self">
+                <a href="personal.html" id="my">个人</a>
+            </li>
+        </ul>
+    </div>
+    <div class="background">
+        <div class="pic">
+            <a href="#"></a>
+        </div>
+        <div class="backgroundText">
+            <span><h2>管理员</h2></span><br>
+            <span><p>root</p></span>
+        </div>
+        <div class="logout">
+            <input type="button" value="安全退出">
+        </div>
+    </div>
+    <div class="messages">
+        <h2>消息</h2>
+        <div>
+            <h5>张小王</h5>
+            <p>消息内容</p>
+        </div>
+        <div>
+            <h5>子女姓名</h5>
+            <p>消息内容</p>
+        </div>
+        <div>
+            <h5>子女姓名</h5>
+            <p>消息内容</p>
+        </div>
+        <div>
+            <h5>子女姓名</h5>
+            <p>消息内容</p>
+        </div>
+    </div>
+    <div class="modify">
+        <h2>修改密码</h2>
+        <div>
+            <!-- action先不填 -->
+            <form action="">
+                <input type="password" placeholder="原密码"><br><br><br>
+                <input type="password" id="new" placeholder="新密码"><br><br><br>
+                <input type="submit" id="submit" value="OK">
+            </form>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/personal_style.css b/web/personal_style.css
new file mode 100644
index 0000000..219157d
--- /dev/null
+++ b/web/personal_style.css
@@ -0,0 +1,235 @@
+body {
+    background-color: papayawhip;
+    margin: 0px;
+}
+
+/* LOGO */
+.box1 {
+    text-align: left;
+    position: absolute;
+    top: 30px;
+    left: 10px;
+    user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+.upper {
+    color: rgb(255, 115, 0);
+    font-weight: bolder;
+    font-family: sans-serif;
+    font-size: 45px;
+    letter-spacing: -10px;
+}
+.lower {
+    color: rgb(255, 183, 124);
+    font-family: sans-serif;
+    font-size: 45px; 
+    letter-spacing: -5px;
+}
+
+/* 横向菜单栏 */
+.menu {
+    width: auto;
+    height: 50px;
+    background-color: rgb(255, 183, 124);
+    margin-top: 100px;
+}
+ul {
+    width: auto;
+    list-style-type: none;
+    white-space: nowrap;
+    padding: 0;
+}
+.menu li {
+    float: left;
+}
+.menu li#self {
+    margin: 0 0 0 979px;
+}
+.menu li a {
+    color: white;
+    text-decoration-line: none;
+    display: block;
+    padding: 14px 40px 15px 70px;
+}
+.menu li a:hover {
+    background-color: rgba(248, 148, 66, 0.7);
+}
+.menu ul li a#firstPage {
+    background-image: url("icons/首页.png");
+    background-repeat: no-repeat;
+    background-size: 12%;
+    background-position: 35px 16px;
+    
+}
+.menu ul li a#my {
+    background-image: url("icons/管理员.png");
+    background-repeat: no-repeat;
+    background-size: 12%;
+    background-position: 35px 16px;
+}
+
+/* 头像及账号资料 */
+.background {
+    width: 700px;
+    height: 200px;
+    background-color: white;
+    margin: 50px 0 0 280px;
+    position: absolute;
+    border-radius: 2px;
+}
+.background .pic {
+    width: 128px;
+    height: 128px;
+    position: relative;
+    top: 36px;
+    left: 30px;
+    /* background-color: yellow; */
+}
+.background .pic a {
+    background-image: url("icons/管理员头像.png");
+    background-repeat: no-repeat;
+    background-size: 100%;
+    border-radius: 2px;
+    display: block;
+    padding: 64px;
+
+}
+.background .backgroundText {
+    width: 200px;
+    height: auto;
+    position: relative;
+    top: -100px;
+    left: 308px;
+    /* background-color: yellow; */
+}
+.background .logout input {
+    width: 90px;
+    height: 30px;
+    border-style: none;
+    border-radius: 2px;
+    color: white;
+    background-color: red;
+    outline: none;
+    position: relative;
+    top: -135px;
+    left: 550px;
+}
+.background .logout input:hover {
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 3px 3px 3px rgba(192, 192, 192, 0.801);
+}
+.background .logout input:active {
+    background-color: rgba(255, 55, 55, 0.781);
+}
+.background:hover {
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 10px 10px 5px rgb(252, 227, 188);
+}
+
+/* 消息块 */
+.messages {
+    width: 400px;
+    height: auto;
+    background-color: white;
+    position: absolute;
+    top: 420px;
+    left: 280px;
+}
+.messages:hover {
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 10px 10px 5px rgb(252, 227, 188);
+}
+.messages h2 {
+    /* background-color: yellow; */
+    padding: 0 0 0 20px;
+}
+.messages div {
+    width: 180px;
+    height: 140px;
+    border-top: 1px rgb(224, 224, 224) solid;
+    float: left;
+    margin: 5px 5px 10px 12px;
+    color: black;
+    /* background: linear-gradient(left,rgb(248, 235, 233),rgba(245, 239, 230, 0.897));
+    background: -webkit-linear-gradient(left,rgb(248, 235, 233),rgba(245, 239, 230, 0.897));
+    background: -o-linear-gradient(left,rgb(248, 235, 233),rgba(245, 239, 230, 0.897));
+    background: -moz-linear-gradient(left,rgb(248, 235, 233),rgba(245, 239, 230, 0.897)); */
+}
+.messages div h5 {
+    margin: 2px 0 0 0;
+    padding: 0 0 0 10px;
+    /* background-color: yellow; */
+}
+.messages div p {
+    width: 170px;
+    height: 105px;
+    padding: 0 0 0 10px;
+    /* background-color: rgb(255, 183, 124); */
+}
+
+/* 修改密码 */
+.modify {
+    width: 280px;
+    height: 383px;
+    background-color: white;
+    position: absolute;
+    top: 420px;
+    left: 700px;
+}
+.modify:hover {
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 10px 10px 5px rgb(252, 227, 188);
+}
+.modify h2 {
+    padding: 0 0 0 20px;
+}
+.modify form input {
+    position: relative;
+    top: 25px;
+    left: 40px;
+    border: 1px rgb(224, 224, 224) solid;
+    border-radius: 25px;
+    text-align: center;
+    outline: none;
+    font-size: 16px;
+}
+.modify form input#new {
+    margin-top: 30px;
+}
+.modify form input#submit {
+    margin-top: 20px;
+    margin-left: 80px;
+    width: 40px;
+    height: 40px;
+    color: white;
+    border: none;
+}
+.modify form input#submit:hover {
+    transform: translate(0,-1px);
+    -ms-transform: translate(0,-1px);
+    -webkit-transform: translate(0,-1px);
+    -o-transform: translate(0,-1px);
+    -moz-transform: translate(0,-1px);
+    box-shadow: 3px 3px 3px rgba(192, 192, 192, 0.801);
+}
+.modify form input#submit:active {
+    background-color: rgb(235, 235, 235);
+}
\ No newline at end of file