Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-api-report
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-api-report
Commits
16e63da4
Commit
16e63da4
authored
May 19, 2022
by
liulianglang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加在逃es查询条件
parent
c02c2b68
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
109 additions
and
12 deletions
+109
-12
src/main/java/com/founder/model/ZtryParam.java
+31
-10
src/main/java/com/founder/service/impl/ZtryServiceImpl.java
+78
-2
No files found.
src/main/java/com/founder/model/ZtryParam.java
View file @
16e63da4
...
@@ -202,11 +202,32 @@ public class ZtryParam extends BaseModel {
...
@@ -202,11 +202,32 @@ public class ZtryParam extends BaseModel {
private
Date
zhrq
;
//抓获日期
private
Date
zhrq
;
//抓获日期
private
String
zhrqStart
;
public
String
getZhrqStart
()
{
return
zhrqStart
;
}
public
void
setZhrqStart
(
String
zhrqStart
)
{
this
.
zhrqStart
=
zhrqStart
;
}
public
String
getZhrqEnd
()
{
return
zhrqEnd
;
}
public
void
setZhrqEnd
(
String
zhrqEnd
)
{
this
.
zhrqEnd
=
zhrqEnd
;
}
private
String
zhrqEnd
;
private
String
zhdd_xzqhdm
;
//抓获地点_行政区划代码
private
String
zhdd_xzqhdm
;
//抓获地点_行政区划代码
private
String
zhdd_dzmc
;
//抓获地点_地址名称
private
String
zhdd_dzmc
;
//抓获地点_地址名称
private
String
zhdw
_g
ajgjgdm
;
//抓获单位_公安机关机构代码
private
String
zhdw
G
ajgjgdm
;
//抓获单位_公安机关机构代码
private
String
zhdw_gajgmc
;
//抓获单位_公安机关名称
private
String
zhdw_gajgmc
;
//抓获单位_公安机关名称
...
@@ -220,7 +241,7 @@ public class ZtryParam extends BaseModel {
...
@@ -220,7 +241,7 @@ public class ZtryParam extends BaseModel {
private
Date
cxsj
;
//撤销时间
private
Date
cxsj
;
//撤销时间
private
String
djspdw
_g
ajgjgdm
;
//登记审批单位_公安机关机构代码
private
String
djspdw
G
ajgjgdm
;
//登记审批单位_公安机关机构代码
private
String
djspdw_gajgmc
;
//登记审批单位_公安机关名称
private
String
djspdw_gajgmc
;
//登记审批单位_公安机关名称
...
@@ -1143,12 +1164,12 @@ public class ZtryParam extends BaseModel {
...
@@ -1143,12 +1164,12 @@ public class ZtryParam extends BaseModel {
this
.
zhdd_dzmc
=
zhdd_dzmc
;
this
.
zhdd_dzmc
=
zhdd_dzmc
;
}
}
public
String
getZhdw
_g
ajgjgdm
()
{
public
String
getZhdw
G
ajgjgdm
()
{
return
zhdw
_g
ajgjgdm
;
return
zhdw
G
ajgjgdm
;
}
}
public
void
setZhdw
_gajgjgdm
(
String
zhdw_g
ajgjgdm
)
{
public
void
setZhdw
Gajgjgdm
(
String
zhdwG
ajgjgdm
)
{
this
.
zhdw
_gajgjgdm
=
zhdw_g
ajgjgdm
;
this
.
zhdw
Gajgjgdm
=
zhdwG
ajgjgdm
;
}
}
public
String
getZhdw_gajgmc
()
{
public
String
getZhdw_gajgmc
()
{
...
@@ -1199,12 +1220,12 @@ public class ZtryParam extends BaseModel {
...
@@ -1199,12 +1220,12 @@ public class ZtryParam extends BaseModel {
this
.
cxsj
=
cxsj
;
this
.
cxsj
=
cxsj
;
}
}
public
String
getDjspdw
_g
ajgjgdm
()
{
public
String
getDjspdw
G
ajgjgdm
()
{
return
djspdw
_g
ajgjgdm
;
return
djspdw
G
ajgjgdm
;
}
}
public
void
setDjspdw
_gajgjgdm
(
String
djspdw_g
ajgjgdm
)
{
public
void
setDjspdw
Gajgjgdm
(
String
djspdwG
ajgjgdm
)
{
this
.
djspdw
_gajgjgdm
=
djspdw_g
ajgjgdm
;
this
.
djspdw
Gajgjgdm
=
djspdwG
ajgjgdm
;
}
}
public
String
getDjspdw_gajgmc
()
{
public
String
getDjspdw_gajgmc
()
{
...
...
src/main/java/com/founder/service/impl/ZtryServiceImpl.java
View file @
16e63da4
...
@@ -23,6 +23,9 @@ import javax.annotation.Resource;
...
@@ -23,6 +23,9 @@ import javax.annotation.Resource;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
org
.
elasticsearch
.
search
.
sort
.
SortOrder
.
ASC
;
import
static
org
.
elasticsearch
.
search
.
sort
.
SortOrder
.
DESC
;
@Service
@Service
public
class
ZtryServiceImpl
implements
ZtryService
{
public
class
ZtryServiceImpl
implements
ZtryService
{
@Resource
@Resource
...
@@ -34,7 +37,7 @@ public class ZtryServiceImpl implements ZtryService {
...
@@ -34,7 +37,7 @@ public class ZtryServiceImpl implements ZtryService {
// bqXyr.must(termQueryBuilderXxsc);
// bqXyr.must(termQueryBuilderXxsc);
//姓名
//姓名
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getXm
()))
{
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getXm
()))
{
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"xm"
,
"*"
+
ztry
.
getXm
()
+
"*"
);
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"xm
.keyword
"
,
"*"
+
ztry
.
getXm
()
+
"*"
);
bqXyr
.
must
(
wildcardQueryBuilder
);
bqXyr
.
must
(
wildcardQueryBuilder
);
}
}
//人员编号
//人员编号
...
@@ -71,6 +74,7 @@ public class ZtryServiceImpl implements ZtryService {
...
@@ -71,6 +74,7 @@ public class ZtryServiceImpl implements ZtryService {
}
}
//上网时间
//上网时间
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getXxrbksjStart
())
&&
StringUtils
.
isNotEmpty
(
ztry
.
getXxrbksjEnd
()))
{
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getXxrbksjStart
())
&&
StringUtils
.
isNotEmpty
(
ztry
.
getXxrbksjEnd
()))
{
RangeQueryBuilder
rangeQueryBuilder
=
QueryBuilders
.
rangeQuery
(
"xxrbksjRqsj.keyword"
).
gte
(
ztry
.
getXxrbksjStart
()).
lte
(
ztry
.
getXxrbksjEnd
());
RangeQueryBuilder
rangeQueryBuilder
=
QueryBuilders
.
rangeQuery
(
"xxrbksjRqsj.keyword"
).
gte
(
ztry
.
getXxrbksjStart
()).
lte
(
ztry
.
getXxrbksjEnd
());
bqXyr
.
must
(
rangeQueryBuilder
);
bqXyr
.
must
(
rangeQueryBuilder
);
...
@@ -98,6 +102,20 @@ public class ZtryServiceImpl implements ZtryService {
...
@@ -98,6 +102,20 @@ public class ZtryServiceImpl implements ZtryService {
bqXyr
.
must
(
rangeQueryBuilder
);
bqXyr
.
must
(
rangeQueryBuilder
);
}
}
}
}
//抓获日期
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getZhrqStart
())
&&
StringUtils
.
isNotEmpty
(
ztry
.
getZhrqEnd
()))
{
RangeQueryBuilder
rangeQueryBuilder
=
QueryBuilders
.
rangeQuery
(
"zhrqStr.keyword"
).
gte
(
ztry
.
getZhrqStart
()).
lte
(
ztry
.
getZhrqEnd
());
bqXyr
.
must
(
rangeQueryBuilder
);
}
else
{
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getZhrqStart
()))
{
RangeQueryBuilder
rangeQueryBuilder
=
QueryBuilders
.
rangeQuery
(
"zhrqStr.keyword"
).
gte
(
ztry
.
getZhrqStart
());
bqXyr
.
must
(
rangeQueryBuilder
);
}
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getZhrqEnd
()))
{
RangeQueryBuilder
rangeQueryBuilder
=
QueryBuilders
.
rangeQuery
(
"zhrqStr.keyword"
).
lte
(
ztry
.
getZhrqEnd
());
bqXyr
.
must
(
rangeQueryBuilder
);
}
}
//立案单位
//立案单位
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getLadwGajgjgdm
()))
{
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getLadwGajgjgdm
()))
{
String
unitcode
=
ztry
.
getLadwGajgjgdm
();
String
unitcode
=
ztry
.
getLadwGajgjgdm
();
...
@@ -115,6 +133,40 @@ public class ZtryServiceImpl implements ZtryService {
...
@@ -115,6 +133,40 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"ladwGajgjgdm"
,
unitcode
+
"*"
);
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"ladwGajgjgdm"
,
unitcode
+
"*"
);
bqXyr
.
must
(
wildcardQueryBuilder
);
bqXyr
.
must
(
wildcardQueryBuilder
);
}
}
//抓获单位
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getZhdwGajgjgdm
()))
{
String
unitcode
=
ztry
.
getZhdwGajgjgdm
();
if
(
unitcode
.
endsWith
(
"0000000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
2
);
}
// 市局
else
if
(
unitcode
.
endsWith
(
"00000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
4
);
}
// 分局
else
if
(
unitcode
.
endsWith
(
"000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
6
);
}
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"zhdwGajgjgdm"
,
unitcode
+
"*"
);
bqXyr
.
must
(
wildcardQueryBuilder
);
}
//上网单位
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getDjspdwGajgjgdm
()))
{
String
unitcode
=
ztry
.
getDjspdwGajgjgdm
();
if
(
unitcode
.
endsWith
(
"0000000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
2
);
}
// 市局
else
if
(
unitcode
.
endsWith
(
"00000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
4
);
}
// 分局
else
if
(
unitcode
.
endsWith
(
"000000"
))
{
unitcode
=
unitcode
.
substring
(
0
,
6
);
}
WildcardQueryBuilder
wildcardQueryBuilder
=
QueryBuilders
.
wildcardQuery
(
"djspdwGajgjgdm"
,
unitcode
+
"*"
);
bqXyr
.
must
(
wildcardQueryBuilder
);
}
// 案件类别代码模糊查询
// 案件类别代码模糊查询
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getAjlbdm
()))
{
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getAjlbdm
()))
{
// 根据规则截取前三位
// 根据规则截取前三位
...
@@ -192,7 +244,31 @@ public class ZtryServiceImpl implements ZtryService {
...
@@ -192,7 +244,31 @@ public class ZtryServiceImpl implements ZtryService {
int
limit
=
ztry
.
getLimit
();
int
limit
=
ztry
.
getLimit
();
int
begin
=
(
page
-
1
)
*
limit
;
int
begin
=
(
page
-
1
)
*
limit
;
searchSourceBuilder
.
query
(
boolQueryBuilder
).
from
(
begin
).
size
(
limit
).
trackTotalHits
(
true
);
// searchSourceBuilder.query(boolQueryBuilder).from(begin).size(limit).sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
searchSourceBuilder
.
query
(
boolQueryBuilder
).
from
(
begin
).
size
(
limit
);
if
(
StringUtils
.
isNotEmpty
(
ztry
.
getPaixu
())){
if
(
"1"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"larq.keyword"
,
ASC
).
trackTotalHits
(
true
);
}
else
if
(
"2"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"larq.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
else
if
(
"3"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"xxrbksjRqsj.keyword"
,
ASC
).
trackTotalHits
(
true
);
}
else
if
(
"4"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"xxrbksjRqsj.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
else
if
(
"5"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"tpsj.keyword"
,
ASC
).
trackTotalHits
(
true
);
}
else
if
(
"6"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"tpsj.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
else
if
(
"7"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"zhrqStr.keyword"
,
ASC
).
trackTotalHits
(
true
);
}
else
if
(
"8"
.
equals
(
ztry
.
getPaixu
())){
searchSourceBuilder
.
sort
(
"zhrqStr.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
else
{
searchSourceBuilder
.
sort
(
"xxrbksjRqsj.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
}
else
{
searchSourceBuilder
.
sort
(
"xxrbksjRqsj.keyword"
,
DESC
).
trackTotalHits
(
true
);
}
searchRequest
.
source
(
searchSourceBuilder
);
searchRequest
.
source
(
searchSourceBuilder
);
try
{
try
{
SearchResponse
searchResponse
=
restHighLevelClient
.
search
(
searchRequest
,
RequestOptions
.
DEFAULT
);
SearchResponse
searchResponse
=
restHighLevelClient
.
search
(
searchRequest
,
RequestOptions
.
DEFAULT
);
...
...
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