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

change table

Browse Source
This commit is contained in:
jiangyuwei666
2019-09-04 21:36:58 +08:00
parent 671d8b3a00
commit 73d3c2d091
13 changed files with 279 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,15 +8,17 @@
<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/HeartRateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.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/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$/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$/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/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/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" />
@@ -27,107 +29,29 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="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/service/impl/ChildServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="132">
<caret line="4" lean-forward="true" 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/sql/add_table.sql">
<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="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 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/entity/HeartRate.java">
<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="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>
</state>
</provider>
</entry>
</file>
<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="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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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" />
<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>
@@ -136,10 +60,19 @@
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
<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="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" />
<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>
</provider>
</entry>
</file>
<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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -147,6 +80,51 @@
</provider>
</entry>
</file>
<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">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" 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/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>
</file>
<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">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<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">
<caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/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>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -166,6 +144,7 @@
<find>utf8mb4_0900_ai_ci</find>
<find>utf8mb4</find>
<find>energy</find>
<find>rat2e</find>
</findStrings>
<replaceStrings>
<replace>utf8_general_ci</replace>
@@ -182,8 +161,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/SleepFilter.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/SleepDao.xml" />
@@ -204,7 +181,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/HeartRateFilter.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.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" />
@@ -224,15 +200,18 @@
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" />
<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/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" />
</list>
</option>
</component>
@@ -262,8 +241,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -297,6 +274,24 @@
<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" />
@@ -313,6 +308,20 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="sql" 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="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -352,17 +361,19 @@
<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="1567562722071" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567604042331" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="reference.settings.project.maven.importing" />
@@ -385,7 +396,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Tomcat Server.chuizichui">
<component name="RunManager" selected="JUnit.ChildParentServiceTest.test">
<configuration name="AdminServiceTest.testLogin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -402,6 +413,22 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ChildParentServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.service" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.service.ChildParentServiceTest" />
<option name="METHOD_NAME" value="test" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="HeartRateServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -418,22 +445,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MotionDaoTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.oldpeoplehome.dao.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.oldpeoplehome.dao" />
<option name="MAIN_CLASS_NAME" value="com.oldpeoplehome.dao.MotionDaoTest" />
<option name="METHOD_NAME" value="test" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MotionDaoTest.testInsert" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -540,20 +551,20 @@
</method>
</configuration>
<list>
<item itemvalue="JUnit.MotionDaoTest.test" />
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
<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" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.ChildParentServiceTest.test" />
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
<item itemvalue="JUnit.RoomDaoTest.testA" />
<item itemvalue="JUnit.MotionDaoTest.test" />
</list>
</recent_temporary>
</component>
@@ -589,26 +600,12 @@
<workItem from="1567134555969" duration="5745000" />
<workItem from="1567150643505" duration="555000" />
<workItem from="1567213610755" duration="47000" />
<workItem from="1567561928915" duration="615000" />
<workItem from="1567561928915" duration="1922000" />
<workItem from="1567582087969" duration="3122000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 15m 06s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 15m 23s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 17m 47s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 18m 44s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 54m 19s.xml">
<configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
</history-entry>
<history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 54m 53s.xml">
<configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
</history-entry>
@@ -624,9 +621,24 @@
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 10h 01m 03s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 15h 30m 28s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 15h 31m 13s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="HeartRateServiceTest_test - 2019.09.04 at 15h 34m 12s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="ChildParentServiceTest_test - 2019.09.04 at 21h 29m 52s.xml">
<configuration name="ChildParentServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="ChildParentServiceTest_test - 2019.09.04 at 21h 30m 19s.xml">
<configuration name="ChildParentServiceTest.test" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="132037000" />
<option name="totallyTimeSpent" value="136466000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -641,7 +653,7 @@
<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.2191689" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22252011" />
<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" />
@@ -651,7 +663,7 @@
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.41501418" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.41501418" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -715,44 +727,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/SleepFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="12" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/RoomStateFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="13" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/HeartRateFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="21" column="60" selection-start-line="21" selection-start-column="60" selection-end-line="21" selection-end-column="60" />
<folding>
<element signature="e#332#333#0" expanded="true" />
<element signature="e#372#373#0" expanded="true" />
</folding>
</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="297">
<caret line="18" column="30" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
@@ -988,13 +962,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
@@ -1031,13 +998,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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="429">
@@ -1055,13 +1015,6 @@
</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">
@@ -1076,13 +1029,6 @@
</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">
@@ -1104,17 +1050,57 @@
</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="1056">
<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/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 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">
<caret line="15" column="29" 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/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="227">
<caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
<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="326">
<caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
<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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1252#1253#0" expanded="true" />
@@ -1125,7 +1111,6 @@
<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" />
@@ -1133,40 +1118,52 @@
</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>
<caret line="27" column="55" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
<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 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/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
<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="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1175,21 +1172,28 @@
</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 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/HeartRateController.java">
<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="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" />
<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" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

3
server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ChildParentController.java
View File

@@ -40,12 +40,13 @@ public class ChildParentController {
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
public void add(@RequestParam Map<String, Object> params) {
public ChildParent 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;
}
}

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

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

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

@@ -25,6 +25,6 @@
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

23
server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java Normal file
View File

@@ -0,0 +1,23 @@
package com.oldpeoplehome.service;
import com.oldpeoplehome.BaseTest;
import com.oldpeoplehome.entity.ChildParent;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
/**
* Created By Jiangyuwei on 2019/9/4 21:27
* Description:
*/
public class ChildParentServiceTest extends BaseTest {
@Autowired
private ChildParentService childParentService;
@Test
public void test(){
ChildParent childParent = new ChildParent(1,1,"父子");
childParentService.combine(childParent);
}
}

8
server/OldPeopleHome/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java
View File

@@ -17,10 +17,10 @@ public class HeartRateServiceTest extends BaseTest {
@Test
public void test(){
// HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3);
// heartRateService.insert(heartRate);
HeartRateFilter heartRateFilter = new HeartRateFilter(1);
System.out.println(heartRateService.findByParent(heartRateFilter));
HeartRate heartRate = new HeartRate(1, "2019-8-22 10:00:00", 20.3, 21,21);
heartRateService.insert(heartRate);
// HeartRateFilter heartRateFilter = new HeartRateFilter(1);
// System.out.println(heartRateService.findByParent(heartRateFilter));
}
}

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

Binary file not shown.

2
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/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://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.username=root
jdbc.password=root

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

@@ -25,6 +25,6 @@
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

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

@@ -25,6 +25,6 @@
</select>
<insert id="insert" parameterType="HeartRate">
insert into heartrate(pid, time, rate1,rate2,oxy)
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
values (#{parentId}, #{time}, #{rate1}, #{rate2}, #{oxy})
</insert>
</mapper>

BIN
server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/ChildParentServiceTest.class Normal file
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/test-classes/com/oldpeoplehome/service/HeartRateServiceTest.class
View File

Binary file not shown.

4
server/README.md
View File

@@ -77,7 +77,7 @@
| Parent | /parent/add | POST | 添加老人 | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 |
| Parent | /parent/update/1 | POST | 更新id=1的老人信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
| Parent | /parent/delete/1 | DELETE | 删除id=1的老人 | |
| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） |
| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回）account:jiang,password:123 |
| Child | /child/get/1 | GET | 查询id=1的子女 | |
| Child | /child/get_longid/111 | GET | 查询身份证=111的child的详细信息 | |
| Child | /child/get_name/小蒋 | GET | 查询姓名=小蒋的child的详细信息 | |
@@ -85,7 +85,7 @@
| Child | /child/add | POST | | childSex，childPassword，childAccount，childName，childLongId，childPhone |
| Child | /child/update/1 | POST | 更新id=1的子女信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
| Child | /child/delete/1 | DELETE | 删除id=1的子女信息 | |
| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) |
| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 |
| ChildAndParent | /child_parent/child/1 | GET | 查看子女id=1对应的老人 | |
| ChildAndParent | /child_parent/parent/1 | GET | 查看老人id=1对应的子女 | |
| ChildAndParent | /child_parent/add | POST | 添加老人子女对应关系 | 子女id：child，老人id：parent，关系：relation |