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

Update README.md

Browse Source
This commit is contained in:
jiangyuwei666
2019-09-06 14:12:35 +08:00
parent 9b1d20ca28
commit 4a431eb734
2 changed files with 104 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,20 +6,7 @@
</artifacts-to-build>
</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/LocationDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/LocationFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/LocationService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/resources/mapper/LocationDao.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java" 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$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" 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" />
@@ -29,59 +16,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/RoomStateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" 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/SleepController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349">
<caret line="58" lean-forward="true" selection-start-line="58" selection-end-line="58" />
<caret line="58" selection-start-line="58" selection-end-line="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/LocationFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#350#351#0" expanded="true" />
<element signature="e#390#391#0" expanded="true" />
<element signature="e#761#762#0" expanded="true" />
<element signature="e#793#794#0" expanded="true" />
<element signature="e#846#847#0" expanded="true" />
<element signature="e#888#889#0" expanded="true" />
<element signature="e#940#941#0" expanded="true" />
<element signature="e#982#983#0" expanded="true" />
<element signature="e#925#926#0" expanded="true" />
<element signature="e#955#956#0" expanded="true" />
<element signature="e#1004#1005#0" expanded="true" />
<element signature="e#1042#1043#0" expanded="true" />
<element signature="e#1195#1196#0" expanded="true" />
<element signature="e#1233#1234#0" expanded="true" />
<element signature="e#1075#1076#0" expanded="true" />
<element signature="e#1106#1107#0" expanded="true" />
<element signature="e#1152#1153#0" expanded="true" />
<element signature="e#1192#1193#0" expanded="true" />
</folding>
</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/java/com/oldpeoplehome/web/LocationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="976">
<caret line="56" column="41" lean-forward="true" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
<state relative-caret-position="316">
<caret line="57" column="23" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -131,17 +79,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
<state relative-caret-position="-759">
<caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="60" column="5" lean-forward="true" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
<state relative-caret-position="187">
<caret line="21" column="78" selection-start-line="21" selection-start-column="78" selection-end-line="21" selection-end-column="93" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -149,6 +97,27 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<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>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -325,7 +294,9 @@
<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="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
@@ -333,7 +304,6 @@
<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" />
@@ -352,7 +322,32 @@
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
<item name="service" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -363,7 +358,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="1567749939054" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567750284440" />
<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" />
@@ -598,7 +593,7 @@
<workItem from="1567561928915" duration="1922000" />
<workItem from="1567582087969" duration="4819000" />
<workItem from="1567664806171" duration="2280000" />
<workItem from="1567739536607" duration="3955000" />
<workItem from="1567739536607" duration="4263000" />
</task>
<servers />
</component>
@@ -635,7 +630,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="144398000" />
<option name="totallyTimeSpent" value="144706000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -723,7 +718,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
@@ -1020,16 +1014,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/LocationServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
@@ -1098,17 +1082,7 @@
<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="349">
<caret line="58" lean-forward="true" selection-start-line="58" selection-end-line="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="976">
<caret line="56" column="41" lean-forward="true" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<caret line="58" selection-start-line="58" selection-end-line="58" />
</state>
</provider>
</entry>
@@ -1143,17 +1117,44 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/RoomState.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Location.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="60" column="5" lean-forward="true" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
<caret line="60" column="5" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Room.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<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/entity/RoomState.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-759">
<caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/LocationServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="21" column="78" selection-start-line="21" selection-start-column="78" selection-end-line="21" selection-end-column="93" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/LocationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="316">
<caret line="57" column="23" selection-start-line="57" selection-start-column="15" selection-end-line="57" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>

6
server/README.md
View File

@@ -77,7 +77,7 @@
| Parent | /parent/add | POST | 添加老人 | parentSex：老人性别，parentPassword：老人密码，parentAccount：账号，parentName：姓名，parentBirth：生日，parentLongId：身份证 |
| Parent | /parent/update/1 | POST | 更新id=1的老人信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
| Parent | /parent/delete/1 | DELETE | 删除id=1的老人 | |
| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） account:bao,password:123 |
| Parent | /parent/login | POST | 老人登陆 | 登陆成功返回老人的所有信息，登陆失败返回null（不返回） account:bao,password:123 |
| Child | /child/get/1 | GET | 查询id=1的子女 | |
| Child | /child/get_longid/111 | GET | 查询身份证=111的child的详细信息 | |
| Child | /child/get_name/小蒋 | GET | 查询姓名=小蒋的child的详细信息 | |
@@ -85,7 +85,7 @@
| Child | /child/add | POST | | childSex，childPassword，childAccount，childName，childLongId，childPhone |
| Child | /child/update/1 | POST | 更新id=1的子女信息 | **要更新的字段严格按照命名格式传参**比如name就传入parentName |
| Child | /child/delete/1 | DELETE | 删除id=1的子女信息 | |
| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 |
| Child | /child/login | POST | 登陆子女 | 登陆成功返回子女信息，失败返回空(不返回) account:bao,password:123 |
| ChildAndParent | /child_parent/child/1 | GET | 查看子女id=1对应的老人 | |
| ChildAndParent | /child_parent/parent/1 | GET | 查看老人id=1对应的子女 | |
| ChildAndParent | /child_parent/add | POST | 添加老人子女对应关系 | 子女id：child，老人id：parent，关系：relation |
@@ -97,3 +97,5 @@
| Sleep | /sleep/add | POST | 添加老人睡眠信息 | parent，date，deep，light，awake |
| HeartRate | /heartrate/get/1 | GET | 查找id=1的心率信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| HeartRate | /heartrate/add | POST | 添加老人睡眠信息 | parentId，time，rate1(收缩压)，rate2(舒张压)，oxy(血氧) |
| Location | /location/get/1 | GET | 查找id=1的老人位置信息 | 参数格式：yyyy-mm-dd hh-mm-ss 加上start参数可以查看某一时刻。加上start和end参数可以查看某一时间段。 |
| Location | /location/add | POST | 添加老人位置信息 | parent，longitude，latitude，time。添加成功返回Location对象 |