Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-solr
Overview
Overview
Details
Activity
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
常超
xzxt-solr
Commits
43ff8c6b
Commit
43ff8c6b
authored
May 23, 2019
by
yanru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将字典码显示改为直接读redis
parent
627c1eff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
151 additions
and
139 deletions
+151
-139
src/main/java/com/cc/service/impl/IDicItemServiceImpl.java
+143
-130
src/main/resources/config.properties
+8
-9
No files found.
src/main/java/com/cc/service/impl/IDicItemServiceImpl.java
View file @
43ff8c6b
...
...
@@ -24,16 +24,14 @@ import java.util.*;
public
class
IDicItemServiceImpl
implements
IDicItemService
{
@Autowired
IDictitemDao
dicItemDao
;
/*@Autowired
private StringRedisTemplate redisTemplate;*/
@Autowired
private
StringRedisTemplate
redisTemplate
;
@Override
public
List
<
ZTreeNode
>
queryTypeCode
(
String
type
,
String
id
,
String
yycj
,
String
name
)
{
List
<
ZTreeNode
>
ztreeNodes
=
new
ArrayList
<
ZTreeNode
>();
PropertiesUtils
propertiesUtil
=
new
PropertiesUtils
(
"config.properties"
);
String
ssdw
=
propertiesUtil
.
getValue
(
"ssdw"
);
//所属单位
String
redisUrl
=
propertiesUtil
.
getValue
(
"redis.url"
);
//redis服务地址
if
(
null
!=
ssdw
&&
!
""
.
equals
(
ssdw
)
&&
ssdw
.
length
()
>=
2
)
{
ssdw
=
ssdw
.
substring
(
0
,
2
);
}
...
...
@@ -45,153 +43,144 @@ public class IDicItemServiceImpl implements IDicItemService {
name
=
"*"
;
}
//获取符合条件的key
String
key
=
ssdw
+
":"
+
type
+
":"
+
id
+
":*:"
+
name
+
":*"
;
XzxtRestResult
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
key
,
redisUrl
);
if
(
null
==
xzxtRestResult
.
getData
()){
RedisUtil
.
UpdateRedisRest
(
ssdw
,
type
,
redisUrl
);
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
key
,
redisUrl
);
String
keys
=
ssdw
+
":"
+
type
+
":"
+
id
+
":*:"
+
name
+
":*"
;
//String keys = ssdw + ":" + type + ":"+id+":"+startId+":"+name+":*";
Set
<
String
>
set
=
redisTemplate
.
keys
(
keys
);
//System.out.println("keys="+keys);
Iterator
<
String
>
iterator
=
set
.
iterator
();
while
(
iterator
.
hasNext
()){
String
str
=
iterator
.
next
();
//System.out.println("key="+str);
String
jsonStr
=
redisTemplate
.
opsForValue
().
get
(
str
);
//System.out.println("jsonStr="+jsonStr);
jsonStr
=
jsonStr
.
replaceAll
(
"\\\\"
,
""
);
if
(
jsonStr
.
startsWith
(
"\""
)){
jsonStr
=
jsonStr
.
substring
(
1
,
jsonStr
.
length
());
}
if
(
jsonStr
.
endsWith
(
"\""
)){
jsonStr
=
jsonStr
.
substring
(
0
,
jsonStr
.
length
()-
1
);
}
//System.out.println("jsonStr="+jsonStr);
SysDictitem
sysDictitem
=
JSON
.
parseObject
(
jsonStr
,
SysDictitem
.
class
);
ZTreeNode
node
=
new
ZTreeNode
();
node
=
parseSysDictitemToNode
(
node
,
sysDictitem
);
if
(
node
.
getpId
()==
null
||
""
.
equals
(
node
.
getpId
())||
node
.
isIsParent
()){
node
.
setState
(
"closed"
);
//显示文件夹图标
}
else
{
node
.
setState
(
null
);
//显示叶子图标
}
if
(
"magl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj1
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"gmfnetgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj2
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"dqcgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj3
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"sqgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj4
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"shgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj5
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"segl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj6
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"kqyxlthaj"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj7
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"wwajgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj8
())){
ztreeNodes
.
add
(
node
);
}
}
else
if
(
"shcegl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
node
.
getYycj9
())){
//涉黑扫恶中案件类别只显示yycj9=shcegl
ztreeNodes
.
add
(
node
);
}
}
else
{
ztreeNodes
.
add
(
node
);
}
}
if
(
null
!=
xzxtRestResult
.
getData
()){
List
<
SysDictitem
>
sysDictitemList
=
(
List
<
SysDictitem
>)
xzxtRestResult
.
getData
();
if
(
CollectionUtils
.
isNotEmpty
(
sysDictitemList
)){
for
(
SysDictitem
sysDictitem:
sysDictitemList
){
ZTreeNode
zTreeNode
=
new
ZTreeNode
();
zTreeNode
.
setIds
(
sysDictitem
.
getId
());
zTreeNode
.
setCodeType
(
sysDictitem
.
getGroupid
());
zTreeNode
.
setName
(
sysDictitem
.
getName
());
zTreeNode
.
setText
(
sysDictitem
.
getName
());
zTreeNode
.
setId
(
sysDictitem
.
getCode
());
zTreeNode
.
setpId
(
sysDictitem
.
getPid
());
if
(
sysDictitem
.
getPid
()==
null
||
""
.
equals
(
sysDictitem
.
getPid
())||
sysDictitem
.
getIsparent
().
equals
(
"true"
)){
zTreeNode
.
setState
(
"closed"
);
//显示文件夹图标
}
else
{
zTreeNode
.
setState
(
null
);
//显示叶子图标
}
return
ztreeNodes
;
}
@Override
public
List
<
ZTreeNode
>
getZtreeNodeByName
(
String
code_type
,
String
id
,
String
yycj
,
String
unitcode
,
String
name
)
{
List
<
ZTreeNode
>
ztreeNodes
=
new
ArrayList
<
ZTreeNode
>();
PropertiesUtils
propertiesUtil
=
new
PropertiesUtils
(
"config.properties"
);
String
ssdw
=
propertiesUtil
.
getValue
(
"ssdw"
);
//所属单位
if
(
null
!=
ssdw
&&
!
""
.
equals
(
ssdw
)
&&
ssdw
.
length
()
>=
2
)
{
ssdw
=
ssdw
.
substring
(
0
,
2
);
}
//获取符合条件的key
String
keys
=
ssdw
+
":"
+
code_type
+
":*:*:*:*"
+
name
+
"*"
;
//String keys = "" + ssdw + ":" + code_type + ":*:*:*"+name+"*:*";
Set
<
String
>
set
=
redisTemplate
.
keys
(
keys
);
Iterator
<
String
>
iterator
=
set
.
iterator
();
while
(
iterator
.
hasNext
())
{
String
str
=
iterator
.
next
();
String
jsonStr
=
redisTemplate
.
opsForValue
().
get
(
str
);
jsonStr
=
jsonStr
.
replaceAll
(
"\\\\"
,
""
);
if
(
jsonStr
.
startsWith
(
"\""
)){
jsonStr
=
jsonStr
.
substring
(
1
,
jsonStr
.
length
());
}
if
(
jsonStr
.
endsWith
(
"\""
)){
jsonStr
=
jsonStr
.
substring
(
0
,
jsonStr
.
length
()-
1
);
}
SysDictitem
sysDictitem
=
JSON
.
parseObject
(
jsonStr
,
SysDictitem
.
class
);
ZTreeNode
node
=
new
ZTreeNode
();
node
=
parseSysDictitemToNode
(
node
,
sysDictitem
);
if
(
"CODE_AJLB"
.
equals
(
code_type
))
{
if
(
null
!=
yycj
&&
!
""
.
equals
(
yycj
))
{
if
(
"magl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj1
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj1
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"gmfnetgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj2
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj2
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"dqcgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj3
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj3
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"sqgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj4
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj4
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"shgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj5
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj5
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"segl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj6
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj6
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"kqyxlthaj"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj7
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj7
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"wwajgl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj8
())){
ztreeNodes
.
add
(
zTreeN
ode
);
if
(
yycj
.
equals
(
node
.
getYycj8
())){
ztreeNodes
.
add
(
n
ode
);
}
}
else
if
(
"shcegl"
.
equals
(
yycj
)){
if
(
yycj
.
equals
(
sysDictitem
.
getYycj9
())){
//涉黑扫恶中案件类别只显示yycj9=shcegl
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
}
}
return
ztreeNodes
;
}
public
List
<
ZTreeNode
>
getZtreeNodeByName
(
String
code_type
,
String
id
,
String
yycj
,
String
unitcode
,
String
name
)
{
List
<
ZTreeNode
>
ztreeNodes
=
new
ArrayList
<
ZTreeNode
>();
PropertiesUtils
propertiesUtil
=
new
PropertiesUtils
(
"config.properties"
);
String
ssdw
=
propertiesUtil
.
getValue
(
"ssdw"
);
//所属单位
String
redisUrl
=
propertiesUtil
.
getValue
(
"redis.url"
);
//redis服务地址
if
(
null
!=
ssdw
&&
!
""
.
equals
(
ssdw
)
&&
ssdw
.
length
()
>=
2
)
{
ssdw
=
ssdw
.
substring
(
0
,
2
);
}
//获取符合条件的key
String
key
=
ssdw
+
":"
+
code_type
+
":*:*:*:*"
+
name
+
"*"
;
if
(
"CODE_UNIT"
.
equals
(
code_type
)){
if
(
null
!=
unitcode
&&
!
""
.
equals
(
unitcode
)){
//单位代码
key
=
ssdw
+
":"
+
code_type
+
":*:"
+
unitcode
+
"*:*:*"
+
name
+
"*"
;
}
}
XzxtRestResult
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
key
,
redisUrl
);
if
(
null
==
xzxtRestResult
.
getData
()){
RedisUtil
.
UpdateRedisRest
(
ssdw
,
code_type
,
redisUrl
);
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
key
,
redisUrl
);
}
if
(
null
!=
xzxtRestResult
.
getData
())
{
List
<
SysDictitem
>
sysDictitemList
=
(
List
<
SysDictitem
>)
xzxtRestResult
.
getData
();
if
(
CollectionUtils
.
isNotEmpty
(
sysDictitemList
))
{
for
(
SysDictitem
sysDictitem
:
sysDictitemList
)
{
ZTreeNode
zTreeNode
=
new
ZTreeNode
();
zTreeNode
.
setIds
(
sysDictitem
.
getId
());
zTreeNode
.
setCodeType
(
sysDictitem
.
getGroupid
());
zTreeNode
.
setName
(
sysDictitem
.
getName
());
zTreeNode
.
setText
(
sysDictitem
.
getName
());
zTreeNode
.
setId
(
sysDictitem
.
getCode
());
zTreeNode
.
setpId
(
sysDictitem
.
getPid
());
if
(
sysDictitem
.
getPid
()
==
null
||
""
.
equals
(
sysDictitem
.
getPid
())
||
sysDictitem
.
getIsparent
().
equals
(
"true"
))
{
zTreeNode
.
setState
(
"closed"
);
//显示文件夹图标
}
else
{
zTreeNode
.
setState
(
null
);
//显示叶子图标
}
if
(
"CODE_AJLB"
.
equals
(
code_type
))
{
if
(
"magl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj1
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"gmfnetgl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj2
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"dqcgl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj3
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"sqgl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj4
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"shgl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj5
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"segl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj6
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"kqyxlthaj"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj7
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"wwajgl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj8
()))
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
if
(
"shcegl"
.
equals
(
yycj
))
{
if
(
yycj
.
equals
(
sysDictitem
.
getYycj9
()))
{
//涉黑扫恶中案件类别只显示yycj9=shcegl
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
{
ztreeNodes
.
add
(
zTreeNode
);
if
(
yycj
.
equals
(
node
.
getYycj9
())){
//涉黑扫恶中案件类别只显示yycj9=shcegl
ztreeNodes
.
add
(
node
);
}
}
else
{
ztreeNodes
.
add
(
zTreeNode
);
}
}
else
{
ztreeNodes
.
add
(
node
);
}
}
else
{
ztreeNodes
.
add
(
node
);
}
}
return
getTreeJsonDataByName
(
ztreeNodes
,
id
);
...
...
@@ -325,5 +314,28 @@ public class IDicItemServiceImpl implements IDicItemService {
List
<
SysDictitem
>
dicItems
=
dicItemDao
.
getAllZzjgxx
(
filterMap
);
return
dicItems
;
}
private
ZTreeNode
parseSysDictitemToNode
(
ZTreeNode
node
,
SysDictitem
sysDictitem
){
node
.
setIds
(
sysDictitem
.
getId
());
node
.
setCodeType
(
sysDictitem
.
getGroupid
());
node
.
setName
(
sysDictitem
.
getName
());
node
.
setText
(
sysDictitem
.
getName
());
node
.
setId
(
sysDictitem
.
getCode
());
node
.
setpId
(
sysDictitem
.
getPid
());
node
.
setDescription
(
sysDictitem
.
getDescription
());
node
.
setEndcode
(
sysDictitem
.
getEndcode
());
//System.out.println(sysDictitem.getName()+":"+sysDictitem.getIsparent());
node
.
setParentFlag
(
sysDictitem
.
getIsparent
());
node
.
setStartcode
(
sysDictitem
.
getStartcode
());
node
.
setYycj1
(
sysDictitem
.
getYycj1
());
node
.
setYycj2
(
sysDictitem
.
getYycj2
());
node
.
setYycj3
(
sysDictitem
.
getYycj3
());
node
.
setYycj4
(
sysDictitem
.
getYycj4
());
node
.
setYycj5
(
sysDictitem
.
getYycj5
());
node
.
setYycj6
(
sysDictitem
.
getYycj6
());
node
.
setYycj7
(
sysDictitem
.
getYycj7
());
node
.
setYycj8
(
sysDictitem
.
getYycj8
());
node
.
setYycj9
(
sysDictitem
.
getYycj9
());
return
node
;
}
}
\ No newline at end of file
src/main/resources/config.properties
View file @
43ff8c6b
...
...
@@ -46,7 +46,7 @@ connectTimeout=30000
#\u8bfb\u53d6\u6570\u636e\u8d85\u65f6\u65f6\u95f4
readTimeout
=
30000
#所属单位
ssdw
=
1
50000000000
ssdw
=
6
50000000000
#默认首页进三员或者工作桌面 1、三员 2、工作桌面
indexFlag
=
2
#关系挖掘服务url
...
...
@@ -56,14 +56,13 @@ JlJmkey=8b67946e
#山西刑事技术平台比中详情页面
xsjsAddress
=
http://10.94.65.15:8081/xjpt/pages/business/sys/viewEntity.action?functionType=20&tableName
#redis config
#redis.host=127.0.0.1
#redis.port=6379
#redis.pass=
#redis.maxIdle=300
#redis.maxActive=600
#redis.maxWait=1000
#redis.testOnBorrow=true
redis.url
=
http://127.0.0.1:9043/xzxt-rest
redis.host
=
127.0.0.1
redis.port
=
6379
redis.pass
=
redis.maxIdle
=
300
redis.maxActive
=
600
redis.maxWait
=
1000
redis.testOnBorrow
=
true
zhyyPath
=
http://zhyy.xzxt.nm:7001
main.url
=
http://www.xzxt.nm
caiji.url
=
http://anjian.xzxt.nm:9022
...
...
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