Commit a8147216 by yangliang

新增关系人、同案人员、笔迹采集及数据完整性检查功能

parent 8f0df404
......@@ -39,9 +39,11 @@ public class DefaultViewConfig implements WebMvcConfigurer {
registry.addViewController("/toObjectKJ").setViewName("rygl/objectKJ");
registry.addViewController("/catchimg").setViewName("rygl/demo");
registry.addViewController("/dnabqdy").setViewName("rygl/dnabqdy");
registry.addViewController("/toBjcj").setViewName("rygl/bjcj");
registry.addViewController("/toHrzjcjpage").setViewName("rygl/hrzjcj");
registry.addViewController("/iframe1").setViewName("zlcc/iframe1");
registry.addViewController("/iframe2").setViewName("zlcc/iframe2");
registry.addViewController("/iframe5").setViewName("zlcc/iframe3");
registry.addViewController("/iframe3").setViewName("zwbzgl/iframe1");
registry.addViewController("/iframe4").setViewName("zwbzgl/iframe2");
registry.addViewController("/xj").setViewName("zlcc/xj");
......
......@@ -96,6 +96,8 @@ public class AutoTbStRy implements Serializable {
private String r_zjRightBase64;
private String tstz1Base64;
private String tstz2Base64;
private String bj1Base64;
private String bj2Base64;
private String r_hmLeftBase64;
private String r_hmRightBase64;
......@@ -116,6 +118,8 @@ public class AutoTbStRy implements Serializable {
private String zjrightflag;
private String tstzflag1;
private String tstzflag2;
private String bjflag1;
private String bjflag2;
private String r_sjlxdh;//指纹比中状态
private String zwfkxx; //指纹反馈信息
......@@ -226,6 +230,27 @@ public class AutoTbStRy implements Serializable {
private String sjcjzt;//采集状态
private String yhkcjzt;//采集状态
private String gxrlxdm1;//关系人类型代码1
private String gxrlxdmStr1;//关系人类型1
private String gxrxm1;//关系人姓名1
private String gxrsfzh1;//关系人身份证号1
private String gxrlxdm2;//关系人类型代码2
private String gxrlxdmStr2;//关系人类型2
private String gxrxm2;//关系人姓名2
private String gxrsfzh2;//关系人身份证号2
private String gxrlxdm3;//关系人类型代码3
private String gxrlxdmStr3;//关系人类型3
private String gxrxm3;//关系人姓名3
private String gxrsfzh3;//关系人身份证号3
private String tary1;//同案人员1
private String taryxq1;//同案人员详情1
private String tary2;//同案人员2
private String taryxq2;//同案人员详情2
private String tary3;//同案人员3
private String taryxq3;//同案人员详情3
public String getRxbdjg() {
return rxbdjg;
}
......@@ -1861,4 +1886,180 @@ public class AutoTbStRy implements Serializable {
public void setYhkcjzt(String yhkcjzt) {
this.yhkcjzt = yhkcjzt;
}
public String getBj1Base64() {
return bj1Base64;
}
public void setBj1Base64(String bj1Base64) {
this.bj1Base64 = bj1Base64;
}
public String getBj2Base64() {
return bj2Base64;
}
public void setBj2Base64(String bj2Base64) {
this.bj2Base64 = bj2Base64;
}
public String getBjflag1() {
return bjflag1;
}
public void setBjflag1(String bjflag1) {
this.bjflag1 = bjflag1;
}
public String getBjflag2() {
return bjflag2;
}
public void setBjflag2(String bjflag2) {
this.bjflag2 = bjflag2;
}
public String getGxrlxdm1() {
return gxrlxdm1;
}
public void setGxrlxdm1(String gxrlxdm1) {
this.gxrlxdm1 = gxrlxdm1;
}
public String getGxrlxdmStr1() {
return gxrlxdmStr1;
}
public void setGxrlxdmStr1(String gxrlxdmStr1) {
this.gxrlxdmStr1 = gxrlxdmStr1;
}
public String getGxrxm1() {
return gxrxm1;
}
public void setGxrxm1(String gxrxm1) {
this.gxrxm1 = gxrxm1;
}
public String getGxrsfzh1() {
return gxrsfzh1;
}
public void setGxrsfzh1(String gxrsfzh1) {
this.gxrsfzh1 = gxrsfzh1;
}
public String getGxrlxdm2() {
return gxrlxdm2;
}
public void setGxrlxdm2(String gxrlxdm2) {
this.gxrlxdm2 = gxrlxdm2;
}
public String getGxrlxdmStr2() {
return gxrlxdmStr2;
}
public void setGxrlxdmStr2(String gxrlxdmStr2) {
this.gxrlxdmStr2 = gxrlxdmStr2;
}
public String getGxrxm2() {
return gxrxm2;
}
public void setGxrxm2(String gxrxm2) {
this.gxrxm2 = gxrxm2;
}
public String getGxrsfzh2() {
return gxrsfzh2;
}
public void setGxrsfzh2(String gxrsfzh2) {
this.gxrsfzh2 = gxrsfzh2;
}
public String getGxrlxdm3() {
return gxrlxdm3;
}
public void setGxrlxdm3(String gxrlxdm3) {
this.gxrlxdm3 = gxrlxdm3;
}
public String getGxrlxdmStr3() {
return gxrlxdmStr3;
}
public void setGxrlxdmStr3(String gxrlxdmStr3) {
this.gxrlxdmStr3 = gxrlxdmStr3;
}
public String getGxrxm3() {
return gxrxm3;
}
public void setGxrxm3(String gxrxm3) {
this.gxrxm3 = gxrxm3;
}
public String getGxrsfzh3() {
return gxrsfzh3;
}
public void setGxrsfzh3(String gxrsfzh3) {
this.gxrsfzh3 = gxrsfzh3;
}
public String getTary1() {
return tary1;
}
public void setTary1(String tary1) {
this.tary1 = tary1;
}
public String getTaryxq1() {
return taryxq1;
}
public void setTaryxq1(String taryxq1) {
this.taryxq1 = taryxq1;
}
public String getTary2() {
return tary2;
}
public void setTary2(String tary2) {
this.tary2 = tary2;
}
public String getTaryxq2() {
return taryxq2;
}
public void setTaryxq2(String taryxq2) {
this.taryxq2 = taryxq2;
}
public String getTary3() {
return tary3;
}
public void setTary3(String tary3) {
this.tary3 = tary3;
}
public String getTaryxq3() {
return taryxq3;
}
public void setTaryxq3(String taryxq3) {
this.taryxq3 = taryxq3;
}
}
\ No newline at end of file
......@@ -17,7 +17,7 @@ mybatis.mapperLocations=classpath:mapper/*.xml
#协同数据源配置
spring.datasource.xzxtdb.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
spring.datasource.xzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
spring.datasource.xzxtdb.username=XZXT
spring.datasource.xzxtdb.password=XZXT
spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
......@@ -60,21 +60,21 @@ spring.datasource.stamsisajzwdb.password=WSZZPT
spring.datasource.stamsisajzwdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.stamsisajzwdb.type: com.alibaba.druid.pool.DruidDataSource
#警综数据源配置(山西使用)
spring.datasource.jwzhdb.url=jdbc:oracle:thin:@47.92.129.99:1600:ORCL
spring.datasource.jwzhdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.jwzhdb.username=XZXT
spring.datasource.jwzhdb.password=XZXT
spring.datasource.jwzhdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.jwzhdb.type: com.alibaba.druid.pool.DruidDataSource
#在逃数据源配置
spring.datasource.ztrydb.url=jdbc:oracle:thin:47.92.129.99:1600:ORCL
spring.datasource.ztrydb.url=jdbc:oracle:thin:127.0.0.1:1521:ORCL
spring.datasource.ztrydb.username=XZXT
spring.datasource.ztrydb.password=XZXT
spring.datasource.ztrydb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.ztrydb.type: com.alibaba.druid.pool.DruidDataSource
#海南刑专数据源配置
spring.datasource.hnxzxtdb.url=jdbc:oracle:thin:@47.92.129.99:1600:ORCL
spring.datasource.hnxzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:ORCL
spring.datasource.hnxzxtdb.username=XZXT
spring.datasource.hnxzxtdb.password=XZXT
spring.datasource.hnxzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
......
......@@ -53,58 +53,6 @@ var index;
function getRxbclj(index_){
index = index_;
getTp();
openDialog_rxbd('#photo-dialog');
$.ajax({
url:"/toSavaRxbdjg?asjxgrybh="+frminput.rybh.value,
date:{"asjxgrybh":frminput.rybh.value},
type:"POST",
success:function(data){
if (data) {
$.messager.alert( '提示',"1111成功!");
} else {
$.messager.alert( '提示',"222失败!");
}
}
});
$.ajax({
url:"/sendMessage?fsrName=测试&jsdwDm=430000000000&xxbt="+frminput.gmsfhm.value+"&xxlx=1&xxnr=姓名:"+frminput.xm.value+" 身份证号:"+frminput.gmsfhm.value+" 有人像比对接结果返回。",
type:"POST",
success:function(data){
if (data) {
$.messager.alert( '提示',"1111成功!");
} else {
$.messager.alert( '提示',"222失败!");
}
}
});
}
function openDialog_rxbd(obj) {
debugger;
$('#w').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
},{
text:'取消',
handler:function(){
$('#w').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#w').show().dialog('open');
$("#w").window('center');
var tops = $(document).scrollTop();//当页面滚动时,把当前距离赋值给页面,这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops);})
}
function getTp(){
......@@ -153,6 +101,10 @@ function getTp(){
setTP(frminput.tstz1Base64,barcodeStr+'_'+nameStr+'_31.jpg',$('#imghead31'),nameStr,31);
}else if(index==32){
setTP(frminput.tstz2Base64,barcodeStr+'_'+nameStr+'_32.jpg',$('#imghead32'),nameStr,32);
}else if(index==41){
setTP(frminput.bj1Base64,barcodeStr+'_'+nameStr+'_41.jpg',$('#imghead41'),nameStr,41);
}else if(index==42){
setTP(frminput.bj2Base64,barcodeStr+'_'+nameStr+'_42.jpg',$('#imghead42'),nameStr,42);
}
}
......@@ -221,7 +173,11 @@ function setTP(tpCode,tpFile,tpShow,tpName,index){//将控件采集的信息放
}else if(index==32){
frminput.tstzflag2.value = "0";
}
if(index==41){
frminput.zjflag1.value = "0";
}else if(index==42){
frminput.zjflag2.value = "0";
}
/*
if(index==2){
......
<!doctype html>
<html lang="en">
<html xmlns:th="http://www.thymeleaf.org">
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>摄像头拍照</title>
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/easyui.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/font-awesome.min.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/base_initialize.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/collection.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/dialog-upload.css">
<link rel="stylesheet" href="/static/xtba/ssxdwp/css/dialog.css">
</head>
<body>
<input type="hidden" name="bjzpimg" id="bjzpimg" value=""/>
<div id="w" class="dialogclass" style="height: 100%;width: 100%;">
<div class="sx-left">
<img id="preview" height="350" width="350" />
<!--<video id="video" width="350" height="350" controls></video>-->
</div>
<div class="sx-btn" style="height: 35px;margin-left: 0px;margin-top: 140px;">
<a class="btn_a btn_search" style="height: 35px;" id="capture" onclick="catchimg()">拍照</a>
<a class="btn_a btn_empty" style="height: 35px;" onclick="pzwc()">完成</a><br>
选择摄像头:<select style="width: 150px;" id="camera1"></select>
</div>
<div class="preview">
<!--<canvas id="canvas" width="350" height="350"></canvas>-->
<img id="result" height="350" width="350" />
</div>
</div>
<script type="text/javascript" src="/static/xtba/ssxdwp/js/jquery.min.js"></script>
<script type="text/javascript" src="/static/xtba/ssxdwp/js/base.js"></script>
<script type="text/javascript" src="/static/xtba/ssxdwp/js/function.js"></script>
<script type="text/javascript" src="/static/xtba/ssxdwp/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/static/xtba/ssxdwp/js/easyui-lang-zh_CN.js"></script>
<script>
function pzwc() {
debugger;
var imgstr = $("#wpzpimg").val();
$("#wpzpimgBase64").val(imgstr);
$("#fileImg").attr("src",imgstr);
$("#wpzpflag").val("1");
$('#w').dialog('close');
$(document).unbind("scroll");
}
var ws;
var flg = false;
var numtemp = -1;
function startXmcj(){
var options = $("#camera1 option:selected");
ws.send("{\"isSole\":1,\"isPreview\":1,\"cameraName\":\"" + options.text() + "\"}");
}
function catchimg() {
ws.send("{\"isSole\":1,\"index\":0}");
}
window.onload = initWS();
//初始化websocket
function initWS() {
debugger;
ws = new WebSocket("ws://127.0.0.1:49000");
ws.onopen = function(e) {
};
ws.onclose = function(e) {
//意外中断,再连接
//if (e.code == '1006' || e.code == '1002') {
// initWS();
// } else {
//$("#run").attr("disabled", false);
// }
}
ws.onmessage = function(e) {
var data = JSON.parse(e.data);
//正常结束,data.Context 可获取最后一张图原图base64
if (data.IsSole == 0) {
if (data.Code < 0) {
alert(data.Context);
}
//采集发生错误
else if (data.Code == 0) {
var context = "data:img/jpg;base64," + data.Context;
$("#content"+numtemp).attr('src', context);
} else if (data.Code == 1) {
var context = "data:img/jpg;base64," + data.Context;
$("#preview").attr('src', context);
} else if (data.Code == 10) {
var context = "data:img/jpg;base64," + data.Context;
$("#result").attr('src', context);
$("#bjzpimg").val(context);
}
} else {
if (data.Code == 2) {
var obj = JSON.parse(data.Context); //解析字符串---解析成object数组
for (var i = 0; i < obj.length; i++) {
document.getElementById("camera1").options.add(new Option(obj[i])); //使用纯js为select动态添加option
}
debugger;
var selected="LiteArray USB2.0 5M Camera";
$("#camera1").find("option").each(function(){
if(selected.indexOf($(this).text())>=0) {
$(this).attr("selected",true);
}
});
} else if (data.Code == 1) {
var context = "data:img/jpg;base64," + data.Context;
$("#preview").attr('src', context);
} else if (data.Code == 0) {
var context = "data:img/jpg;base64," + data.Context;
$("#result").attr('src', context);
$("#bjzpimg").val(context);
} else {
//$("#context"+numtemp).attr('src', data.context);
alert(data.Context);
}
}
//采集发生错误
}
}
$(function() {
startXmcj();
debugger;
$("select").bind("change", function () {
startXmcj();
})
});
</script>
</body>
</html>
\ No newline at end of file
......@@ -44,6 +44,13 @@
<i class="fa fa-caret-left zdy-icon zdy-icon2"></i>
</li>
-->
<li id="B0503" class="posi" flag="2" onclick="changeContent(this)">
<a id="left_gmajspgl" class="left-list-ftitle">
<i class="fa fa-book" style="font-size:12px;"></i> 数据完整性检查
</a>
<i class="fa fa-caret-left zdy-icon zdy-icon2"></i>
</li>
</ul>
</aside>
<article class="main-cen-box" style="margin-left: 230px;">
......@@ -53,6 +60,9 @@
<div id="content1" class="content-box" style="display: block;">
<iframe name="myiframe" id="f2" src="iframe2" frameborder="0" align="left" width="100%" height="100%" scrolling="yes"></iframe>
</div>
<div id="content2" class="content-box" style="display: block;">
<iframe name="myiframe" id="f3" src="iframe5" frameborder="0" align="left" width="100%" height="100%" scrolling="yes"></iframe>
</div>
</article>
<script src="static/xtba/zlcc/js/jquery.min.js" type="text/javascript"></script>
<script src="static/xtba/zlcc/layer/layer.js" type="text/javascript"></script>
......
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