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
4cab7db0
Commit
4cab7db0
authored
Jan 23, 2019
by
wangxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
排序修改
parent
616108d5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
37 deletions
+58
-37
src/main/java/com/cc/controller/SolrController.java
+11
-3
src/main/java/com/cc/service/impl/SolrServiceImpl.java
+39
-29
src/main/webapp/wzmstcx.jsp
+8
-5
No files found.
src/main/java/com/cc/controller/SolrController.java
View file @
4cab7db0
...
...
@@ -8231,6 +8231,14 @@ public class SolrController {
wzmstQ
+=
" AND WZMST_STWZCDDM:"
+
asjRyRelateVO
.
getWzmst_stwzcddm
();
}
}
//尸体完整程度名称
if
(
null
!=
asjRyRelateVO
.
getWzmst_stwzcdmc
()&&
!
""
.
equals
(
asjRyRelateVO
.
getWzmst_stwzcdmc
())){
if
(
"null"
.
equals
(
asjRyRelateVO
.
getWzmst_stwzcdmc
())){
wzmstQ
+=
" AND -WZMST_STWZCDMC:*"
;
}
else
{
wzmstQ
+=
" AND WZMST_STWZCDMC:"
+
asjRyRelateVO
.
getWzmst_stwzcdmc
();
}
}
//尸体部位
if
(
null
!=
asjRyRelateVO
.
getWzmst_rtbw_dmbcms
()&&
!
""
.
equals
(
asjRyRelateVO
.
getWzmst_rtbw_dmbcms
())){
if
(
"null"
.
equals
(
asjRyRelateVO
.
getWzmst_rtbw_dmbcms
())){
...
...
@@ -8434,7 +8442,7 @@ public class SolrController {
}
//发现案事件地点
if
(
null
!=
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
())){
jsasjQ
+=
" AND
JSASJ_
FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
jsasjQ
+=
" AND FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
}
//受理单位
if
(
null
!=
asjRyRelateVO
.
getSldw_gajgjgdm
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSldw_gajgjgdm
())){
...
...
@@ -8921,7 +8929,7 @@ public class SolrController {
}
//接受案事件发现案事件地点地址名称
if
(
null
!=
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
())){
jsasjQ
+=
" AND
JSASJ_
FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
jsasjQ
+=
" AND FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
}
//受理单位
if
(
null
!=
asjRyRelateVO
.
getSldw_gajgjgdm
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSldw_gajgjgdm
())){
...
...
@@ -10060,7 +10068,7 @@ public class SolrController {
//接受案事件发现案事件地点地址名称
if
(
null
!=
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
())){
jsasjQ
+=
" AND
JSASJ_
FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
jsasjQ
+=
" AND FXASJDD_DZMC:*"
+
asjRyRelateVO
.
getJsasj_fxasjdd_dzmc
()+
"*"
;
}
if
(
null
!=
asjRyRelateVO
.
getAsjfssj_asjfskssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssj_asjfskssj
())){
...
...
src/main/java/com/cc/service/impl/SolrServiceImpl.java
View file @
4cab7db0
...
...
@@ -3242,7 +3242,7 @@ public class SolrServiceImpl implements SolrService {
solrParams
.
add
(
"q"
,
"*:*"
);
solrParams
.
add
(
"start"
,
begin
+
""
);
solrParams
.
add
(
"rows"
,
end
+
""
);
if
(
StringUtils
.
isNotBlank
(
sort
)){
if
(
StringUtils
.
isNotBlank
(
sort
)
&&
sort
.
equals
(
"DJSJ_DESC"
)
){
solrParams
.
add
(
"sort"
,
sort
.
toUpperCase
()+
" "
+
order
);
}
else
{
if
(
StringUtils
.
isNotBlank
(
order
)){
...
...
@@ -3304,7 +3304,15 @@ public class SolrServiceImpl implements SolrService {
if
(
arr
[
i
].
indexOf
(
"JSASJ_"
)==
0
){
//页面上未知名尸体的分类过滤掉,只查案件的分类
continue
;
}
String
groupid
=
arr
[
i
];
String
groupid
=
arr
[
i
];
if
(
arr
[
i
].
indexOf
(
"WZMST_XXDJDW_GAJGJGDM"
)==
0
){
groupid
=
arr
[
i
].
replaceFirst
(
"WZMST_"
,
""
);
}
if
(
arr
[
i
].
indexOf
(
"WZMST_DJSJ"
)==
0
){
groupid
=
arr
[
i
].
replaceFirst
(
"WZMST_"
,
""
);
}
Map
<
String
,
Object
>
total
=
new
HashedMap
();
if
(
groupid
.
indexOf
(
"GAJGJGDM_SECOND"
)!=-
1
)
{
String
gajgjgdm
=
""
;
...
...
@@ -5755,7 +5763,7 @@ public class SolrServiceImpl implements SolrService {
solrParams
.
add
(
"q"
,
"*:*"
);
solrParams
.
add
(
"start"
,
begin
+
""
);
solrParams
.
add
(
"rows"
,
end
+
""
);
if
(
StringUtils
.
isNotBlank
(
sort
)){
if
(
StringUtils
.
isNotBlank
(
sort
)
&&
sort
.
equals
(
"ASJFSSJ_ASJFSKSSJ"
)
){
solrParams
.
add
(
"sort"
,
sort
.
toUpperCase
()+
" "
+
order
);
}
else
{
if
(
StringUtils
.
isNotBlank
(
order
)){
...
...
@@ -5796,10 +5804,11 @@ public class SolrServiceImpl implements SolrService {
for
(
SolrDocument
solrDocument
:
results
)
{
Map
<
String
,
Object
>
mapResult
=
new
HashMap
<
String
,
Object
>();
mapResult
.
put
(
"jsasj_jyaq"
,
solrDocument
.
get
(
"JSASJ_JYAQ"
));
mapResult
.
put
(
"jsasj_fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"jsasj_asjfsdd_xzqhdm"
,
solrDocument
.
get
(
"ASJFSDD_XZQHDM"
));
mapResult
.
put
(
"jsasj_asjfsdd_dzmc"
,
solrDocument
.
get
(
"ASJFSDD_DZMC"
));
mapResult
.
put
(
"jsasj_fxasjdd_dzmc"
,
solrDocument
.
get
(
"JSASJ_FXASJDD_DZMC"
));
mapResult
.
put
(
"asjbh"
,
solrDocument
.
get
(
"ASJBH"
));
mapResult
.
put
(
"fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"asjfsdd_xzqhdm"
,
solrDocument
.
get
(
"ASJFSDD_XZQHDM"
));
mapResult
.
put
(
"asjfsdd_dzmc"
,
solrDocument
.
get
(
"ASJFSDD_DZMC"
));
mapResult
.
put
(
"fxasjdd_dzmc"
,
solrDocument
.
get
(
"FXASJDD_DZMC"
));
String
jsasjAsjfssjAsjfskssj
=
(
String
)
solrDocument
.
get
(
"ASJFSSJ_ASJFSJSSJ"
);
if
(
null
!=
jsasjAsjfssjAsjfskssj
&&
!
""
.
equals
(
jsasjAsjfssjAsjfskssj
)){
if
(
jsasjAsjfssjAsjfskssj
.
length
()
>
19
){
...
...
@@ -5821,14 +5830,14 @@ public class SolrServiceImpl implements SolrService {
mapResult
.
put
(
"zuzdw_xbr_xm1"
,
solrDocument
.
get
(
"ZUZDW_XBR_XM1"
));
mapResult
.
put
(
"zuzdw_gajgmc"
,
solrDocument
.
get
(
"ZUZDW_GAJGMC"
));
mapResult
.
put
(
"xxdjdw_gajgmc"
,
solrDocument
.
get
(
"XXDJDW_GAJGMC"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj_year"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_YEAR"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj_month"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_MONTH"
));
mapResult
.
put
(
"
jsasj_asjfssj_asjfskssj_month
"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_DATE"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm_province"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_PROVINCE"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm_city"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_CITY"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"asjfssj_asjfskssj"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ"
));
mapResult
.
put
(
"asjfssj_asjfskssj_year"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_YEAR"
));
mapResult
.
put
(
"asjfssj_asjfskssj_month"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_MONTH"
));
mapResult
.
put
(
"
asjfssj_asjfskssj_date
"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_DATE"
));
mapResult
.
put
(
"fxasjdd_xzqhdm"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM"
));
mapResult
.
put
(
"fxasjdd_xzqhdm_province"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_PROVINCE"
));
mapResult
.
put
(
"fxasjdd_xzqhdm_city"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_CITY"
));
mapResult
.
put
(
"fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
// 输出高亮
Map
<
String
,
List
<
String
>>
map
=
highlighting
.
get
(
solrDocument
.
get
(
"ID"
));
List
<
String
>
list
=
map
.
get
(
"keywords"
);
...
...
@@ -6421,24 +6430,25 @@ public class SolrServiceImpl implements SolrService {
if
(
solrDocument
!=
null
){
Map
<
String
,
Object
>
mapResult
=
new
HashMap
<
String
,
Object
>();
mapResult
.
put
(
"jsasj_jyaq"
,
solrDocument
.
get
(
"JSASJ_JYAQ"
));
mapResult
.
put
(
"jsasj_fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"jsasj_asjfsdd_xzqhdm"
,
solrDocument
.
get
(
"ASJFSDD_XZQHDM"
));
mapResult
.
put
(
"jsasj_asjfsdd_dzmc"
,
solrDocument
.
get
(
"ASJFSDD_DZMC"
));
mapResult
.
put
(
"jsasj_fxasjdd_dzmc"
,
solrDocument
.
get
(
"JSASJ_FXASJDD_DZMC"
));
mapResult
.
put
(
"asjbh"
,
solrDocument
.
get
(
"ASJBH"
));
mapResult
.
put
(
"fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"asjfsdd_xzqhdm"
,
solrDocument
.
get
(
"ASJFSDD_XZQHDM"
));
mapResult
.
put
(
"asjfsdd_dzmc"
,
solrDocument
.
get
(
"ASJFSDD_DZMC"
));
mapResult
.
put
(
"fxasjdd_dzmc"
,
solrDocument
.
get
(
"FXASJDD_DZMC"
));
String
jsasjAsjfssjAsjfskssj
=
(
String
)
solrDocument
.
get
(
"ASJFSSJ_ASJFSJSSJ"
);
if
(
null
!=
jsasjAsjfssjAsjfskssj
&&
!
""
.
equals
(
jsasjAsjfssjAsjfskssj
)){
if
(
jsasjAsjfssjAsjfskssj
.
length
()
>
19
){
jsasjAsjfssjAsjfskssj
=
(
String
)
jsasjAsjfssjAsjfskssj
.
subSequence
(
0
,
19
);
}
}
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj"
,
jsasjAsjfssjAsjfskssj
);
mapResult
.
put
(
"asjfssj_asjfskssj"
,
jsasjAsjfssjAsjfskssj
);
String
jsasjAsjfssjAsjfsjssj
=
(
String
)
solrDocument
.
get
(
"ASJFSSJ_ASJFSJSSJ"
);
if
(
null
!=
jsasjAsjfssjAsjfsjssj
&&
!
""
.
equals
(
jsasjAsjfssjAsjfsjssj
)){
if
(
jsasjAsjfssjAsjfsjssj
.
length
()
>
19
){
jsasjAsjfssjAsjfsjssj
=
(
String
)
jsasjAsjfssjAsjfsjssj
.
subSequence
(
0
,
19
);
}
}
mapResult
.
put
(
"
JSASJ_
ASJFSSJ_ASJFSJSSJ"
,
jsasjAsjfssjAsjfsjssj
);
mapResult
.
put
(
"ASJFSSJ_ASJFSJSSJ"
,
jsasjAsjfssjAsjfsjssj
);
mapResult
.
put
(
"slsj"
,
solrDocument
.
get
(
"SLSJ"
));
mapResult
.
put
(
"zzdwfzrXm"
,
solrDocument
.
get
(
"ZZDWFZR_XM"
));
mapResult
.
put
(
"zzdwfzr_xm"
,
solrDocument
.
get
(
"ZZDWFZR_XM"
));
...
...
@@ -6446,14 +6456,14 @@ public class SolrServiceImpl implements SolrService {
mapResult
.
put
(
"zuzdw_xbr_xm1"
,
solrDocument
.
get
(
"ZUZDW_XBR_XM1"
));
mapResult
.
put
(
"zuzdw_gajgmc"
,
solrDocument
.
get
(
"ZUZDW_GAJGMC"
));
mapResult
.
put
(
"xxdjdw_gajgmc"
,
solrDocument
.
get
(
"XXDJDW_GAJGMC"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj_year"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_YEAR"
));
mapResult
.
put
(
"
jsasj_
asjfssj_asjfskssj_month"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_MONTH"
));
mapResult
.
put
(
"
jsasj_asjfssj_asjfskssj_month
"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_DATE"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm_province"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_PROVINCE"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhdm_city"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_CITY"
));
mapResult
.
put
(
"
jsasj_
fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
mapResult
.
put
(
"asjfssj_asjfskssj"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ"
));
mapResult
.
put
(
"asjfssj_asjfskssj_year"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_YEAR"
));
mapResult
.
put
(
"asjfssj_asjfskssj_month"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_MONTH"
));
mapResult
.
put
(
"
asjfssj_asjfskssj_date
"
,
solrDocument
.
get
(
"ASJFSSJ_ASJFSKSSJ_DATE"
));
mapResult
.
put
(
"fxasjdd_xzqhdm"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM"
));
mapResult
.
put
(
"fxasjdd_xzqhdm_province"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_PROVINCE"
));
mapResult
.
put
(
"fxasjdd_xzqhdm_city"
,
solrDocument
.
get
(
"FXASJDD_XZQHDM_CITY"
));
mapResult
.
put
(
"fxasjdd_xzqhmc"
,
solrDocument
.
get
(
"FXASJDD_XZQHMC"
));
xyrxxList
.
add
(
mapResult
);
}
}
...
...
src/main/webapp/wzmstcx.jsp
View file @
4cab7db0
...
...
@@ -852,10 +852,11 @@
var
jsasjcheckConfig
=
{
//案件暂定已选数据
checkList
:
[
{
'1'
:[
'jsasj_fxasjdd_xzqhmc'
,
'发现地区划'
],
'2'
:[
'jsasj_fxasjdd_dzmc'
,
'发现地点名称'
],
'3'
:[
'jsasj_asjfssj_asjfskssj'
,
'发现时间'
],
'4'
:[
'jsasj_jyaq'
,
'简要案情'
]
'1'
:[
'asjbh'
,
'案事件编号'
],
'2'
:[
'asjfssj_asjfskssj'
,
'发现时间'
],
'3'
:[
'fxasjdd_xzqhmc'
,
'发现地区划'
],
'4'
:[
'fxasjdd_dzmc'
,
'发现地点名称'
],
'5'
:[
'jsasj_jyaq'
,
'简要案情'
]
}
]
};
...
...
@@ -943,8 +944,10 @@
{{
for
#
data
}}
<
div
class
=
"currResult"
>
<
p
class
=
"currResultP"
>
<
span
class
=
"navSpan rtitleSpan noLinkSpan"
>
案事件编号:
<
/span
>
<
span
class
=
"navSpan noLinkSpan singleColumns"
>
{{:
asjbh
}}
<
/span
>
<
span
class
=
"navSpan rtitleSpan noLinkSpan"
>
发现地区划:
<
/span
>
<
span
class
=
"navSpan noLinkSpan singleColumns"
>
{{:
jsasj_
fxasjdd_xzqhmc
}}
<
/span
>
<
span
class
=
"navSpan noLinkSpan singleColumns"
>
{{:
fxasjdd_xzqhmc
}}
<
/span
>
<
span
class
=
"navSpan rtitleSpan noLinkSpan"
>
发现地名称:
<
/span
>
<
span
class
=
"navSpan noLinkSpan singleColumns"
>
{{:
jsasj_asjfsdd_dzmc
}}
<
/span
>
<
span
class
=
"navSpan rtitleSpan noLinkSpan"
>
发现时间:
<
/span
>
...
...
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