Skip to content

H
hnxtbaboot
Commit 00873e79 by wuchengwu
Options

添加万里红足迹URl,眼神科技推送修改

parent 1b7e240c
Showing with 213 additions and 40 deletions
hnxtba-core/src/main/java/com/founder/controller/HmCjController.java
package com.founder.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import com.founder.model.*;
......@@ -10,8 +9,6 @@ import com.founder.service.IHmCjService;
import com.founder.service.IParamService;
import com.founder.utils.FileUtils;
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;
......@@ -36,8 +33,6 @@ import java.net.URLDecoder;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
* 虹膜采集Controller
......@@ -57,8 +52,8 @@ public class HmCjController {
@Autowired
private AutoTbXwRycjService rycjService;
@Value("${wlhUrl}")
private String wlhUrl;
@Value("${hmUrl}")
private String hmUrl;
/**
* 保存虹膜采集数据
*
......@@ -178,7 +173,7 @@ public class HmCjController {
model.addObject("xm",request.getParameter("xm"));
model.addObject("gmsfhm",request.getParameter("gmsfhm"));
model.addObject("username",request.getParameter("username"));
model.addObject("wlhUrl",wlhUrl);
model.addObject("hmUrl",hmUrl);
String sbcs = request.getParameter("sbcs");
if("2".equals(sbcs)){
model.setViewName("hmcj/wlh");
......
hnxtba-core/src/main/resources/application.properties
......@@ -15,4 +15,4 @@ sjcjEsUrl=http://localhost:8030
#sjcjEsUrl=http://65.65.66.22:8030
zjtsUrl=http://127.0.0.1:9102/zjtsByRybh
wlhUrl=http://127.0.0.1:9102/sendHmxxToWlh
\ No newline at end of file
hmUrl=http://127.0.0.1:9102
\ No newline at end of file
hnxtba-core/src/main/resources/static/hmcj/js/hmcj_wlh.js
......@@ -143,6 +143,12 @@ function wlhbaocun(){
$("#hmqsqkRight").val($("#rightSelect option:selected").val());
$("#hmqsqkLeft").val($("#leftSelect option:selected").val());
$("#sbxh").val($("#device_type option:selected").val());
if($("#rightSelect option:selected").val()=='1' && $("#leftSelect option:selected").val() =='1'
&&($("#hmsjLeft").val() == '' || $("#hmsjLeft").val() == null)&&($("#hmsjRight").val() == '' || $("#hmsjRight").val() == null)){
layer.alert('如两眼均残缺不可采集，请到人员信息无法采集说明备注！',{icon:2});
return;
}
if(($("#hmsjLeft").val() == '' || $("#hmsjLeft").val() == null) && $("#hmqsqkLeft").val()=='0'){
layer.alert('请选择左眼缺失情况！');
return;
......@@ -151,10 +157,6 @@ function wlhbaocun(){
layer.alert('请选择右眼缺失情况！');
return;
}
if($("#hmsjRight").val() != '0' && $("#hmsjLeft").val()!='0'){
layer.alert('如两眼均残缺不可采集，请到人员信息无法采集说明备注！',{icon:2});
return;
}
$.ajax({
url:"/saveHmSjXxHb",
......@@ -164,7 +166,7 @@ function wlhbaocun(){
dataType:"json",
success:function(data){
layer.closeAll();
var code = data.code
var code = data.code;
if(code == "0"){
wlhhmts();
} else {
......@@ -184,12 +186,14 @@ function wlhhmts(){
var rybh = window.opener.document.getElementById("rybh").value;
$.ajax({
type: "POST",
url: $('#wlhUrl').val(),
url: $('#wlhUrl').val()+'/sendHmxxToWlh',
data: {"asjxgrybh":rybh,"username":$('#username').val()},
dataType: "json",
success:function(data){
if (data.result !=null &&(data.result.cjjg =='1' || data.result.cjjg =='2')){
layer.msg('虹膜推送成功！',{icon:1})
}else if (data.status_code =='8888' ){
layer.confirm('<span style="color: red">'+data.message+'</span>',{icon: 7, title:'警告提示'});
}else {
if (data.message == null || data.message == ""){
layer.confirm('<span style="color: red">'+data.result.xxms+'</span>',{icon: 2, title:'推送错误提示'});
......@@ -201,7 +205,7 @@ function wlhhmts(){
},
error:function(e){
console.log("error="+JSON.stringify(e));
layer.confirm('<span style="color: red">发生未知错误，请联系工程师！</span>',{icon: 2, title:'错误提示'});
layer.confirm('<span style="color: red">推送路径已更新，请刷新页面或清除缓存后重试！</span>',{icon: 2, title:'错误提示'});
// window.close();
}
});
......
hnxtba-core/src/main/resources/static/hmcj/js/yskj.js
......@@ -211,19 +211,24 @@ function EyeFlagChange(selObj)
}
function ysbaocun(){
function ysbaocun(){debugger
$("#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'){
$("#hmsjRight").val("sda")
if($("#rightSelect option:selected").val()=='1' && $("#leftSelect option:selected").val() =='1'
&&($("#hmsjLeft").val() == '' || $("#hmsjLeft").val() == null)&&($("#hmsjRight").val() == '' || $("#hmsjRight").val() == null)){
layer.alert('如两眼均残缺不可采集，请到人员信息无法采集说明备注！',{icon:2});
return;
}
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;
}
layer.msg('保存中...');
$.ajax({
url:"/saveHmSjXxHb",
data:$('#hmForm').serialize(),
......@@ -232,15 +237,9 @@ function ysbaocun(){
dataType:"json",
success:function(data){
layer.closeAll();
var code = data.code
var code = data.code;
if(code == "0"){
layer.alert(data.msg, {
skin: 'layui-layer-molv' //样式类名
,closeBtn: 0
}, function(){
yshmts();
});
} else {
layer.alert(data.msg);
}
......@@ -252,20 +251,32 @@ function ysbaocun(){
}
function yshmts(){
layer.msg('正在推送中！',{icon: 16,shade: [0.5, '#f5f5f5'],scrollbar: false,offset: 'auto', time:10000});
//equipID();
//window.open("/testImages?zwbh="+$("#rybh").val()+"&xm="+$("#xm").val()+"&gmsfhm="+$("#zjhm").val());
var rybh = window.opener.document.getElementById("rybh").value;
$.ajax({
type: "POST",
url: "/sendHmxxToYanShen",
data: {"asjxgrybh":rybh},
url: $('#yskjUrl').val()+'/sendHmxxToYanShen',
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.status_code =='8888' ){
layer.confirm('<span style="color: red">'+data.message+'</span>',{icon: 7, title:'警告提示'});
}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:'推送错误提示'});
}
}
},
error:function(e){
console.log("error="+JSON.stringify(e));
window.close();
layer.confirm('<span style="color: red">发生未知错误，请联系工程师！</span>',{icon: 2, title:'错误提示'});
// window.close();
}
});
}
hnxtba-core/src/main/resources/templates/hmcj/wlh.html
......@@ -157,7 +157,7 @@
<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="wlhUrl" name="wlhUrl" th:value="${hmUrl}"/>
<input type="hidden" id="hmywdm" name="hmywdm" value="">
<input type="hidden" id="hmsjLeft" name="hmsjLeft" value="">
<input type="hidden" id="hmsjRight" name="hmsjRight" value="">
......
hnxtba-core/src/main/resources/templates/hmcj/yskj.html
......@@ -167,6 +167,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="yskjUrl" name="yskjUrl" th:value="${hmUrl}"/>
<input type="hidden" id="hmywdm" name="hmywdm" value="">
<input type="hidden" id="hmsjLeft" name="hmsjLeft" value="">
<input type="hidden" id="hmsjRight" name="hmsjRight" value="">
......
hnxtba-interface/src/main/java/com/founder/config/FilterConfig.java
......@@ -17,7 +17,8 @@ public class FilterConfig extends WebMvcConfigurerAdapter {
//
registry.addInterceptor(InterceptorConfig).
addPathPatterns("/**").
excludePathPatterns("/Tsjgtest","/sendHmxxToHongba","/irisking/collect/result","/zjtsByRybh","/sendHmxxToWlh");
excludePathPatterns("/Tsjgtest","/sendHmxxToHongba","/irisking/collect/result","/zjtsByRybh"
,"/sendHmxxToWlh","/sendHmxxToYanShen");
}
......
hnxtba-interface/src/main/java/com/founder/controller/HmCjTsController.java
......@@ -11,7 +11,6 @@ import com.founder.service.LoginService;
import com.founder.service.RycjService;
import com.founder.utils.DateFormatUtils;
import com.founder.utils.FileUtils;
import com.founder.utils.ThreadPoolContainer;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
......@@ -693,7 +692,7 @@ public class HmCjTsController {
log.info("中科虹霸返回结果：" + jsonObject.toJSONString());
} else if ("5606".equals(sbcsdm)) {
//眼神科技
jsonObject = sendHmxxToYanShen(resultList);
jsonObject = sendHmxxToYanShenTs(resultList);
log.info("眼神科技返回结果：" + jsonObject.toJSONString());
} else if ("429T".equals(sbcsdm)) {
//万里红
......@@ -870,7 +869,163 @@ public class HmCjTsController {
return jsonResult;
}
public JSONObject sendHmxxToYanShen(List<TbStHm> hmxxs) {
@RequestMapping("/sendHmxxToYanShen")
@ResponseBody
public TsHmResultDto sendHmxxToYanShen( String asjxgrybh,String username) {
List<TbStHm> hmxxs = hmCjService.getHmxxAndRyInfoList(asjxgrybh);
for (TbStHm tb:hmxxs) {
if ("1".equals(tb.getSfts())){
return new TsHmResultDto("8888","虹膜已推送，请勿重复推送！",null);
}
}
Param param = paramService.getParamById("0102");
String urlstr = "";
String allIp = param.getParamvalue();
String arr_ip[] = allIp.split("#");
String codeunit = hmxxs.get(0).getRybh().substring(1, 5);
for (int i = 0; i < arr_ip.length; i++) {
if (arr_ip[i] != null && arr_ip[i].startsWith(codeunit)) {
urlstr = arr_ip[i].substring(5);
break;
}
}
if (urlstr == null || "".equals(urlstr)) {
urlstr = yanshen;
}
User user = loginService.getUserByUsername(username);
Map<String, Object> res = new HashMap<>();
res.put("client_id", "yanshen");
res.put("client_secret", "yanshen");
res.put("version", "1.0");
Date d = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
String dateNowStr = sdf.format(d);
String unitcodenew = getNewCode(user.getUnitcode());
if (hmxxs.get(0).getRequest_id() == null || "".equals(hmxxs.get(0).getRequest_id())) {
//res.put("request_id","HMCJ-"+"460000000000"+"-"+"911101087740615606"+"-"+dateNowStr+"-0001"+asjxgrybh.substring(19,23));
res.put("request_id", "HMCJ-" + unitcodenew + "-" + "911101087740615606" + "-" + dateNowStr + "-0001" + hmxxs.get(0).getRybh().substring(19, 23));
} else {
res.put("request_id", hmxxs.get(0).getRequest_id());
}
Calendar cal = Calendar.getInstance();
String hour = cal.get(Calendar.HOUR) + "";
String minute = cal.get(Calendar.MINUTE) + "";
String second = cal.get(Calendar.SECOND) + "";
if (hour.length() == 1) {
hour = "0" + hour;
}
if (minute.length() == 1) {
minute = "0" + minute;
}
if (second.length() == 1) {
second = "0" + second;
}
res.put("ywfssj", dateNowStr + hour + minute + second);
res.put("user_id", hmxxs.get(0).getIdentitycard());
res.put("user_dept", unitcodenew);
//res.put("user_dept","460000000000");
String unitname = dicItemService.queryNameByCode(user.getUnitcode(), "CODE_UNIT");
if (unitname == null || "".equals(unitname)) {
unitname = "湖南省公安厅";
}
res.put("user_deptname", unitname);
//res.put("user_deptname","海南省公安厅");
if (hmxxs.get(0).getSbcsdm() == null || "".equals(hmxxs.get(0).getSbcsdm())) {
res.put("sbcsdm", "911101087740615606");
} else {
res.put("sbcsdm", hmxxs.get(0).getSbcsdm());
}
res.put("hmcjsbxhdm", "05");
if (hmxxs.get(0).getSbbh() == null || "".equals(hmxxs.get(0).getSbbh())) {
hmxxs.get(0).setSbbh("ECI102_926499991110108774061560600000");
} else {
res.put("sbbh", hmxxs.get(0).getSbbh());
}
res.put("cjcd", "11");
res.put("dzmc", hmxxs.get(0).getXzzDzmc());
res.put("jd", "");
res.put("wd", "");
//res.put("cjbh","HM"+xyrC.getRybh().substring(1,19)+"01"+xyrC.getRybh().substring(19,23));
res.put("cjbh", "HM" + unitcodenew + dateNowStr + hmxxs.get(0).getRybh().substring(21, 23) + minute + second);
res.put("cjr_xm", hmxxs.get(0).getTrueName());
res.put("cjr_gmsfhm", hmxxs.get(0).getIdentitycard());
res.put("zyycjdm", "1");
for (int i = 0; i < hmxxs.size(); i++) {
TbStHm hm = hmxxs.get(i);
if ("0".equals(hm.getHmywdm()) && hm.getHmsj() != null) {
res.put("zyqsqkdm", hm.getHmqsqk());
res.put("hmzp_zy", new BASE64Encoder().encode(hm.getHmsj()).replace("\r\n", ""));
res.put("zy_xxzlpf", "85");
} else if ("1".equals(hm.getHmywdm()) && hm.getHmsj() != null) {
res.put("yyqsqkdm", hm.getHmqsqk());
res.put("hmzp_yy", new BASE64Encoder().encode(hm.getHmsj()).replace("\r\n", ""));
res.put("yy_xxzlpf", "85");
}
}
res.put("source", "3");
res.put("cjtphs", "1.825");
res.put("bcjr_rylb", "026");
res.put("zjbz", "1");
res.put("lrbz", "2");
res.put("qzcjbz", "0");
res.put("bcjr_zjlxdm", "111");
String sfzh = "";
if (hmxxs.get(0).getGmsfhm() == null || "".equals(hmxxs.get(0).getGmsfhm())) {
sfzh = hmxxs.get(0).getZjhm();
} else {
sfzh = hmxxs.get(0).getGmsfhm();
}
res.put("bcjr_zjhm", sfzh);
res.put("bcjr_xm", hmxxs.get(0).getXm());
res.put("bcjr_xb", hmxxs.get(0).getXbdm());
if (sfzh != null && sfzh.length() > 14) {
res.put("bcjr_csrq", sfzh.substring(6, 14));
} else {
res.put("bcjr_csrq", "");
}
res.put("bcjr_mz", hmxxs.get(0).getMzdm());
res.put("bcjr_gj", hmxxs.get(0).getGjdm());
res.put("bcjr_zjqfjg", "");
res.put("bcjr_zjyxqx", "");
res.put("bcjr_hjdz", hmxxs.get(0).getHjdzXzqhdm());
res.put("bcjr_jzdz", hmxxs.get(0).getXzzXzqhdm());
String sjhmstr = "";
if (hmxxs.get(0).getLxdm() != null && !"".equals(hmxxs.get(0).getLxdm())) {
sjhmstr = hmxxs.get(0).getLxdm();
}
res.put("bcjr_sjhm1", sjhmstr);
res.put("bcjr_sjhm2", "");
res.put("zjzp", "");
res.put("cjbz", "");
//JSONObject jsonResult= FileUtils.requestByPost(urlstr+"/api/xingzhuan/v1/regIris",res);//虹霸
//JSONObject jsonResult = FileUtils.requestByPost("http://74.10.26.178/iris/regIris",res);//眼神科技(海南)
log.info("眼神虹膜数据推送接口地址：" + urlstr + " " + "请求任务号：" + res.get("request_id")
+ "请求方 ID:" + res.get("client_id") +"请求方_公安机关机构名称："+res.get("user_deptname"));
TsHmResultDto tsHmResultDto=null;
try {
JSONObject jsonResult= FileUtils.requestByPost(urlstr,res);//眼神科技（湖南）
tsHmResultDto = JSONObject.parseObject(JSONObject.toJSONString(jsonResult), TsHmResultDto.class);
log.info("眼神推送结果！"+jsonResult.toJSONString());
}catch (Exception e){
log.error("虹膜推送错误："+e.getMessage());
return new TsHmResultDto("9999","推送超时，请稍后重试！",null);
}
for (TbStHm hm : hmxxs) {
hm.setTsjgmx(StringUtils.isNotBlank(tsHmResultDto.getMessage()) ? tsHmResultDto.getMessage():tsHmResultDto.getResult().getXxms());
if (tsHmResultDto.getResult() != null && ("1".equals(tsHmResultDto.getResult().getCjjg()) || "2".equals(tsHmResultDto.getResult().getCjjg()))) {
hm.setSfts("1");
// 将推送状态改为已推送
}
log.info("眼神虹膜是否推送：{}，虹膜id：{}，人员编号：{}",hm.getSfts(),hm.getXxzjbh(),hm.getRybh());
hmCjService.updateHmSfts(hm);
}
return tsHmResultDto;
}
public JSONObject sendHmxxToYanShenTs(List<TbStHm> hmxxs) {
Param param = paramService.getParamById("0102");
String urlstr = "";
String allIp = param.getParamvalue();
......@@ -919,9 +1074,8 @@ public class HmCjTsController {
String unitname = dicItemService.queryNameByCode(hmxxs.get(0).getUnitcode(), "CODE_UNIT");
if (unitname == null || "".equals(unitname)) {
unitname = "湖南省公安厅";
} else {
res.put("user_deptname", unitname);
}
res.put("user_deptname", unitname);
//res.put("user_deptname","海南省公安厅");
if (hmxxs.get(0).getSbcsdm() == null || "".equals(hmxxs.get(0).getSbcsdm())) {
res.put("sbcsdm", "911101087740615606");
......@@ -1005,6 +1159,11 @@ public class HmCjTsController {
@ResponseBody
public TsHmResultDto sendHmxxToWlh(Model model, String asjxgrybh,String username, HttpServletRequest request){
List<TbStHm> hmxxs = hmCjService.getHmxxInfoList(asjxgrybh);
for (TbStHm tb:hmxxs) {
if ("1".equals(tb.getSfts())){
return new TsHmResultDto("8888","虹膜已推送，请勿重复推送！",null);
}
}
AutoTbStRy xyrC = rycjService.getRyxxByRybh(asjxgrybh);
//Param param = paramService.getParamById("0103");
String urlstr = wlh;
......@@ -1614,7 +1773,7 @@ public class HmCjTsController {
log.info("中科虹霸返回结果：" + jsonObject.toJSONString());
} else if ("5606".equals(sbcsdm)) {
//眼神科技
jsonObject = sendHmxxToYanShen(tbStHmList);
jsonObject = sendHmxxToYanShenTs(tbStHmList);
log.info("眼神科技返回结果：" + jsonObject.toJSONString());
} else if ("429T".equals(sbcsdm)) {
//万里红
......
hnxtba-interface/src/main/resources/mapper/HmSqlMapper.xml
......@@ -100,6 +100,7 @@
CLIENT_ID,
REQUEST_ID,
SBCSDM,
SFTS,
XXSC_PDBZ from TB_XW_YTHCJ_HM where (XXSC_PDBZ='0' or XXSC_PDBZ is null) and RYBH = #{rybh , jdbcType=VARCHAR }
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment