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/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