Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome
This commit is contained in:
ScorpioMiku
499
server/OldPeopleHome/.idea/workspace.xml
generated
499
server/OldPeopleHome/.idea/workspace.xml
generated
@@ -6,18 +6,7 @@
|
||||
</artifacts-to-build>
|
||||
</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/HeartRate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/HeartRate.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/entity/HeartRate.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/oldpeoplehome/web/HeartRateController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/HeartRateDao.xml" afterDir="false" />
|
||||
</list>
|
||||
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="" />
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
@@ -27,29 +16,23 @@
|
||||
</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">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="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="33">
|
||||
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="468">
|
||||
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -57,8 +40,8 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="487">
|
||||
<caret line="65" column="43" lean-forward="true" selection-start-line="65" selection-start-column="43" selection-end-line="65" selection-end-column="43" />
|
||||
<state relative-caret-position="388">
|
||||
<caret line="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -66,10 +49,14 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="326">
|
||||
<caret line="78" column="18" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
|
||||
<state relative-caret-position="218">
|
||||
<caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#707#708#0" expanded="true" />
|
||||
<element signature="e#734#735#0" expanded="true" />
|
||||
<element signature="e#774#775#0" expanded="true" />
|
||||
<element signature="e#806#807#0" expanded="true" />
|
||||
<element signature="e#1252#1253#0" expanded="true" />
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1322#1323#0" expanded="true" />
|
||||
@@ -88,10 +75,10 @@
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
|
||||
<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="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" />
|
||||
<state relative-caret-position="594">
|
||||
<caret line="21" selection-start-line="21" selection-end-line="21" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -99,50 +86,47 @@
|
||||
</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="198">
|
||||
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</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="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>
|
||||
</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="363">
|
||||
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</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="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>
|
||||
</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" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1215">
|
||||
<caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="-117">
|
||||
<caret line="12" column="59" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -166,6 +150,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 +167,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 +187,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,14 +206,17 @@
|
||||
<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/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
|
||||
<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/java/com/oldpeoplehome/web/ChildParentController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
|
||||
</list>
|
||||
</option>
|
||||
@@ -262,8 +247,6 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -317,52 +300,33 @@
|
||||
<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="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" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="service" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="target" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="main" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="webapp" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567562722071" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567605147736" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<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 +349,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 +366,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 +398,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 +504,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="JUnit.ChildParentServiceTest.test" />
|
||||
<item itemvalue="Tomcat Server.chuizichui" />
|
||||
</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 +553,13 @@
|
||||
<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="4819000" />
|
||||
<workItem from="1567664806171" duration="1249000" />
|
||||
</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 +575,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="139412000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -641,7 +607,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.22587131" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Designer" order="2" />
|
||||
<window_info id="Image Layers" order="3" />
|
||||
@@ -651,7 +617,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 +681,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 +916,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 +952,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 +969,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 +983,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,19 +1004,108 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
|
||||
<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="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="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/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/web/ChildController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2046">
|
||||
<caret line="79" column="5" selection-start-line="79" selection-start-column="5" selection-end-line="79" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1386">
|
||||
<caret line="52" column="40" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="429">
|
||||
<caret line="17" selection-start-line="17" selection-end-line="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ChildParentServiceTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="594">
|
||||
<caret line="21" selection-start-line="21" selection-end-line="21" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="198">
|
||||
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2013">
|
||||
<caret line="80" column="4" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="363">
|
||||
<caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="858">
|
||||
<caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/HeartRate.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="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="218">
|
||||
<caret line="32" column="18" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#707#708#0" expanded="true" />
|
||||
<element signature="e#734#735#0" expanded="true" />
|
||||
<element signature="e#774#775#0" expanded="true" />
|
||||
<element signature="e#806#807#0" expanded="true" />
|
||||
<element signature="e#1252#1253#0" expanded="true" />
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1322#1323#0" expanded="true" />
|
||||
@@ -1133,63 +1122,37 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/HeartRateDao.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="330">
|
||||
<caret line="15" column="29" lean-forward="true" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="165">
|
||||
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
|
||||
<folding>
|
||||
<element signature="n#mapper#0;n#!!top" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/HeartRateServiceTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="378">
|
||||
<caret line="37" column="37" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="121">
|
||||
<caret line="22" column="37" lean-forward="true" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="99">
|
||||
<caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
|
||||
<state relative-caret-position="-117">
|
||||
<caret line="12" column="59" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/HeartRateController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1215">
|
||||
<caret line="60" column="43" lean-forward="true" selection-start-line="60" selection-start-column="43" selection-end-line="60" selection-end-column="43" />
|
||||
<state relative-caret-position="468">
|
||||
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="388">
|
||||
<caret line="68" column="24" selection-start-line="68" selection-start-column="24" selection-end-line="68" selection-end-column="24" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="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>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
||||
@@ -12,6 +12,7 @@ public class HeartRate {
|
||||
|
||||
private long parentId;
|
||||
private Timestamp time;
|
||||
private double rate;
|
||||
private double rate1;
|
||||
private double rate2;
|
||||
private double oxy;
|
||||
@@ -19,16 +20,39 @@ public class HeartRate {
|
||||
public HeartRate() {
|
||||
}
|
||||
|
||||
public HeartRate(long parentId, Timestamp time, double rate1, double rate2, double oxy) {
|
||||
public HeartRate(long parentId, Timestamp time, double rate1, double rate, double rate2, double oxy) {
|
||||
this.parentId = parentId;
|
||||
this.time = time;
|
||||
this.rate = rate;
|
||||
this.rate1 = rate1;
|
||||
this.rate2 = rate2;
|
||||
this.oxy = oxy;
|
||||
}
|
||||
public HeartRate(long parentId, String time, double rate1, double rate2, double oxy) {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "HeartRate{" +
|
||||
"parentId=" + parentId +
|
||||
", time=" + time +
|
||||
", rate=" + rate +
|
||||
", rate1=" + rate1 +
|
||||
", rate2=" + rate2 +
|
||||
", oxy=" + oxy +
|
||||
'}';
|
||||
}
|
||||
|
||||
public double getRate() {
|
||||
return rate;
|
||||
}
|
||||
|
||||
public void setRate(double rate) {
|
||||
this.rate = rate;
|
||||
}
|
||||
|
||||
public HeartRate(long parentId, String time, double rate1, double rate, double rate2, double oxy) {
|
||||
this.parentId = parentId;
|
||||
this.time = Timestamp.valueOf(time);
|
||||
this.rate = rate;
|
||||
this.rate1 = rate1;
|
||||
this.rate2 = rate2;
|
||||
this.oxy = oxy;
|
||||
@@ -42,7 +66,8 @@ public class HeartRate {
|
||||
public void setParentId(long parentId) {
|
||||
this.parentId = parentId;
|
||||
}
|
||||
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
public Timestamp getTime() {
|
||||
return time;
|
||||
}
|
||||
@@ -75,14 +100,4 @@ public class HeartRate {
|
||||
this.oxy = oxy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "HeartRate{" +
|
||||
"parentId=" + parentId +
|
||||
", time=" + time +
|
||||
", rate1=" + rate1 +
|
||||
", rate2=" + rate2 +
|
||||
", oxy=" + oxy +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.oldpeoplehome.entity.ChildParent;
|
||||
import com.oldpeoplehome.entity.Parent;
|
||||
import com.oldpeoplehome.entity.Room;
|
||||
import com.oldpeoplehome.service.ChildParentService;
|
||||
import com.oldpeoplehome.service.ParentService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -21,6 +22,8 @@ public class ChildParentController {
|
||||
|
||||
@Autowired
|
||||
private ChildParentService childParentService;
|
||||
@Autowired
|
||||
private ParentService parentService;
|
||||
|
||||
@RequestMapping("/child/{id}")
|
||||
@ResponseBody
|
||||
@@ -40,12 +43,13 @@ public class ChildParentController {
|
||||
|
||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public void add(@RequestParam Map<String, Object> params) {
|
||||
public Parent add(@RequestParam Map<String, Object> params) {
|
||||
|
||||
long child = Long.valueOf(String.valueOf(params.get("child")));
|
||||
long parent = Long.valueOf(String.valueOf(params.get("parent")));
|
||||
String relation = String.valueOf(params.get("relation"));
|
||||
ChildParent childParent = new ChildParent(parent, child, relation);
|
||||
childParentService.combine(childParent);
|
||||
return parentService.findByID(parent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,17 +32,15 @@ public class HeartRateController {
|
||||
List<HeartRate> list;
|
||||
String startDate = request.getParameter("start");
|
||||
String endDate = request.getParameter("end");
|
||||
if (endDate == null){
|
||||
if (endDate == null) {
|
||||
if (startDate == null) {
|
||||
HeartRateFilter heartRateFilter = new HeartRateFilter(Long.valueOf(id));
|
||||
list = heartRateService.findByParent(heartRateFilter);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
HeartRateFilter heartRateFilter = new HeartRateFilter(Timestamp.valueOf(startDate), Long.valueOf(id));
|
||||
list = heartRateService.findByParentAndTime(heartRateFilter);
|
||||
}
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
HeartRateFilter heartRateFilter = new HeartRateFilter(Timestamp.valueOf(startDate), Timestamp.valueOf(endDate), Long.valueOf(id));
|
||||
list = heartRateService.findByTime(heartRateFilter);
|
||||
}
|
||||
@@ -51,13 +49,14 @@ public class HeartRateController {
|
||||
|
||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public void add(@RequestParam Map<String, Object> params){
|
||||
public void add(@RequestParam Map<String, Object> params) {
|
||||
long parentId = Long.valueOf(String.valueOf(params.get("parentId")));
|
||||
String time = String.valueOf(params.get("time"));
|
||||
double rate = Double.valueOf(String.valueOf(params.get("rate")));
|
||||
double rate1 = Double.valueOf(String.valueOf(params.get("rate1")));
|
||||
double rate2 = Double.valueOf(String.valueOf(params.get("rate2")));
|
||||
double oxy = Double.valueOf(String.valueOf(params.get("oxy")));
|
||||
HeartRate heartRate = new HeartRate(parentId, time, rate1, rate2, oxy);
|
||||
HeartRate heartRate = new HeartRate(parentId, time, rate, rate1, rate2, oxy);
|
||||
heartRateService.insert(heartRate);
|
||||
}
|
||||
|
||||
|
||||
@@ -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=
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
|
||||
<id column="pid" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="time" property="time" jdbcType="TIMESTAMP"/>
|
||||
<result column="rate" property="rate" jdbcType="DOUBLE"/>
|
||||
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
|
||||
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
|
||||
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
|
||||
@@ -24,7 +25,7 @@
|
||||
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="HeartRate">
|
||||
insert into heartrate(pid, time, rate1,rate2,oxy)
|
||||
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
|
||||
insert into heartrate(pid, time,rate, rate1,rate2,oxy)
|
||||
values (#{parentId}, #{time},#{rate}, #{rate1}, #{rate2}, #{oxy})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -65,6 +65,9 @@ CHANGE COLUMN `rate` `rate1` double NULL DEFAULT NULL COMMENT '收缩压' AFTER
|
||||
ADD COLUMN `rate2` double NULL COMMENT '舒张压' AFTER `rate1`,
|
||||
ADD COLUMN `oxy` double NULL AFTER `rate2`;
|
||||
|
||||
ALTER TABLE `heartrate`
|
||||
ADD COLUMN `rate` double NULL COMMENT '心率' AFTER `time`;
|
||||
|
||||
CREATE TABLE `motion` (
|
||||
`pid` bigint(20) DEFAULT NULL COMMENT 'parent id',
|
||||
`date` date DEFAULT NULL COMMENT '当日日期',
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -1,5 +0,0 @@
|
||||
Manifest-Version: 1.0
|
||||
Built-By: Jiangyuwei
|
||||
Created-By: IntelliJ IDEA
|
||||
Build-Jdk: 1.8.0_161
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +0,0 @@
|
||||
jdbc.driver=com.mysql.jdbc.Driver
|
||||
jdbc.url=jdbc:mysql://localhost:3306/ssmtest?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
|
||||
jdbc.username=root
|
||||
jdbc.password=root
|
||||
@@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration debug="true">
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- encoders are by default assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="debug">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.AdminDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Admin">
|
||||
<result column="account" property="adminAccount" jdbcType="VARCHAR"/>
|
||||
<result column="password" property="adminPassword" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByAccount" resultMap="BaseResultMap" parameterType="String">
|
||||
select * from admin where account=#{account}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -1,53 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.ChildDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Child">
|
||||
<id column="id" property="childId" jdbcType="BIGINT"/>
|
||||
<result column="longid" property="childLongId" jdbcType="CHAR"/>
|
||||
<result column="name" property="childName" jdbcType="VARCHAR"/>
|
||||
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
|
||||
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
|
||||
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
|
||||
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findById" resultMap="BaseResultMap" parameterType="long">
|
||||
select * from child where id = #{childId}
|
||||
</select>
|
||||
<select id="findByLongId" resultMap="BaseResultMap" parameterType="String">
|
||||
select * from child where longid = #{childLongId}
|
||||
</select>
|
||||
<select id="findByName" resultMap="BaseResultMap" parameterType="String">
|
||||
select * from child where name = #{childName}
|
||||
</select>
|
||||
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
|
||||
select * from child where account = #{childAccount}
|
||||
</select>
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
select * from child
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="childId" parameterType="Child">
|
||||
insert into child(longid,name,sex,account,password,phone)
|
||||
values (#{childLongId},#{childName},#{childSex},#{childAccount},#{childPassword},#{childPhone})
|
||||
</insert>
|
||||
|
||||
<delete id="delete" parameterType="long">
|
||||
delete from child where id = #{childId}
|
||||
</delete>
|
||||
|
||||
<update id="update" parameterType="Child">
|
||||
update child
|
||||
set longid = #{childLongId},
|
||||
name = #{childName},
|
||||
sex = #{childSex},
|
||||
account = #{childAccount},
|
||||
password = #{childPassword},
|
||||
phone = #{childPhone}
|
||||
where id =#{childId}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -1,59 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.ChildParentDao">
|
||||
<resultMap id="ParentResultMap" type="com.oldpeoplehome.entity.Parent">
|
||||
<id column="id" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
|
||||
<result column="name" property="parentName" jdbcType="VARCHAR"/>
|
||||
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
|
||||
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
|
||||
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
|
||||
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
|
||||
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
|
||||
<result column="birth" property="parentBirth" jdbcType="DATE"/>
|
||||
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
|
||||
<association property="child" javaType="Child">
|
||||
<id column="cid" property="childId" jdbcType="BIGINT"/>
|
||||
<result column="clongid" property="childLongId" jdbcType="CHAR"/>
|
||||
<result column="cname" property="childName" jdbcType="VARCHAR"/>
|
||||
<result column="csex" property="childSex" jdbcType="VARCHAR"/>
|
||||
<result column="caccount" property="childAccount" jdbcType="VARCHAR"/>
|
||||
<result column="cpassword" property="childPassword" jdbcType="VARCHAR"/>
|
||||
<result column="cphone" property="childPhone" jdbcType="VARCHAR"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
<resultMap id="ChildResultMap" type="com.oldpeoplehome.entity.Child">
|
||||
<id column="id" property="childId" jdbcType="BIGINT"/>
|
||||
<result column="longid" property="childLongId" jdbcType="CHAR"/>
|
||||
<result column="name" property="childName" jdbcType="VARCHAR"/>
|
||||
<result column="sex" property="childSex" jdbcType="VARCHAR"/>
|
||||
<result column="account" property="childAccount" jdbcType="VARCHAR"/>
|
||||
<result column="password" property="childPassword" jdbcType="VARCHAR"/>
|
||||
<result column="phone" property="childPhone" jdbcType="VARCHAR"/>
|
||||
<association property="parent" javaType="Parent">
|
||||
<id column="pid" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="plongid" property="parentLongId" jdbcType="CHAR"/>
|
||||
<result column="pname" property="parentName" jdbcType="VARCHAR"/>
|
||||
<result column="psex" property="parentSex" jdbcType="VARCHAR"/>
|
||||
<result column="paccount" property="parentAccount" jdbcType="VARCHAR"/>
|
||||
<result column="ppassword" property="parentPassword" jdbcType="VARCHAR"/>
|
||||
<result column="pheight" property="parentHeight" jdbcType="DOUBLE"/>
|
||||
<result column="pweight" property="parentWeight" jdbcType="DOUBLE"/>
|
||||
<result column="pbirth" property="parentBirth" jdbcType="DATE"/>
|
||||
<result column="pphone" property="parentPhone" jdbcType="CHAR"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
<select id="findByChild" resultMap="ParentResultMap" parameterType="long">
|
||||
select c.*, p.* from cp c left join parent p on c.pid = p.id where c.cid = #{childId}
|
||||
</select>
|
||||
<select id="findByParent" resultMap="ChildResultMap" parameterType="long">
|
||||
select c.*, p.* from cp c left join child p on c.pid = p.id where c.pid = #{parentId}
|
||||
</select>
|
||||
<insert id="insert" parameterType="ChildParent">
|
||||
insert into cp(pid, cid, relation)
|
||||
values (#{parentId}, #{childId}, #{relation})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.HeartRateDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.HeartRate">
|
||||
<id column="pid" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="time" property="time" jdbcType="TIMESTAMP"/>
|
||||
<result column="rate1" property="rate1" jdbcType="DOUBLE"/>
|
||||
<result column="rate2" property="rate2" jdbcType="DOUBLE"/>
|
||||
<result column="oxy" property="oxy" jdbcType="DOUBLE"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByParent" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
|
||||
select *
|
||||
from heartrate where pid = #{parentId}
|
||||
</select>
|
||||
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
|
||||
select *
|
||||
from heartrate where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d %T') between #{startDate} and #{endDate}
|
||||
</select>
|
||||
<select id="findByParentAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.HeartRateFilter">
|
||||
select h.*, p.* from heartrate h left join parent p on h.pid = p.id where h.pid = #{parentId} and h.date = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="HeartRate">
|
||||
insert into heartrate(pid, time, rate1,rate2,oxy)
|
||||
values (#{parentId}, #{time}, #{rate1}, #{rat2e}, #{oxy})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.MotionDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Motion">
|
||||
<id column="pid" property="motionParentId" jdbcType="BIGINT"/>
|
||||
<result column="date" property="motionDate" jdbcType="DATE"/>
|
||||
<result column="count" property="motionCount" jdbcType="BIGINT"/>
|
||||
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
|
||||
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
|
||||
<result column="time" property="motionTime" jdbcType="TIME"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
|
||||
select m.*
|
||||
from motion m where pid = #{motionParentId}
|
||||
</select>
|
||||
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
|
||||
select *
|
||||
from motion where pid = #{motionParentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
|
||||
</select>
|
||||
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.MotionFilter">
|
||||
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="Motion">
|
||||
insert into motion(pid, date, count, distance, energy, time)
|
||||
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,58 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.oldpeoplehome.dao.ParentDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Parent">
|
||||
<id column="id" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="longid" property="parentLongId" jdbcType="CHAR"/>
|
||||
<result column="name" property="parentName" jdbcType="VARCHAR"/>
|
||||
<result column="sex" property="parentSex" jdbcType="VARCHAR"/>
|
||||
<result column="account" property="parentAccount" jdbcType="VARCHAR"/>
|
||||
<result column="password" property="parentPassword" jdbcType="VARCHAR"/>
|
||||
<result column="height" property="parentHeight" jdbcType="DOUBLE"/>
|
||||
<result column="weight" property="parentWeight" jdbcType="DOUBLE"/>
|
||||
<result column="birth" property="parentBirth" jdbcType="DATE"/>
|
||||
<result column="phone" property="parentPhone" jdbcType="CHAR"/>
|
||||
<association property="parentRoom" javaType="Room">
|
||||
<id column="rid" property="roomId" jdbcType="INTEGER"/>
|
||||
<result column="rlocation" property="roomLocation" jdbcType="VARCHAR"/>
|
||||
<result column="rname" property="roomName" jdbcType="VARCHAR"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByID" parameterType="long" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.id=#{parentId}
|
||||
</select>
|
||||
<select id="findByLongId" parameterType="String" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.longid=#{parentLongId}
|
||||
</select>
|
||||
<select id="findByRoomId" parameterType="int" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from room r left join parent p on p.id=r.id where r.id=#{r.roomId}
|
||||
</select>
|
||||
<select id="findByName" parameterType="String" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.name=#{p.parentName}
|
||||
</select>
|
||||
<select id="findByAccount" parameterType="String" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id where p.account=#{p.parentAccount}
|
||||
</select>
|
||||
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
select p.*,r.id rid,r.name rname, r.location rlocation from parent p left join room r on p.id=r.id
|
||||
</select>
|
||||
|
||||
<insert id="insert" parameterType="Parent" useGeneratedKeys="true" keyColumn="id">
|
||||
insert into parent(longid,name,sex,account,password,height,weight,birth,phone)
|
||||
values (#{parentLongId}, #{parentName}, #{parentSex}, #{parentAccount}, #{parentPassword}, #{parentHeight}, #{parentWeight}, #{parentBirth}, #{parentPhone})
|
||||
</insert>
|
||||
|
||||
<update id="update" keyColumn="id">
|
||||
update parent
|
||||
set longid=#{parentLongId}, name=#{parentName}, sex=#{parentSex}, account=#{parentAccount}, password=#{parentPassword}, height=#{parentHeight}, weight=#{parentWeight}, birth=#{parentBirth}, phone=#{parentPhone}
|
||||
where id=#{parentId}
|
||||
</update>
|
||||
|
||||
<delete id="delete" parameterType="long">
|
||||
delete from parent where id=#{parentId}
|
||||
</delete>
|
||||
</mapper>
|
||||
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.RoomDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Room">
|
||||
<id column="id" property="roomId" jdbcType="INTEGER"/>
|
||||
<result column="location" property="roomLocation" jdbcType="VARCHAR"/>
|
||||
<result column="name" property="roomName" jdbcType="VARCHAR"/>
|
||||
<result column="pid" property="parentId" jdbcType="BIGINT"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findById" resultMap="BaseResultMap" parameterType="int">
|
||||
select * from room where id = #{roomId}
|
||||
</select>
|
||||
|
||||
<select id="findAll" resultMap="BaseResultMap">
|
||||
select * from room
|
||||
</select>
|
||||
|
||||
<select id="findEmptyRoom" resultMap="BaseResultMap">
|
||||
select * from room where pid is null
|
||||
</select>
|
||||
|
||||
<insert id="insertRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="roomId" parameterType="Room">
|
||||
insert into room(location, name) values (#{roomLocation}, #{roomName})
|
||||
</insert>
|
||||
|
||||
<delete id="deleteRoom" parameterType="int">
|
||||
delete from room where id = #{roomId}
|
||||
</delete>
|
||||
|
||||
<update id="updateRoom" parameterType="Room">
|
||||
update room
|
||||
set location = #{roomLocation},
|
||||
name = #{roomName},
|
||||
pid = #{parentId}
|
||||
where id =#{roomId}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.RoomStateDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.RoomState">
|
||||
<id column="rid" property="roomId" jdbcType="BIGINT"/>
|
||||
<result column="time" property="time" jdbcType="TIMESTAMP"/>
|
||||
<result column="temperature" property="temperature" jdbcType="DOUBLE"/>
|
||||
<result column="humidity" property="humidity" jdbcType="DOUBLE"/>
|
||||
<result column="isin" property="isin" jdbcType="INTEGER"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByRoom" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
|
||||
select *
|
||||
from rstate where rid = #{roomId}
|
||||
</select>
|
||||
<select id="findByTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
|
||||
select *
|
||||
from rstate where rid = #{roomId} and DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s')between #{startDate} and #{endDate}
|
||||
</select>
|
||||
<select id="findByRoomAndTime" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.RoomStateFilter">
|
||||
select r.*, room.* from rstate r left join room on r.rid = room.id where r.rid = #{roomId} and r.time = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="RoomState">
|
||||
insert into rstate(rid, time, temperature, humidity, isin)
|
||||
values (#{roomId}, #{time}, #{temperature}, #{humidity}, #{isin})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.oldpeoplehome.dao.SleepDao">
|
||||
<resultMap id="BaseResultMap" type="com.oldpeoplehome.entity.Sleep">
|
||||
<id column="pid" property="parentId" jdbcType="BIGINT"/>
|
||||
<result column="date" property="date" jdbcType="DATE"/>
|
||||
<result column="deep" property="lightTime" jdbcType="TIME"/>
|
||||
<result column="light" property="deepTime" jdbcType="TIME"/>
|
||||
<result column="awake" property="awakeTime" jdbcType="TIME"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByParentId" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
|
||||
select *
|
||||
from sleep where pid = #{parentId}
|
||||
</select>
|
||||
<select id="findByDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
|
||||
select *
|
||||
from sleep where pid = #{parentId} and DATE_FORMAT(date,'%Y-%m-%d') between #{startDate} and #{endDate}
|
||||
</select>
|
||||
<select id="findByParentIdAndDate" resultMap="BaseResultMap" parameterType="com.oldpeoplehome.dto.SleepFilter">
|
||||
select s.*, p.* from sleep s left join parent p on s.pid = p.id where s.pid = #{parentId} and s.date = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="Sleep">
|
||||
insert into sleep(pid, date, deep, light, awake)
|
||||
values (#{parentId}, #{date}, #{lightTime}, #{deepTime}, #{awakeTime})
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE configuration
|
||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<!-- 配置全局属性 -->
|
||||
<settings>
|
||||
<!-- 使用jdbc的getGeneratedKeys获取数据库自增主键值 -->
|
||||
<setting name="useGeneratedKeys" value="true" />
|
||||
|
||||
<!-- 使用列别名替换列名 默认:true -->
|
||||
<setting name="useColumnLabel" value="true" />
|
||||
|
||||
<!-- 开启驼峰命名转换:Table{create_time} -> Entity{createTime} -->
|
||||
<setting name="mapUnderscoreToCamelCase" value="true" />
|
||||
</settings>
|
||||
</configuration>
|
||||
@@ -1,51 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context.xsd">
|
||||
<!--配置数据库相关参数 -->
|
||||
<context:property-placeholder location="classpath:jdbc.properties"/>
|
||||
<!-- 2.数据库连接池 -->
|
||||
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
|
||||
<!-- 配置连接池属性 -->
|
||||
<property name="driverClass" value="${jdbc.driver}"/>
|
||||
<property name="jdbcUrl" value="${jdbc.url}"/>
|
||||
<property name="user" value="${jdbc.username}"/>
|
||||
<property name="password" value="${jdbc.password}"/>
|
||||
|
||||
<!-- c3p0连接池的私有属性 -->
|
||||
<property name="maxPoolSize" value="30"/>
|
||||
<property name="minPoolSize" value="10"/>
|
||||
<!-- 关闭连接后不自动commit -->
|
||||
<property name="autoCommitOnClose" value="false"/>
|
||||
<!-- 获取连接超时时间 -->
|
||||
<property name="checkoutTimeout" value="10000"/>
|
||||
<!-- 当获取连接失败重试次数 -->
|
||||
<property name="acquireRetryAttempts" value="2"/>
|
||||
</bean>
|
||||
|
||||
<!-- 3.配置SqlSessionFactory对象 -->
|
||||
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
|
||||
<!-- 注入数据库连接池 -->
|
||||
<property name="dataSource" ref="dataSource"/>
|
||||
<!-- 配置MyBaties全局配置文件:mybatis-config.xml -->
|
||||
<property name="configLocation" value="classpath:mybatis-config.xml"/>
|
||||
<!-- 扫描entity包 使用别名 -->
|
||||
<property name="typeAliasesPackage" value="com.oldpeoplehome.entity"/>
|
||||
<!-- 扫描sql配置文件:mapper需要的xml文件 -->
|
||||
<property name="mapperLocations" value="classpath:mapper/*.xml"/>
|
||||
</bean>
|
||||
|
||||
<!-- 4.配置扫描Dao接口包，动态实现Dao接口，注入到spring容器中 -->
|
||||
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
|
||||
<!-- 注入sqlSessionFactory -->
|
||||
<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
|
||||
<!-- 给出需要扫描Dao接口包 -->
|
||||
<property name="basePackage" value="com.oldpeoplehome.dao"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
@@ -1,26 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:tx="http://www.springframework.org/schema/tx"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context.xsd
|
||||
http://www.springframework.org/schema/tx
|
||||
http://www.springframework.org/schema/tx/spring-tx.xsd">
|
||||
|
||||
<!-- 扫描service包下所有使用注解的类型 -->
|
||||
<context:component-scan base-package="com.oldpeoplehome.service" />
|
||||
|
||||
<!-- 配置事务管理器 -->
|
||||
<bean id="transactionManager"
|
||||
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
|
||||
<!-- 注入数据库连接池 -->
|
||||
<property name="dataSource" ref="dataSource" />
|
||||
</bean>
|
||||
|
||||
<!-- 配置基于注解的声明式事务 -->
|
||||
<tx:annotation-driven transaction-manager="transactionManager" />
|
||||
|
||||
</beans>
|
||||
@@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/mvc
|
||||
http://www.springframework.org/schema/mvc/spring-mvc.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context.xsd">
|
||||
|
||||
<!-- 配置SpringMVC -->
|
||||
<!-- 1.开启SpringMVC注解模式 -->
|
||||
<!-- 简化配置：
|
||||
(1)自动注册DefaultAnootationHandlerMapping,AnotationMethodHandlerAdapter
|
||||
(2)提供一些列：数据绑定，数字和日期的format @NumberFormat, @DateTimeFormat, xml,json默认读写支持
|
||||
-->
|
||||
<mvc:annotation-driven />
|
||||
<!-- 2.静态资源默认servlet配置
|
||||
(1)加入对静态资源的处理：js,gif,png
|
||||
(2)允许使用"/"做整体映射
|
||||
-->
|
||||
<mvc:default-servlet-handler/>
|
||||
|
||||
<!-- 3.配置jsp 显示ViewResolver -->
|
||||
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
|
||||
<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
|
||||
<property name="prefix" value="/WEB-INF/jsp/" />
|
||||
<property name="suffix" value=".jsp" />
|
||||
</bean>
|
||||
|
||||
<!-- 4.扫描web相关的bean -->
|
||||
<context:component-scan base-package="com.oldpeoplehome.web" />
|
||||
<context:component-scan base-package="com.oldpeoplehome">
|
||||
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
|
||||
</context:component-scan>
|
||||
</beans>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user