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

add login

Browse Source
This commit is contained in:
jiangyuwei666
2019-08-30 14:19:03 +08:00
parent f273901038
commit cc35d95111
32 changed files with 238 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,20 +7,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6bd3ae69-d707-4556-9602-b04e8d55fbdd" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/AdminController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" 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/com/oldpeoplehome/entity/Motion.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/entity/Motion.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/web/MotionController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/jdbc.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/mapper/MotionDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,19 +28,19 @@
<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/entity/Parent.java">
<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="-3351">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<state relative-caret-position="132">
<caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
<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="590">
<caret line="57" column="57" selection-start-line="57" selection-start-column="57" selection-end-line="57" selection-end-column="57" />
<state relative-caret-position="121">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -53,36 +49,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="10" column="30" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<caret line="15" column="14" lean-forward="true" selection-start-line="15" selection-start-column="14" selection-end-line="15" selection-end-column="14" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#433#434#0" expanded="true" />
<element signature="e#487#488#0" 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/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="26" column="4" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="220">
<caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
</state>
</provider>
</entry>
@@ -90,54 +60,74 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="47" column="61" lean-forward="true" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="61" />
<state relative-caret-position="118">
<caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java">
<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="88">
<caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
<state relative-caret-position="165">
<caret line="15" column="11" lean-forward="true" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1451#1452#0" expanded="true" />
<element signature="e#1478#1479#0" 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">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
<state relative-caret-position="264">
<caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-465">
<caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1248#1249#0" expanded="true" />
<element signature="e#1303#1304#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
</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="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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -173,17 +163,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildParentService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildParentServiceImpl.java" />
<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/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" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildParentController.java" />
<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" />
@@ -224,6 +203,17 @@
<option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/AdminServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/AdminController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ParentService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" />
<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" />
</list>
</option>
</component>
@@ -330,6 +320,14 @@
<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" />
@@ -354,7 +352,7 @@
<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="1567138177858" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567145246914" />
<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" />
@@ -583,7 +581,7 @@
<workItem from="1566536413587" duration="7748000" />
<workItem from="1566876393093" duration="5679000" />
<workItem from="1567043814685" duration="630000" />
<workItem from="1567134555969" duration="3276000" />
<workItem from="1567134555969" duration="5745000" />
</task>
<servers />
</component>
@@ -620,7 +618,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="128351000" />
<option name="totallyTimeSpent" value="130820000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -633,7 +631,6 @@
</component>
<component name="ToolWindowManager">
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21045576" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -709,105 +706,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/MotionFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="20" column="11" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
<folding>
<element signature="e#319#320#0" expanded="true" />
<element signature="e#371#372#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://E:/Java/jdk1.8.0_161/src.zip!/java/sql/Timestamp.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-572">
<caret line="167" column="28" selection-start-line="167" selection-start-column="28" selection-end-line="167" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/RoomDaoTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="78" column="60" lean-forward="true" selection-start-line="78" selection-start-column="60" selection-end-line="78" selection-end-column="60" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1934#1935#0" expanded="true" />
<element signature="e#1993#1994#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/SleepServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/RoomStateService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/RoomStateServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="20" selection-start-line="20" selection-end-line="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1085#1086#0" expanded="true" />
<element signature="e#1114#1115#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/SleepController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="46" column="30" selection-start-line="46" selection-start-column="30" selection-end-line="46" 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">
<caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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">
@@ -1055,13 +953,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="132">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</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">
@@ -1146,16 +1037,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
@@ -1185,23 +1066,121 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="47" column="61" lean-forward="true" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="61" />
<state relative-caret-position="495">
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/RoomDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="26" column="4" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<state relative-caret-position="165">
<caret line="23" column="8" lean-forward="true" selection-start-line="23" selection-start-column="8" selection-end-line="24" selection-end-column="91" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ParentDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="17" 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="165">
<caret line="15" column="11" lean-forward="true" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="85" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="35" column="4" selection-start-line="35" selection-start-column="4" selection-end-line="37" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="26" column="58" selection-start-line="26" selection-start-column="58" selection-end-line="26" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-465">
<caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="33">
<caret line="57" column="13" lean-forward="true" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<folding>
<element signature="e#1451#1452#0" expanded="true" />
<element signature="e#1478#1479#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="77" column="35" lean-forward="true" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/ChildService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="55" column="21" lean-forward="true" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
<folding>
<element signature="e#1248#1249#0" expanded="true" />
<element signature="e#1303#1304#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

