Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
znks
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王夏晖
znks
Commits
5386cf02
Commit
5386cf02
authored
Sep 25, 2018
by
leyboy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.开锁记录查询修改,只查询d.type=1的情况
parent
fdb638ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
90 deletions
+75
-90
workspace.xml
.idea/workspace.xml
+73
-89
LockRecordMapper.xml
...c/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
+2
-1
No files found.
.idea/workspace.xml
View file @
5386cf02
...
...
@@ -8,7 +8,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"55789a40-4cf0-4b7d-ac1a-d6938e521645"
name=
"Default"
comment=
""
>
<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/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/
resources/mybatis/mapper/znks/LockRecordMapper.xml"
afterPath=
"$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/adc-da-ui/target/"
/>
<ignored
path=
"$PROJECT_DIR$/target/"
/>
...
...
@@ -50,32 +50,25 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf>
<file
leaf-file-name=
"
PositionController.java
"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/adc-da-main/src/main/
java/com/adc/da/znks/controller/PositionController.java
"
>
<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=
"
199
"
>
<caret
line=
"
63"
column=
"61"
lean-forward=
"false"
selection-start-line=
"63"
selection-start-column=
"61"
selection-end-line=
"63"
selection-end-column=
"61
"
/>
<state
relative-caret-position=
"
352
"
>
<caret
line=
"
56"
column=
"22"
lean-forward=
"true"
selection-start-line=
"56"
selection-start-column=
"22"
selection-end-line=
"56"
selection-end-column=
"22
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<marker
date=
"1537879362316"
expanded=
"true"
signature=
"790:1172"
ph=
"SELECT loc.*... tb_lock_record"
/>
<marker
date=
"1537879362316"
expanded=
"true"
signature=
"1307:1412"
ph=
"insert into tb_lock_record... "
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"
PositionVO
.java"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/
znks/vo/PositionVO
.java"
>
<file
leaf-file-name=
"
AdcDaApplication
.java"
pinned=
"false"
current-in-tab=
"false"
>
<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=
"136"
>
<caret
line=
"8"
column=
"42"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"42"
selection-end-line=
"10"
selection-end-column=
"27"
/>
<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
relative-caret-position=
"357"
>
<caret
line=
"36"
column=
"28"
lean-forward=
"true"
selection-start-line=
"36"
selection-start-column=
"28"
selection-end-line=
"36"
selection-end-column=
"28"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -182,8 +175,8 @@
<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/resources/mybatis/mapper/znks/PositionMapper.xml"
/>
<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/controller/PositionController.java"
/>
<option
value=
"$PROJECT_DIR$/adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml"
/>
</list>
</option>
</component>
...
...
@@ -674,10 +667,7 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"AndroidView"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"PackagesPane"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -726,9 +716,7 @@
<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=
"resources"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"znks"
type=
"b2602c69:ProjectViewProjectNode"
/>
...
...
@@ -736,10 +724,8 @@
<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=
"controller"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"resources"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"mybatis"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"znks"
type=
"b2602c69:ProjectViewProjectNode"
/>
...
...
@@ -748,11 +734,16 @@
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"main"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"resources"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"mybatis"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"znks"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</expand>
<select
/>
</subPane>
</pane>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"PackagesPane"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -1028,7 +1019,8 @@
<workItem
from=
"1537413095756"
duration=
"1332000"
/>
<workItem
from=
"1537490029087"
duration=
"204000"
/>
<workItem
from=
"1537492837605"
duration=
"9522000"
/>
<workItem
from=
"1537836506994"
duration=
"85000"
/>
<workItem
from=
"1537836506994"
duration=
"311000"
/>
<workItem
from=
"1537879213969"
duration=
"879000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"A"
>
<created>
1534412427208
</created>
...
...
@@ -1184,7 +1176,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1537504090045
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"23"
/>
<task
id=
"LOCAL-00023"
summary=
"2018/9/25,位置信息新增接口修改"
>
<created>
1537836649186
</created>
<option
name=
"number"
value=
"00023"
/>
<option
name=
"presentableId"
value=
"LOCAL-00023"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1537836649186
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"24"
/>
<servers
/>
</component>
<component
name=
"TestHistory"
>
...
...
@@ -1202,7 +1201,7 @@
</history-entry>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"34
7221
000"
/>
<option
name=
"totallyTimeSpent"
value=
"34
8326
000"
/>
</component>
<component
name=
"TodoView"
selected-index=
"3"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -1227,18 +1226,20 @@
<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	"
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=
"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=
"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=
"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=
"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=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.34114978"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<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.3464448"
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=
"Find"
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=
"2"
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=
"Favorites"
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=
"6"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -1246,12 +1247,10 @@
<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"
/>
<window_info
id=
"Bean Validation"
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=
"8"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Find"
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=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
</layout>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
...
@@ -1319,7 +1318,8 @@
<MESSAGE
value=
"1.管理员逻辑修改"
/>
<MESSAGE
value=
"2018/9/21"
/>
<MESSAGE
value=
"1.位置信息接口 2.锁记录接口修改"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"1.位置信息接口 2.锁记录接口修改"
/>
<MESSAGE
value=
"2018/9/25,位置信息新增接口修改"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"2018/9/25,位置信息新增接口修改"
/>
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
...
...
@@ -1336,20 +1336,6 @@
</watches-manager>
</component>
<component
name=
"editorHistoryManager"
>
<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=
"-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$/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=
"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/service/LockRecordService.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"386"
>
...
...
@@ -1529,7 +1515,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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>
...
...
@@ -1544,7 +1529,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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>
...
...
@@ -1552,7 +1536,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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>
...
...
@@ -1609,7 +1592,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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>
...
...
@@ -1675,17 +1657,37 @@
</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/vo/PositionVO
.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<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
relative-caret-position=
"136"
>
<caret
line=
"8"
column=
"42"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"42"
selection-end-line=
"10"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
<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=
"233"
>
<caret
line=
"68"
column=
"19"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"19"
selection-end-line=
"68"
selection-end-column=
"19"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/FtpUtil.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"317"
>
<caret
line=
"175"
column=
"15"
lean-forward=
"true"
selection-start-line=
"175"
selection-start-column=
"15"
selection-end-line=
"175"
selection-end-column=
"15"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/util/FileUtil.java"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"170"
>
<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/resources/mybatis/mapper/znks/PositionMapper.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"3
35
"
>
<state
relative-caret-position=
"3
60
"
>
<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... "
/>
...
...
@@ -1701,39 +1703,21 @@
</state>
</provider>
</entry>
<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>
<entry
file=
"file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/vo/PositionVO.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=
"136"
>
<caret
line=
"8"
column=
"42"
lean-forward=
"false"
selection-start-line=
"8"
selection-start-column=
"42"
selection-end-line=
"10"
selection-end-column=
"27"
/>
<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
relative-caret-position=
"357"
>
<caret
line=
"36"
column=
"28"
lean-forward=
"true"
selection-start-line=
"36"
selection-start-column=
"28"
selection-end-line=
"36"
selection-end-column=
"28"
/>
<folding
/>
</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/
resources/mybatis/mapper/znks/LockRecordMapper.xml
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
199
"
>
<caret
line=
"
63"
column=
"61"
lean-forward=
"false"
selection-start-line=
"63"
selection-start-column=
"61"
selection-end-line=
"63"
selection-end-column=
"61
"
/>
<state
relative-caret-position=
"
352
"
>
<caret
line=
"
56"
column=
"22"
lean-forward=
"true"
selection-start-line=
"56"
selection-start-column=
"22"
selection-end-line=
"56"
selection-end-column=
"22
"
/>
<folding>
<element
signature=
"imports"
expanded=
"true"
/>
<marker
date=
"1537879362316"
expanded=
"true"
signature=
"790:1172"
ph=
"SELECT loc.*... tb_lock_record"
/>
<marker
date=
"1537879362316"
expanded=
"true"
signature=
"1307:1412"
ph=
"insert into tb_lock_record... "
/>
</folding>
</state>
</provider>
...
...
adc-da-main/src/main/resources/mybatis/mapper/znks/LockRecordMapper.xml
View file @
5386cf02
...
...
@@ -53,7 +53,8 @@
</if>
u.id = d.user_id and
d.id = lr.device_id and
lr.lock_type != ''
lr.lock_type != '' and
d.type = 1
</where>
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment