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
8a68232e
Commit
8a68232e
authored
Oct 17, 2019
by
liu_xiaoxu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兵团分支需求(注销标志加上条件,默认注销标志为0;加破案时间字段;时间的字段加时分秒;登录超时提醒;损失价值模块加一个立案日期)
parent
13ca1414
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
377 additions
and
26 deletions
+377
-26
src/main/java/com/cc/controller/AsjxxController.java
+3
-3
src/main/java/com/cc/controller/RecordController.java
+4
-3
src/main/java/com/cc/controller/SolrController.java
+99
-14
src/main/java/com/cc/model/AsjRyRelateVO.java
+247
-0
src/main/java/com/cc/service/IAsjxxService.java
+1
-1
src/main/java/com/cc/service/impl/AsjxxServiceImpl.java
+3
-1
src/main/java/com/cc/service/impl/SolrServiceImpl.java
+1
-0
src/main/resources/mapper/xzxt/AsjxxSqlMap.xml
+7
-0
src/main/webapp/gdwssjz.jsp
+12
-4
src/main/webapp/rasc.jsp
+0
-0
No files found.
src/main/java/com/cc/controller/AsjxxController.java
View file @
8a68232e
...
@@ -37,7 +37,7 @@ public class AsjxxController {
...
@@ -37,7 +37,7 @@ public class AsjxxController {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
AsjxxController
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
AsjxxController
.
class
);
@RequestMapping
(
value
=
"/ssjzqk"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
})
@RequestMapping
(
value
=
"/ssjzqk"
,
method
=
{
RequestMethod
.
POST
,
RequestMethod
.
GET
})
@ResponseBody
public
List
<
Map
<
String
,
Object
>>
ssjzqk
(
HttpServletRequest
request
,
@RequestParam
(
required
=
false
)
String
asjfskssj
,
@RequestParam
(
required
=
false
)
String
asjfsjssj
,
@RequestParam
(
required
=
false
)
String
gajgdm
,
String
unitcode
,
String
userGrade
)
{
@ResponseBody
public
List
<
Map
<
String
,
Object
>>
ssjzqk
(
HttpServletRequest
request
,
@RequestParam
(
required
=
false
)
String
asjfskssj
,
@RequestParam
(
required
=
false
)
String
asjfsjssj
,
@RequestParam
(
required
=
false
)
String
lasjRqsjKssj
,
@RequestParam
(
required
=
false
)
String
lasjRqsjJssj
,
@RequestParam
(
required
=
false
)
String
gajgdm
,
String
unitcode
,
String
userGrade
)
{
List
<
Map
<
String
,
Object
>>
ssjzqkList
=
new
ArrayList
<
Map
<
String
,
Object
>>();
List
<
Map
<
String
,
Object
>>
ssjzqkList
=
new
ArrayList
<
Map
<
String
,
Object
>>();
String
ladwdm
=
""
;
String
ladwdm
=
""
;
String
myCode
=
""
;
String
myCode
=
""
;
...
@@ -83,7 +83,7 @@ public class AsjxxController {
...
@@ -83,7 +83,7 @@ public class AsjxxController {
}
}
}
}
}
}
Map
<
String
,
Object
>
map
=
asjxxService
.
getSsjzqk
(
ladwdm
,
asjfskssj
,
asjfsjssj
);
Map
<
String
,
Object
>
map
=
asjxxService
.
getSsjzqk
(
ladwdm
,
asjfskssj
,
asjfsjssj
,
lasjRqsjKssj
,
lasjRqsjJssj
);
for
(
int
i
=
0
;
i
<=
dictItemList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<=
dictItemList
.
size
();
i
++)
{
SysDictitem
dictItem
=
null
;
SysDictitem
dictItem
=
null
;
String
code
=
null
;
String
code
=
null
;
...
@@ -119,7 +119,7 @@ public class AsjxxController {
...
@@ -119,7 +119,7 @@ public class AsjxxController {
name
=
"合计"
;
name
=
"合计"
;
code
=
null
;
code
=
null
;
}
else
{
}
else
{
Map
<
String
,
Object
>
map1
=
asjxxService
.
getSsjzqk
(
ladwdm1
,
asjfskssj
,
asjfsjssj
);
Map
<
String
,
Object
>
map1
=
asjxxService
.
getSsjzqk
(
ladwdm1
,
asjfskssj
,
asjfsjssj
,
lasjRqsjKssj
,
lasjRqsjJssj
);
BigDecimal
ssjzrmby
=(
BigDecimal
)
map1
.
get
(
"SSJZRMBY"
);
BigDecimal
ssjzrmby
=(
BigDecimal
)
map1
.
get
(
"SSJZRMBY"
);
BigDecimal
sjcwjzrmby
=(
BigDecimal
)
map1
.
get
(
"SJCWJZRMBY"
);
BigDecimal
sjcwjzrmby
=(
BigDecimal
)
map1
.
get
(
"SJCWJZRMBY"
);
BigDecimal
asjswry_rs
=(
BigDecimal
)
map1
.
get
(
"ASJSWRY_RS"
);
BigDecimal
asjswry_rs
=(
BigDecimal
)
map1
.
get
(
"ASJSWRY_RS"
);
...
...
src/main/java/com/cc/controller/RecordController.java
View file @
8a68232e
...
@@ -34,16 +34,17 @@ public class RecordController {
...
@@ -34,16 +34,17 @@ public class RecordController {
public
Record
queryRybhRecord
(
HttpServletRequest
request
)
{
public
Record
queryRybhRecord
(
HttpServletRequest
request
)
{
User
users
=
(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
User
users
=
(
User
)
request
.
getSession
().
getAttribute
(
"user"
);
Record
record
=
new
Record
();
Record
record
=
new
Record
();
if
(
users
!=
null
)
{
if
(
null
==
recordService
.
queryRybhRecord
(
users
.
getIdentitycard
()))
{
if
(
null
==
recordService
.
queryRybhRecord
(
users
.
getIdentitycard
()))
{
record
.
setUserid
(
users
.
getIdentitycard
());
record
.
setUserid
(
users
.
getIdentitycard
());
record
.
setAj_record
(
"案事件编号:id,案件名称:ajmc,侦查阶段:zcjdmc,业务状态:sjzt,案件类别:ajlbdmmc,案件时间:ajxgsj,立案单位:ladw_gajgmc,简要案情:jyaq"
);
record
.
setAj_record
(
"案事件编号:id,案件名称:ajmc,侦查阶段:zcjdmc,业务状态:sjzt,案件类别:ajlbdmmc,案件时间:ajxgsj,立案单位:ladw_gajgmc,简要案情:jyaq"
);
record
.
setXyr_record
(
"案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,现住地行政区划:xzz_xzqhmc,到案状态:zhfzxyr_fzxyrdaztmc"
);
record
.
setXyr_record
(
"案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,现住地行政区划:xzz_xzqhmc,到案状态:zhfzxyr_fzxyrdaztmc"
);
record
.
setRybh_record
(
"案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,人身侵犯结果:rsqfjgmc,人身伤害程度:rsshcdmc"
);
record
.
setRybh_record
(
"案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,人身侵犯结果:rsqfjgmc,人身伤害程度:rsshcdmc"
);
recordService
.
insertRecord
(
record
);
recordService
.
insertRecord
(
record
);
}
else
{
}
else
{
record
=
recordService
.
queryRybhRecord
(
users
.
getIdentitycard
());
record
=
recordService
.
queryRybhRecord
(
users
.
getIdentitycard
());
}
}
}
return
record
;
return
record
;
}
}
...
...
src/main/java/com/cc/controller/SolrController.java
View file @
8a68232e
package
com
.
cc
.
controller
;
package
com
.
cc
.
controller
;
import
java.io.*
;
import
java.io.*
;
import
java.text.ParsePosition
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.*
;
import
com.cc.model.AsjRyRelateVO
;
import
com.cc.model.AsjRyRelateVO
;
...
@@ -152,10 +153,78 @@ public class SolrController {
...
@@ -152,10 +153,78 @@ public class SolrController {
System
.
out
.
println
(
"当前页:"
+
page
+
"----------行数:"
+
rows
);
System
.
out
.
println
(
"当前页:"
+
page
+
"----------行数:"
+
rows
);
return
solrService
.
querySolrAsj
(
q
,
fqList
,
asjRyRelateVO
,
page
,
rows
,
sorlAddress
,
sorlInstance
,
groupids
,
sort
,
order
,
unitcode
,
configMap
,
daohan
,
groupidvalue
);
return
solrService
.
querySolrAsj
(
q
,
fqList
,
asjRyRelateVO
,
page
,
rows
,
sorlAddress
,
sorlInstance
,
groupids
,
sort
,
order
,
unitcode
,
configMap
,
daohan
,
groupidvalue
);
}
}
public
String
dateChange
(
String
str
)
{
ParsePosition
pos
=
new
ParsePosition
(
0
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
Date
date
=
sdf
.
parse
(
str
,
pos
);
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
date
);
int
zoneOffset
=
calendar
.
get
(
Calendar
.
ZONE_OFFSET
);
int
dstOffset
=
calendar
.
get
(
Calendar
.
DST_OFFSET
);
calendar
.
add
(
Calendar
.
MILLISECOND
,
-(
zoneOffset
+
dstOffset
));
long
timeInMillis
=
calendar
.
getTimeInMillis
();
SimpleDateFormat
df
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
);
System
.
out
.
println
(
df
.
format
(
timeInMillis
));
return
df
.
format
(
timeInMillis
);
}
private
Map
<
String
,
Object
>
getAsjFqList
(
AsjRyRelateVO
asjRyRelateVO
,
String
unitcode
,
String
grade
)
{
private
Map
<
String
,
Object
>
getAsjFqList
(
AsjRyRelateVO
asjRyRelateVO
,
String
unitcode
,
String
grade
)
{
Map
<
String
,
Object
>
map
=
new
HashedMap
();
Map
<
String
,
Object
>
map
=
new
HashedMap
();
List
<
String
>
fqList
=
new
ArrayList
<>();
List
<
String
>
fqList
=
new
ArrayList
<>();
String
asjQ
=
"XXSC_PDBZ:0"
;
//立案开始时间、结束时间
String
lqsjKssj
=
null
;
String
lqsjJssj
=
null
;
//案发开始时间、结束时间
String
afsjKssj
=
null
;
String
afsjJssj
=
null
;
//侦查终结开始时间、结束时间
String
zczjKssj
=
null
;
String
zczjJssj
=
null
;
//抓获开始时间、结束时间
String
zhKssj
=
null
;
String
zhJssj
=
null
;
//破案开始时间、结束时间
String
paKssj
=
null
;
String
paJssj
=
null
;
//立案开始时间、结束时间
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjKssj
()))
{
lqsjKssj
=
dateChange
(
asjRyRelateVO
.
getLasjRqsjKssj
());
}
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjJssj
()))
{
lqsjJssj
=
dateChange
(
asjRyRelateVO
.
getLasjRqsjJssj
());
}
//案发开始时间、结束时间
if
(
null
!=
asjRyRelateVO
.
getAsjfssjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjKssj
()))
{
afsjKssj
=
dateChange
(
asjRyRelateVO
.
getAsjfssjKssj
());
}
if
(
null
!=
asjRyRelateVO
.
getAsjfssjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjJssj
()))
{
afsjJssj
=
dateChange
(
asjRyRelateVO
.
getAsjfssjJssj
());
}
//侦查终结开始时间、结束时间
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Kssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Kssj
()))
{
zczjKssj
=
dateChange
(
asjRyRelateVO
.
getZczj_zxsj01Kssj
());
}
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
()))
{
zczjJssj
=
dateChange
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
());
}
//抓获开始时间、结束时间
if
(
null
!=
asjRyRelateVO
.
getZhrqKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqKssj
()))
{
zhKssj
=
dateChange
(
asjRyRelateVO
.
getZhrqKssj
());
}
if
(
null
!=
asjRyRelateVO
.
getZhrqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqJssj
()))
{
zhJssj
=
dateChange
(
asjRyRelateVO
.
getZhrqJssj
());
}
//破案开始时间、结束时间
if
(
null
!=
asjRyRelateVO
.
getParqKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getParqKssj
())){
paKssj
=
dateChange
(
asjRyRelateVO
.
getParqKssj
());
}
if
(
null
!=
asjRyRelateVO
.
getParqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getParqJssj
()))
{
paJssj
=
dateChange
(
asjRyRelateVO
.
getParqJssj
());
}
//String asjQ = "XXSC_PDBZ:0";
String
asjQ
=
"*"
;
if
(
null
!=
asjRyRelateVO
.
getXxsc_pdbz
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getXxsc_pdbz
())){
asjQ
+=
"AND XXSC_PDBZ:"
+
asjRyRelateVO
.
getXxsc_pdbz
();
}
if
(
null
!=
unitcode
&&
!
""
.
equals
(
unitcode
)
&&
null
!=
grade
&&
!
""
.
equals
(
grade
)){
if
(
null
!=
unitcode
&&
!
""
.
equals
(
unitcode
)
&&
null
!=
grade
&&
!
""
.
equals
(
grade
)){
String
ladw
=
CodeUtils
.
getLadw
(
unitcode
,
grade
);
String
ladw
=
CodeUtils
.
getLadw
(
unitcode
,
grade
);
asjQ
+=
" AND XXDJDW_GAJGJGDM:"
+
ladw
+
"*"
;
asjQ
+=
" AND XXDJDW_GAJGJGDM:"
+
ladw
+
"*"
;
...
@@ -475,12 +544,12 @@ public class SolrController {
...
@@ -475,12 +544,12 @@ public class SolrController {
}
}
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjKssj
())){
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjKssj
())){
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjJssj
()))
{
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjJssj
()))
{
asjQ
+=
" AND LARQ
:["
+
asjRyRelateVO
.
getLasjRqsjKssj
()
+
" TO "
+
asjRyRelateVO
.
getLasjRqsjJssj
()
+
"]"
;
asjQ
+=
" AND LARQ
SJ:["
+
lqsjKssj
+
" TO "
+
lqsjJssj
+
"]"
;
}
else
{
}
else
{
asjQ
+=
" AND LARQ
:["
+
asjRyRelateVO
.
getLasjRqsjKssj
()
+
" TO "
+
"*]"
;
asjQ
+=
" AND LARQ
SJ:["
+
lqsjKssj
+
" TO "
+
"*]"
;
}
}
}
else
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjJssj
()))
{
}
else
if
(
null
!=
asjRyRelateVO
.
getLasjRqsjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getLasjRqsjJssj
()))
{
asjQ
+=
" AND LARQ
:[* TO "
+
asjRyRelateVO
.
getLasjRqsjJssj
()
+
"]"
;
asjQ
+=
" AND LARQ
SJ:[* TO "
+
lqsjJssj
+
"]"
;
}
}
if
(
null
!=
asjRyRelateVO
.
getAsjfssj_asjfskssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssj_asjfskssj
())){
if
(
null
!=
asjRyRelateVO
.
getAsjfssj_asjfskssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssj_asjfskssj
())){
...
@@ -510,13 +579,13 @@ public class SolrController {
...
@@ -510,13 +579,13 @@ public class SolrController {
if
(
null
!=
asjRyRelateVO
.
getAsjfssjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjKssj
())){
if
(
null
!=
asjRyRelateVO
.
getAsjfssjKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjKssj
())){
if
(
null
!=
asjRyRelateVO
.
getAsjfssjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjJssj
()))
{
if
(
null
!=
asjRyRelateVO
.
getAsjfssjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjJssj
()))
{
asjQ
+=
" AND ASJFSSJ_ASJFSKSSJ:["
+
a
sjRyRelateVO
.
getAsjfssjKssj
()
+
" TO "
+
"*]"
;
asjQ
+=
" AND ASJFSSJ_ASJFSKSSJ:["
+
a
fsjKssj
+
" TO "
+
"*]"
;
asjQ
+=
" AND ASJFSSJ_ASJFSJSSJ:[* TO "
+
asjRyRelateVO
.
getAsjfssjJssj
()
+
"]"
;
asjQ
+=
" AND ASJFSSJ_ASJFSJSSJ:[* TO "
+
afsjJssj
+
"]"
;
}
else
{
}
else
{
asjQ
+=
" AND ASJFSSJ_ASJFSKSSJ:["
+
a
sjRyRelateVO
.
getAsjfssjKssj
()
+
" TO "
+
"*]"
;
asjQ
+=
" AND ASJFSSJ_ASJFSKSSJ:["
+
a
fsjKssj
+
" TO "
+
"*]"
;
}
}
}
else
if
(
null
!=
asjRyRelateVO
.
getAsjfssjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjJssj
()))
{
}
else
if
(
null
!=
asjRyRelateVO
.
getAsjfssjJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getAsjfssjJssj
()))
{
asjQ
+=
" AND ASJFSSJ_ASJFSJSSJ:[* TO "
+
asjRyRelateVO
.
getAsjfssjJssj
()
+
"]"
;
asjQ
+=
" AND ASJFSSJ_ASJFSJSSJ:[* TO "
+
afsjJssj
+
"]"
;
}
}
if
(
null
!=
asjRyRelateVO
.
getSlsj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSlsj
())){
if
(
null
!=
asjRyRelateVO
.
getSlsj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getSlsj
())){
...
@@ -1366,12 +1435,12 @@ public class SolrController {
...
@@ -1366,12 +1435,12 @@ public class SolrController {
//侦查终结时间查询
//侦查终结时间查询
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Kssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Kssj
())){
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Kssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Kssj
())){
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
()))
{
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
()))
{
asjQ
+=
" AND ZCZJ_ZXSJ01:["
+
asjRyRelateVO
.
getZczj_zxsj01Kssj
()
+
" TO "
+
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
+
"]"
;
asjQ
+=
" AND ZCZJ_ZXSJ01:["
+
zczjKssj
+
" TO "
+
zczjJssj
+
"]"
;
}
else
{
}
else
{
asjQ
+=
" AND ZCZJ_ZXSJ01:["
+
asjRyRelateVO
.
getZczj_zxsj01Kssj
()
+
" TO "
+
"*]"
;
asjQ
+=
" AND ZCZJ_ZXSJ01:["
+
zczjKssj
+
" TO "
+
"*]"
;
}
}
}
else
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
()))
{
}
else
if
(
null
!=
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczj_zxsj01Jssj
()))
{
asjQ
+=
" AND ZCZJ_ZXSJ01:[* TO "
+
asjRyRelateVO
.
getZczj_zxsj01Jssj
()
+
"]"
;
asjQ
+=
" AND ZCZJ_ZXSJ01:[* TO "
+
zczjJssj
+
"]"
;
}
}
if
(
null
!=
asjRyRelateVO
.
getZczjdw_gajgjgdm
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczjdw_gajgjgdm
())){
if
(
null
!=
asjRyRelateVO
.
getZczjdw_gajgjgdm
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZczjdw_gajgjgdm
())){
String
zczjdw_gajgjgdm
=
CommonFunc
.
getDwLike
(
asjRyRelateVO
.
getZczjdw_gajgjgdm
(),
1
);
String
zczjdw_gajgjgdm
=
CommonFunc
.
getDwLike
(
asjRyRelateVO
.
getZczjdw_gajgjgdm
(),
1
);
...
@@ -2169,12 +2238,12 @@ public class SolrController {
...
@@ -2169,12 +2238,12 @@ public class SolrController {
if
(
null
!=
asjRyRelateVO
.
getZhrqKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqKssj
())){
if
(
null
!=
asjRyRelateVO
.
getZhrqKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqKssj
())){
if
(
null
!=
asjRyRelateVO
.
getZhrqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqJssj
()))
{
if
(
null
!=
asjRyRelateVO
.
getZhrqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqJssj
()))
{
zhfzxyrQ
+=
" AND ZHRQ:["
+
asjRyRelateVO
.
getZhrqKssj
()
+
" TO "
+
asjRyRelateVO
.
getZhrqJssj
()
+
"]"
;
zhfzxyrQ
+=
" AND ZHRQ:["
+
zhKssj
+
" TO "
+
zhJssj
+
"]"
;
}
else
{
}
else
{
zhfzxyrQ
+=
" AND ZHRQ:["
+
asjRyRelateVO
.
getZhrqKssj
()
+
" TO "
+
"*]"
;
zhfzxyrQ
+=
" AND ZHRQ:["
+
zhKssj
+
" TO "
+
"*]"
;
}
}
}
else
if
(
null
!=
asjRyRelateVO
.
getZhrqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqJssj
()))
{
}
else
if
(
null
!=
asjRyRelateVO
.
getZhrqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhrqJssj
()))
{
zhfzxyrQ
+=
" AND ZHRQ:[* TO "
+
asjRyRelateVO
.
getZhrqKssj
()
+
"]"
;
zhfzxyrQ
+=
" AND ZHRQ:[* TO "
+
zhJssj
+
"]"
;
}
}
if
(
null
!=
asjRyRelateVO
.
getZhfzxyr_rdfzss_zcxwyjms
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhfzxyr_rdfzss_zcxwyjms
())){
if
(
null
!=
asjRyRelateVO
.
getZhfzxyr_rdfzss_zcxwyjms
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getZhfzxyr_rdfzss_zcxwyjms
())){
...
@@ -2703,6 +2772,22 @@ public class SolrController {
...
@@ -2703,6 +2772,22 @@ public class SolrController {
System
.
out
.
println
(
fq
);
System
.
out
.
println
(
fq
);
fqList
.
add
(
fq
);
fqList
.
add
(
fq
);
}
}
String
paQ
=
""
;
if
(
null
!=
asjRyRelateVO
.
getParqKssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getParqKssj
())){
if
(
null
!=
asjRyRelateVO
.
getParqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getParqJssj
()))
{
paQ
+=
" AND PARQ:["
+
paKssj
+
" TO "
+
paJssj
+
"]"
;
}
else
{
paQ
+=
" AND PARQ:["
+
paKssj
+
" TO "
+
"*]"
;
}
}
else
if
(
null
!=
asjRyRelateVO
.
getParqJssj
()
&&
!
""
.
equals
(
asjRyRelateVO
.
getParqJssj
()))
{
paQ
+=
" AND PARQ:[* TO "
+
paJssj
+
"]"
;
}
if
(
StringUtils
.
isNotBlank
(
paQ
)){
String
fq
=
"{!join fromIndex=TB_XW_PA from=ID to=ID}"
;
fq
+=
paQ
.
substring
(
5
,
paQ
.
length
());
System
.
out
.
println
(
fq
);
fqList
.
add
(
fq
);
}
System
.
out
.
println
(
"过虑查询条件fqList==================="
+
fqList
);
System
.
out
.
println
(
"过虑查询条件fqList==================="
+
fqList
);
System
.
out
.
println
(
"查询的关键字q==================="
+
q
);
System
.
out
.
println
(
"查询的关键字q==================="
+
q
);
map
.
put
(
"fqList"
,
fqList
);
map
.
put
(
"fqList"
,
fqList
);
...
...
src/main/java/com/cc/model/AsjRyRelateVO.java
View file @
8a68232e
...
@@ -159,6 +159,7 @@ public class AsjRyRelateVO {
...
@@ -159,6 +159,7 @@ public class AsjRyRelateVO {
private
String
zczjdw_gajgjgdm_third
;
private
String
zczjdw_gajgjgdm_third
;
private
String
zczjdw_gajgjgdm_fourth
;
private
String
zczjdw_gajgjgdm_fourth
;
private
String
zczjdw_gajgmc
;
private
String
zczjdw_gajgmc
;
private
String
xxsc_pdbz
;
//人员
//人员
private
String
szzwbh
;
private
String
szzwbh
;
private
String
rydnabh
;
private
String
rydnabh
;
...
@@ -637,6 +638,36 @@ public class AsjRyRelateVO {
...
@@ -637,6 +638,36 @@ public class AsjRyRelateVO {
private
String
jsasj_djsjKssj
;
private
String
jsasj_djsjKssj
;
private
String
jsasj_djsjJssj
;
private
String
jsasj_djsjJssj
;
//破案
private
String
ajzt
;
private
String
ajztmc
;
private
String
pafs
;
private
String
pafsmc
;
private
String
pajk
;
private
String
sldw
;
private
String
sldwmc
;
private
String
slr
;
private
String
djdw
;
private
String
djdwmc
;
private
String
djr
;
private
String
ladw
;
private
String
ladwmc
;
private
String
lasj
;
private
String
padw
;
private
String
padwmc
;
private
String
parqKssj
;
private
String
parqJssj
;
private
String
parq
;
private
String
xgdw
;
private
String
xgdwmc
;
private
String
xgr
;
private
String
xgsj
;
private
String
xbr
;
private
String
zbr
;
private
String
xxlyms
;
public
String
getFxasjdd_xzqhdm
()
{
public
String
getFxasjdd_xzqhdm
()
{
return
fxasjdd_xzqhdm
;
return
fxasjdd_xzqhdm
;
}
}
...
@@ -5243,4 +5274,220 @@ public class AsjRyRelateVO {
...
@@ -5243,4 +5274,220 @@ public class AsjRyRelateVO {
public
void
setSfbhcxaj
(
String
sfbhcxaj
)
{
public
void
setSfbhcxaj
(
String
sfbhcxaj
)
{
this
.
sfbhcxaj
=
sfbhcxaj
;
this
.
sfbhcxaj
=
sfbhcxaj
;
}
}
public
String
getXxsc_pdbz
()
{
return
xxsc_pdbz
;
}
public
void
setXxsc_pdbz
(
String
xxsc_pdbz
)
{
this
.
xxsc_pdbz
=
xxsc_pdbz
;
}
public
String
getAjzt
()
{
return
ajzt
;
}
public
void
setAjzt
(
String
ajzt
)
{
this
.
ajzt
=
ajzt
;
}
public
String
getAjztmc
()
{
return
ajztmc
;
}
public
void
setAjztmc
(
String
ajztmc
)
{
this
.
ajztmc
=
ajztmc
;
}
public
String
getPafs
()
{
return
pafs
;
}
public
void
setPafs
(
String
pafs
)
{
this
.
pafs
=
pafs
;
}
public
String
getPafsmc
()
{
return
pafsmc
;
}
public
void
setPafsmc
(
String
pafsmc
)
{
this
.
pafsmc
=
pafsmc
;
}
public
String
getPajk
()
{
return
pajk
;
}
public
void
setPajk
(
String
pajk
)
{
this
.
pajk
=
pajk
;
}
public
String
getSldw
()
{
return
sldw
;
}
public
void
setSldw
(
String
sldw
)
{
this
.
sldw
=
sldw
;
}
public
String
getSldwmc
()
{
return
sldwmc
;
}
public
void
setSldwmc
(
String
sldwmc
)
{
this
.
sldwmc
=
sldwmc
;
}
public
String
getSlr
()
{
return
slr
;
}
public
void
setSlr
(
String
slr
)
{
this
.
slr
=
slr
;
}
public
String
getDjdw
()
{
return
djdw
;
}
public
void
setDjdw
(
String
djdw
)
{
this
.
djdw
=
djdw
;
}
public
String
getDjdwmc
()
{
return
djdwmc
;
}
public
void
setDjdwmc
(
String
djdwmc
)
{
this
.
djdwmc
=
djdwmc
;
}
public
String
getDjr
()
{
return
djr
;
}
public
void
setDjr
(
String
djr
)
{
this
.
djr
=
djr
;
}
public
String
getLadw
()
{
return
ladw
;
}
public
void
setLadw
(
String
ladw
)
{
this
.
ladw
=
ladw
;
}
public
String
getLadwmc
()
{
return
ladwmc
;
}
public
void
setLadwmc
(
String
ladwmc
)
{
this
.
ladwmc
=
ladwmc
;
}
public
String
getLasj
()
{
return
lasj
;
}
public
void
setLasj
(
String
lasj
)
{
this
.
lasj
=
lasj
;
}
public
String
getPadw
()
{
return
padw
;
}
public
void
setPadw
(
String
padw
)
{
this
.
padw
=
padw
;
}
public
String
getPadwmc
()
{
return
padwmc
;
}
public
void
setPadwmc
(
String
padwmc
)
{
this
.
padwmc
=
padwmc
;
}
public
String
getParq
()
{
return
parq
;
}
public
void
setParq
(
String
parq
)
{
this
.
parq
=
parq
;
}
public
String
getXgdw
()
{
return
xgdw
;
}
public
void
setXgdw
(
String
xgdw
)
{
this
.
xgdw
=
xgdw
;
}
public
String
getXgdwmc
()
{
return
xgdwmc
;
}
public
void
setXgdwmc
(
String
xgdwmc
)
{
this
.
xgdwmc
=
xgdwmc
;
}
public
String
getXgr
()
{
return
xgr
;
}
public
void
setXgr
(
String
xgr
)
{
this
.
xgr
=
xgr
;
}
public
String
getXgsj
()
{
return
xgsj
;
}
public
void
setXgsj
(
String
xgsj
)
{
this
.
xgsj
=
xgsj
;
}
public
String
getXbr
()
{
return
xbr
;
}
public
void
setXbr
(
String
xbr
)
{
this
.
xbr
=
xbr
;
}
public
String
getZbr
()
{
return
zbr
;
}
public
void
setZbr
(
String
zbr
)
{
this
.
zbr
=
zbr
;
}
public
String
getXxlyms
()
{
return
xxlyms
;
}
public
void
setXxlyms
(
String
xxlyms
)
{
this
.
xxlyms
=
xxlyms
;
}
public
String
getParqKssj
()
{
return
parqKssj
;
}
public
void
setParqKssj
(
String
parqKssj
)
{
this
.
parqKssj
=
parqKssj
;
}
public
String
getParqJssj
()
{
return
parqJssj
;
}
public
void
setParqJssj
(
String
parqJssj
)
{
this
.
parqJssj
=
parqJssj
;
}
}
}
src/main/java/com/cc/service/IAsjxxService.java
View file @
8a68232e
...
@@ -4,6 +4,6 @@ import java.util.Map;
...
@@ -4,6 +4,6 @@ import java.util.Map;
public
interface
IAsjxxService
{
public
interface
IAsjxxService
{
public
Map
<
String
,
Object
>
getSsjzqk
(
String
ladwdm
,
String
asjfskssj
,
String
asjfsjssj
);
public
Map
<
String
,
Object
>
getSsjzqk
(
String
ladwdm
,
String
asjfskssj
,
String
asjfsjssj
,
String
lasjRqsjKssj
,
String
lasjRqsjJssj
);
}
}
src/main/java/com/cc/service/impl/AsjxxServiceImpl.java
View file @
8a68232e
...
@@ -25,11 +25,13 @@ public class AsjxxServiceImpl implements IAsjxxService {
...
@@ -25,11 +25,13 @@ public class AsjxxServiceImpl implements IAsjxxService {
@Autowired
@Autowired
AsjxxDao
asjxxDao
;
AsjxxDao
asjxxDao
;
public
Map
<
String
,
Object
>
getSsjzqk
(
String
ladwdm
,
String
asjfskssj
,
String
asjfsjssj
){
public
Map
<
String
,
Object
>
getSsjzqk
(
String
ladwdm
,
String
asjfskssj
,
String
asjfsjssj
,
String
lasjRqsjKssj
,
String
lasjRqsjJssj
){
Map
<
String
,
String
>
map
=
new
HashedMap
();
Map
<
String
,
String
>
map
=
new
HashedMap
();
map
.
put
(
"ladwdm"
,
ladwdm
);
map
.
put
(
"ladwdm"
,
ladwdm
);
map
.
put
(
"asjfskssj"
,
asjfskssj
);
map
.
put
(
"asjfskssj"
,
asjfskssj
);
map
.
put
(
"asjfsjssj"
,
asjfsjssj
);
map
.
put
(
"asjfsjssj"
,
asjfsjssj
);
map
.
put
(
"lasjRqsjKssj"
,
lasjRqsjKssj
);
map
.
put
(
"lasjRqsjJssj"
,
lasjRqsjJssj
);
return
asjxxDao
.
getSsjzqk
(
map
);
return
asjxxDao
.
getSsjzqk
(
map
);
}
}
...
...
src/main/java/com/cc/service/impl/SolrServiceImpl.java
View file @
8a68232e
...
@@ -157,6 +157,7 @@ public class SolrServiceImpl implements SolrService {
...
@@ -157,6 +157,7 @@ public class SolrServiceImpl implements SolrService {
mapResult
.
put
(
"asjssry_rs"
,
solrDocument
.
get
(
"ASJSSRY_RS"
));
mapResult
.
put
(
"asjssry_rs"
,
solrDocument
.
get
(
"ASJSSRY_RS"
));
mapResult
.
put
(
"asjswry_rs"
,
solrDocument
.
get
(
"ASJSWRY_RS"
));
mapResult
.
put
(
"asjswry_rs"
,
solrDocument
.
get
(
"ASJSWRY_RS"
));
mapResult
.
put
(
"laywsjztmc"
,
solrDocument
.
get
(
"LAYWSJZTMC"
));
mapResult
.
put
(
"laywsjztmc"
,
solrDocument
.
get
(
"LAYWSJZTMC"
));
mapResult
.
put
(
"xxsc_pdbz"
,
solrDocument
.
get
(
"XXSC_PDBZ"
));
String
lazt
=
String
.
valueOf
(
solrDocument
.
get
(
"LAYWSJZTMC"
));
String
lazt
=
String
.
valueOf
(
solrDocument
.
get
(
"LAYWSJZTMC"
));
String
zczjzt
=
String
.
valueOf
(
solrDocument
.
get
(
"ZCZJYWSJZTMC"
));
String
zczjzt
=
String
.
valueOf
(
solrDocument
.
get
(
"ZCZJYWSJZTMC"
));
//当tb_xw_asjcz表中的laywsjzt和zczjywsjzt都为null的时候,数据状态显示为等待立案采集
//当tb_xw_asjcz表中的laywsjzt和zczjywsjzt都为null的时候,数据状态显示为等待立案采集
...
...
src/main/resources/mapper/xzxt/AsjxxSqlMap.xml
View file @
8a68232e
...
@@ -11,5 +11,11 @@
...
@@ -11,5 +11,11 @@
<if
test=
"asjfsjssj != ''"
>
<if
test=
"asjfsjssj != ''"
>
AND t.DJSJ
<![CDATA[<]]>
to_date(#{asjfsjssj},'yyyy-MM-dd')+1
AND t.DJSJ
<![CDATA[<]]>
to_date(#{asjfsjssj},'yyyy-MM-dd')+1
</if>
</if>
<if
test=
"lasjRqsjKssj != ''"
>
AND t.LARQ
<![CDATA[>=]]>
to_date(#{lasjRqsjKssj},'yyyy-MM-dd')
</if>
<if
test=
"lasjRqsjJssj != ''"
>
AND t.LARQ
<![CDATA[<]]>
to_date(#{lasjRqsjJssj},'yyyy-MM-dd')+1
</if>
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/webapp/gdwssjz.jsp
View file @
8a68232e
...
@@ -17,11 +17,19 @@
...
@@ -17,11 +17,19 @@
</head>
</head>
<body>
<body>
<div
class=
"datec"
>
<div
class=
"datec"
>
<div
style=
"text-align:center;"
>
案发时间
:
<div
style=
"text-align:center;"
>
立案日期
:
<div
class=
"date-l"
>
<div
class=
"date-l"
>
<input
class=
"easyui-datebox"
id=
"asjfskssj"
style=
"height:24px;width:180px;"
>
-
<input
class=
"easyui-datebox"
id=
"asjfsjssj"
data-options=
""
style=
"height:24px;width:180px;"
>
<input
class=
"easyui-datebox"
id=
"lasjRqsjKssj"
style=
"height:24px;width:140px;"
>
-
<input
class=
"easyui-datebox"
id=
"lasjRqsjJssj"
data-options=
""
style=
"height:24px;width:180px;"
>
</div>
</div>
<div
style=
"text-align:center;"
>
案发时间:
<div
class=
"date-l"
>
<input
class=
"easyui-datebox"
id=
"asjfskssj"
style=
"height:24px;width:140px;"
>
-
<input
class=
"easyui-datebox"
id=
"asjfsjssj"
data-options=
""
style=
"height:24px;width:180px;"
>
</div>
<a
onclick=
"sszjqk('');"
class=
"btn_cx"
>
查询
</a>
</div>
</div>
<a
onclick=
"sszjqk('');"
class=
"btn_cx"
>
查询
</a></div>
</div>
</div>
<p><span
class=
"dw-span"
>
单位:${param.unitname}
</span></p>
<p><span
class=
"dw-span"
>
单位:${param.unitname}
</span></p>
<table
class=
"easyui-datagrid"
id=
"sszjqk"
style=
"width:100%;border:1px dashed #ccc;margin:0 auto"
width=
"100%"
>
<table
class=
"easyui-datagrid"
id=
"sszjqk"
style=
"width:100%;border:1px dashed #ccc;margin:0 auto"
width=
"100%"
>
...
@@ -50,7 +58,7 @@
...
@@ -50,7 +58,7 @@
{
title
:
"受伤人数"
,
field
:
"asjssrsTotal"
,
align
:
'center'
,
width
:
200
}
{
title
:
"受伤人数"
,
field
:
"asjssrsTotal"
,
align
:
'center'
,
width
:
200
}
];
];
var
query_params
=
{
"gajgdm"
:
gajgdm
,
"unitcode"
:
'${param.unitcode}'
,
"userGrade"
:
'${param.grade}'
,
"asjfskssj"
:
$
(
"#asjfskssj"
).
datebox
(
"getValue"
),
"asjfsjssj"
:
$
(
"#asjfsjssj"
).
datebox
(
"getValue"
)};
var
query_params
=
{
"gajgdm"
:
gajgdm
,
"unitcode"
:
'${param.unitcode}'
,
"userGrade"
:
'${param.grade}'
,
"asjfskssj"
:
$
(
"#asjfskssj"
).
datebox
(
"getValue"
),
"asjfsjssj"
:
$
(
"#asjfsjssj"
).
datebox
(
"getValue"
)
,
"lasjRqsjKssj"
:
$
(
"#lasjRqsjKssj"
).
datebox
(
"getValue"
),
"lasjRqsjJssj"
:
$
(
"#lasjRqsjJssj"
).
datebox
(
"getValue"
)
};
$
(
'#sszjqk'
).
datagrid
({
$
(
'#sszjqk'
).
datagrid
({
url
:
url
,
url
:
url
,
columns
:
[
table_title
],
columns
:
[
table_title
],
...
...
src/main/webapp/rasc.jsp
View file @
8a68232e
This diff is collapsed.
Click to expand it.
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