shen/OldPeopleHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new column

Browse Source
This commit is contained in:
jiangyuwei666
2019-09-04 10:07:51 +08:00
parent 9dd69d81ac
commit 518154e940
14 changed files with 341 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

537
server/OldPeopleHome/.idea/workspace.xml generated
View File

@@ -7,16 +7,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<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" />
<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/HeartRate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.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$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="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/com/oldpeoplehome/entity/HeartRate.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/HeartRate.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,19 +28,70 @@
<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/ParentController.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
<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 relative-caret-position="1155">
<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="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
<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="121">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
<state relative-caret-position="1155">
<caret line="55" column="21" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="65" column="43" lean-forward="true" selection-start-line="65" selection-start-column="43" selection-end-line="65" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1252#1253#0" expanded="true" />
<element signature="e#1280#1281#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1356#1357#0" expanded="true" />
<element signature="e#1388#1389#0" expanded="true" />
<element signature="e#1416#1417#0" expanded="true" />
<element signature="e#1458#1459#0" expanded="true" />
<element signature="e#1492#1493#0" expanded="true" />
<element signature="e#1522#1523#0" expanded="true" />
<element signature="e#1548#1549#0" expanded="true" />
<element signature="e#1586#1587#0" expanded="true" />
<element signature="e#1616#1617#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/dao/HeartRateDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -49,80 +100,48 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
<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="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
<folding>
<element signature="e#1451#1452#0" expanded="true" />
<element signature="e#1478#1479#0" expanded="true" />
<element signature="n#mapper#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
<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 relative-caret-position="378">
<caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
<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/entity/Child.java">
<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="-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 relative-caret-position="121">
<caret line="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.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" />
<state relative-caret-position="1215">
<caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
<folding>
<element signature="e#1248#1249#0" expanded="true" />
<element signature="e#1303#1304#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -183,18 +202,13 @@
<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" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
<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/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/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" />
@@ -214,6 +228,11 @@
<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" />
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
<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/main/resources/jdbc.properties" />
</list>
</option>
</component>
@@ -234,8 +253,8 @@
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1910" />
<option name="y" value="-10" />
<option name="width" value="1939" />
<option name="height" value="1049" />
<option name="width" value="1940" />
<option name="height" value="1050" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -243,6 +262,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -276,34 +297,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="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" />
@@ -324,35 +317,47 @@
<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" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="sql" 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="service" 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="1567145246914" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567562722071" />
<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" />
@@ -539,14 +544,14 @@
<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" />
<item itemvalue="Tomcat Server.chuizichui" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<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" />
</list>
@@ -582,16 +587,13 @@
<workItem from="1566876393093" duration="5679000" />
<workItem from="1567043814685" duration="630000" />
<workItem from="1567134555969" duration="5745000" />
<workItem from="1567150643505" duration="555000" />
<workItem from="1567213610755" duration="47000" />
<workItem from="1567561928915" duration="615000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 40m 15s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 41m 50s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 15m 06s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
@@ -616,9 +618,15 @@
<history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 56m 27s.xml">
<configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 10h 00m 00s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 10h 01m 03s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130820000" />
<option name="totallyTimeSpent" value="132037000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -631,8 +639,9 @@
</component>
<component name="ToolWindowManager">
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21045576" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2191689" />
<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" />
@@ -775,16 +784,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="4" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomStateDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -795,16 +794,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="778">
<caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/HeartRateService.java">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -825,13 +814,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="16" column="26" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
@@ -839,26 +821,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="57" column="8" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="66" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<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">
@@ -953,20 +915,6 @@
</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">
<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/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<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">
@@ -974,14 +922,7 @@
</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/resources/mapper/AdminDao.fxml" />
<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">
@@ -1066,16 +1007,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="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">
@@ -1100,69 +1031,16 @@
</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 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/dao/ChildDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<state relative-caret-position="429">
<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" />
@@ -1170,13 +1048,144 @@
</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">
<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/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="77" column="35" 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/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">
<caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" 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="858">
<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="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/resources/mapper/ParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1155">
<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/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" />
<state relative-caret-position="1155">
<caret line="55" column="21" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
</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="487">
<caret line="65" column="43" lean-forward="true" selection-start-line="65" selection-start-column="43" selection-end-line="65" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
<folding>
<element signature="e#1248#1249#0" expanded="true" />
<element signature="e#1303#1304#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#1252#1253#0" expanded="true" />
<element signature="e#1280#1281#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1356#1357#0" expanded="true" />
<element signature="e#1388#1389#0" expanded="true" />
<element signature="e#1416#1417#0" expanded="true" />
<element signature="e#1458#1459#0" expanded="true" />
<element signature="e#1492#1493#0" expanded="true" />
<element signature="e#1522#1523#0" expanded="true" />
<element signature="e#1548#1549#0" expanded="true" />
<element signature="e#1586#1587#0" expanded="true" />
<element signature="e#1616#1617#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
<folding>
<element signature="n#mapper#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
<folding>
<element signature="imports" 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="121">
<caret line="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
<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="99">
<caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1215">
<caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>

54
server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/HeartRate.java
View File

