Skip to content

Z
znks
Commit 6d940399 authored by leyboy's avatar leyboy
Browse files
Options

1.位置信息接口 

2.锁记录接口修改
parent 670858a4
Show whitespace changes
Inline Side-by-side
Showing with 445 additions and 268 deletions
.idea/workspace.xml
View file @ 6d940399
......@@ -6,34 +6,17 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="1.管理员逻辑修改">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="2018/9/21">
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/PositionVO.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/dozer/dozer-mappings.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/adc-da-main-2.2.0.jar" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/adc-da-main-2.2.0.jar.original" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-dev.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application-prd.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/application.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/banner.txt" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/cache/ehcache-hibernate-local.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/cache/ehcache-hibernate-rmi.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/cache/ehcache-local.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/cache/ehcache-rmi.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/config/application.yml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/gen/config.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/gen/database.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/logback-spring.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/logo/logo_white.png" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/mybatis/mybatis-config.xml" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/py4j/py4j.dic" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/white/csrfWhite.txt" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/white/uploadWhite.txt" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/classes/white/xssWhite.txt" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/maven-archiver/pom.properties" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/target/test-classes/com/adc/da/gen/CodeUtil.class" afterPath="" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.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/service/PositionService.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/resources/banner.txt" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/banner.txt" />
<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/PositionMapper.xml" afterPath="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml" />
</list>
<ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -74,7 +57,21 @@
<select />
</component>
<component name="FileEditorManager">
<leaf />
<leaf>
<file leaf-file-name="LockRecordMapper.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="54" column="15" lean-forward="false" selection-start-line="54" selection-start-column="15" selection-end-line="55" selection-end-column="30" />
<folding>
<marker date="1537504034940" expanded="true" signature="790:1172" ph="SELECT loc.*... tb_lock_record" />
<marker date="1537504034940" expanded="true" signature="1307:1412" ph="insert into tb_lock_record... " />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -127,10 +124,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pom.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/test/java/com/adc/da/gen/jasypt/SecurityUtilsTest.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/database.properties" />
......@@ -138,9 +131,6 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/User.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Position.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/page/PositionPage.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/Message.java" />
......@@ -158,7 +148,6 @@
<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/service/UserService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/UserController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java" />
......@@ -170,7 +159,6 @@
<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" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.java" />
......@@ -178,6 +166,15 @@
<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/resources/mybatis/mapper/znks/AdminMapper.xml" />
<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/resources/dozer/dozer-mappings.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/PositionVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/banner.txt" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml" />
</list>
</option>
</component>
......@@ -668,8 +665,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -677,12 +676,36 @@
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
</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" />
</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" />
</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="resources" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -703,12 +726,10 @@
<property name="restartRequiresConfirmation" value="false" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\server" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\entity" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources" />
<recent name="E:\Working\znks\adc-da-main\src\main\java\com\adc\da\znks" />
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
<recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper.znks" />
<recent name="E:\Working\znds\adc-da-main\src\main" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.adc.da.znks.controller" />
......@@ -717,10 +738,12 @@
<recent name="com.adc.da.znks.dao" />
<recent name="com.adc.da.znks.entity" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
<recent name="E:\Working\znks\adc-da-main\src\main\resources\mybatis\mapper.znks" />
<recent name="E:\Working\znds\adc-da-main\src\main" />
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources\dozer" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\server" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources\mybatis\mapper\znks" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\java\com\adc\da\znks\entity" />
<recent name="D:\java study workspace\znks\znks\adc-da-main\src\main\resources" />
</key>
</component>
<component name="RunDashboard">
......@@ -956,7 +979,8 @@
<workItem from="1536920079291" duration="103000" />
<workItem from="1537174191117" duration="527000" />
<workItem from="1537413095756" duration="1332000" />
<workItem from="1537490029087" duration="121000" />
<workItem from="1537490029087" duration="204000" />
<workItem from="1537492837605" duration="9453000" />
</task>
<task id="LOCAL-00001" summary="A">
<created>1534412427208</created>
......@@ -1098,7 +1122,14 @@
<option name="project" value="LOCAL" />
<updated>1536917233761</updated>
</task>
<option name="localTasksCounter" value="21" />
<task id="LOCAL-00021" summary="2018/9/21">
<created>1537490171410</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1537490171410</updated>
</task>
<option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="TestHistory">
......@@ -1116,7 +1147,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="337531000" />
<option name="totallyTimeSpent" value="347067000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -1141,16 +1172,17 @@
<window_info id="UI Designer" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4243421" sideWeight="0.49394855" order="4" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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="6" 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="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="true" 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="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="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="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.33055976" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33585477" 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="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" />
......@@ -1160,7 +1192,6 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5231561" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17324185" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
......@@ -1231,11 +1262,12 @@
<MESSAGE value="1.开锁记录增加模糊查询" />
<MESSAGE value="1.用户记录查询增加模糊查询" />
<MESSAGE value="1.管理员逻辑修改" />
<option name="LAST_COMMIT_MESSAGE" value="1.管理员逻辑修改" />
<MESSAGE value="2018/9/21" />
<option name="LAST_COMMIT_MESSAGE" value="2018/9/21" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="122" />
<option name="time" value="123" />
</breakpoint-manager>
<watches-manager>
<configuration name="SpringBootApplicationConfigurationType">
......@@ -1248,366 +1280,417 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
<entry file="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-sources.jar!/com/github/pagehelper/autoconfigure/PageHelperAutoConfiguration.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/GatewayController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="71" column="19" lean-forward="false" selection-start-line="71" selection-start-column="19" selection-end-line="71" selection-end-column="19" />
<folding />
<state relative-caret-position="-110">
<caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
</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-sources.jar!/com/github/pagehelper/autoconfigure/PageHelperProperties.java">
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.10.RELEASE/spring-beans-4.3.10.RELEASE.jar!/org/springframework/beans/factory/annotation/Autowired.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-719">
<caret line="36" column="13" lean-forward="false" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
<state relative-caret-position="170">
<caret line="17" column="12" lean-forward="false" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
</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/service/LockRecordService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
<caret line="35" column="25" lean-forward="false" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
<state relative-caret-position="386">
<caret line="69" column="27" lean-forward="false" selection-start-line="69" selection-start-column="27" selection-end-line="69" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/User.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<state relative-caret-position="213">
<caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/UserSearch.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="27" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml">
<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="34">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Position.java">
<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="357">
<caret line="27" column="31" lean-forward="false" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="31" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java">
<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="10" column="7" lean-forward="true" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/AppPushUtils.java">
<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="23" column="37" lean-forward="false" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/DeviceService.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">
<state relative-caret-position="153">
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<state relative-caret-position="102">
<caret line="6" column="28" lean-forward="false" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/GatewayController.java">
<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="-110">
<caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<state relative-caret-position="170">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.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">
<state relative-caret-position="136">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<state relative-caret-position="-44">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.10.RELEASE/spring-beans-4.3.10.RELEASE.jar!/org/springframework/beans/factory/annotation/Autowired.class">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="17" column="12" lean-forward="false" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
<state relative-caret-position="235">
<caret line="60" column="64" lean-forward="false" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/LockRecordService.java">
<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="386">
<caret line="69" column="27" lean-forward="false" selection-start-line="69" selection-start-column="27" selection-end-line="69" selection-end-column="27" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/GenResponse.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/xss/SQLFilter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="40" lean-forward="false" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
<state relative-caret-position="51">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/LockRecord.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/xss/HTMLFilter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213">
<caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<state relative-caret-position="-6277">
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/LockRecordVO.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/xss/XssHttpServletRequestWrapper.class">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="-255">
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/LockRecordDao.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/filter/FakeJSessionIdFilter.class">
<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" />
<state relative-caret-position="425">
<caret line="37" column="41" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/GatewayMapper.xml">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/xss/XssFilter.class">
<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" />
<state relative-caret-position="306">
<caret line="28" column="27" lean-forward="true" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/GatewayDao.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/filter/CsrfFilter.class">
<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" />
<state relative-caret-position="272">
<caret line="35" column="64" lean-forward="false" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/AdminVO.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/csrfWhite.txt">
<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" />
<state relative-caret-position="51">
<caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/xssWhite.txt">
<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 relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/DeviceMapper.xml">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="28" lean-forward="false" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="28" />
<state relative-caret-position="527">
<caret line="40" column="44" lean-forward="false" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
</state>
</provider>
</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/java/com/adc/da/znks/controller/InstructionsController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="56" column="21" lean-forward="false" selection-start-line="56" selection-start-column="21" selection-end-line="56" selection-end-column="21" />
<state relative-caret-position="-238">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
</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">
<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">
<state relative-caret-position="170">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<state relative-caret-position="-348">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/DeviceDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="158" column="41" lean-forward="true" selection-start-line="158" selection-start-column="41" selection-end-line="158" selection-end-column="41" />
<state relative-caret-position="12">
<caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
</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/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-44">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<state relative-caret-position="-527">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
<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="165">
<caret line="158" column="53" lean-forward="false" selection-start-line="158" selection-start-column="53" selection-end-line="158" selection-end-column="53" />
<state relative-caret-position="272">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
<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="250">
<caret line="34" column="48" lean-forward="true" selection-start-line="34" selection-start-column="48" selection-end-line="34" selection-end-column="48" />
<state relative-caret-position="340">
<caret line="20" column="14" lean-forward="true" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
</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/logback-spring.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="25" column="20" lean-forward="false" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" />
<state relative-caret-position="-459">
<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="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/Position.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="24" column="2" lean-forward="true" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
<state relative-caret-position="0">
<caret line="0" column="30" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/UserDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<state relative-caret-position="192">
<caret line="24" column="29" lean-forward="false" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/AdminController.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">
<state relative-caret-position="204">
<caret line="46" column="41" lean-forward="false" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
<state relative-caret-position="102">
<caret line="6" column="40" lean-forward="false" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/AdminService.java">
<entry file="jar://$MAVEN_REPOSITORY$/com/adc/adc-da-util/2.2.41/adc-da-util-2.2.41.jar!/com/adc/da/util/utils/BeanMapper.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="60" column="64" lean-forward="false" selection-start-line="60" selection-start-column="64" selection-end-line="60" selection-end-column="64" />
<state relative-caret-position="258">
<caret line="49" column="27" lean-forward="false" selection-start-line="49" selection-start-column="27" selection-end-line="49" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/LockRecordController.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.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" />
<state relative-caret-position="544">
<caret line="63" column="5" lean-forward="false" selection-start-line="63" selection-start-column="5" selection-end-line="63" selection-end-column="5" />
<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/xss/SQLFilter.class">
<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">
<state relative-caret-position="51">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<state relative-caret-position="-204">
<caret line="54" column="35" lean-forward="false" selection-start-line="54" selection-start-column="35" selection-end-line="54" selection-end-column="35" />
<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/xss/HTMLFilter.class">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/AdminDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6277">
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
<state relative-caret-position="286">
<caret line="27" column="156" lean-forward="false" selection-start-line="27" selection-start-column="87" selection-end-line="27" selection-end-column="156" />
<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/xss/XssHttpServletRequestWrapper.class">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/dozer/dozer-mappings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-255">
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<state relative-caret-position="153">
<caret line="9" column="11" lean-forward="true" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
<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/filter/FakeJSessionIdFilter.class">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="37" column="41" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="41" />
<state relative-caret-position="238">
<caret line="19" column="48" lean-forward="false" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
<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/xss/XssFilter.class">
<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="306">
<caret line="28" column="27" lean-forward="true" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
<state relative-caret-position="318">
<caret line="97" column="38" lean-forward="false" selection-start-line="97" selection-start-column="30" selection-end-line="97" selection-end-column="38" />
<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/filter/CsrfFilter.class">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="35" column="64" lean-forward="false" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="64" />
<state relative-caret-position="413">
<caret line="65" column="0" lean-forward="true" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/csrfWhite.txt">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/UserEOMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
<state relative-caret-position="102">
<caret line="6" column="40" lean-forward="false" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="40" />
<folding>
<marker date="1537413114083" expanded="true" signature="1617:1827" ph="insert into tb_user... " />
<marker date="1537413114083" expanded="true" signature="2928:3072" ph="update tb_user... " />
<marker date="1537413114083" expanded="true" signature="3215:3495" ph="update tb_user... " />
<marker date="1537413114083" expanded="true" signature="3655:3754" ph="select from tb_user" />
<marker date="1537413114083" expanded="true" signature="3878:3925" ph="delete from tb_user... " />
<marker date="1537413114083" expanded="true" signature="4096:4124" ph="select count... tb_user" />
<marker date="1537413114083" expanded="true" signature="4322:4610" ph="select from tb_user" />
<marker date="1537413114083" expanded="true" signature="5094:5208" ph="select way.m... tb_user" />
<marker date="1537413114083" expanded="true" signature="5324:5435" ph="select u.cli... tb_user" />
<marker date="1537413114083" expanded="true" signature="5794:6614" ph="SELECT u.`cr... tb_user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/xssWhite.txt">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java">
<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="0" selection-end-column="8" />
<state relative-caret-position="187">
<caret line="17" column="19" lean-forward="false" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="40" column="44" lean-forward="false" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
<state relative-caret-position="187">
<caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/DeviceController.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/banner.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="63" column="5" lean-forward="false" selection-start-line="63" selection-start-column="5" selection-end-line="63" selection-end-column="5" />
<state relative-caret-position="85">
<caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/InstructionsController.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/PositionVO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-238">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<state relative-caret-position="162">
<caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#289#290#0" expanded="true" />
<element signature="e#320#321#0" expanded="true" />
<element signature="e#368#369#0" expanded="true" />
<element signature="e#408#409#0" expanded="true" />
<element signature="e#630#631#0" expanded="true" />
<element signature="e#680#681#0" expanded="true" />
</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/resources/mybatis/mapper/znks/AdminMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1207">
<caret line="92" column="57" lean-forward="false" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
<state relative-caret-position="60">
<caret line="36" column="81" lean-forward="true" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="81" />
<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/AdcDaApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-348">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<state relative-caret-position="294">
<caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/dao/DeviceDao.java">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12">
<caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
<state relative-caret-position="119">
<caret line="42" column="0" lean-forward="true" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application.properties">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-527">
<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 relative-caret-position="335">
<caret line="167" column="33" lean-forward="false" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
<folding>
<marker date="1537503922073" expanded="true" signature="1817:2051" ph="insert into tb_position... " />
<marker date="1537503922073" expanded="true" signature="3198:3380" ph="update tb_position... " />
<marker date="1537503922073" expanded="true" signature="3527:3928" ph="update tb_position... " />
<marker date="1537503922073" expanded="true" signature="4092:4204" ph="select from tb_position" />
<marker date="1537503922073" expanded="true" signature="4329:4389" ph="delete from tb_position... " />
<marker date="1537503922073" expanded="true" signature="4560:4592" ph="select count... tb_position" />
<marker date="1537503922073" expanded="true" signature="4794:5090" ph="select from tb_position" />
<marker date="1537503922073" expanded="true" signature="6081:6158" ph="select from tb_position" />
<marker date="1537503922073" expanded="true" signature="6081:6160" ph="select from tb_position" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-dev.properties">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml">
<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 relative-caret-position="360">
<caret line="54" column="15" lean-forward="false" selection-start-line="54" selection-start-column="15" selection-end-line="55" selection-end-column="30" />
<folding>
<marker date="1537504034940" expanded="true" signature="790:1172" ph="SELECT loc.*... tb_lock_record" />
<marker date="1537504034940" expanded="true" signature="1307:1412" ph="insert into tb_lock_record... " />
</folding>
</state>
</provider>
</entry>
......
adc-da-main/src/main/java/com/adc/da/main/config/DozerConfig.java
View file @ 6d940399
......@@ -15,7 +15,7 @@ public class DozerConfig {
@Bean(name = "org.dozer.Mapper")
public DozerBeanMapper dozer() {
List<String> mappingFiles = Arrays.asList("dozer/dozer-mappings-sys.xml");
List<String> mappingFiles = Arrays.asList("dozer/dozer-mappings.xml");
DozerBeanMapper dozerBean = new DozerBeanMapper();
dozerBean.setMappingFiles(mappingFiles);
return dozerBean;
......
adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java
View file @ 6d940399
package com.adc.da.znks.controller;
import com.adc.da.util.utils.BeanMapper;
import com.adc.da.znks.entity.Position;
import com.adc.da.znks.entity.ResponseEntity;
import com.adc.da.znks.entity.User;
import com.adc.da.znks.page.PositionPage;
import com.adc.da.znks.service.PositionService;
import com.adc.da.znks.service.UserService;
import com.adc.da.znks.util.GenResponse;
import com.adc.da.znks.vo.PositionVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.adc.da.base.web.BaseController;
import com.adc.da.util.http.PageInfo;
import com.adc.da.util.http.ResponseMessage;
import com.adc.da.util.http.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -29,37 +35,48 @@ public class PositionController extends BaseController<Position> {
@Autowired
private PositionService positionService;
@Autowired
private UserService userService;
@Autowired
private BeanMapper beanMapper;
private static final Logger logger = LoggerFactory.getLogger(PositionController.class);
// @ApiOperation(value = "|Position|分页查询")
// @GetMapping("/page")
// public ResponseMessage<PageInfo<Position>> page(PositionPage page) throws Exception {
// List<Position> rows = positionService.queryByPage(page);
// return Result.success(getPageInfo(page.getPager(), rows));
// }
//
// @ApiOperation(value = "|Position|查询")
// @GetMapping("")
// public ResponseMessage<List<Position>> list(PositionPage page) throws Exception {
// return Result.success(positionService.queryByList(page));
// }
//
// @ApiOperation(value = "|Position|详情")
// @GetMapping("/position/{positionId}")
// public ResponseMessage<Position> find(@PathVariable String positionId) throws Exception {
// return Result.success(positionService.selectByPrimaryKey(positionId));
// }
@ApiOperation(value = "|Position|分页查询")
@GetMapping("/page")
public ResponseEntity<PageInfo> page(@RequestParam(required = false) String telphone, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "8") Integer pageSize) throws Exception {
try {
PageHelper.startPage(pageNum, pageSize);
List<PositionVO> positionVOS = positionService.listPositionsByPage(telphone, pageNum, pageSize);
PageInfo positionVOPageInfo = new PageInfo(positionVOS);
return GenResponse.success(String.valueOf(HttpStatus.OK.value()),
"查询位置信息成功", positionVOPageInfo);
} catch (Exception e) {
e.printStackTrace();
return GenResponse.fail("查询位置信息失败");
}
}
@ApiOperation(value = "|Position|新增")
@PostMapping("/position")
public ResponseMessage<Boolean> create(@RequestBody Position position) throws Exception {
@PostMapping(value = "/position", consumes = {"application/x-www-form-urlencoded"})
public ResponseEntity<Boolean> create(PositionVO positionVO) throws Exception {
Position position = beanMapper.map(positionVO, Position.class);
String userTelphone = positionVO.getTelphone();
User user = userService.getByPhoneNumber(userTelphone);
if (user != null) {
position.setPositionId(UUID.randomUUID().toString());
position.setRecordTime(new Date(System.currentTimeMillis()));
position.setUserId(user.getId());
int result = positionService.insertSelective(position);
if (result != 0) {
return Result.success(String.valueOf(HttpStatus.OK.value()), "新增位置成功", true);
return GenResponse.success(String.valueOf(HttpStatus.OK.value()), "新增位置成功", true);
} else {
return GenResponse.fail("新增位置失败");
}
} else {
return Result.error(String.valueOf(HttpStatus.OK.value()), "新增位置失败", false);
return GenResponse.fail("用户手机号在数据库不存在");
}
}
......
adc-da-main/src/main/java/com/adc/da/znks/dao/PositionDao.java
View file @ 6d940399
......@@ -2,15 +2,18 @@ package com.adc.da.znks.dao;
import com.adc.da.base.dao.BaseDao;
import com.adc.da.znks.entity.Position;
import com.adc.da.znks.vo.PositionVO;
import org.apache.ibatis.annotations.*;
import java.util.List;
import java.util.Map;
/**
*
* <br>
* <b>功能：</b>PositionDao<br>
*/
@Mapper
public interface PositionDao extends BaseDao<Position> {
List<PositionVO> listPositionByPage(@Param("telphone") String telphone, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
}
adc-da-main/src/main/java/com/adc/da/znks/service/PositionService.java
View file @ 6d940399
......@@ -3,6 +3,7 @@ package com.adc.da.znks.service;
import com.adc.da.base.service.BaseService;
import com.adc.da.znks.dao.PositionDao;
import com.adc.da.znks.entity.Position;
import com.adc.da.znks.vo.PositionVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -10,6 +11,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* <br>
......@@ -28,4 +31,8 @@ public class PositionService extends BaseService<Position, String> {
return dao;
}
public List<PositionVO> listPositionsByPage(String telphone, Integer pageNum, Integer pageSize) {
return dao.listPositionByPage(telphone,pageNum, pageSize);
}
}
adc-da-main/src/main/java/com/adc/da/znks/vo/PositionVO.java 0 → 100644
View file @ 6d940399
package com.adc.da.znks.vo;
import com.adc.da.znks.entity.Position;
import org.apache.commons.lang3.time.DateFormatUtils;
/**
* @author ley
**/
public class PositionVO extends Position {
private String telphone;
private String recordTimeStr;
public String getTelphone() {
return telphone;
}
public void setTelphone(String telphone) {
this.telphone = telphone;
}
public String getRecordTimeStr() {
recordTimeStr = DateFormatUtils.format(getRecordTime(), "yyyy-MM-dd HH:mm:ss");
return recordTimeStr;
}
public void setRecordTimeStr(String recordTimeStr) {
this.recordTimeStr = recordTimeStr;
}
}
adc-da-main/src/main/resources/banner.txt
View file @ 6d940399
......@@ -6,4 +6,4 @@ ${AnsiColor.RED} _ _
${AnsiColor.YELLOW}------------------------------------------------
${AnsiColor.YELLOW} :: ${AnsiColor.YELLOW}@数据资源中心
${AnsiColor.YELLOW}------------------------------------------------${AnsiColor.WHITE}
\ No newline at end of file
${AnsiColor.YELLOW}------------------------------------------------${AnsiColor.BLACK}
\ No newline at end of file
adc-da-main/src/main/resources/dozer/dozer-mappings.xml 0 → 100644
View file @ 6d940399
<?xml version="1.0" encoding="UTF-8"?>
<mappings xmlns="http://dozer.sourceforge.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://dozer.sourceforge.net
http://dozer.sourceforge.net/schema/beanmapping.xsd">
<mapping>
<!--配置EO和VO全类名对应-->
<class-a>com.adc.da.znks.entity.Position</class-a>
<class-b>com.adc.da.znks.vo.PositionVO</class-b>
</mapping>
</mappings>
\ No newline at end of file
adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
View file @ 6d940399
......@@ -52,8 +52,8 @@
u.temphone LIKE #{telphoneLike} and
</if>
u.id = d.user_id and
d.code = lr.device_id
and lr.lock_type != ''
d.id = lr.device_id and
lr.lock_type != ''
</where>
</select>
......
adc-da-main/src/main/resources/mybatis/mapper/znks/PositionMapper.xml
View file @ 6d940399
......@@ -42,19 +42,20 @@
<!-- 插入记录 -->
<insert id="insert" parameterType="com.adc.da.znks.entity.Position">
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="position_id">
SELECT SEQ_tb_position.NEXTVAL FROM DUAL
</selectKey> -->
SELECT SEQ_tb_position.NEXTVAL FROM DUAL
</selectKey> -->
insert into tb_position(
<include refid="Base_Column_List"/>
)
values (#{positionId, jdbcType=VARCHAR}, #{recordTime, jdbcType=TIMESTAMP}, #{positionName, jdbcType=VARCHAR}, #{userId, jdbcType=VARCHAR})
values (#{positionId, jdbcType=VARCHAR}, #{recordTime, jdbcType=TIMESTAMP}, #{positionName, jdbcType=VARCHAR},
#{userId, jdbcType=VARCHAR})
</insert>
<!-- 动态插入记录 主键是序列 -->
<insert id="insertSelective" parameterType="com.adc.da.znks.entity.Position">
<!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="position_id">
SELECT SEQ_tb_position.NEXTVAL FROM DUAL
</selectKey> -->
SELECT SEQ_tb_position.NEXTVAL FROM DUAL
</selectKey> -->
insert into tb_position
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="positionId != null">position_id,</if>
......@@ -144,4 +145,29 @@
</if>
</select>
<resultMap id="PositionVOMap" type="com.adc.da.znks.vo.PositionVO">
<id column="position_id" property="positionId"/>
<result column="record_time" property="recordTime"/>
<result column="position_name" property="positionName"/>
<result column="user_id" property="userId"/>
<result column="temphone" property="telphone"/>
</resultMap>
<sql id="Position_VO_Column">
p.position_id,p.record_time, p.position_name, p.user_id,u.temphone
</sql>
<select id="listPositionByPage" parameterType="object" resultMap="PositionVOMap">
select
<include refid="Position_VO_Column"/>
from tb_position p INNER JOIN tb_user u ON p.user_id = u.id
<where>
<if test="telphone!=null and telphone!=''">
<bind name="telphoneLike" value="'%'+telphone+'%'"/>
u.temphone LIKE #{telphoneLike}
</if>
</where>
</select>
</mapper>
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