Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hnxtbaboot
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
杨亮
hnxtbaboot
Commits
62816853
Commit
62816853
authored
Sep 28, 2021
by
wuchengwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
虹膜采集页面样式调整、虹膜推送接口修改、人员查询页面添加虹膜状态
parent
d7caabbf
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
95 additions
and
19 deletions
+95
-19
src/main/java/com/founder/controller/HmCjController.java
+10
-4
src/main/java/com/founder/model/AutoTbStRy.java
+9
-0
src/main/java/com/founder/model/TbStHm.java
+17
-0
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
+5
-3
src/main/resources/mapper/HmCjSqlMapper.xml
+2
-0
src/main/resources/static/hmcj/js/hmcj_wlh.js
+21
-6
src/main/resources/templates/hmcj/wlh.html
+3
-1
src/main/resources/templates/hmcj/yskj.html
+5
-0
src/main/resources/templates/rygl/addryxx.html
+0
-0
src/main/resources/templates/rygl/rysjxxlist.html
+13
-5
src/main/resources/templates/rygl/ryxxlist.html
+10
-0
No files found.
src/main/java/com/founder/controller/HmCjController.java
View file @
62816853
...
...
@@ -13,6 +13,7 @@ import org.apache.commons.codec.binary.Base64;
import
org.apache.http.NameValuePair
;
import
org.apache.http.message.BasicNameValuePair
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.util.StringUtils
;
...
...
@@ -55,6 +56,9 @@ public class HmCjController {
@Autowired
private
AutoTbXwRycjService
rycjService
;
@Value
(
"${wlhUrl}"
)
private
String
wlhUrl
;
/**
* 保存虹膜采集数据
*
...
...
@@ -173,6 +177,8 @@ public class HmCjController {
model
.
addObject
(
"rybh"
,
request
.
getParameter
(
"rybh"
));
model
.
addObject
(
"xm"
,
request
.
getParameter
(
"xm"
));
model
.
addObject
(
"gmsfhm"
,
request
.
getParameter
(
"gmsfhm"
));
model
.
addObject
(
"username"
,
request
.
getParameter
(
"username"
));
model
.
addObject
(
"wlhUrl"
,
wlhUrl
);
String
sbcs
=
request
.
getParameter
(
"sbcs"
);
if
(
"2"
.
equals
(
sbcs
)){
model
.
setViewName
(
"hmcj/wlh"
);
...
...
@@ -524,7 +530,7 @@ public class HmCjController {
temp
.
setSbxh
(
tbStHm
.
getSbxh
());
temp
.
setSbbh
(
tbStHm
.
getSbbh
());
temp
.
setSbcsdm
(
tbStHm
.
getSbcsdm
());
temp
.
setSfts
(
"1"
);
if
(
tbStHm
.
getSbcsdm
()!=
null
&&!
""
.
equals
(
tbStHm
.
getSbcsdm
())){
temp
.
setRequest_id
(
"HMCJ-"
+
unitcode
+
"-"
+
tbStHm
.
getSbcsdm
()+
"-"
+
dateNowStr
+
"-0001"
+
tbStHm
.
getRybh
().
substring
(
19
,
23
));
...
...
@@ -547,7 +553,7 @@ public class HmCjController {
temp
.
setSbxh
(
tbStHm
.
getSbxh
());
temp
.
setSbbh
(
tbStHm
.
getSbbh
());
temp
.
setSbcsdm
(
tbStHm
.
getSbcsdm
());
temp
.
setSfts
(
"1"
);
if
(
tbStHm
.
getSbcsdm
()!=
null
&&!
""
.
equals
(
tbStHm
.
getSbcsdm
())){
temp
.
setRequest_id
(
"HMCJ-"
+
unitcode
+
"-"
+
tbStHm
.
getSbcsdm
()+
"-"
+
dateNowStr
+
"-0001"
+
tbStHm
.
getRybh
().
substring
(
19
,
23
));
}
else
{
...
...
@@ -573,7 +579,7 @@ public class HmCjController {
temp
.
setSbxh
(
tbStHm
.
getSbxh
());
temp
.
setSbbh
(
tbStHm
.
getSbbh
());
temp
.
setSbcsdm
(
tbStHm
.
getSbcsdm
());
temp
.
setSfts
(
"1"
);
if
(
tbStHm
.
getSbcsdm
()!=
null
&&!
""
.
equals
(
tbStHm
.
getSbcsdm
())){
temp
.
setRequest_id
(
"HMCJ-"
+
unitcode
+
"-"
+
tbStHm
.
getSbcsdm
()+
"-"
+
dateNowStr
+
"-0001"
+
tbStHm
.
getRybh
().
substring
(
19
,
23
));
}
else
{
...
...
@@ -595,7 +601,7 @@ public class HmCjController {
temp
.
setSbxh
(
tbStHm
.
getSbxh
());
temp
.
setSbbh
(
tbStHm
.
getSbbh
());
temp
.
setSbcsdm
(
tbStHm
.
getSbcsdm
());
temp
.
setSfts
(
"1"
);
if
(
tbStHm
.
getSbcsdm
()!=
null
&&!
""
.
equals
(
tbStHm
.
getSbcsdm
())){
temp
.
setRequest_id
(
"HMCJ-"
+
unitcode
+
"-"
+
tbStHm
.
getSbcsdm
()+
"-"
+
dateNowStr
+
"-0001"
+
tbStHm
.
getRybh
().
substring
(
19
,
23
));
}
else
{
...
...
src/main/java/com/founder/model/AutoTbStRy.java
View file @
62816853
...
...
@@ -259,6 +259,7 @@ public class AutoTbStRy implements Serializable {
private
String
tsjgmx
;
//推送结果描述
private
String
sfcj
;
//是否残疾
private
String
hm
;
//是否采集虹膜
private
String
hmts
;
//虹膜是否全部推送成功
private
String
sw
;
//是否采集声纹
private
String
sjjbxx
;
//是否采集手机基本信息
private
String
sjlxrxx
;
//是否采集手机联系人信息
...
...
@@ -273,6 +274,14 @@ public class AutoTbStRy implements Serializable {
private
String
rwbh
;
//任务编号
private
String
fssj
;
//发送比对时间
public
String
getHmts
()
{
return
hmts
;
}
public
void
setHmts
(
String
hmts
)
{
this
.
hmts
=
hmts
;
}
public
String
getSfcj
()
{
return
sfcj
;
}
...
...
src/main/java/com/founder/model/TbStHm.java
View file @
62816853
...
...
@@ -70,7 +70,24 @@ public class TbStHm implements Serializable {
private
String
yyhmtp
;
private
String
zyycjdm
;
private
String
token
;
private
String
sfts
;
//是否推送
private
String
tsjgmx
;
//推送结果描述
public
String
getSfts
()
{
return
sfts
;
}
public
void
setSfts
(
String
sfts
)
{
this
.
sfts
=
sfts
;
}
public
String
getTsjgmx
()
{
return
tsjgmx
;
}
public
void
setTsjgmx
(
String
tsjgmx
)
{
this
.
tsjgmx
=
tsjgmx
;
}
public
String
getXxzldf
()
{
return
xxzldf
;
...
...
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
View file @
62816853
...
...
@@ -313,6 +313,7 @@
LRSJ,
AJLBDM,
(select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh) as HM,
(select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '1' ) ) as HMTS,
(select count(1) from tb_xw_ythcj_sw s where s.rybh=TB_RY_RYCJ.rybh) as SW,
(select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh) as ZJ,
(select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) ) as ZJTS,
...
...
@@ -339,6 +340,9 @@
#{entity.xxdjdwGajgjgdm , jdbcType=VARCHAR }||'%'
</if>
<include
refid=
"queryWhere"
/>
<if
test=
"entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 2"
>
and (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) ) >0
</if>
order by ${sort} ${order} ) d
where 1=1
<if
test=
"entity.swyw != null and entity.swyw != '' and entity.swyw == 0"
>
...
...
@@ -360,9 +364,7 @@
<if
test=
"entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 1"
>
and d.ZJ >0
</if>
<if
test=
"entity.zjyw != null and entity.zjyw != '' and entity.zjyw == 2"
>
and d.ZJTS >0
</if>
<if
test=
"entity.ajlbdm != null and entity.ajlbdm != '' "
>
and d.AJLBDM = #{entity.ajlbdm , jdbcType=VARCHAR }
</if>
...
...
src/main/resources/mapper/HmCjSqlMapper.xml
View file @
62816853
...
...
@@ -63,6 +63,8 @@
<if
test=
"sbcsdm == null or sbcsdm == ''"
>
SBCSDM=NULL,
</if>
<if
test=
"request_id != null and request_id != ''"
>
REQUEST_ID=#{request_id , jdbcType=VARCHAR },
</if>
<if
test=
"request_id == null or request_id == ''"
>
REQUEST_ID=NULL,
</if>
<if
test=
"sfts != null and sfts != ''"
>
SFTS=#{sfts , jdbcType=VARCHAR },
</if>
<if
test=
"sfts == null or sfts == ''"
>
SFTS='0',
</if>
GXSJ = sysdate
WHERE XXZJBH=#{xxzjbh , jdbcType=VARCHAR }
</update>
...
...
src/main/resources/static/hmcj/js/hmcj_wlh.js
View file @
62816853
...
...
@@ -143,14 +143,18 @@ function wlhbaocun(){
$
(
"#hmqsqkRight"
).
val
(
$
(
"#rightSelect option:selected"
).
val
());
$
(
"#hmqsqkLeft"
).
val
(
$
(
"#leftSelect option:selected"
).
val
());
$
(
"#sbxh"
).
val
(
$
(
"#device_type option:selected"
).
val
());
if
((
$
(
"#hmsjLeft"
).
val
()
==
''
||
$
(
"#hmsjLeft"
).
val
()
==
null
)
&&
(
"#hmqsqkLeft"
).
val
()
==
'0'
){
if
((
$
(
"#hmsjLeft"
).
val
()
==
''
||
$
(
"#hmsjLeft"
).
val
()
==
null
)
&&
$
(
"#hmqsqkLeft"
).
val
()
==
'0'
){
layer
.
alert
(
'请选择左眼缺失情况!'
);
return
;
}
if
((
$
(
"#hmsjRight"
).
val
()
==
''
||
$
(
"#hmsjRight"
).
val
()
==
null
)
&&
(
"#hmqsqkRight"
).
val
()
==
'0'
){
if
((
$
(
"#hmsjRight"
).
val
()
==
''
||
$
(
"#hmsjRight"
).
val
()
==
null
)
&&
$
(
"#hmqsqkRight"
).
val
()
==
'0'
){
layer
.
alert
(
'请选择右眼缺失情况!'
);
return
;
}
if
(
$
(
"#hmsjRight"
).
val
()
!=
'0'
&&
$
(
"#hmsjLeft"
).
val
()
!=
'0'
){
layer
.
alert
(
'如两眼均残缺不可采集,请到人员信息无法采集说明备注!'
,{
icon
:
2
});
return
;
}
layer
.
msg
(
'保存中...'
);
$
.
ajax
({
url
:
"/saveHmSjXxHb"
,
...
...
@@ -185,15 +189,25 @@ function wlhhmts(){
var
rybh
=
window
.
opener
.
document
.
getElementById
(
"rybh"
).
value
;
$
.
ajax
({
type
:
"POST"
,
url
:
"/sendHmxxToWlh"
,
data
:
{
"asjxgrybh"
:
rybh
},
url
:
$
(
'#wlhUrl'
).
val
()
,
data
:
{
"asjxgrybh"
:
rybh
,
"username"
:
$
(
'#username'
).
val
()
},
dataType
:
"json"
,
success
:
function
(
data
){
window
.
close
();
if
(
data
.
result
!=
null
&&
(
data
.
result
.
cjjg
==
'1'
||
data
.
result
.
cjjg
==
'2'
)){
layer
.
msg
(
'虹膜推送成功!'
,{
icon
:
1
})
}
else
{
if
(
data
.
message
==
null
||
data
.
message
==
""
){
layer
.
confirm
(
'<span style="color: red">'
+
data
.
result
.
xxms
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
});
}
else
{
layer
.
confirm
(
'<span style="color: red">'
+
data
.
message
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
});
}
}
// window.close();
},
error
:
function
(
e
){
console
.
log
(
"error="
+
JSON
.
stringify
(
e
));
window
.
close
();
layer
.
confirm
(
'<span style="color: red">发生未知错误,请联系工程师!</span>'
,{
icon
:
2
,
title
:
'错误提示'
});
// window.close();
}
});
}
\ No newline at end of file
src/main/resources/templates/hmcj/wlh.html
View file @
62816853
...
...
@@ -123,7 +123,7 @@
</tr>
<tr>
<td
colspan=
"3"
style=
"text-align: center"
>
<button
type=
"button"
class=
"btn_style"
id=
"hmts"
onclick=
"wlhhmts()
()
"
>
虹膜推送
</button>
<button
type=
"button"
class=
"btn_style"
id=
"hmts"
onclick=
"wlhhmts()"
>
虹膜推送
</button>
</td>
</tr>
</table>
...
...
@@ -156,6 +156,8 @@
<input
type=
"hidden"
id=
"rybh"
name=
"rybh"
th:value=
"${rybh}"
/>
<input
type=
"hidden"
id=
"xm"
name=
"xm"
th:value=
"${xm}"
/>
<input
type=
"hidden"
id=
"gmsfhm"
name=
"gmsfhm"
th:value=
"${gmsfhm}"
/>
<input
type=
"hidden"
id=
"username"
name=
"username"
th:value=
"${username}"
/>
<input
type=
"hidden"
id=
"wlhUrl"
name=
"wlhUrl"
th:value=
"${wlhUrl}"
/>
<input
type=
"hidden"
id=
"hmywdm"
name=
"hmywdm"
value=
""
>
<input
type=
"hidden"
id=
"hmsjLeft"
name=
"hmsjLeft"
value=
""
>
<input
type=
"hidden"
id=
"hmsjRight"
name=
"hmsjRight"
value=
""
>
...
...
src/main/resources/templates/hmcj/yskj.html
View file @
62816853
...
...
@@ -133,6 +133,11 @@
<button
type=
"button"
class=
"btn_style"
id=
"baocun"
onclick=
"ysbaocun()"
>
保存
</button>
</td>
</tr>
<tr>
<td
colspan=
"3"
style=
"text-align: center"
>
<button
type=
"button"
class=
"btn_style"
id=
"hmts"
onclick=
"yshmts()"
>
虹膜推送
</button>
</td>
</tr>
</table>
</td>
<td
class=
"display_panel"
>
...
...
src/main/resources/templates/rygl/addryxx.html
View file @
62816853
This diff is collapsed.
Click to expand it.
src/main/resources/templates/rygl/rysjxxlist.html
View file @
62816853
...
...
@@ -91,7 +91,6 @@
<td
colspan=
"8"
style=
"text-align:center;"
>
<a
href=
"javascript:doQuery();"
class=
"btn_cx"
>
查询
</a>
<a
href=
"javascript:doClear();"
class=
"btn_qkcxtj"
>
清空
</a>
<a
href=
"javascript:doExportExcel();"
class=
"btn btn_dc"
>
导出
</a>
</td>
</tr>
</table>
...
...
@@ -433,15 +432,24 @@
function
doExportExcel
(){
var
rybh
=
$
(
"#rybh"
).
val
();
var
zjhm
=
$
(
"#zjhm
"
).
val
();
var
szzwbh
=
$
(
"#szzwbh
"
).
val
();
var
xm
=
$
(
"#xm"
).
val
();
var
zjhm
=
$
(
"#zjhm"
).
val
();
var
fcsrqStr
=
$
(
"#fcsrqStr"
).
val
();
var
ecsrqStr
=
$
(
"#ecsrqStr"
).
val
();
var
jcjg
=
$
(
"#jcjg"
).
val
();
var
xbdm
=
$
(
"#xbdm"
).
val
();
var
hjdzXzqhdm
=
$
(
"#hjdzXzqhdm"
).
val
();
var
lrdwdm
=
$
(
"#lrdwdm"
).
val
();
var
lrr
=
$
(
"#lrr"
).
val
();
var
flrsjStr
=
$
(
"#flrsjStr"
).
val
();
var
elrsjStr
=
$
(
"#elrsjStr"
).
val
();
var
lxdm
=
$
(
"#lxdm"
).
val
();
window
.
location
.
href
=
"/exportExcelToRysjxx?rybh="
+
rybh
+
"&zjhm="
+
zjhm
+
"&xm="
+
xm
+
"&fcsrqStr="
+
fcsrqStr
+
"&ecsrqStr="
+
ecsrqStr
+
"&flrsjStr="
+
flrsjStr
+
"&elrsjStr="
+
elrsjStr
+
"&lxdm="
+
lxdm
;
var
jcjg
=
$
(
"#jcjg"
).
val
();
var
RRx
=
$
(
"#RRx"
).
val
();
var
r_sjlxdh
=
$
(
"#r_sjlxdh"
).
val
();
var
dnabh
=
$
(
"#dnabh"
).
val
();
window
.
location
.
href
=
"/exportExcelToRyxx?rybh="
+
rybh
+
"&zjhm="
+
zjhm
+
"&xm="
+
xm
+
"&szzwbh="
+
szzwbh
+
"&jcjg="
+
jcjg
+
"&xbdm="
+
xbdm
+
"&hjdzXzqhdm="
+
hjdzXzqhdm
+
"&RRx="
+
RRx
+
"&r_sjlxdh="
+
r_sjlxdh
+
"&dnabh="
+
dnabh
+
"&lrdwdm="
+
lrdwdm
+
"&fcsrqStr="
+
fcsrqStr
+
"&ecsrqStr="
+
ecsrqStr
+
"&lrr="
+
lrr
+
"&flrsjStr="
+
flrsjStr
+
"&elrsjStr="
+
elrsjStr
;
}
function
showYche
(
obj
,
rybh
,
zwbh
,
zjhm
){
...
...
src/main/resources/templates/rygl/ryxxlist.html
View file @
62816853
...
...
@@ -599,12 +599,17 @@
width
:
60
,
formatter
:
function
(
val
,
row
,
index
)
{
var
hm
=
row
.
hm
;
var
hmts
=
row
.
hmts
;
var
rstStr
;
if
(
hm
==
null
||
hm
==
""
||
hm
<=
0
)
{
rstStr
=
"<span style='color: red;font-size: 20px;font-weight: bold;' title='虹膜'>×</span>"
;
}
else
{
if
(
hmts
!=
'2'
){
rstStr
=
"<span style='color: red;font-size: 20px;font-weight: bold;' title='虹膜推送失败!'>√</span>"
;
}
else
{
rstStr
=
"<span style='color: green;font-size: 20px;font-weight: bold;' title='虹膜'>√</span>"
;
}
}
return
rstStr
;
}
},
...
...
@@ -952,12 +957,17 @@
width
:
60
,
formatter
:
function
(
val
,
row
,
index
)
{
var
hm
=
row
.
hm
;
var
hmts
=
row
.
hmts
;
var
rstStr
;
if
(
hm
==
null
||
hm
==
""
||
hm
<=
0
)
{
rstStr
=
"<span style='color: red;font-size: 20px;font-weight: bold;' title='虹膜'>×</span>"
;
}
else
{
if
(
hmts
!=
'2'
){
rstStr
=
"<span style='color: red;font-size: 20px;font-weight: bold;' title='虹膜推送失败!'>√</span>"
;
}
else
{
rstStr
=
"<span style='color: green;font-size: 20px;font-weight: bold;' title='虹膜'>√</span>"
;
}
}
return
rstStr
;
}
},
...
...
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