diff --git a/server/OldPeopleHome/.idea/workspace.xml b/server/OldPeopleHome/.idea/workspace.xml
index b771d8e..de7af59 100644
--- a/server/OldPeopleHome/.idea/workspace.xml
+++ b/server/OldPeopleHome/.idea/workspace.xml
@@ -6,7 +6,17 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="" />
+    <list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java" afterDir="false" />
+      <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/dao/RoomDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/RoomDao.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" />
+    </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -17,43 +27,19 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/SleepController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
-              <caret line="58" selection-start-line="58" selection-end-line="58" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="316">
-              <caret line="57" column="23" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="23" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <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/web/MotionController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-179">
-              <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="321">
-              <caret line="80" column="4" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
+            <state relative-caret-position="355">
+              <caret line="33" selection-start-line="33" selection-end-line="34" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -61,50 +47,44 @@
       <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="591">
+            <state relative-caret-position="218">
               <caret line="74" column="17" selection-start-line="74" selection-start-column="17" selection-end-line="74" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java">
+      <file pinned="false" current-in-tab="true">
+        <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="-1653">
-              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+            <state relative-caret-position="-1089">
+              <caret line="12" column="32" 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/java/com/oldpeoplehome/entity/RoomState.java">
+        <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="-759">
-              <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
+            <state relative-caret-position="-267">
+              <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/service/LocationServiceTest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="21" column="78" selection-start-line="21" selection-start-column="78" selection-end-line="21" selection-end-column="93" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="217">
+              <caret line="71" column="33" selection-start-line="71" selection-start-column="33" selection-end-line="71" 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/entity/Location.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/utils/MethodUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="22">
+              <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -112,12 +92,46 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="495">
+              <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
+              <folding>
+                <element signature="e#1794#1795#0" expanded="true" />
+                <element signature="e#1834#1835#0" expanded="true" />
+                <element signature="e#1640#1641#0" expanded="true" />
+                <element signature="e#1667#1668#0" expanded="true" />
+                <element signature="e#1706#1707#0" expanded="true" />
+                <element signature="e#1738#1739#0" expanded="true" />
+                <element signature="e#1910#1911#0" expanded="true" />
+                <element signature="e#1942#1943#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1093">
+              <caret line="114" column="5" selection-start-line="114" selection-start-column="5" selection-end-line="114" selection-end-column="5" />
+              <folding>
+                <element signature="e#3676#3677#0" expanded="true" />
+                <element signature="e#3724#3725#0" expanded="true" />
+                <element signature="e#3660#3661#0" expanded="true" />
+                <element signature="e#3695#3696#0" expanded="true" />
+                <element signature="e#3854#3855#0" expanded="true" />
+                <element signature="e#3902#3903#0" expanded="true" />
+                <element signature="e#4484#4485#0" expanded="true" />
+                <element signature="e#4532#4533#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -156,13 +170,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/SleepController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/SleepDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRate.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/RoomStateFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/ChangeRoom.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/HeartRateService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/HeartRateFilter.java" />
@@ -197,16 +204,23 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/LocationDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/LocationService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/LocationFilter.java" />
-        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
         <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/LocationDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java" />
+        <option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml" />
+        <option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
       </list>
     </option>
   </component>
@@ -236,8 +250,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -271,15 +283,6 @@
               <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="dto" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -296,7 +299,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
@@ -305,6 +308,14 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
+              <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
               <item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -353,12 +364,14 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </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="1567750284440" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567826803643" />
     <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" />
@@ -451,17 +464,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="MotionDaoTest.testInsert" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="RoomServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="OldPeopleHome" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.oldpeoplehome.dao.*" />
+          <option name="PATTERN" value="com.oldpeoplehome.service.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
-      <option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.MotionDaoTest" />
-      <option name="METHOD_NAME" value="testInsert" />
+      <option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
+      <option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.RoomServiceTest" />
+      <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -541,20 +554,20 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.MotionDaoTest.testInsert" />
       <item itemvalue="JUnit.HeartRateServiceTest.test" />
       <item itemvalue="JUnit.AdminServiceTest.testLogin" />
       <item itemvalue="JUnit.ChildParentServiceTest.test" />
-      <item itemvalue="Tomcat Server.chuizichui" />
       <item itemvalue="JUnit.LocationServiceTest.test" />
+      <item itemvalue="Tomcat Server.chuizichui" />
+      <item itemvalue="JUnit.RoomServiceTest.test" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.RoomServiceTest.test" />
         <item itemvalue="JUnit.LocationServiceTest.test" />
         <item itemvalue="JUnit.ChildParentServiceTest.test" />
         <item itemvalue="JUnit.HeartRateServiceTest.test" />
         <item itemvalue="JUnit.AdminServiceTest.testLogin" />
-        <item itemvalue="JUnit.MotionDaoTest.testInsert" />
       </list>
     </recent_temporary>
   </component>
@@ -593,14 +606,13 @@
       <workItem from="1567561928915" duration="1922000" />
       <workItem from="1567582087969" duration="4819000" />
       <workItem from="1567664806171" duration="2280000" />
-      <workItem from="1567739536607" duration="4263000" />
+      <workItem from="1567739536607" duration="4839000" />
+      <workItem from="1567777529260" duration="871000" />
+      <workItem from="1567824861214" duration="2137000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="LocationServiceTest_test - 2019.09.06 at 11h 43m 21s.xml">
-      <configuration name="LocationServiceTest.test" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 41m 32s.xml">
       <configuration name="LocationServiceTest.test" configurationId="JUnit" />
     </history-entry>
@@ -628,9 +640,12 @@
     <history-entry file="LocationServiceTest_test - 2019.09.06 at 13h 52m 00s.xml">
       <configuration name="LocationServiceTest.test" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="RoomServiceTest_test - 2019.09.07 at 11h 12m 55s.xml">
+      <configuration name="RoomServiceTest.test" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="144706000" />
+    <option name="totallyTimeSpent" value="148290000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -644,7 +659,7 @@
   <component name="ToolWindowManager">
     <frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22922252" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23592493" />
       <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" />
@@ -654,7 +669,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 anchor="bottom" id="Run" order="2" 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" />
@@ -718,90 +733,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="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/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/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/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/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/ChildService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="429">
@@ -809,13 +740,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="429">
-          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1221">
@@ -823,13 +747,6 @@
         </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="396">
-          <caret line="12" column="32" 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/ChildServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1155">
@@ -905,20 +822,6 @@
         </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="447">
-          <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
-        </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="132">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-        </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">
@@ -987,13 +890,6 @@
         </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="33">
-          <caret line="108" column="22" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
-        </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="128">
@@ -1079,16 +975,9 @@
         </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="349">
-          <caret line="58" selection-start-line="58" selection-end-line="58" />
-        </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="-179">
+        <state relative-caret-position="1551">
           <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" />
@@ -1096,71 +985,195 @@
         </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="321">
-          <caret line="80" column="4" 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/java/com/oldpeoplehome/entity/Motion.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="591">
-          <caret line="74" column="17" selection-start-line="74" selection-start-column="17" selection-end-line="74" selection-end-column="17" />
-        </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="-1653">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-759">
-          <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="21" column="78" selection-start-line="21" selection-start-column="78" selection-end-line="21" selection-end-column="93" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="57" column="23" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="23" />
+        <state relative-caret-position="1353">
+          <caret line="51" column="70" selection-start-line="51" selection-start-column="64" selection-end-line="51" selection-end-column="70" />
           <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="2013">
