This commit is contained in:
jiangyuwei666
2019-09-05 14:46:10 +08:00
236 changed files with 2436 additions and 1966 deletions

View File

@@ -8,17 +8,15 @@
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/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/ChildParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/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/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" 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/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/mapper/HeartRateDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/ChildParentController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/ChildParentController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/ChildParentController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../README.md" beforeDir="false" afterPath="$PROJECT_DIR$/../README.md" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,29 +27,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<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" />
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.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="392">
<caret line="79" column="5" lean-forward="true" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="48" column="31" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="31" />
<state relative-caret-position="468">
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -59,11 +48,39 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java">
<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="154">
<caret line="14" column="28" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="28" />
<state relative-caret-position="388">
<caret line="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" />
</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="218">
<caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#707#708#0" expanded="true" />
<element signature="e#734#735#0" expanded="true" />
<element signature="e#774#775#0" expanded="true" />
<element signature="e#806#807#0" 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>
@@ -71,8 +88,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<state relative-caret-position="594">
<caret line="21" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -83,7 +100,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
<state relative-caret-position="198">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
@@ -92,7 +109,7 @@
<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="614">
<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>
@@ -101,7 +118,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<state relative-caret-position="363">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
@@ -110,7 +127,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414">
<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>
@@ -119,8 +136,8 @@
<file pinned="false" current-in-tab="false">
<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="27" column="55" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
<state relative-caret-position="-117">
<caret line="12" column="59" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
</state>
</provider>
</entry>
@@ -203,15 +220,15 @@
<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/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/mapper/HeartRateDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java" />
<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/sql/add_table.sql" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
</list>
</option>
</component>
@@ -274,24 +291,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="entity" 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" />
@@ -322,53 +321,18 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="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" />
<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="1567604042331" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567605147736" />
<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" />
@@ -555,8 +519,8 @@
<item itemvalue="JUnit.RoomDaoTest.testA" />
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
<item itemvalue="Tomcat Server.chuizichui" />
<item itemvalue="JUnit.ChildParentServiceTest.test" />
<item itemvalue="Tomcat Server.chuizichui" />
</list>
<recent_temporary>
<list>
@@ -601,7 +565,8 @@
<workItem from="1567150643505" duration="555000" />
<workItem from="1567213610755" duration="47000" />
<workItem from="1567561928915" duration="1922000" />
<workItem from="1567582087969" duration="3122000" />
<workItem from="1567582087969" duration="4819000" />
<workItem from="1567664806171" duration="719000" />
</task>
<servers />
</component>
@@ -638,7 +603,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="136466000" />
<option name="totallyTimeSpent" value="138882000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -651,9 +616,8 @@
</component>
<component name="ToolWindowManager">
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22252011" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22587131" />
<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" />
@@ -1060,23 +1024,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="289">
<caret line="62" selection-start-line="62" selection-end-line="65" selection-end-column="43" />
</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="121">
<caret line="60" column="43" 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>
</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="99">
@@ -1097,12 +1044,78 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="69" column="28" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="28" />
<state relative-caret-position="2046">
<caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1386">
<caret line="52" column="40" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429">
<caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594">
<caret line="21" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<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/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/resources/mapper/AdminDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="858">
<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/HeartRate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#707#708#0" expanded="true" />
<element signature="e#734#735#0" expanded="true" />
<element signature="e#774#775#0" expanded="true" />
<element signature="e#806#807#0" 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" />
@@ -1111,6 +1124,7 @@
<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" />
@@ -1120,77 +1134,32 @@
</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="27" column="55" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
<state relative-caret-position="-117">
<caret line="12" column="59" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
<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="350">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414">
<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/ChildParent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
<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/web/ParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="614">
<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/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="79" column="5" lean-forward="true" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<state relative-caret-position="468">
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
<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="388">
<caret line="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" />
</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/web/ChildParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="48" column="31" selection-start-line="48" selection-start-column="31" selection-end-line="48" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="14" column="28" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="28" />
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>

View File

