Skip to content

H
hnxtbaboot
Commit 1b7e240c by wuchengwu
Options

虹膜采集与足迹采集静态修改

parent e8c71802
Showing with 73 additions and 87 deletions
hnxtba-core/src/main/java/com/founder/SpringBootStartApplication.java
......@@ -10,6 +10,6 @@ public class SpringBootStartApplication extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
// 注意这里要指向原先用main方法执行的Application启动类
return builder.sources(XtbaBootApplication.class);
return builder.sources(CoreBootApplication.class);
}
}
\ No newline at end of file
hnxtba-core/src/main/java/com/founder/XtbaBootApplication.java deleted 100644 → 0
package com.founder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.MultipartConfigElement;
/**
* 项目运行启动类
*/
@EnableAsync
@SpringBootApplication
@EnableCaching
public class XtbaBootApplication {
public static void main(String[] args) {
SpringApplication.run(XtbaBootApplication.class, args);
}
/**
* 文件上传配置
* @return
*/
@Bean
public MultipartConfigElement multipartConfigElement() {
MultipartConfigFactory factory = new MultipartConfigFactory();
//单个文件最大
factory.setMaxFileSize("215040MB"); //210MB
/// 设置总上传数据总大小
factory.setMaxRequestSize("256000MB");//250MB
return factory.createMultipartConfig();
}
}
hnxtba-core/src/main/java/com/founder/controller/ZjCjController.java
......@@ -836,7 +836,7 @@ public class ZjCjController {
model.addAttribute("zjhm",zjxx.getGmsfhm());
model.addAttribute("zjtsUrl",zjtsUrl);
model.addAttribute("zjxx",zjxx);
if(rst){
if(photoflag){
model.addAttribute("isflag","1");
model.addAttribute("type","1");
}else{
......
hnxtba-core/src/main/resources/static/hmcj/js/hmcj_wlh.js
......@@ -151,11 +151,11 @@ function wlhbaocun(){
layer.alert('请选择右眼缺失情况！');
return;
}
if($("#hmsjRight").val() != '0' && $("#hmsjLeft").val()!='0'){
layer.alert('如两眼均残缺不可采集，请到人员信息无法采集说明备注！',{icon:2});
return;
}
layer.msg('保存中...');
if($("#hmsjRight").val() != '0' && $("#hmsjLeft").val()!='0'){
layer.alert('如两眼均残缺不可采集，请到人员信息无法采集说明备注！',{icon:2});
return;
}
$.ajax({
url:"/saveHmSjXxHb",
data:$('#hmForm').serialize(),
......@@ -166,13 +166,7 @@ function wlhbaocun(){
layer.closeAll();
var code = data.code
if(code == "0"){
layer.alert(data.msg, {
skin: 'layui-layer-molv' //样式类名
,closeBtn: 0
}, function(){
wlhhmts();
});
} else {
layer.alert(data.msg);
}
......@@ -184,6 +178,7 @@ function wlhbaocun(){
}
function wlhhmts(){
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;
......
hnxtba-core/src/main/resources/templates/rygl/addryxx.html
......@@ -370,11 +370,8 @@
if(edzzpStr64!=null&&edzzpStr64!=""){
$("#imghead1").attr("src","data:image/jpg;base64,"+edzzpStr64);
$("#edzifcj").attr("src","/static/rygl/img/yes.png");
}else if($("#gmsfhm").val()!=null&&$("#gmsfhm").val()!=""&&$("#gmsfhm").val()!="无"&&$("#gmsfhm").val().indexOf("X")<0&&$("#gmsfhm").val().indexOf("x")<0){
$("#edzifcj").attr("src","/static/rygl/img/yes.png");
}else if($("#gmsfhm").val()!=null&&$("#gmsfhm").val()!=""&&$("#gmsfhm").val()!="无"){
toFyckxx();
}else if($("#gmsfhm").val()!=null&&$("#gmsfhm").val()!=""&&$("#gmsfhm").val()!="无"&&($("#gmsfhm").val().indexOf("X")>=0||$("#gmsfhm").val().indexOf("x")>=0)){
$("#edzifcj").attr("src","/static/rygl/img/yes.png");
}
var zmzpStr64 = $("#zmzpStr64").val();
if(zmzpStr64!=null&&zmzpStr64!=""){
......@@ -1520,7 +1517,7 @@
"phoneNum:"+$("#lxdm").val()+",birthAddrNo:"+$("#hjdzXzqhdm").combobox("getValue")+",residenceAddr:"+$("#xzzDzmc").val()+",hometownAddr:"+$("#hjdzDzmc").val()+","+
"caseTypeNo:"+$("#ajlbdm").combobox("getValue")+",personTypeNo:,remark:null,collectorName:"+$("#truename").val();
//alert(obj3);
window.location.href = encodeURI(obj3);
window.location.href = obj3;
}
}else{
//$("#swifcj").attr("src","/static/rygl/img/yes.png");
......@@ -2208,7 +2205,7 @@
<div class="btn-group btn-group-sm" style=" margin-left: 5px; margin-top: 8px;">
<button type="button" style="width: 60px;margin-left: 0px;" class="btn btn-primary" onclick="getRxbclj('2')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
<button type="button" class="btn btn-danger" onclick="catchimg('2')"><i class="fa fa-crop"></i> 截图 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzp('2')"><i class="fa fa-crop"></i> 导出 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzptest('2')"><i class="fa fa-crop"></i> 导出 </button>
</div>
</div>
<div class="upl">
......@@ -2220,7 +2217,7 @@
<div class="btn-group btn-group-sm" style=" margin-left: 5px; margin-top: 8px;">
<button type="button" style="width: 60px;margin-left: 0px;" class="btn btn-primary" onclick="getRxbclj('3')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
<button type="button" class="btn btn-danger" onclick="catchimg('3')"><i class="fa fa-crop"></i> 截图 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzp('3')"><i class="fa fa-crop"></i> 导出 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzptest('3')"><i class="fa fa-crop"></i> 导出 </button>
</div>
</div>
<div class="upl">
......@@ -2232,7 +2229,7 @@
<div class="btn-group btn-group-sm" style=" margin-left: 5px; margin-top: 8px;">
<button type="button" style="width: 60px;margin-left: 0px;" class="btn btn-primary" onclick="getRxbclj('4')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
<button type="button" class="btn btn-danger" onclick="catchimg('4')"><i class="fa fa-crop"></i> 截图 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzp('4')"><i class="fa fa-crop"></i> 导出 </button>
<button type="button" style="width: 60px;margin-right: 0px;float: right;" class="btn btn-primary" onclick="downloadRyzptest('4')"><i class="fa fa-crop"></i> 导出 </button>
</div>
</div>
<input type="hidden" id="R_ZMZP" name="R_ZMZP" />
......@@ -3005,10 +3002,6 @@
**/
function toFyckxx(){
var zjhm = $("#gmsfhm").val();
if(zjhm.indexOf("X")>=0 || zjhm.indexOf("x")>=0){
$("#edzifcj").attr("src","/static/rygl/img/yes.png");
return false;
}
if(zjhm == null || zjhm ==''){
$.messager.alert( '提示',"请先输入身份证号再点击复用按钮！");
return false;
......@@ -3266,8 +3259,8 @@
var canvas = document.createElement("canvas");
canvas.width = 450;
canvas.height = 600;
//canvas.width = image.width;
//canvas.height = image.height;
// canvas.width = image.width;
// canvas.height = image.height;
canvas.getContext("2d").drawImage(image, 0, 0);
return canvas;
}
......@@ -3284,7 +3277,36 @@
document.getElementById('tttt').setAttribute('download', $('#rybh').val()+num+'.jpg')
document.getElementById('tttt').click();
}
function dataURLtoBlob(dataurl) {
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
while (n--) {
u8arr[n] = bstr.charCodeAt(n);
}
return new Blob([u8arr], { type: mime });
}
function downloadFile(url,name='What\'s the fuvk'){
var a = document.createElement("a")
a.setAttribute("href",url)
a.setAttribute("download",name)
a.setAttribute("target","_blank")
let clickEvent = document.createEvent("MouseEvents");
clickEvent.initEvent("click", true, true);
a.dispatchEvent(clickEvent);
}
function downloadFileByBase64(base64,name){
var myBlob = dataURLtoBlob(base64)
var myUrl = URL.createObjectURL(myBlob)
downloadFile(myUrl,name)
}
function downloadRyzptest(num) {
var sampleImage = document.getElementById("imghead"+num);
var srcs=$('#imghead'+num).attr('src');
downloadFileByBase64(srcs,$('#rybh').val()+num+'.jpg')
}
</script>
<!-- 权限机制
<div style="display: none" id="perurl" th:text="${perurl}"></div>-->
......
hnxtba-core/src/main/resources/templates/zjcj/zjcj.html
......@@ -471,10 +471,11 @@
$.messager.alert("提示","是否残疾不能为空！");
return;
}
//xxts_user();
//xxts_ryxx();
document.zjcjform.action = "/doSaveZjxx";
document.zjcjform.submit();
}
function toCxts(){
if($("#ifts").val() =='true'){
$.messager.alert("提示","已经推送请勿重复推送！");
......@@ -492,25 +493,26 @@
$.messager.alert("提示","是否残疾不能为空！");
return;
}
layer.msg('正在推送中！',{icon: 16,shade: [0.5, '#f5f5f5'],scrollbar: false,offset: 'auto', time:20000})
$.ajax({
url:$('#zjtsUrl').val(),
type:"POST",
data:{"rybh" : $('#rybh').val(),"username":$('#username').val()},
success:function(data){
var code = data.code;
if (code == "1000"){
layer.alert(data.msg, {
skin: 'layui-layer-molv' //样式类名
,closeBtn: 0
}, function(){
window.close()
});
}else if (code ==undefined){
layer.confirm('<span style="color: red">发生未知错误请联系工程师！</span>',{icon: 2, title:'推送错误提示'});
}else {
// layer.alert(data.msg);
layer.confirm('<span style="color: red">'+data.msg+'</span>',{icon: 2, title:'推送错误提示'});
}
var code = data.code;
if (code == "1000"){
layer.alert(data.msg, {
skin: 'layui-layer-molv' //样式类名
,closeBtn: 0
}, function(){
window.close()
});
}else if (code ==undefined){
layer.confirm('<span style="color: red">发生未知错误请联系工程师！</span>',{icon: 2, title:'推送错误提示'});
}else {
// layer.alert(data.msg);
layer.confirm('<span style="color: red">'+data.msg+'</span>',{icon: 2, title:'推送错误提示'});
}
}
});
}
......
hnxtba-interface/src/main/java/com/founder/controller/HmCjTsController.java
......@@ -11,6 +11,7 @@ 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;
......@@ -714,7 +715,7 @@ public class HmCjTsController {
hmCjService.updateHmSfts(hm);
}
// HmTs hmTsHongBa = new HmTs(resultList);
// ThreadPoolContainer threadPoolContainer = new ThreadPoolContainer(1,1,1);
// ThreadPoolContainer threadPoolContainer = new ThreadPoolContainer(10,10,10);
// threadPoolContainer.addRunnableTask(hmTsHongBa);
});
} else {
......@@ -1134,10 +1135,15 @@ public class HmCjTsController {
res.put("bcjr_sjhm2",xyrC.getLxdm2());
res.put("zjzp",xyrC.getEdzzpStr64());
System.out.println("万里红虹膜数据推送接口地址："+urlstr);
JSONObject jsonResult= FileUtils.requestByPost(urlstr,res);
System.out.println(jsonResult.toJSONString());
TsHmResultDto tsHmResultDto = JSONObject.parseObject(JSONObject.toJSONString(jsonResult), TsHmResultDto.class);
log.info("万里红推送结果！"+tsHmResultDto.toString());
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()))) {
......
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