+          <caret line="80" column="4" 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/java/com/oldpeoplehome/entity/Sleep.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1287">
+          <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="21" column="78" selection-start-line="21" selection-start-column="78" selection-end-line="21" selection-end-column="93" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1452">
+          <caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </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="468">
+          <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="37" column="5" lean-forward="true" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="359">
+          <caret line="22" selection-start-line="22" selection-end-line="22" />
+        </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="492">
+          <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+        </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="312">
+          <caret line="39" column="26" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </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="355">
+          <caret line="33" selection-start-line="33" selection-end-line="34" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
+      <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>
+    <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="-267">
+          <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/main/java/com/oldpeoplehome/utils/MethodUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="71" column="33" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
+          <folding>
+            <element signature="e#1794#1795#0" expanded="true" />
+            <element signature="e#1834#1835#0" expanded="true" />
+            <element signature="e#1640#1641#0" expanded="true" />
+            <element signature="e#1667#1668#0" expanded="true" />
+            <element signature="e#1706#1707#0" expanded="true" />
+            <element signature="e#1738#1739#0" expanded="true" />
+            <element signature="e#1910#1911#0" expanded="true" />
+            <element signature="e#1942#1943#0" expanded="true" />
+          </folding>
+        </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="-1093">
+          <caret line="114" column="5" selection-start-line="114" selection-start-column="5" selection-end-line="114" selection-end-column="5" />
+          <folding>
+            <element signature="e#3676#3677#0" expanded="true" />
+            <element signature="e#3724#3725#0" expanded="true" />
+            <element signature="e#3660#3661#0" expanded="true" />
+            <element signature="e#3695#3696#0" expanded="true" />
+            <element signature="e#3854#3855#0" expanded="true" />
+            <element signature="e#3902#3903#0" expanded="true" />
+            <element signature="e#4484#4485#0" expanded="true" />
+            <element signature="e#4532#4533#0" expanded="true" />
+          </folding>
+        </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="218">
+          <caret line="74" column="17" selection-start-line="74" selection-start-column="17" selection-end-line="74" selection-end-column="17" />
+        </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="-1089">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
index 8c94ca7..236b679 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/RoomDao.java
@@ -22,4 +22,5 @@ public interface RoomDao {
     int updateRoom(Room room);
 
 
+
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
index 72cb137..8d59542 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Parent.java
@@ -117,6 +117,9 @@ public class Parent {
     public void setParentHeight(Double parentHeight) {
         this.parentHeight = parentHeight;
     }
+    public void setParentHeight(String parentHeight) {
+        this.parentHeight = Double.valueOf(parentHeight);
+    }
 
     public double getParentWeight() {
         return parentWeight;
@@ -125,6 +128,9 @@ public class Parent {
     public void setParentWeight(Double parentWeight) {
         this.parentWeight = parentWeight;
     }
+    public void setParentWeight(String parentWeight) {
+        this.parentWeight = Double.valueOf(parentWeight);
+    }
 
     public Date getParentBirth() {
         return parentBirth;
@@ -152,6 +158,9 @@ public class Parent {
     public void setParentRoomId(Integer parentRoomId) {
         this.parentRoomId = parentRoomId;
     }
+    public void setParentRoomId(String parentRoomId) {
+        this.parentRoomId = Integer.valueOf(parentRoomId);
+    }
 
     public Room getParentRoom() {
         return parentRoom;
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
index c1bc353..18b1aa3 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Room.java
@@ -11,6 +11,7 @@ public class Room {
     private String roomName;
     private long parentId;
     private Parent parent;
+    private float temp;
 
     public Room() {
     }
@@ -18,19 +19,27 @@ public class Room {
     public Room(String roomLocation, String roomName) {
         this.roomLocation = roomLocation;
         this.roomName = roomName;
+
+    }
+    public Room(String roomLocation, String roomName, float temp) {
+        this.roomLocation = roomLocation;
+        this.roomName = roomName;
+        this.temp = temp;
     }
 
-    public Room(String roomLocation, String roomName, Long parentId) {
+    public Room(String roomLocation, String roomName, Long parentId, float temp) {
         this.roomLocation = roomLocation;
         this.roomName = roomName;
         this.parentId = parentId;
+        this.temp = temp;
     }
 
-    public Room(Integer roomId, String roomLocation, String roomName, Long parentId) {
+    public Room(Integer roomId, String roomLocation, String roomName, Long parentId, float temp) {
         this.roomId = roomId;
         this.roomName = roomName;
         this.roomLocation = roomLocation;
         this.parentId = parentId;
+        this.temp = temp;
     }
 
     public int getRoomId() {
@@ -64,6 +73,20 @@ public class Room {
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
+    public void setParentId(String parentId) {
+        this.parentId = Long.valueOf(parentId);
+    }
+
+    public float getTemp() {
+        return temp;
+    }
+
+    public void setTemp(float temp) {
+        this.temp = temp;
+    }
+    public void setTemp(String temp) {
+        this.temp = Float.valueOf(temp);
+    }
 
     @Override
     public String toString() {
@@ -73,6 +96,7 @@ public class Room {
                 ", roomName='" + roomName + '\'' +
                 ", parentId=" + parentId +
                 ", parent=" + parent +
+                ", temp=" + temp +
                 '}';
     }
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
index 9ec8bcc..24fbb2f 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/RoomService.java
@@ -21,4 +21,5 @@ public interface RoomService {
 
     int delete(int roomId);
 
+
 }
diff --git a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
index 6718b80..f833aa6 100644
--- a/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
+++ b/server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/RoomServiceImpl.java
@@ -48,4 +48,5 @@ public class RoomServiceImpl implements RoomService {
     public int delete(int roomId) {
         return roomDao.deleteRoom(roomId);
     }
+
 }
diff --git a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
index 5e3820a..bf4a273 100644
--- a/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
+++ b/server/OldPeopleHome/src/main/resources/mapper/RoomDao.xml
@@ -9,6 +9,7 @@
         <result column="location" property="roomLocation" jdbcType="VARCHAR"/>
         <result column="name" property="roomName" jdbcType="VARCHAR"/>
         <result column="pid" property="parentId" jdbcType="BIGINT"/>
+        <result column="temp" property="temp" jdbcType="FLOAT"/>
     </resultMap>
 
     <select id="findById" resultMap="BaseResultMap" parameterType="int">
@@ -35,7 +36,9 @@
         update room
         set location = #{roomLocation},
             name = #{roomName},
-            pid = #{parentId}
+            pid = #{parentId},
+            temp = #{temp}
         where id =#{roomId}
     </update>
+
 </mapper>
\ No newline at end of file
diff --git a/server/OldPeopleHome/src/main/sql/add_table.sql b/server/OldPeopleHome/src/main/sql/add_table.sql
index d4681e0..b24dcfb 100644
--- a/server/OldPeopleHome/src/main/sql/add_table.sql
+++ b/server/OldPeopleHome/src/main/sql/add_table.sql
@@ -31,7 +31,8 @@ CREATE TABLE `room` (
   UNIQUE KEY `index` (`pid`) USING BTREE,
   CONSTRAINT `room_fk_1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci  ROW_FORMAT=DYNAMIC;
-
+ALTER TABLE `room`
+ADD COLUMN `temp` float NULL COMMENT '房间温度阈值' AFTER `pid`;
 CREATE TABLE `child` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
   `longid` char(18) NOT NULL COMMENT '身份证',
diff --git a/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java
new file mode 100644
index 0000000..14cd0bd
--- /dev/null
+++ b/server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/RoomServiceTest.java
@@ -0,0 +1,24 @@
+package com.oldpeoplehome.service;
+
+import com.oldpeoplehome.BaseTest;
+import com.oldpeoplehome.entity.Room;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Created By Jiangyuwei on 2019/9/7 11:10
+ * Description:
+ */
+public class RoomServiceTest extends BaseTest {
+
+    @Autowired
+    private RoomService roomService;
+
+    @Test
+    public void test(){
+        Room room = roomService.findById(1);
+        room.setTemp(22.2f);
+        roomService.update(room);
+    }
+
+}