Skip to content

Z
znks
Commit 0c32f520 authored by leyboy's avatar leyboy
Browse files
Options

1.开锁记录增加模糊查询

parent 55c094c2
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 188 deletions
.idea/workspace.xml
View file @ 0c32f520
...@@ -7,28 +7,15 @@ ...@@ -7,28 +7,15 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment=""> <list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/LockRecordService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/LockRecordService.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" /> <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml" /> <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" /> <change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" /> <change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-dev.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application-dev.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-prd.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application-prd.properties" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" afterPath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" />
</list> </list>
<ignored path="$PROJECT_DIR$/adc-da-ui/target/" /> <ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -69,7 +56,18 @@ ...@@ -69,7 +56,18 @@
<select /> <select />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf /> <leaf>
<file leaf-file-name="PageInfo.java" pinned="false" current-in-tab="true">
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -126,7 +124,6 @@ ...@@ -126,7 +124,6 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserMapper.xml" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/page/UserPage.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/page/UserPage.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/test/java/com/adc/da/gen/jasypt/SecurityUtilsTest.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/test/java/com/adc/da/gen/jasypt/SecurityUtilsTest.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/SecurityUtils.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/SecurityUtils.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/config.properties" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/config.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/database.properties" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/gen/database.properties" />
...@@ -150,9 +147,6 @@ ...@@ -150,9 +147,6 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java" />
<option value="$PROJECT_DIR$/adc-da-main/pom.xml" /> <option value="$PROJECT_DIR$/adc-da-main/pom.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mybatis-config.xml" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mybatis-config.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java" />
...@@ -170,9 +164,13 @@ ...@@ -170,9 +164,13 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java" /> <option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties" />
</list> </list>
</option> </option>
</component> </component>
...@@ -728,6 +726,17 @@ ...@@ -728,6 +726,17 @@
<item name="znks" type="462c0819:PsiDirectoryNode" /> <item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" /> <item name="controller" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="dao" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" /> <item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" /> <item name="znks" type="462c0819:PsiDirectoryNode" />
...@@ -788,7 +797,7 @@ ...@@ -788,7 +797,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../springboot-idea/springboot-learn" />
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
...@@ -952,9 +961,10 @@ ...@@ -952,9 +961,10 @@
<envs /> <envs />
<patterns /> <patterns />
</configuration> </configuration>
<configuration name="AdcDaApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration name="AdcDaApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" singleton="false">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.adc.da.AdcDaApplication" /> <option name="SPRING_BOOT_MAIN_CLASS" value="com.adc.da.AdcDaApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<module name="adc-da-main" /> <module name="adc-da-main" />
<envs /> <envs />
</configuration> </configuration>
...@@ -987,11 +997,11 @@ ...@@ -987,11 +997,11 @@
</configuration> </configuration>
<list size="6"> <list size="6">
<item index="0" class="java.lang.String" itemvalue="Spring Boot.AdcDaApplication" /> <item index="0" class="java.lang.String" itemvalue="Spring Boot.AdcDaApplication" />
<item index="1" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" /> <item index="1" class="java.lang.String" itemvalue="Application.CodeUtil" />
<item index="2" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" /> <item index="2" class="java.lang.String" itemvalue="Application.ZnksServer" />
<item index="3" class="java.lang.String" itemvalue="Application.CodeUtil" /> <item index="3" class="java.lang.String" itemvalue="Application.ZnksClient" />
<item index="4" class="java.lang.String" itemvalue="Application.ZnksServer" /> <item index="4" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.encrypt" />
<item index="5" class="java.lang.String" itemvalue="Application.ZnksClient" /> <item index="5" class="java.lang.String" itemvalue="JUnit.SecurityUtilsTest.decrypt" />
</list> </list>
<recent_temporary> <recent_temporary>
<list size="5"> <list size="5">
...@@ -1051,7 +1061,7 @@ ...@@ -1051,7 +1061,7 @@
<workItem from="1536837981631" duration="137000" /> <workItem from="1536837981631" duration="137000" />
<workItem from="1536838164874" duration="2991000" /> <workItem from="1536838164874" duration="2991000" />
<workItem from="1536885579712" duration="12549000" /> <workItem from="1536885579712" duration="12549000" />
<workItem from="1536901590633" duration="3216000" /> <workItem from="1536901590633" duration="9339000" />
</task> </task>
<task id="LOCAL-00001" summary="A"> <task id="LOCAL-00001" summary="A">
<created>1534412427208</created> <created>1534412427208</created>
...@@ -1158,7 +1168,14 @@ ...@@ -1158,7 +1168,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1536841098568</updated> <updated>1536841098568</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="1.开锁记录分页,用户分页,管理员分页完成">
<created>1536905008854</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1536905008854</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -1176,7 +1193,7 @@ ...@@ -1176,7 +1193,7 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="324855000" /> <option name="totallyTimeSpent" value="330978000" />
</component> </component>
<component name="TodoView" selected-index="3"> <component name="TodoView" selected-index="3">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1206,12 +1223,12 @@ ...@@ -1206,12 +1223,12 @@
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41447368" sideWeight="0.49394855" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41118422" sideWeight="0.49394855" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3256579" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3256579" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31089258" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31089258" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
...@@ -1287,7 +1304,8 @@ ...@@ -1287,7 +1304,8 @@
<MESSAGE value="1.登录和修改密码接口对接完毕" /> <MESSAGE value="1.登录和修改密码接口对接完毕" />
<MESSAGE value="注释" /> <MESSAGE value="注释" />
<MESSAGE value="1.Admin相关接口完成" /> <MESSAGE value="1.Admin相关接口完成" />
<option name="LAST_COMMIT_MESSAGE" value="1.Admin相关接口完成" /> <MESSAGE value="1.开锁记录分页,用户分页,管理员分页完成" />
<option name="LAST_COMMIT_MESSAGE" value="1.开锁记录分页,用户分页,管理员分页完成" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1304,13 +1322,6 @@ ...@@ -1304,13 +1322,6 @@
</watches-manager> </watches-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.10.RELEASE/spring-webmvc-4.3.10.RELEASE.jar!/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.10.RELEASE/spring-webmvc-4.3.10.RELEASE.jar!/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.class"> <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.10.RELEASE/spring-webmvc-4.3.10.RELEASE.jar!/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106"> <state relative-caret-position="106">
...@@ -1332,29 +1343,6 @@ ...@@ -1332,29 +1343,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="48" column="9" lean-forward="true" selection-start-line="48" selection-start-column="9" selection-end-line="48" selection-end-column="9" />
<folding>
<marker date="1536570031301" expanded="true" signature="732:854" ph="select * fro... tb_device" />
<marker date="1536570031301" expanded="true" signature="2215:2253" ph="delete from tb_device... " />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/GatewayMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-289">
<caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="33" selection-end-column="15" />
<folding>
<marker date="1536570031305" expanded="true" signature="1702:1826" ph="select * fro... tb_gateway" />
<marker date="1536570031305" expanded="true" signature="1929:1995" ph="update tb_gateway... " />
<marker date="1536570031305" expanded="true" signature="2078:2119" ph="select * fro... tb_gateway" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/http/PageInfo.class"> <entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/http/PageInfo.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="396">
...@@ -1381,14 +1369,6 @@ ...@@ -1381,14 +1369,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2.jar!/com/github/pagehelper/PageInfo.class"> <entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2.jar!/com/github/pagehelper/PageInfo.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="108">
...@@ -1396,14 +1376,6 @@ ...@@ -1396,14 +1376,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-816">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5.jar!/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.class"> <entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5.jar!/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="153">
...@@ -1440,20 +1412,6 @@ ...@@ -1440,20 +1412,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="22" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="61" column="26" lean-forward="true" selection-start-line="61" selection-start-column="26" selection-end-line="61" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminSearch.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332"> <state relative-caret-position="332">
...@@ -1552,6 +1510,7 @@ ...@@ -1552,6 +1510,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="102">
<caret line="10" column="7" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" /> <caret line="10" column="7" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1581,6 +1540,7 @@ ...@@ -1581,6 +1540,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-187"> <state relative-caret-position="-187">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1621,16 +1581,6 @@ ...@@ -1621,16 +1581,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
<caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/GenResponse.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/GenResponse.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="102">
...@@ -1652,22 +1602,14 @@ ...@@ -1652,22 +1602,14 @@
<state relative-caret-position="201"> <state relative-caret-position="201">
<caret line="70" column="54" lean-forward="false" selection-start-line="70" selection-start-column="54" selection-end-line="70" selection-end-column="54" /> <caret line="70" column="54" lean-forward="false" selection-start-line="70" selection-start-column="54" selection-end-line="70" selection-end-column="54" />
<folding> <folding>
<element signature="e#1682#1683#0" expanded="true" /> <element signature="e#1682#1683#0" expanded="false" />
<element signature="e#1734#1735#0" expanded="true" /> <element signature="e#1734#1735#0" expanded="false" />
<element signature="e#2233#2234#0" expanded="true" /> <element signature="e#2233#2234#0" expanded="false" />
<element signature="e#2296#2297#0" expanded="true" /> <element signature="e#2296#2297#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="96" column="19" lean-forward="true" selection-start-line="96" selection-start-column="19" selection-end-line="96" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68"> <state relative-caret-position="68">
...@@ -1676,14 +1618,6 @@ ...@@ -1676,14 +1618,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="264">
...@@ -1692,14 +1626,6 @@ ...@@ -1692,14 +1626,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="34" column="28" lean-forward="false" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Admin.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="544">
...@@ -1721,34 +1647,94 @@ ...@@ -1721,34 +1647,94 @@
<state relative-caret-position="34"> <state relative-caret-position="34">
<caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
<folding> <folding>
<element signature="e#500#501#0" expanded="true" /> <element signature="e#500#501#0" expanded="false" />
<element signature="e#533#534#0" expanded="true" /> <element signature="e#533#534#0" expanded="false" />
<element signature="e#585#586#0" expanded="true" /> <element signature="e#585#586#0" expanded="false" />
<element signature="e#629#630#0" expanded="true" /> <element signature="e#629#630#0" expanded="false" />
<element signature="e#664#665#0" expanded="true" /> <element signature="e#664#665#0" expanded="false" />
<element signature="e#695#696#0" expanded="true" /> <element signature="e#695#696#0" expanded="false" />
<element signature="e#743#744#0" expanded="true" /> <element signature="e#743#744#0" expanded="false" />
<element signature="e#783#784#0" expanded="true" /> <element signature="e#783#784#0" expanded="false" />
<element signature="e#818#819#0" expanded="true" /> <element signature="e#818#819#0" expanded="false" />
<element signature="e#849#850#0" expanded="true" /> <element signature="e#849#850#0" expanded="false" />
<element signature="e#897#898#0" expanded="true" /> <element signature="e#897#898#0" expanded="false" />
<element signature="e#937#938#0" expanded="true" /> <element signature="e#937#938#0" expanded="false" />
<element signature="e#972#973#0" expanded="true" /> <element signature="e#972#973#0" expanded="false" />
<element signature="e#1003#1004#0" expanded="true" /> <element signature="e#1003#1004#0" expanded="false" />
<element signature="e#1051#1052#0" expanded="true" /> <element signature="e#1051#1052#0" expanded="false" />
<element signature="e#1091#1092#0" expanded="true" /> <element signature="e#1091#1092#0" expanded="false" />
<element signature="e#1126#1127#0" expanded="true" /> <element signature="e#1126#1127#0" expanded="false" />
<element signature="e#1157#1158#0" expanded="true" /> <element signature="e#1157#1158#0" expanded="false" />
<element signature="e#1205#1206#0" expanded="true" /> <element signature="e#1205#1206#0" expanded="false" />
<element signature="e#1245#1246#0" expanded="true" /> <element signature="e#1245#1246#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="25" column="23" lean-forward="false" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/GatewayMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="782">
<caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
<folding>
<marker date="1536570031305" expanded="true" signature="1702:1826" ph="select * fro... tb_gateway" />
<marker date="1536570031305" expanded="true" signature="1929:1995" ph="update tb_gateway... " />
<marker date="1536570031305" expanded="true" signature="2078:2119" ph="select * fro... tb_gateway" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/GatewayDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="96" column="21" lean-forward="false" selection-start-line="96" selection-start-column="21" selection-end-line="96" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-56"> <state relative-caret-position="60">
<caret line="18" column="7" lean-forward="false" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" /> <caret line="33" column="81" lean-forward="true" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="81" />
<folding> <folding>
<element signature="e#1604#1608#0" expanded="true" /> <element signature="e#1604#1608#0" expanded="true" />
<marker date="1536901861727" expanded="true" signature="631:873" ph="update tb_admin... " /> <marker date="1536901861727" expanded="true" signature="631:873" ph="update tb_admin... " />
...@@ -1758,26 +1744,62 @@ ...@@ -1758,26 +1744,62 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="102">
<caret line="25" column="23" lean-forward="false" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" /> <caret line="6" column="28" lean-forward="false" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="28" />
<folding /> <folding>
<marker date="1536570031301" expanded="true" signature="732:854" ph="select * fro... tb_device" />
<marker date="1536570031301" expanded="true" signature="2215:2253" ph="delete from tb_device... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml"> <entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349"> <state relative-caret-position="216">
<caret line="60" column="32" lean-forward="false" selection-start-line="60" selection-start-column="32" selection-end-line="60" selection-end-column="32" /> <caret line="56" column="21" lean-forward="false" selection-start-line="56" selection-start-column="21" selection-end-line="56" selection-end-column="21" />
<folding> <folding>
<marker date="1536904362283" expanded="true" signature="790:1254" ph="SELECT loc.*... tb_lock_record" /> <marker date="1536909785522" expanded="true" signature="790:1254" ph="SELECT loc.*... tb_lock_record" />
<marker date="1536904362283" expanded="true" signature="1389:1494" ph="insert into tb_lock_record... " /> <marker date="1536909785522" expanded="true" signature="1389:1494" ph="insert into tb_lock_record... " />
<marker date="1536904362283" expanded="true" signature="1983:2160" ph="select from tb_lock_record" /> <marker date="1536909785522" expanded="true" signature="1983:2160" ph="select from tb_lock_record" />
<marker date="1536909785522" expanded="true" signature="1983:2161" ph="select u.tem... tb_lock_record" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
<caret line="32" column="29" lean-forward="true" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="32" column="19" lean-forward="false" selection-start-line="32" selection-start-column="19" selection-end-line="32" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.2/pagehelper-5.1.2-sources.jar!/com/github/pagehelper/PageInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java
View file @ 0c32f520
...@@ -14,15 +14,6 @@ public class AdminVO { ...@@ -14,15 +14,6 @@ public class AdminVO {
@JSONField(format = "yyyy-MM-dd") @JSONField(format = "yyyy-MM-dd")
private String createTime; private String createTime;
private String adminId;
public String getAdminId() {
return adminId;
}
public void setAdminId(String adminId) {
this.adminId = adminId;
}
public String getAdminName() { public String getAdminName() {
return adminName; return adminName;
......
adc-da-main/src/main/resources/application-dev.properties
View file @ 0c32f520
...@@ -13,6 +13,7 @@ spring.datasource.username = root ...@@ -13,6 +13,7 @@ spring.datasource.username = root
#后端端口 #后端端口
server.port=8888 server.port=8888
#server.port=${random.int(8000,9000)}
useSSL = false useSSL = false
......
adc-da-main/src/main/resources/application-prd.properties
View file @ 0c32f520
...@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform ...@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform
spring.datasource.password = adc_platform spring.datasource.password = adc_platform
#后端端口 #后端端口
server.port=8080 server.port=${random.int(8000,9000)}
#验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1 #验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1
verifyCodeMode=1 verifyCodeMode=1
......
adc-da-main/src/main/resources/application.properties
View file @ 0c32f520
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#spring.datasource.password = root #spring.datasource.password = root
# =============================== # ===============================
# = DATA SOURCE2 # = DATA SOURCE2
# =============================== # ===============================
......
adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
View file @ 0c32f520
...@@ -49,14 +49,14 @@ ...@@ -49,14 +49,14 @@
lr.lock_type as lockType,lr.time as lockTime lr.lock_type as lockType,lr.time as lockTime
from tb_lock_record lr,tb_device d,tb_user u from tb_lock_record lr,tb_device d,tb_user u
<where> <where>
<trim suffixOverrides="and"> <if test="deviceName!=null and deviceName!=''">
<if test="deviceName!=null"> <bind name="deviceNameLike" value="'%'+deviceName+'%'"/>
d.deviceName = #{deviceName} and d.name LIKE #{deviceNameLike} and
</if> </if>
<if test="telphone!=null"> <if test="telphone!=null and telphone !=''">
u.telphone = #{telphone} and <bind name="telphoneLike" value="'%'+telphone+'%'"/>
</if> u.temphone LIKE #{telphoneLike} and
</trim> </if>
u.id = d.user_id and u.id = d.user_id and
d.code = lr.device_id d.code = lr.device_id
and lr.lock_type != '' and lr.lock_type != ''
......
adc-da-main/target/classes/application-dev.properties
View file @ 0c32f520
...@@ -13,6 +13,7 @@ spring.datasource.username = root ...@@ -13,6 +13,7 @@ spring.datasource.username = root
#后端端口 #后端端口
server.port=8888 server.port=8888
#server.port=${random.int(8000,9000)}
useSSL = false useSSL = false
......
adc-da-main/target/classes/application-prd.properties
View file @ 0c32f520
...@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform ...@@ -7,7 +7,7 @@ spring.datasource.username = adc_platform
spring.datasource.password = adc_platform spring.datasource.password = adc_platform
#后端端口 #后端端口
server.port=8080 server.port=${random.int(8000,9000)}
#验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1 #验证码后台模式：1为不开启，2为开启，3为三次输错用户名或密码才开启，默认为1
verifyCodeMode=1 verifyCodeMode=1
......
adc-da-main/target/classes/application.properties
View file @ 0c32f520
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#spring.datasource.password = root #spring.datasource.password = root
# =============================== # ===============================
# = DATA SOURCE2 # = DATA SOURCE2
# =============================== # ===============================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment