Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
dfc1fb44
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1433
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
dfc1fb44
编写于
11月 22, 2018
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
展示三级行政区划
上级
ec435950
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
2685 addition
and
2225 deletion
+2685
-2225
skyeye-common/src/main/java/com/skyeye/common/util/ToolUtil.java
...common/src/main/java/com/skyeye/common/util/ToolUtil.java
+4
-4
skyeye-dao/src/main/java/com/skyeye/authority/dao/SysTAreaDao.java
...o/src/main/java/com/skyeye/authority/dao/SysTAreaDao.java
+1
-5
skyeye-service/src/main/java/com/skyeye/authority/service/impl/SysTAreaServiceImpl.java
...om/skyeye/authority/service/impl/SysTAreaServiceImpl.java
+2
-14
skyeye-web/src/main/resources/dbmapper/SysTAreaMapper.xml
skyeye-web/src/main/resources/dbmapper/SysTAreaMapper.xml
+3
-13
skyeye-web/src/main/resources/mapping/reqmapping.xml
skyeye-web/src/main/resources/mapping/reqmapping.xml
+0
-2
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/dltable.js
.../webapp/assets/lib/layui/lay/modules/treetable/dltable.js
+0
-2161
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/treeGrid.css
...ebapp/assets/lib/layui/lay/modules/treetable/treeGrid.css
+0
-3
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/treeGrid.js
...webapp/assets/lib/layui/lay/modules/treetable/treeGrid.js
+2673
-21
skyeye-web/src/main/webapp/js/tarea/tarea.js
skyeye-web/src/main/webapp/js/tarea/tarea.js
+2
-2
未找到文件。
skyeye-common/src/main/java/com/skyeye/common/util/ToolUtil.java
浏览文件 @
dfc1fb44
...
@@ -689,15 +689,15 @@ public class ToolUtil {
...
@@ -689,15 +689,15 @@ public class ToolUtil {
}
}
// log.info("line="+line);
// log.info("line="+line);
if
(
caption
.
equals
(
"System Idle Process"
)
||
caption
.
equals
(
"System"
))
{
if
(
caption
.
equals
(
"System Idle Process"
)
||
caption
.
equals
(
"System"
))
{
idletime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
trim
()).
longValue
();
idletime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
replaceAll
(
" "
,
""
).
trim
()).
longValue
();
idletime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
trim
()).
longValue
();
idletime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
replaceAll
(
" "
,
""
).
trim
()).
longValue
();
continue
;
continue
;
}
}
if
(!
isBlank
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
trim
())){
if
(!
isBlank
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
trim
())){
kneltime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
trim
()).
longValue
();
kneltime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
kmtidx
,
rocidx
-
1
).
replaceAll
(
" "
,
""
).
trim
()).
longValue
();
}
}
if
(!
isBlank
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
trim
())){
if
(!
isBlank
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
trim
())){
usertime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
trim
()).
longValue
();
usertime
+=
Long
.
valueOf
(
Bytes
.
substring
(
line
,
umtidx
,
wocidx
-
1
).
replaceAll
(
" "
,
""
).
trim
()).
longValue
();
}
}
}
}
retn
[
0
]
=
idletime
;
retn
[
0
]
=
idletime
;
...
...
skyeye-dao/src/main/java/com/skyeye/authority/dao/SysTAreaDao.java
浏览文件 @
dfc1fb44
...
@@ -3,12 +3,8 @@ package com.skyeye.authority.dao;
...
@@ -3,12 +3,8 @@ package com.skyeye.authority.dao;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
com.github.miemiedev.mybatis.paginator.domain.PageBounds
;
public
interface
SysTAreaDao
{
public
interface
SysTAreaDao
{
public
List
<
Map
<
String
,
Object
>>
querySysTAreaList
(
Map
<
String
,
Object
>
map
,
PageBounds
pageBounds
)
throws
Exception
;
public
List
<
Map
<
String
,
Object
>>
querySysTAreaList
(
Map
<
String
,
Object
>
map
)
throws
Exception
;
public
List
<
Map
<
String
,
Object
>>
querySysTAreaSecondList
(
Map
<
String
,
Object
>
bean
)
throws
Exception
;
}
}
skyeye-service/src/main/java/com/skyeye/authority/service/impl/SysTAreaServiceImpl.java
浏览文件 @
dfc1fb44
package
com.skyeye.authority.service.impl
;
package
com.skyeye.authority.service.impl
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.github.miemiedev.mybatis.paginator.domain.PageBounds
;
import
com.github.miemiedev.mybatis.paginator.domain.PageList
;
import
com.skyeye.authority.dao.SysTAreaDao
;
import
com.skyeye.authority.dao.SysTAreaDao
;
import
com.skyeye.authority.service.SysTAreaService
;
import
com.skyeye.authority.service.SysTAreaService
;
import
com.skyeye.common.object.InputObject
;
import
com.skyeye.common.object.InputObject
;
...
@@ -31,18 +28,9 @@ public class SysTAreaServiceImpl implements SysTAreaService{
...
@@ -31,18 +28,9 @@ public class SysTAreaServiceImpl implements SysTAreaService{
@Override
@Override
public
void
querySysTAreaList
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
public
void
querySysTAreaList
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
map
=
inputObject
.
getParams
();
Map
<
String
,
Object
>
map
=
inputObject
.
getParams
();
List
<
Map
<
String
,
Object
>>
beans
=
sysTAreaDao
.
querySysTAreaList
(
map
,
List
<
Map
<
String
,
Object
>>
beans
=
sysTAreaDao
.
querySysTAreaList
(
map
);
new
PageBounds
(
Integer
.
parseInt
(
map
.
get
(
"page"
).
toString
()),
Integer
.
parseInt
(
map
.
get
(
"limit"
).
toString
())));
PageList
<
Map
<
String
,
Object
>>
beansPageList
=
(
PageList
<
Map
<
String
,
Object
>>)
beans
;
int
total
=
beansPageList
.
getPaginator
().
getTotalCount
();
List
<
Map
<
String
,
Object
>>
arrs
=
new
ArrayList
<>();
for
(
Map
<
String
,
Object
>
bean
:
beans
){
List
<
Map
<
String
,
Object
>>
items
=
sysTAreaDao
.
querySysTAreaSecondList
(
bean
);
arrs
.
addAll
(
items
);
}
beans
.
addAll
(
arrs
);
outputObject
.
setBeans
(
beans
);
outputObject
.
setBeans
(
beans
);
outputObject
.
settotal
(
total
);
outputObject
.
settotal
(
beans
.
size
()
);
}
}
}
}
skyeye-web/src/main/resources/dbmapper/SysTAreaMapper.xml
浏览文件 @
dfc1fb44
...
@@ -6,21 +6,11 @@
...
@@ -6,21 +6,11 @@
SELECT
SELECT
a.code_id id,
a.code_id id,
IFNULL(a.parent_code_id, '0') pId,
IFNULL(a.parent_code_id, '0') pId,
a.`name`
a.`name`,
false lay_is_open
FROM
FROM
t_area a
t_area a
WHERE a.level = '0'
WHERE 3 > a.level
</select>
<select
id=
"querySysTAreaSecondList"
parameterType=
"java.util.Map"
resultType=
"java.util.Map"
>
SELECT
a.code_id id,
a.parent_code_id pId,
a.`name`
FROM
t_area a
WHERE a.level = '1'
AND a.parent_code_id = #{id}
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
skyeye-web/src/main/resources/mapping/reqmapping.xml
浏览文件 @
dfc1fb44
...
@@ -502,8 +502,6 @@
...
@@ -502,8 +502,6 @@
</url>
</url>
<url
id=
"systarea001"
path=
"/post/SysTAreaController/querySysTAreaList"
val=
"获取行政区划信息"
allUse=
"1"
>
<url
id=
"systarea001"
path=
"/post/SysTAreaController/querySysTAreaList"
val=
"获取行政区划信息"
allUse=
"1"
>
<property
id=
"limit"
name=
"limit"
ref=
"required,num"
var=
"分页参数,每页多少条数据"
/>
<property
id=
"page"
name=
"page"
ref=
"required,num"
var=
"分页参数,第几页"
/>
</url>
</url>
<!-- 小程序系列结束 -->
<!-- 小程序系列结束 -->
...
...
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/dltable.js
已删除
100644 → 0
浏览文件 @
ec435950
此差异已折叠。
点击以展开。
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/treeGrid.css
已删除
100644 → 0
浏览文件 @
ec435950
.layui-tree-head
{
cursor
:
pointer
;
}
\ No newline at end of file
skyeye-web/src/main/webapp/assets/lib/layui/lay/modules/treetable/treeGrid.js
浏览文件 @
dfc1fb44
此差异已折叠。
点击以展开。
skyeye-web/src/main/webapp/js/tarea/tarea.js
浏览文件 @
dfc1fb44
...
@@ -23,7 +23,7 @@ layui.config({
...
@@ -23,7 +23,7 @@ layui.config({
treeGrid
.
render
({
treeGrid
.
render
({
id
:
'
messageTable
'
,
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
ge
t
'
,
method
:
'
pos
t
'
,
idField
:
'
id
'
,
idField
:
'
id
'
,
url
:
reqBasePath
+
'
systarea001
'
,
url
:
reqBasePath
+
'
systarea001
'
,
cellMinWidth
:
100
,
cellMinWidth
:
100
,
...
@@ -35,7 +35,7 @@ layui.config({
...
@@ -35,7 +35,7 @@ layui.config({
{
field
:
'
id
'
,
width
:
100
,
title
:
'
id
'
},
{
field
:
'
id
'
,
width
:
100
,
title
:
'
id
'
},
{
field
:
'
pId
'
,
title
:
'
pId
'
},
{
field
:
'
pId
'
,
title
:
'
pId
'
},
]],
]],
p
age
:
false
isP
age
:
false
});
});
function
loadTable
(){
function
loadTable
(){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录