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

Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome

Browse Source
This commit is contained in:
ScorpioMiku
2019-08-28 16:51:57 +08:00
parent 4fcc41e7b6 203489b72f
commit dd3946829d
23 changed files with 416 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,19 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,80 +30,10 @@
</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/java/com/oldpeoplehome/web/HeartRateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="57" column="8" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="66" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
<caret line="20" column="57" selection-start-line="20" selection-start-column="57" selection-end-line="20" selection-end-column="83" />
</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="187">
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</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="198">
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="3" column="7" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/target/classes/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="52" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5624">
<state relative-caret-position="891">
<caret line="27" column="25" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
</state>
</provider>
@@ -100,17 +42,118 @@
<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="264">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="1880">
<caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
</state>
</provider>
</entry>
</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="33">
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1246#1247#0" expanded="true" />
<element signature="e#1283#1284#0" expanded="true" />
<element signature="e#1335#1336#0" expanded="true" />
<element signature="e#1381#1382#0" expanded="true" />
<element signature="e#1416#1417#0" expanded="true" />
<element signature="e#1449#1450#0" expanded="true" />
<element signature="e#1499#1500#0" expanded="true" />
<element signature="e#1543#1544#0" expanded="true" />
<element signature="e#1594#1595#0" expanded="true" />
<element signature="e#1652#1653#0" expanded="true" />
<element signature="e#1688#1689#0" expanded="true" />
<element signature="e#1722#1723#0" expanded="true" />
<element signature="e#1774#1775#0" expanded="true" />
<element signature="e#1820#1821#0" expanded="true" />
<element signature="e#1861#1862#0" expanded="true" />
<element signature="e#1898#1899#0" expanded="true" />
<element signature="e#1958#1959#0" expanded="true" />
<element signature="e#2010#2011#0" expanded="true" />
<element signature="e#2045#2046#0" expanded="true" />
<element signature="e#2078#2079#0" expanded="true" />
<element signature="e#2128#2129#0" expanded="true" />
<element signature="e#2172#2173#0" expanded="true" />
<element signature="e#2211#2212#0" expanded="true" />
<element signature="e#2246#2247#0" expanded="true" />
<element signature="e#2302#2303#0" expanded="true" />
<element signature="e#2350#2351#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="3" column="21" lean-forward="true" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
<state relative-caret-position="151">
<caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141">
<caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="132">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
@@ -130,7 +173,15 @@
<findStrings>
<find>setRoomName</find>
<find>***</find>
<find>utf8mb4_0900_ai_ci</find>
<find>utf8mb4</find>
<find>energy</find>
</findStrings>
<replaceStrings>
<replace>utf8_general_ci</replace>
<replace>utf8</replace>
<replace>motionEnergy</replace>
</replaceStrings>
<dirStrings>
<dir>E:\课设\OldPeopleHome\server\OldPeopleHome\src\main\java\com\oldpeoplehome\service\impl</dir>
</dirStrings>
@@ -156,9 +207,6 @@
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ChildParentDaoTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/MotionFilter.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
<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/service/MotionService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/MotionServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java" />
@@ -174,7 +222,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomStateService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomStateServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/SleepController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/SleepDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRate.java" />
@@ -191,7 +238,11 @@
<option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" />
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
</list>
</option>
</component>
@@ -210,10 +261,10 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1911" />
<option name="y" value="-9" />
<option name="width" value="1938" />
<option name="height" value="1048" />
<option name="x" value="1910" />
<option name="y" value="-10" />
<option name="width" value="1939" />
<option name="height" value="1049" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -222,7 +273,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -241,6 +291,21 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" 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" />
</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" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
@@ -248,22 +313,73 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mapper" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<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="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="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="1566548021112" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566912018885" />
<property name="last_opened_file_path" value="E:/新建文件夹 (2)/TestDemo" />
<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="Facets" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.last.edited" value="Artifacts" />
<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" />
</component>
@@ -285,7 +401,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Tomcat Server.chuizichui">
<component name="RunManager" selected="JUnit.MotionDaoTest.testInsert">
<configuration name="HeartRateServiceTest.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="OldPeopleHome" />
<extension name="coverage">
@@ -444,14 +560,14 @@
<item itemvalue="JUnit.RoomDaoTest.testFindAll" />
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
<item itemvalue="JUnit.RoomDaoTest.testA" />
<item itemvalue="Tomcat Server.chuizichui" />
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="Tomcat Server.chuizichui" />
</list>
<recent_temporary>
<list>
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
<item itemvalue="JUnit.HeartRateServiceTest.test" />
<item itemvalue="JUnit.RoomDaoTest.testA" />
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
<item itemvalue="JUnit.MotionDaoTest.test" />
<item itemvalue="JUnit.RoomDaoTest.testFindAll" />
</list>
@@ -483,23 +599,12 @@
<workItem from="1566531222223" duration="605000" />
<workItem from="1566533277465" duration="598000" />
<workItem from="1566536292540" duration="37000" />
<workItem from="1566536413587" duration="6705000" />
<workItem from="1566536413587" duration="7748000" />
<workItem from="1566876393093" duration="4610000" />
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="MotionDaoTest_test - 2019.08.22 at 13h 59m 39s.xml">
<configuration name="MotionDaoTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_test - 2019.08.22 at 14h 00m 07s.xml">
<configuration name="MotionDaoTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.22 at 14h 25m 49s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.22 at 14h 27m 41s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.22 at 14h 28m 43s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
@@ -518,9 +623,21 @@
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 41m 50s.xml">
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
</history-entry>
<history-entry file="MotionDaoTest_testInsert - 2019.08.27 at 21h 15m 06s.xml">
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
</history-entry>
<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>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="117723000" />
<option name="totallyTimeSpent" value="123376000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -535,7 +652,7 @@
<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.20241287" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20509383" />
<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" />
@@ -609,20 +726,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="15" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="34" column="41" lean-forward="true" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
@@ -674,16 +777,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-462">
@@ -717,33 +810,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="14" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="18" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="24" column="13" lean-forward="true" selection-end-line="29" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
@@ -881,16 +947,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/SleepDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
@@ -1043,7 +1099,7 @@
</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="184">
<state relative-caret-position="1485">
<caret line="57" column="8" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="66" />
<folding>
<element signature="imports" expanded="true" />
@@ -1053,7 +1109,7 @@
</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="187">
<state relative-caret-position="627">
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
@@ -1063,7 +1119,7 @@
</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="198">
<state relative-caret-position="594">
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
@@ -1079,9 +1135,7 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66" />
</provider>
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/target/classes/mybatis-config.xml">
<provider selected="true" editor-type-id="text-editor">
@@ -1092,22 +1146,109 @@
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5624">
<state relative-caret-position="891">
<caret line="27" column="25" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="1880">
<caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1246#1247#0" expanded="true" />
<element signature="e#1283#1284#0" expanded="true" />
<element signature="e#1335#1336#0" expanded="true" />
<element signature="e#1381#1382#0" expanded="true" />
<element signature="e#1416#1417#0" expanded="true" />
<element signature="e#1449#1450#0" expanded="true" />
<element signature="e#1499#1500#0" expanded="true" />
<element signature="e#1543#1544#0" expanded="true" />
<element signature="e#1594#1595#0" expanded="true" />
<element signature="e#1652#1653#0" expanded="true" />
<element signature="e#1688#1689#0" expanded="true" />
<element signature="e#1722#1723#0" expanded="true" />
<element signature="e#1774#1775#0" expanded="true" />
<element signature="e#1820#1821#0" expanded="true" />
<element signature="e#1861#1862#0" expanded="true" />
<element signature="e#1898#1899#0" expanded="true" />
<element signature="e#1958#1959#0" expanded="true" />
<element signature="e#2010#2011#0" expanded="true" />
<element signature="e#2045#2046#0" expanded="true" />
<element signature="e#2078#2079#0" expanded="true" />
<element signature="e#2128#2129#0" expanded="true" />
<element signature="e#2172#2173#0" expanded="true" />
<element signature="e#2211#2212#0" expanded="true" />
<element signature="e#2246#2247#0" expanded="true" />
<element signature="e#2302#2303#0" expanded="true" />
<element signature="e#2350#2351#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141">
<caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="3" column="21" lean-forward="true" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
<state relative-caret-position="33">
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
<caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
</state>
</provider>
</entry>
@@ -1117,7 +1258,7 @@
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<last-edited>OldPeopleHome:Web exploded</last-edited>
<last-edited>OldPeopleHome:war</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
@@ -1191,7 +1332,7 @@
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>scala-sdk-2.11.8</last-edited>
<last-edited>Maven: c3p0:c3p0:0.9.1.2</last-edited>
<splitter-proportions>
<option name="proportions">
<list>

18
server/OldPeopleHome/src/main/java/com/oldpeoplehome/entity/Motion.java
View File

@@ -12,24 +12,27 @@ public class Motion {
private Date motionDate;
private long motionCount;
private double motionDistance;
private double motionEnergy;
private Time motionTime;
public Motion() {
}
public Motion(long motionParentId, String motionDate, long motionCount, double motionDistance, String motionTime) {
public Motion(long motionParentId, String motionDate, long motionCount, double motionDistance, double motionEnergy, String motionTime) {
this.motionParentId = motionParentId;
this.motionDate = Date.valueOf(motionDate);
this.motionCount = motionCount;
this.motionDistance = motionDistance;
this.motionEnergy = motionEnergy;
this.motionTime = Time.valueOf(motionTime);
}
public Motion(long motionParentId, Date motionDate, long motionCount, double motionDistance, Time motionTime) {
public Motion(long motionParentId, Date motionDate, long motionCount, double motionDistance, double motionEnergy, Time motionTime) {
this.motionParentId = motionParentId;
this.motionDate = motionDate;
this.motionCount = motionCount;
this.motionDistance = motionDistance;
this.motionEnergy = motionEnergy;
this.motionTime = motionTime;
}
@@ -77,13 +80,22 @@ public class Motion {
this.motionTime = motionTime;
}
public double getmotionEnergy() {
return motionEnergy;
}
public void setmotionEnergy(double motionEnergy) {
this.motionEnergy = motionEnergy;
}
@Override
public String toString() {
return "Motion{" +
"parentId=" + motionParentId +
"motionParentId=" + motionParentId +
", motionDate=" + motionDate +
", motionCount=" + motionCount +
", motionDistance=" + motionDistance +
", motionEnergy=" + motionEnergy +
", motionTime=" + motionTime +
'}';
}

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

@@ -58,8 +58,9 @@ public class MotionController {
String date = String.valueOf(params.get("date"));
long count = Long.valueOf(String.valueOf(params.get("count")));
double distance = Long.valueOf(String.valueOf(params.get("distance")));
double energy = Long.valueOf(String.valueOf(params.get("energy")));
String time = String.valueOf(params.get("time"));
Motion motion = new Motion(parentId, date, count, distance, time);
Motion motion = new Motion(parentId, date, count, distance,energy, time);
motionService.insert(motion);
}

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

@@ -1,4 +1,4 @@
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.url=jdbc:mysql://localhost:3306/oldpeople?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
jdbc.username=root
jdbc.password=想看?的密码？滚！
jdbc.password=root

5
server/OldPeopleHome/src/main/resources/mapper/MotionDao.xml
View File

@@ -9,6 +9,7 @@
<result column="date" property="motionDate" jdbcType="DATE"/>
<result column="count" property="motionCount" jdbcType="BIGINT"/>
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
<result column="time" property="motionTime" jdbcType="TIME"/>
</resultMap>
@@ -24,7 +25,7 @@
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
</select>
<insert id="insert" parameterType="Motion">
insert into motion(pid, date, count, distance, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime})
insert into motion(pid, date, count, distance, energy, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
</insert>
</mapper>

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

@@ -10,10 +10,10 @@ DROP TABLE IF EXISTS `sleep`;
CREATE TABLE `parent` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '老人id',
`longid` char(18) NOT NULL COMMENT '老人身份证',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '姓名',
`sex` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '性别',
`account` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '账号',
`password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '密码',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '姓名',
`sex` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '性别',
`account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '账号',
`password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
`height` double DEFAULT NULL COMMENT '身高',
`weight` double DEFAULT NULL COMMENT '体重',
`birth` date NOT NULL COMMENT '生日',
@@ -21,16 +21,16 @@ CREATE TABLE `parent` (
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `index_longid` (`longid`) USING BTREE,
KEY `index_name` (`name`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC;
) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC;
CREATE TABLE `room` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '房间id',
`location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间位置',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '房间名称(房间号)',
`location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间位置',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '房间名称(房间号)',
`pid` bigint(20) DEFAULT NULL COMMENT '房间住人id',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `index` (`pid`) USING BTREE,
CONSTRAINT `room_fk_1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL
) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC;
) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC;
CREATE TABLE `child` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -43,14 +43,14 @@ CREATE TABLE `child` (
PRIMARY KEY (`id`),
UNIQUE KEY `index _longid` (`longid`) USING BTREE,
KEY `index_name` (`name`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
CREATE TABLE `cp` (
`pid` bigint(20) DEFAULT NULL,
`cid` bigint(20) DEFAULT NULL,
`relation` varchar(255) DEFAULT NULL,
KEY `index_pid` (`pid`) USING BTREE,
KEY `index_cid` (`cid`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
CREATE TABLE `heartrate` (
`pid` bigint(20) DEFAULT NULL,
`time` datetime DEFAULT NULL,
@@ -58,7 +58,7 @@ CREATE TABLE `heartrate` (
KEY `index_pid` (`pid`) USING BTREE,
KEY `time` (`time`) USING BTREE,
CONSTRAINT `fk_pid2` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
CREATE TABLE `motion` (
`pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
`date` date DEFAULT NULL COMMENT '当日日期',
@@ -68,7 +68,7 @@ CREATE TABLE `motion` (
KEY `index_date` (`date`) USING BTREE,
KEY `index_pid` (`pid`) USING BTREE,
CONSTRAINT `fk_pid` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
CREATE TABLE `rstate` (
`rid` int(11) DEFAULT NULL,
@@ -79,7 +79,7 @@ CREATE TABLE `rstate` (
KEY `index_rid` (`rid`) USING BTREE,
KEY `index_time` (`time`) USING BTREE,
CONSTRAINT `fk_rid1` FOREIGN KEY (`rid`) REFERENCES `room` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
CREATE TABLE `sleep` (
`pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
`date` date DEFAULT NULL COMMENT '当天日期',
@@ -90,5 +90,5 @@ CREATE TABLE `sleep` (
KEY `index_pid` (`pid`) USING BTREE,
KEY `index_pid_date` (`pid`,`date`) USING BTREE,
CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;

3
server/OldPeopleHome/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java
View File

@@ -30,8 +30,9 @@ public class MotionDaoTest extends BaseTest {
@Test
public void testInsert(){
Motion motion = new Motion(2, "2019-2-2", 1239, 11, "1:1:1");
Motion motion = new Motion(2, "2019-2-2", 1239, 11,22, "1:1:1");
motionDao.insert(motion);
System.out.println(motionDao.findByParentId(new MotionFilter(1)));
}
}

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

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module
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

BIN
server/OldPeopleHome/target/classes/META-INF/OldPeopleHome.kotlin_module
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

5
server/OldPeopleHome/target/classes/mapper/MotionDao.xml
View File

@@ -9,6 +9,7 @@
<result column="date" property="motionDate" jdbcType="DATE"/>
<result column="count" property="motionCount" jdbcType="BIGINT"/>
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
<result column="time" property="motionTime" jdbcType="TIME"/>
</resultMap>
@@ -24,7 +25,7 @@
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
</select>
<insert id="insert" parameterType="Motion">
insert into motion(pid, date, count, distance, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime})
insert into motion(pid, date, count, distance, energy, time)
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
</insert>
</mapper>

BIN
server/OldPeopleHome/target/test-classes/META-INF/OldPeopleHome.kotlin_module
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/test-classes/com/oldpeoplehome/dao/MotionDaoTest.class
View File

Binary file not shown.

4
server/README.md
View File

@@ -56,6 +56,8 @@
### 接口格式
使用实例：http://39.105.65.209:8080/parent/list
基本的业务接口已经完成，如下
| 实体 | url示例 | 请求方式 | 功能概述 | 参数格式 |
@@ -91,4 +93,4 @@
| Sleep | /sleep/get/1 | GET | 查找id=1的老人睡眠信息 | 参数格式：yyyy-mm-dd 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| Sleep | /sleep/add | POST | 添加老人睡眠信息 | parent，date，deep，light，awake |
| HeartRate | /heartrate/get/1 | GET | 查找id=1的心率信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate |
| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate |

15
web/firstPage.html Normal file
View File

@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>首页</title>
<link rel="stylesheet" href="firstPage_style.css">
</head>
<body>
<div id="logo">
<a href="‪C:\Users\lenovo\Desktop\OldPeopleHome\web\图标\LOGO.png"></a>
</div>
</body>
</html>

0
web/firstPage_style.css Normal file
View File

8
web/oldPeopleHome.html → web/login.html
View File

@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>oldPeopleHome</title>
<link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="login_style.css">
</head>
<body>
<div>
@@ -15,9 +15,9 @@
<div>
<!-- 先空着，action不知道填什么 -->
<form action="" id="name">
用户名：<input type="text" name="name" ><br><br>
密码：<input type="password" name="password"><br><br>
<input type="submit">
<input type="text" name="name" placeholder="用户名" autofocus><br><br><br>
<input type="password" name="password" placeholder="密码"><br><br><br>
<input type="submit" id="submit" value="OK">
</form>
</div>
</div>

48
web/style.css → web/login_style.css
View File

@@ -8,8 +8,7 @@ body {
font-style: italic;
font-family: sans-serif;
font-size: 125px;
text-align: center;
position: absolute;
position: relative;
top: 120px;
/* background-color: yellow; */
@@ -20,29 +19,44 @@ body {
font-family: youyuan;
font-size: 30px;
text-align: center;
position: relative;
top: 140px;
position: absolute;
top: 100px;
}
#name {
width: 120px;
/* width: 120px; */
width: 100%;
color: slategray;
font-family: youyuan;
font-size: 24px;
position: relative;
left: 490px;
top: 150px;
text-align: center;
position: absolute;
/* left: 490px; */
top: 230px;
}
input[name] {
height: 27px;
border: none;
position: absolute;
left: 150px;
background-color: rgba(240, 248, 255, 0);
height: 30px;
border: 0.5px solid rgba(128, 128, 128, 0.5);
border-radius: 15px;
position: relative;
font-family: youyuan;
text-align: center;
font-size: 18px;
outline: none;
}
input[password] {
height: 27px;
#submit {
background-color: rgba(255, 239, 213);
height: 40px;
width: 40px;
border: none;
position: absolute;
left: 150px;
font-family: youyuan;
border-radius: 100%;
font-size: 22px;
color: white;
padding: 0;
outline: none;
}
#submit:hover {
width: 45px;
height: 45px;
background-color: rgba(255, 239, 213, 0.582);
}

BIN
web/图标/LOGO.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
web/图标/箭头01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB