add admin service
This commit is contained in:
jiangyuwei666
690
server/OldPeopleHome/.idea/workspace.xml
generated
690
server/OldPeopleHome/.idea/workspace.xml
generated
@@ -7,19 +7,20 @@
|
||||
</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/java/com/oldpeoplehome/entity/Motion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/jdbc.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/sql/add_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/sql/add_table.sql" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OldPeopleHome.war" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/OldPeopleHome/WEB-INF/classes/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/classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/jdbc.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/test-classes/META-INF/OldPeopleHome.kotlin_module" beforeDir="false" />
|
||||
<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" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
@@ -31,108 +32,10 @@
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/pom.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="891">
|
||||
<caret line="27" column="25" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<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="1880">
|
||||
<caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="33">
|
||||
<caret line="1" column="44" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="99">
|
||||
<caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1246#1247#0" expanded="true" />
|
||||
<element signature="e#1283#1284#0" expanded="true" />
|
||||
<element signature="e#1335#1336#0" expanded="true" />
|
||||
<element signature="e#1381#1382#0" expanded="true" />
|
||||
<element signature="e#1416#1417#0" expanded="true" />
|
||||
<element signature="e#1449#1450#0" expanded="true" />
|
||||
<element signature="e#1499#1500#0" expanded="true" />
|
||||
<element signature="e#1543#1544#0" expanded="true" />
|
||||
<element signature="e#1594#1595#0" expanded="true" />
|
||||
<element signature="e#1652#1653#0" expanded="true" />
|
||||
<element signature="e#1688#1689#0" expanded="true" />
|
||||
<element signature="e#1722#1723#0" expanded="true" />
|
||||
<element signature="e#1774#1775#0" expanded="true" />
|
||||
<element signature="e#1820#1821#0" expanded="true" />
|
||||
<element signature="e#1861#1862#0" expanded="true" />
|
||||
<element signature="e#1898#1899#0" expanded="true" />
|
||||
<element signature="e#1958#1959#0" expanded="true" />
|
||||
<element signature="e#2010#2011#0" expanded="true" />
|
||||
<element signature="e#2045#2046#0" expanded="true" />
|
||||
<element signature="e#2078#2079#0" expanded="true" />
|
||||
<element signature="e#2128#2129#0" expanded="true" />
|
||||
<element signature="e#2172#2173#0" expanded="true" />
|
||||
<element signature="e#2211#2212#0" expanded="true" />
|
||||
<element signature="e#2246#2247#0" expanded="true" />
|
||||
<element signature="e#2302#2303#0" expanded="true" />
|
||||
<element signature="e#2350#2351#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="151">
|
||||
<caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="383">
|
||||
<caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="226">
|
||||
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="141">
|
||||
<caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
<state 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>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -140,8 +43,8 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="248">
|
||||
<caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
|
||||
<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" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -150,10 +53,87 @@
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java">
|
||||
<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 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>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<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>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<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">
|
||||
<caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
|
||||
<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="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>
|
||||
</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>
|
||||
@@ -164,6 +144,7 @@
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Kotlin File" />
|
||||
<option value="FxmlFile" />
|
||||
<option value="Interface" />
|
||||
<option value="Class" />
|
||||
</list>
|
||||
@@ -192,14 +173,6 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ChildServiceImpl.java" />
|
||||
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/ParentServiceTest.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/ParentServiceImpl.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ChildController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Child.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/ParentDao.xml" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/ChildParent.java" />
|
||||
<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" />
|
||||
@@ -237,12 +210,20 @@
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/RoomStateDao.xml" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/HeartRateDao.xml" />
|
||||
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/HeartRateServiceTest.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java" />
|
||||
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
|
||||
<option value="$PROJECT_DIR$/src/main/sql/add_table.sql" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/AdminDao.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.java" />
|
||||
<option value="$PROJECT_DIR$/src/test/java/com/oldpeoplehome/service/AdminServiceTest.java" />
|
||||
<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" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -272,7 +253,6 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -311,7 +291,37 @@
|
||||
<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="dao" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="main" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="service" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="main" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="service" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="impl" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="main" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="web" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
@@ -319,7 +329,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" />
|
||||
@@ -334,47 +343,19 @@
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="oldpeoplehome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="dao" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="OldPeopleHome" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="OldPeopleHome" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="target" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566912018885" />
|
||||
<property name="last_opened_file_path" value="E:/新建文件夹 (2)/TestDemo" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567138177858" />
|
||||
<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" />
|
||||
@@ -401,7 +382,23 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="JUnit.MotionDaoTest.testInsert">
|
||||
<component name="RunManager" selected="Tomcat Server.chuizichui">
|
||||
<configuration name="AdminServiceTest.testLogin" 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.AdminServiceTest" />
|
||||
<option name="METHOD_NAME" value="testLogin" />
|
||||
<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">
|
||||
@@ -466,22 +463,6 @@
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="RoomDaoTest.testFindAll" 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.RoomDaoTest" />
|
||||
<option name="METHOD_NAME" value="testFindAll" />
|
||||
<option name="TEST_OBJECT" value="method" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="chuizichui" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.22" ALTERNATIVE_JRE_ENABLED="false">
|
||||
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8090/" />
|
||||
<option name="UPDATING_POLICY" value="restart-server" />
|
||||
@@ -557,19 +538,19 @@
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="JUnit.MotionDaoTest.test" />
|
||||
<item itemvalue="JUnit.RoomDaoTest.testFindAll" />
|
||||
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
|
||||
<item itemvalue="JUnit.RoomDaoTest.testA" />
|
||||
<item itemvalue="JUnit.HeartRateServiceTest.test" />
|
||||
<item itemvalue="Tomcat Server.chuizichui" />
|
||||
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="JUnit.AdminServiceTest.testLogin" />
|
||||
<item itemvalue="JUnit.MotionDaoTest.testInsert" />
|
||||
<item itemvalue="JUnit.HeartRateServiceTest.test" />
|
||||
<item itemvalue="JUnit.RoomDaoTest.testA" />
|
||||
<item itemvalue="JUnit.MotionDaoTest.test" />
|
||||
<item itemvalue="JUnit.RoomDaoTest.testFindAll" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
@@ -600,23 +581,13 @@
|
||||
<workItem from="1566533277465" duration="598000" />
|
||||
<workItem from="1566536292540" duration="37000" />
|
||||
<workItem from="1566536413587" duration="7748000" />
|
||||
<workItem from="1566876393093" duration="4610000" />
|
||||
<workItem from="1566876393093" duration="5679000" />
|
||||
<workItem from="1567043814685" duration="630000" />
|
||||
<workItem from="1567134555969" duration="3276000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TestHistory">
|
||||
<history-entry file="MotionDaoTest_testInsert - 2019.08.22 at 14h 28m 43s.xml">
|
||||
<configuration name="MotionDaoTest.testInsert" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
<history-entry file="RoomDaoTest_testA - 2019.08.22 at 17h 27m 02s.xml">
|
||||
<configuration name="RoomDaoTest.testA" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 37m 36s.xml">
|
||||
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 38m 42s.xml">
|
||||
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
<history-entry file="HeartRateServiceTest_test - 2019.08.23 at 13h 40m 15s.xml">
|
||||
<configuration name="HeartRateServiceTest.test" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
@@ -635,9 +606,21 @@
|
||||
<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>
|
||||
<history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 55m 46s.xml">
|
||||
<configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
<history-entry file="AdminServiceTest_testLogin - 2019.08.30 at 11h 56m 27s.xml">
|
||||
<configuration name="AdminServiceTest.testLogin" configurationId="JUnit" />
|
||||
</history-entry>
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="123376000" />
|
||||
<option name="totallyTimeSpent" value="128351000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -652,7 +635,7 @@
|
||||
<frame x="1913" y="-7" width="1550" height="838" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20509383" />
|
||||
<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" />
|
||||
<window_info id="Designer" order="2" />
|
||||
<window_info id="Image Layers" order="3" />
|
||||
@@ -662,7 +645,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 anchor="bottom" id="Run" order="2" visible="true" weight="0.41501418" />
|
||||
<window_info active="true" 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" />
|
||||
@@ -726,138 +709,6 @@
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="121">
|
||||
<caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="15" selection-end-column="41" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/RoomDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="99">
|
||||
<caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ChildParentDaoTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://E:/Java/jdk1.8.0_161/src.zip!/java/sql/Time.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-452">
|
||||
<caret line="91" column="23" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildParentDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="72">
|
||||
<caret line="54" column="38" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" />
|
||||
</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="231">
|
||||
<caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="25" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/ParentController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-462">
|
||||
<caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="51" />
|
||||
<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="121">
|
||||
<caret line="15" column="22" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="22" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/impl/MotionServiceImpl.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="154">
|
||||
<caret line="38" column="33" lean-forward="true" selection-start-line="38" selection-start-column="33" selection-end-line="38" selection-end-column="33" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#612#613#0" expanded="true" />
|
||||
<element signature="e#644#645#0" expanded="true" />
|
||||
<element signature="e#898#899#0" expanded="true" />
|
||||
<element signature="e#933#934#0" expanded="true" />
|
||||
<element signature="e#1033#1034#0" expanded="true" />
|
||||
<element signature="e#1057#1058#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Sleep.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="319">
|
||||
<caret line="15" column="26" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="26" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#951#952#0" expanded="true" />
|
||||
<element signature="e#978#979#0" expanded="true" />
|
||||
<element signature="e#1016#1017#0" expanded="true" />
|
||||
<element signature="e#1048#1049#0" expanded="true" />
|
||||
<element signature="e#1080#1081#0" expanded="true" />
|
||||
<element signature="e#1112#1113#0" expanded="true" />
|
||||
<element signature="e#1082#1083#0" expanded="true" />
|
||||
<element signature="e#1114#1115#0" expanded="true" />
|
||||
<element signature="e#1162#1163#0" expanded="true" />
|
||||
<element signature="e#1204#1205#0" expanded="true" />
|
||||
<element signature="e#1336#1337#0" expanded="true" />
|
||||
<element signature="e#1390#1391#0" expanded="true" />
|
||||
<element signature="e#1237#1238#0" expanded="true" />
|
||||
<element signature="e#1268#1269#0" expanded="true" />
|
||||
<element signature="e#1314#1315#0" expanded="true" />
|
||||
<element signature="e#1354#1355#0" expanded="true" />
|
||||
<element signature="e#1488#1489#0" expanded="true" />
|
||||
<element signature="e#1544#1545#0" expanded="true" />
|
||||
<element signature="e#1388#1389#0" expanded="true" />
|
||||
<element signature="e#1420#1421#0" expanded="true" />
|
||||
<element signature="e#1468#1469#0" expanded="true" />
|
||||
<element signature="e#1510#1511#0" expanded="true" />
|
||||
<element signature="e#1637#1638#0" expanded="true" />
|
||||
<element signature="e#1679#1680#0" expanded="true" />
|
||||
<element signature="e#955#956#0" expanded="true" />
|
||||
<element signature="e#986#987#0" expanded="true" />
|
||||
<element signature="e#1032#1033#0" expanded="true" />
|
||||
<element signature="e#1072#1073#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/MotionService.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="284">
|
||||
<caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/SleepService.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="392">
|
||||
@@ -1005,13 +856,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SleepDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="264">
|
||||
<caret line="8" column="57" selection-start-line="8" selection-start-column="57" selection-end-line="8" selection-end-column="57" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dto/ChangeRoom.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
@@ -1117,16 +961,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="594">
|
||||
<caret line="22" column="73" selection-start-line="22" selection-start-column="73" selection-end-line="22" selection-end-column="73" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="99">
|
||||
@@ -1151,23 +985,9 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="132">
|
||||
<caret line="4" selection-start-line="4" selection-end-line="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1880">
|
||||
<caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Motion.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="99">
|
||||
<state relative-caret-position="429">
|
||||
<caret line="14" column="31" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="31" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
@@ -1201,10 +1021,17 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="891">
|
||||
<caret line="27" column="68" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/MotionDao.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="383">
|
||||
<caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
|
||||
<state relative-caret-position="495">
|
||||
<caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -1213,14 +1040,14 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/ParentDaoTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="226">
|
||||
<state relative-caret-position="264">
|
||||
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/test/java/com/oldpeoplehome/dao/MotionDaoTest.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="141">
|
||||
<state relative-caret-position="891">
|
||||
<caret line="34" column="70" selection-start-line="34" selection-start-column="70" selection-end-line="34" selection-end-column="70" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
@@ -1228,13 +1055,10 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ChildDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="248">
|
||||
<caret line="61" column="57" lean-forward="true" selection-start-line="61" selection-start-column="57" selection-end-line="61" selection-end-column="57" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="132">
|
||||
<caret line="4" selection-start-line="4" selection-end-line="4" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -1245,10 +1069,136 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MotionDao.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/sql/add_table.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="151">
|
||||
<caret line="27" column="68" lean-forward="true" selection-start-line="27" selection-start-column="68" selection-end-line="27" selection-end-column="68" />
|
||||
<state relative-caret-position="421">
|
||||
<caret line="93" column="13" selection-start-line="93" selection-start-column="13" selection-end-line="93" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Parent.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-3351">
|
||||
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AdminDao.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret selection-end-line="13" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/dao/ChildParentDao.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="330">
|
||||
<caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SleepDao.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret selection-end-line="12" selection-end-column="16" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<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>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/entity/Admin.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="491">
|
||||
<caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
|
||||
<folding>
|
||||
<element signature="e#412#413#0" expanded="true" />
|
||||
<element signature="e#447#448#0" expanded="true" />
|
||||
<element signature="e#503#504#0" expanded="true" />
|
||||
<element signature="e#551#552#0" expanded="true" />
|
||||
<element signature="e#591#592#0" expanded="true" />
|
||||
<element signature="e#627#628#0" expanded="true" />
|
||||
<element signature="e#685#686#0" expanded="true" />
|
||||
<element signature="e#735#736#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/web/MotionController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="590">
|
||||
<caret line="57" column="57" selection-start-line="57" selection-start-column="57" selection-end-line="57" selection-end-column="57" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/oldpeoplehome/service/AdminService.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>
|
||||
<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">
|
||||
<caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</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">
|
||||
<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>
|
||||
<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>
|
||||
</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" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.oldpeoplehome.dao;
|
||||
|
||||
import com.oldpeoplehome.entity.Admin;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:25
|
||||
* Description:
|
||||
*/
|
||||
public interface AdminDao {
|
||||
|
||||
Admin findByAccount(String account);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.oldpeoplehome.entity;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:10
|
||||
* Description:
|
||||
*/
|
||||
public class Admin {
|
||||
|
||||
private String adminAccount;
|
||||
private String adminPassword;
|
||||
|
||||
public Admin() {
|
||||
}
|
||||
|
||||
public Admin(String adminAccount, String adminPassword) {
|
||||
this.adminAccount = adminAccount;
|
||||
this.adminPassword = adminPassword;
|
||||
}
|
||||
|
||||
public String getAdminAccount() {
|
||||
return adminAccount;
|
||||
}
|
||||
|
||||
public void setAdminAccount(String adminAccount) {
|
||||
this.adminAccount = adminAccount;
|
||||
}
|
||||
|
||||
public String getAdminPassword() {
|
||||
return adminPassword;
|
||||
}
|
||||
|
||||
public void setAdminPassword(String adminPassword) {
|
||||
this.adminPassword = adminPassword;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Admin{" +
|
||||
"adminAccount='" + adminAccount + '\'' +
|
||||
", adminPassword='" + adminPassword + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.oldpeoplehome.service;
|
||||
|
||||
import com.oldpeoplehome.entity.Admin;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:31
|
||||
* Description:
|
||||
*/
|
||||
public interface AdminService {
|
||||
|
||||
Admin login(String account);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.oldpeoplehome.service.impl;
|
||||
|
||||
import com.oldpeoplehome.dao.AdminDao;
|
||||
import com.oldpeoplehome.entity.Admin;
|
||||
import com.oldpeoplehome.service.AdminService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:31
|
||||
* Description:
|
||||
*/
|
||||
@Service
|
||||
public class AdminServiceImpl implements AdminService {
|
||||
|
||||
@Autowired
|
||||
private AdminDao adminDao;
|
||||
|
||||
@Override
|
||||
public Admin login(String account) {
|
||||
return adminDao.findByAccount(account);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.oldpeoplehome.web;
|
||||
|
||||
import com.oldpeoplehome.entity.Admin;
|
||||
import com.oldpeoplehome.service.AdminService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:57
|
||||
* Description:
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/admin")
|
||||
public class AdminController {
|
||||
|
||||
@Autowired
|
||||
private AdminService adminService;
|
||||
|
||||
@RequestMapping(value = "/login",method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public Admin login(@RequestParam Map<String, Object> params){
|
||||
Admin res = adminService.login(params.get("account").toString());
|
||||
return res.getAdminPassword().equals(params.get("password").toString()) ? res:null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
jdbc.driver=com.mysql.jdbc.Driver
|
||||
jdbc.url=jdbc:mysql://localhost:3306/oldpeople?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=root
|
||||
|
||||
16
server/OldPeopleHome/src/main/resources/mapper/AdminDao.xml
Normal file
16
server/OldPeopleHome/src/main/resources/mapper/AdminDao.xml
Normal file
@@ -0,0 +1,16 @@
|
||||
<?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>
|
||||
@@ -91,4 +91,10 @@ CREATE TABLE `sleep` (
|
||||
KEY `index_pid_date` (`pid`,`date`) USING BTREE,
|
||||
CONSTRAINT `fk_pid1` FOREIGN KEY (`pid`) REFERENCES `parent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ;
|
||||
CREATE TABLE `Untitled` (
|
||||
`account` varchar(255) NOT NULL COMMENT '管理员账号',
|
||||
`password` varchar(255) NULL COMMENT '管理员密码',
|
||||
PRIMARY KEY (`account`),
|
||||
UNIQUE INDEX `index_acc`(`account`) USING BTREE
|
||||
);
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.oldpeoplehome.service;
|
||||
|
||||
import com.oldpeoplehome.BaseTest;
|
||||
import org.junit.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
/**
|
||||
* Created By Jiangyuwei on 2019/8/30 11:33
|
||||
* Description:
|
||||
*/
|
||||
public class AdminServiceTest extends BaseTest {
|
||||
|
||||
@Autowired
|
||||
private AdminService adminService;
|
||||
|
||||
@Test
|
||||
public void testLogin(){
|
||||
|
||||
System.out.println(adminService.login("root"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
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 +1,4 @@
|
||||
jdbc.driver=com.mysql.jdbc.Driver
|
||||
jdbc.url=jdbc:mysql://localhost:3306/oldpeople?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=root
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<?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>
|
||||
@@ -9,6 +9,7 @@
|
||||
<result column="date" property="motionDate" jdbcType="DATE"/>
|
||||
<result column="count" property="motionCount" jdbcType="BIGINT"/>
|
||||
<result column="distance" property="motionDistance" jdbcType="DOUBLE"/>
|
||||
<result column="energy" property="motionEnergy" jdbcType="DOUBLE"/>
|
||||
<result column="time" property="motionTime" jdbcType="TIME"/>
|
||||
</resultMap>
|
||||
|
||||
@@ -24,7 +25,7 @@
|
||||
select m.*, p.* from motion m left join parent p on m.pid = p.id where m.pid = #{motionParentId} and m.date = #{startDate}
|
||||
</select>
|
||||
<insert id="insert" parameterType="Motion">
|
||||
insert into motion(pid, date, count, distance, time)
|
||||
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionTime})
|
||||
insert into motion(pid, date, count, distance, energy, time)
|
||||
values (#{motionParentId}, #{motionDate}, #{motionCount}, #{motionDistance}, #{motionEnergy}, #{motionTime})
|
||||
</insert>
|
||||
</mapper>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16
server/OldPeopleHome/target/classes/mapper/AdminDao.xml
Normal file
16
server/OldPeopleHome/target/classes/mapper/AdminDao.xml
Normal file
@@ -0,0 +1,16 @@
|
||||
<?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>
|
||||
Binary file not shown.
Reference in New Issue
Block a user