1
server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ChildDao.java
View File

@@ -13,6 +13,7 @@ public interface ChildDao {
Child findById(long childId);
Child findByLongId(String childLongId);
Child findByName(String childName);
Child findByAccount(String account);
List<Child> findAll();
void delete(long childId);
void update(Child child);

1
server/OldPeopleHome/src/main/java/com/oldpeoplehome/dao/ParentDao.java
View File

@@ -15,6 +15,7 @@ public interface ParentDao {
Parent findByLongId(String longId);
Parent findByRoomId(int roomId);
Parent findByName(String name);
Parent findByAccount(String name);
List<Parent> findAll();
void insert(Parent parent);
void update(Parent parent);

1
server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ChildService.java
View File

@@ -13,6 +13,7 @@ public interface ChildService {
Child findById(long childId);
Child findByLongId(String childLongId);
Child findByName(String childName);
Child login(String account);
List<Child> findAll();
void delete(long childId);
void update(Child child);

1
server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/ParentService.java
View File

@@ -13,6 +13,7 @@ public interface ParentService {
Parent findByLongId(String longId);
Parent findByRoomId(int roomId);
Parent findByName(String name);
Parent login(String account);
List<Parent> findAll();
void insert(Parent parent);
void update(Parent parent);

4
server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java
View File

@@ -52,4 +52,8 @@ public class ChildServiceImpl implements ChildService {
public void insert(Child child) {
childDao.insert(child);
}
@Override
public Child login(String account) {
return childDao.findByAccount(account);
}
}

6
server/OldPeopleHome/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java
View File

@@ -15,6 +15,8 @@ import java.util.List;
@Service
public class ParentServiceImpl implements ParentService {
@Autowired
private ParentDao parentDao;
@@ -62,4 +64,8 @@ public class ParentServiceImpl implements ParentService {
public void delete(long id) {
parentDao.delete(id);
}
@Override
public Parent login(String account) {
return parentDao.findByAccount(account);
}
}

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

@@ -72,4 +72,10 @@ public class ChildController {
childService.delete(Long.valueOf(id));
return childService.findAll();
}
@RequestMapping(value = "/login", method = RequestMethod.POST)
@ResponseBody
public Child login(@RequestParam Map<String, Object> params){
Child res = childService.login(params.get("account").toString());
return res.getChildPassword().equals(params.get("password").toString()) ? res:null;
}
}

8
server/OldPeopleHome/src/main/java/com/oldpeoplehome/web/ParentController.java
View File

@@ -1,5 +1,6 @@
package com.oldpeoplehome.web;
import com.oldpeoplehome.entity.Admin;
import com.oldpeoplehome.entity.Parent;
import com.oldpeoplehome.service.ParentService;
import com.oldpeoplehome.utils.MethodUtil;
@@ -76,4 +77,11 @@ public class ParentController {
parentService.delete(Long.valueOf(id));
return parentService.findAll();
}
@RequestMapping(value = "/login", method = RequestMethod.POST)
@ResponseBody
public Parent login(@RequestParam Map<String, Object> params){
Parent res = parentService.login(params.get("account").toString());
return res.getParentPassword().equals(params.get("password").toString()) ? res:null;
}
}

4
server/OldPeopleHome/src/main/resources/mapper/ChildDao.xml
View File

@@ -23,7 +23,9 @@
<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>

3
server/OldPeopleHome/src/main/resources/mapper/ParentDao.xml
View File

@@ -33,6 +33,9 @@
<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

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

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ChildDao.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/dao/ParentDao.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ChildService.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/ParentService.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ChildDao.xml
View File

@@ -23,7 +23,9 @@
<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>

3
server/OldPeopleHome/target/OldPeopleHome/WEB-INF/classes/mapper/ParentDao.xml
View File

@@ -33,6 +33,9 @@
<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

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ChildDao.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/dao/ParentDao.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ChildService.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/service/ParentService.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ChildServiceImpl.class
View File

Binary file not shown.

BIN
server/OldPeopleHome/target/classes/com/oldpeoplehome/service/impl/ParentServiceImpl.class
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
server/OldPeopleHome/target/classes/mapper/ChildDao.xml
View File

@@ -23,7 +23,9 @@
<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>

3
server/OldPeopleHome/target/classes/mapper/ParentDao.xml
View File

@@ -33,6 +33,9 @@
<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