@@ -12,6 +12,7 @@ public class HeartRate {
private long parentId;
private Timestamp time;
private double rate;
private double rate1;
private double rate2;
private double oxy;
@@ -19,16 +20,39 @@ public class HeartRate {
public HeartRate() {
}
public HeartRate(long parentId, Timestamp time, double rate1, double rate2, double oxy) {
public HeartRate(long parentId, Timestamp time, double rate1, double rate, 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) {
@Override
public String toString() {
return "HeartRate{" +
"parentId=" + parentId +
", time=" + time +
", rate=" + rate +
", rate1=" + rate1 +
", rate2=" + rate2 +
", oxy=" + oxy +
'}';
}
public double getRate() {
return rate;
}
public void setRate(double rate) {
this.rate = rate;
}
public HeartRate(long parentId, String time, double rate1, double rate, double rate2, double oxy) {
this.parentId = parentId;
this.time = Timestamp.valueOf(time);
this.rate = rate;
this.rate1 = rate1;
this.rate2 = rate2;
this.oxy = oxy;
@@ -42,7 +66,8 @@ public class HeartRate {
public void setParentId(long parentId) {
this.parentId = parentId;
}
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
public Timestamp getTime() {
return time;
}
@@ -75,14 +100,4 @@ public class HeartRate {
this.oxy = oxy;
}
@Override
public String toString() {
return "HeartRate{" +
"parentId=" + parentId +
", time=" + time +
", rate1=" + rate1 +
", rate2=" + rate2 +
", oxy=" + oxy +
'}';
}
}

View File

@@ -5,6 +5,7 @@ import com.oldpeoplehome.entity.ChildParent;
import com.oldpeoplehome.entity.Parent;
import com.oldpeoplehome.entity.Room;
import com.oldpeoplehome.service.ChildParentService;
import com.oldpeoplehome.service.ParentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,8 @@ public class ChildParentController {
@Autowired
private ChildParentService childParentService;
@Autowired
private ParentService parentService;
@RequestMapping("/child/{id}")
@ResponseBody
@@ -40,13 +43,13 @@ public class ChildParentController {
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
public ChildParent add(@RequestParam Map<String, Object> params) {
public Parent add(@RequestParam Map<String, Object> params) {
long child = Long.valueOf(String.valueOf(params.get("child")));
long parent = Long.valueOf(String.valueOf(params.get("parent")));
String relation = String.valueOf(params.get("relation"));
ChildParent childParent = new ChildParent(parent, child, relation);
childParentService.combine(childParent);
return childParent;
return parentService.findByID(parent);
}
}

View File

@@ -32,17 +32,15 @@ public class HeartRateController {
List<HeartRate> list;
String startDate = request.getParameter("start");
String endDate = request.getParameter("end");
if (endDate == null){
if (endDate == null) {
if (startDate == null) {
HeartRateFilter heartRateFilter = new HeartRateFilter(Long.valueOf(id));
list = heartRateService.findByParent(heartRateFilter);
}
else {
} else {
HeartRateFilter heartRateFilter = new HeartRateFilter(Timestamp.valueOf(startDate), Long.valueOf(id));
list = heartRateService.findByParentAndTime(heartRateFilter);
}
}
else{
} else {
HeartRateFilter heartRateFilter = new HeartRateFilter(Timestamp.valueOf(startDate), Timestamp.valueOf(endDate), Long.valueOf(id));
list = heartRateService.findByTime(heartRateFilter);
}
@@ -51,13 +49,14 @@ public class HeartRateController {
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
public void add(@RequestParam Map<String, Object> params){
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")));
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);
HeartRate heartRate = new HeartRate(parentId, time, rate, rate1, rate2, oxy);
heartRateService.insert(heartRate);
}

View File

@@ -7,6 +7,7 @@
<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"/>
@@ -24,7 +25,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, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy})
insert into heartrate(pid, time,rate, rate1,rate2,oxy)
values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

View File

@@ -65,6 +65,9 @@ CHANGE COLUMN `rate` `rate1` double NULL DEFAULT NULL COMMENT '收缩压' AFTER
ADD COLUMN `rate2` double NULL COMMENT '舒张压' AFTER `rate1`,
ADD COLUMN `oxy` double NULL AFTER `rate2`;
ALTER TABLE `heartrate`
ADD COLUMN `rate` double NULL COMMENT '心率' AFTER `time`;
CREATE TABLE `motion` (
`pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
`date` date DEFAULT NULL COMMENT '当日日期',

View File

@@ -1,5 +0,0 @@
Manifest-Version: 1.0
Built-By: Jiangyuwei
Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_161

View File

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

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="STDOUT" />
</root>
</configuration>

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.AdminDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Admin">
<result column="account" property="adminAccount" jdbcType="VARCHAR"/>
<result column="password" property="adminPassword" jdbcType="VARCHAR"/>
</resultMap>
<select id="findByAccount" resultMap="BaseResultMap" parameterType="String">
select * from admin where account=#{account}
</select>
</mapper>

View File

@@ -1,53 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ChildDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Child">
<id column="id" property="childId" jdbcType="BIGINT"/>
<result column="longid" property="childLongId" jdbcType="CHAR"/>
<result column="name" property="childName" jdbcType="VARCHAR"/>
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="long">
select * from child where id = #{childId}
</select>
<select id="findByLongId" resultMap="BaseResultMap" parameterType="String">
select * from child where longid = #{childLongId}
</select>
<select id="findByName" resultMap="BaseResultMap" parameterType="String">
select * from child where name = #{childName}
</select>
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
select * from child where account = #{childAccount}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from child
</select>
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="childId" parameterType="Child">
insert into child(longid,name,sex,account,password,phone)
values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
</insert>
<delete id="delete" parameterType="long">
delete from child where id = #{childId}
</delete>
<update id="update" parameterType="Child">
update child
set longid = #{childLongId},
name = #{childName},
sex = #{childSex},
account = #{childAccount},
password = #{childPassword},
phone = #{childPhone}
where id =#{childId}
</update>
</mapper>

View File

@@ -1,59 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ChildParentDao">
<resultMap id="ParentResultMap" type="com.oldpeoplehome.entity.Parent">
<id column="id" property="parentId" jdbcType="BIGINT"/>
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
<result column="name" property="parentName" jdbcType="VARCHAR"/>
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="birth" property="parentBirth" jdbcType="DATE"/>
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
<association property="child" javaType="Child">
<id column="cid" property="childId" jdbcType="BIGINT"/>
<result column="clongid" property="childLongId" jdbcType="CHAR"/>
<result column="cname" property="childName" jdbcType="VARCHAR"/>
<result column="csex" property="childSex" jdbcType="VARCHAR"/>
<result column="caccount" property="childAccount" jdbcType="VARCHAR"/>
<result column="cpassword" property="childPassword" jdbcType="VARCHAR"/>
<result column="cphone" property="childPhone" jdbcType="VARCHAR"/>
</association>
</resultMap>
<resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
<id column="id" property="childId" jdbcType="BIGINT"/>
<result column="longid" property="childLongId" jdbcType="CHAR"/>
<result column="name" property="childName" jdbcType="VARCHAR"/>
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
<association property="parent" javaType="Parent">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="plongid" property="parentLongId" jdbcType="CHAR"/>
<result column="pname" property="parentName" jdbcType="VARCHAR"/>
<result column="psex" property="parentSex" jdbcType="VARCHAR"/>
<result column="paccount" property="parentAccount" jdbcType="VARCHAR"/>
<result column="ppassword" property="parentPassword" jdbcType="VARCHAR"/>
<result column="pheight" property="parentHeight" jdbcType="DOUBLE"/>
<result column="pweight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="pbirth" property="parentBirth" jdbcType="DATE"/>
<result column="pphone" property="parentPhone" jdbcType="CHAR"/>
</association>
</resultMap>
<select id="findByChild" resultMap="ParentResultMap" parameterType="long">
select c.*, p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
</select>
<select id="findByParent" resultMap="ChildResultMap" parameterType="long">
select c.*, p.* from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
</select>
<insert id="insert" parameterType="ChildParent">
insert into cp(pid, cid, relation)
values (#{parentId}, #{childId}, #{relation})
</insert>
</mapper>

View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.HeartRateDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
</resultMap>
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select *
from heartrate where pid = #{parentId}
</select>
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select *
from heartrate where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d %T') between #{startDate} and #{endDate}
</select>
<select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.MotionDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Motion">
<id column="pid" property="motionParentId" jdbcType="BIGINT"/>
<result column="date" property="motionDate" jdbcType="DATE"/>
<result column="count" property="motionCount" jdbcType="BIGINT"/>
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
<result column="time" property="motionTime" jdbcType="TIME"/>
</resultMap>
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select m.*
from motion m where pid = #{motionParentId}
</select>
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select *
from motion where pid = #{motionParentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
</select>
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
</select>
<insert id="insert" parameterType="Motion">
insert into motion(pid, date, count, distance, energy, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
</insert>
</mapper>

View File

@@ -1,58 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.ParentDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Parent">
<id column="id" property="parentId" jdbcType="BIGINT"/>
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
<result column="name" property="parentName" jdbcType="VARCHAR"/>
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
<result column="birth" property="parentBirth" jdbcType="DATE"/>
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
<association property="parentRoom" javaType="Room">
<id column="rid" property="roomId" jdbcType="INTEGER"/>
<result column="rlocation" property="roomLocation" jdbcType="VARCHAR"/>
<result column="rname" property="roomName" jdbcType="VARCHAR"/>
</association>
</resultMap>
<select id="findByID" parameterType="long" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.id=#{parentId}
</select>
<select id="findByLongId" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.longid=#{parentLongId}
</select>
<select id="findByRoomId" parameterType="int" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from room r left join parent p on p.id=r.id where r.id=#{r.roomId}
</select>
<select id="findByName" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.name=#{p.parentName}
</select>
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.account=#{p.parentAccount}
</select>
<select id="findAll" resultMap="BaseResultMap">
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id
</select>
<insert id="insert" parameterType="Parent" useGeneratedKeys="true" keyColumn="id">
insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
</insert>
<update id="update" keyColumn="id">
update parent
set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
where id=#{parentId}
</update>
<delete id="delete" parameterType="long">
delete from parent where id=#{parentId}
</delete>
</mapper>

View File

@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
<id column="id" property="roomId" jdbcType="INTEGER"/>
<result column="location" property="roomLocation" jdbcType="VARCHAR"/>
<result column="name" property="roomName" jdbcType="VARCHAR"/>
<result column="pid" property="parentId" jdbcType="BIGINT"/>
</resultMap>
<select id="findById" resultMap="BaseResultMap" parameterType="int">
select * from room where id = #{roomId}
</select>
<select id="findAll" resultMap="BaseResultMap">
select * from room
</select>
<select id="findEmptyRoom" resultMap="BaseResultMap">
select * from room where pid is null
</select>
<insert id="insertRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="roomId" parameterType="Room">
insert into room(location, name) values (#{roomLocation}, #{roomName})
</insert>
<delete id="deleteRoom" parameterType="int">
delete from room where id = #{roomId}
</delete>
<update id="updateRoom" parameterType="Room">
update room
set location = #{roomLocation},
name = #{roomName},
pid = #{parentId}
where id =#{roomId}
</update>
</mapper>

View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.RoomStateDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.RoomState">
<id column="rid" property="roomId" jdbcType="BIGINT"/>
<result column="time" property="time" jdbcType="TIMESTAMP"/>
<result column="temperature" property="temperature" jdbcType="DOUBLE"/>
<result column="humidity" property="humidity" jdbcType="DOUBLE"/>
<result column="isin" property="isin" jdbcType="INTEGER"/>
</resultMap>
<select id="findByRoom" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select *
from rstate where rid = #{roomId}
</select>
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select *
from rstate where rid = #{roomId} and DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s')between #{startDate} and #{endDate}
</select>
<select id="findByRoomAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
select r.*, room.* from rstate r left join room on r.rid = room.id where r.rid = #{roomId} and r.time = #{startDate}
</select>
<insert id="insert" parameterType="RoomState">
insert into rstate(rid, time, temperature, humidity, isin)
values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
</insert>
</mapper>

View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.oldpeoplehome.dao.SleepDao">
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Sleep">
<id column="pid" property="parentId" jdbcType="BIGINT"/>
<result column="date" property="date" jdbcType="DATE"/>
<result column="deep" property="lightTime" jdbcType="TIME"/>
<result column="light" property="deepTime" jdbcType="TIME"/>
<result column="awake" property="awakeTime" jdbcType="TIME"/>
</resultMap>
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select *
from sleep where pid = #{parentId}
</select>
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select *
from sleep where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
</select>
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
select s.*, p.* from sleep s left join parent p on s.pid = p.id where s.pid = #{parentId} and s.date = #{startDate}
</select>
<insert id="insert" parameterType="Sleep">
insert into sleep(pid, date, deep, light, awake)
values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
</insert>
</mapper>

View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<!-- 配置全局属性 -->
<settings>
<!-- 使用jdbc的getGeneratedKeys获取数据库自增主键值 -->
<setting name="useGeneratedKeys" value="true" />
<!-- 使用列别名替换列名 默认:true -->
<setting name="useColumnLabel" value="true" />
<!-- 开启驼峰命名转换:Table{create_time} -> Entity{createTime} -->
<setting name="mapUnderscoreToCamelCase" value="true" />
</settings>
</configuration>

View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<!--配置数据库相关参数 -->
<context:property-placeholder location="classpath:jdbc.properties"/>
<!-- 2.数据库连接池 -->
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
<!-- 配置连接池属性 -->
<property name="driverClass" value="${jdbc.driver}"/>
<property name="jdbcUrl" value="${jdbc.url}"/>
<property name="user" value="${jdbc.username}"/>
<property name="password" value="${jdbc.password}"/>
<!-- c3p0连接池的私有属性 -->
<property name="maxPoolSize" value="30"/>
<property name="minPoolSize" value="10"/>
<!-- 关闭连接后不自动commit -->
<property name="autoCommitOnClose" value="false"/>
<!-- 获取连接超时时间 -->
<property name="checkoutTimeout" value="10000"/>
<!-- 当获取连接失败重试次数 -->
<property name="acquireRetryAttempts" value="2"/>
</bean>
<!-- 3.配置SqlSessionFactory对象 -->
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
<!-- 注入数据库连接池 -->
<property name="dataSource" ref="dataSource"/>
<!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
<property name="configLocation" value="classpath:mybatis-config.xml"/>
<!-- 扫描entity包 使用别名 -->
<property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
<!-- 扫描sql配置文件:mapper需要的xml文件 -->
<property name="mapperLocations" value="classpath:mapper/*.xml"/>
</bean>
<!-- 4.配置扫描Dao接口包动态实现Dao接口注入到spring容器中 -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<!-- 注入sqlSessionFactory -->
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
<!-- 给出需要扫描Dao接口包 -->
<property name="basePackage" value="com.oldpeoplehome.dao"/>
</bean>
</beans>

View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd">
<!-- 扫描service包下所有使用注解的类型 -->
<context:component-scan base-package="com.oldpeoplehome.service" />
<!-- 配置事务管理器 -->
<bean id="transactionManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<!-- 注入数据库连接池 -->
<property name="dataSource" ref="dataSource" />
</bean>
<!-- 配置基于注解的声明式事务 -->
<tx:annotation-driven transaction-manager="transactionManager" />
</beans>

View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<!-- 配置SpringMVC -->
<!-- 1.开启SpringMVC注解模式 -->
<!-- 简化配置:
(1)自动注册DefaultAnootationHandlerMapping,AnotationMethodHandlerAdapter
(2)提供一些列数据绑定数字和日期的format @NumberFormat, @DateTimeFormat, xml,json默认读写支持
-->
<mvc:annotation-driven />
<!-- 2.静态资源默认servlet配置
(1)加入对静态资源的处理js,gif,png
(2)允许使用"/"做整体映射
-->
<mvc:default-servlet-handler/>
<!-- 3.配置jsp 显示ViewResolver -->
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
<property name="prefix" value="/WEB-INF/jsp/" />
<property name="suffix" value=".jsp" />
</bean>
<!-- 4.扫描web相关的bean -->
<context:component-scan base-package="com.oldpeoplehome.web" />
<context:component-scan base-package="com.oldpeoplehome">
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
</context:component-scan>
</beans>

Some files were not shown because too many files have changed in this diff Show More