@@ -12,22 +12,28 @@ public class HeartRate {
private long parentId;
private Timestamp time;
private double rate;
private double rate1;
private double rate2;
private double oxy;
public HeartRate() {
}
public HeartRate(long parentId, String time, double rate) {
this.parentId = parentId;
this.time = Timestamp.valueOf(time);
this.rate = rate;
}
public HeartRate(long parentId, Timestamp time, double rate) {
public HeartRate(long parentId, Timestamp time, double rate1, double rate2, double oxy) {
this.parentId = parentId;
this.time = time;
this.rate = rate;
this.rate1 = rate1;
this.rate2 = rate2;
this.oxy = oxy;
}
public HeartRate(long parentId, String time, double rate1, double rate2, double oxy) {
this.parentId = parentId;
this.time = Timestamp.valueOf(time);
this.rate1 = rate1;
this.rate2 = rate2;
this.oxy = oxy;
}
public long getParentId() {
return parentId;
@@ -45,20 +51,38 @@ public class HeartRate {
this.time = time;
}
public double getRate() {
return rate;
public double getRate1() {
return rate1;
}
public void setRate(double rate) {
this.rate = rate;
public void setRate1(double rate1) {
this.rate1 = rate1;
}
public double getRate2() {
return rate2;
}
public void setRate2(double rate2) {
this.rate2 = rate2;
}
public double getOxy() {
return oxy;
}
public void setOxy(double oxy) {
this.oxy = oxy;
}
@Override
public String toString() {
return "HeartRateDao{" +
return "HeartRate{" +
"parentId=" + parentId +
", time=" + time +
", rate=" + rate +
", rate1=" + rate1 +
", rate2=" + rate2 +
", oxy=" + oxy +
'}';
}
}

6
server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/HeartRateController.java
View File

@@ -54,8 +54,10 @@ public class HeartRateController {
public void add(@RequestParam Map<String, Object> params){
long parentId = Long.valueOf(String.valueOf(params.get("parentId")));
String time = String.valueOf(params.get("time"));
double rate = Double.valueOf(String.valueOf(params.get("rate")));
HeartRate heartRate = new HeartRate(parentId, time, rate);
double rate1 = Double.valueOf(String.valueOf(params.get("rate1")));
double rate2 = Double.valueOf(String.valueOf(params.get("rate2")));
double oxy = Double.valueOf(String.valueOf(params.get("oxy")));
HeartRate heartRate = new HeartRate(parentId, time, rate1, rate2, oxy);
heartRateService.insert(heartRate);
}

4
server/OldPeopleHome/src/main/resources/jdbc.properties
View File

@@ -1,4 +1,4 @@
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.url=jdbc:mysql://ssmtest:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.username=root
jdbc.password=root
jdbc.password=

8
server/OldPeopleHome/src/main/resources/mapper/HeartRateDao.xml
View File

@@ -7,7 +7,9 @@
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="rate" property="rate" jdbcType="DOUBLE"/>
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate)
values (#{parentId}, #{time}, #{rate})
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
</insert>
</mapper>

8
server/OldPeopleHome/src/main/sql/add_table.sql
View File

@@ -59,6 +59,12 @@ CREATE TABLE `heartrate` (
KEY `time` (`time`) USING BTREE,
CONSTRAINT `fk_pid2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
ALTER TABLE `heartrate`
CHANGE COLUMN `rate` `rate1` double NULL DEFAULT NULL COMMENT '收缩压' AFTER `time`,
ADD COLUMN `rate2` double NULL COMMENT '舒张压' AFTER `rate1`,
ADD COLUMN `oxy` double NULL AFTER `rate2`;
CREATE TABLE `motion` (
`pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
`date` date DEFAULT NULL COMMENT '当日日期',
@@ -91,7 +97,7 @@ 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` (
CREATE TABLE `admin` (
`account` varchar(255) NOT NULL COMMENT '管理员账号',
`password` varchar(255) NULL COMMENT '管理员密码',
PRIMARY KEY (`account`),

BIN
server/OldPeopleHome/target/OldPeopleHome.war
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/HeartRate.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/HeartRateController.class
View File

Binary file not shown.

8
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml
View File

@@ -7,7 +7,9 @@
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="rate" property="rate" jdbcType="DOUBLE"/>
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate)
values (#{parentId}, #{time}, #{rate})
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
</insert>
</mapper>

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/entity/HeartRate.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/web/HeartRateController.class
View File

Binary file not shown.

8
server/OldPeopleHome/target/classes/mapper/HeartRateDao.xml
View File

@@ -7,7 +7,9 @@
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="rate" property="rate" jdbcType="DOUBLE"/>
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
@@ -22,7 +24,7 @@
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate)
values (#{parentId}, #{time}, #{rate})
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
</insert>
</mapper>

2
server/README.md
View File

@@ -96,4 +96,4 @@
| Sleep | /sleep/get/1 | GET | 查找id=1的老人睡眠信息 | 参数格式：yyyy-mm-dd 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| Sleep | /sleep/add | POST | 添加老人睡眠信息 | parent，date，deep，light，awake |
| HeartRate | /heartrate/get/1 | GET | 查找id=1的心率信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate |
| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate1(收缩压)，rate2(舒张压)，oxy。 |