Commit b7c574d9 by e

修改首页用户信息显示及质量检查入指纹编辑队列错误问题

parent 9f8fb8fb
......@@ -196,6 +196,26 @@
<artifactId>lombok</artifactId>
<version>1.16.10</version>
</dependency>
<dependency>
<groupId>com.founder.xfire</groupId>
<artifactId>xfire-all</artifactId>
<version>1.2.6</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>com.founder.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
......
......@@ -11,6 +11,7 @@ import com.founder.util.Zwsjzljc;
import com.founder.utils.*;
import org.apache.http.client.HttpClient;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.codehaus.xfire.client.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -31,6 +32,7 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URL;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -1708,12 +1710,12 @@ public class TbXwRycjController {
Plainimg plainimg=new Plainimg();
plainimg.setBarcode(szzwbh);
plainimg = amsisPlainImgService.getAmsisPlainInputTimeService(szzwbh);
if(plainimg!=null){
if(plainimg!=null&&plainimg.getEdittime()!=null&&!"".equals(plainimg.getEdittime())){
boolean flg1 = bjDate(cjsj,plainimg.getEdittime());
Rollimg rollimg=new Rollimg();
rollimg.setBarcode(szzwbh);
rollimg = amsisRollImgService.getAmsisInputTimeService(szzwbh);
if(rollimg!=null){
if(rollimg!=null&&rollimg.getEdittime()!=null&&!"".equals(rollimg.getEdittime())){
boolean flg2 = bjDate(cjsj,rollimg.getEdittime());
if(flg1&&flg2){
result="1";
......
......@@ -4,6 +4,7 @@ import com.founder.login.service.LoginService;
import com.founder.model.AutoTbStRy;
import com.founder.model.Param;
import com.founder.model.User;
import com.founder.module.redis.service.IDicItemService;
import com.founder.service.AutoTbXwRycjService;
import com.founder.service.IParamService;
import com.founder.util.HttpClientUtil;
......@@ -53,6 +54,8 @@ public class LoginController {
private IParamService paramService;
@Autowired
private LoginService loginService;
@Autowired
private IDicItemService dicItemService;
@Value("${zhyyPath}")
private String zhyyPath;
@Value("${qxUrl}")
......@@ -85,6 +88,7 @@ public class LoginController {
if(user!=null){
if(userId==null||"".equals(userId)){
model.addAttribute("username",user.getUsername());
model.addAttribute("unitname",user.getUnitname());
model.addAttribute("truename",user.getTrueName());
model.addAttribute("unitcode",user.getUnitcode());
returnStr = "home.html";
......@@ -149,6 +153,8 @@ public class LoginController {
}
model.addAttribute("username",user.getUsername());
model.addAttribute("unitcode",user.getUnitcode());
model.addAttribute("unitname",user.getUnitname());
model.addAttribute("truename",user.getTrueName());
model.addAttribute("ryxx",xyrC);
model.addAttribute("saveflag","0");
model.addAttribute("perurl",perurl);
......
......@@ -402,6 +402,7 @@ public class User {
public String getCountryCode() {
String unitcode = getUnitcode();
String grade = getGrade();
if( !StringUtils.isEmpty(unitcode) && !StringUtils.isEmpty(grade)){
countryCode = Utils.countryCode(unitcode,grade);
}else{
......
......@@ -69,12 +69,12 @@ public class TestTask {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+zpbw+".jpg");
rst=zpBase64;
}
//if("1".equals(zpbw)&&(rst==null||"".equals(rst))){
// AutoTbStRy ryxx=new AutoTbStRy();
// Qgckzp qgckzp = new Qgckzp();
// ryxx=qgckzp.getQgckAllxxXml(zjhm);
// rst = ryxx.getEdzzpStr64();
//}
if("1".equals(zpbw)&&(rst==null||"".equals(rst))){
AutoTbStRy ryxx=new AutoTbStRy();
Qgckzp qgckzp = new Qgckzp();
ryxx=qgckzp.getQgckAllxxXml(zjhm);
rst = ryxx.getEdzzpStr64();
}
return new AsyncResult<>(rst);
}
......
package com.founder.util;
import java.io.IOException;
import java.io.StringReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.sql.SQLException;
import java.text.ParseException;
......@@ -14,6 +16,17 @@ import java.util.Map;
import com.founder.utils.JdbcUtil;
import com.founder.utils.StringUtil;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.ResponseHandler;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.codehaus.xfire.client.Client;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
......@@ -25,18 +38,20 @@ import org.xml.sax.InputSource;
public class Zwsjzljc {
private Logger log= LoggerFactory.getLogger(this.getClass());
private static JdbcUtil jdbcUtil = new JdbcUtil();
//private static Client client = null;
private static Client client = null;
{
String serviceUrl = jdbcUtil.queryParam("0012");
//String serviceUrl = "http://localhost:8080/PHDataUploadWS/ws/UploadServer";
if (serviceUrl != null && !"".equals(serviceUrl)) {
try {
if(serviceUrl.indexOf("?wsdl")<0){
serviceUrl = serviceUrl + "?wsdl";
}
//if(client == null){
//client = new Client(new URL(serviceUrl));
//}
if(client == null){
URL urlstr = new URL(serviceUrl);
client = new Client(urlstr);
}
} catch (Exception e) {
log.info("......-------------------调用AMSIS服务器端异常,请检查wsdl连接是否正常!......"+e.getMessage());
e.printStackTrace();
......@@ -56,8 +71,8 @@ public class Zwsjzljc {
if (xmlstr != null && !"".equals(xmlstr)) {
log.info("......-------------------调用待采集信息确认接口传递的结果值:"+xmlstr);
if (xmlstr != null && !"".equals(xmlstr)) {
//Object[] results = client.invoke("setPersonNum", new Object[] { xmlstr });
//returnstr = "" + results[0];
Object[] results = client.invoke("setPersonNum", new Object[] { xmlstr });
returnstr = "" + results[0];
log.info("......-------------------调用待采集信息确认接口返回的结果值:"+returnstr);
}
}
......@@ -79,8 +94,8 @@ public class Zwsjzljc {
String xmlstr = getCheckResultXml(barcode);
if (xmlstr != null && !"".equals(xmlstr)) {
log.info("......-------------------调用质量检查完成接口传递的结果值:"+xmlstr);
//Object[] results = client.invoke("setCheckResult", new Object[] { xmlstr });
//returnstr = "" + results[0];
Object[] results = client.invoke("setCheckResult", new Object[] { xmlstr });
returnstr = "" + results[0];
log.info("......-------------------调用质量检查完成接口返回的结果值:"+returnstr);
}
}
......
......@@ -13,7 +13,27 @@
</select>
<select id="queryUserByName" resultType="com.founder.model.User" parameterType="map">
select t.*,t.true_name trueName from SYS_USER t where 1=1
select id,
unitcode,
username,
password,
open_flag,
default_model,
remark,
lrr,
lrsj,
gxr,
gxsj,
lrdwdm,
lrdwmc,
identitycard,
sex,
birthday,
telephone,
grade,
policemanid,
scbz,
t.true_name trueName,(select name from sys_dictitem_xzxt s where s.groupid='CODE_UNIT' and s.code = t.unitcode) as unitname from SYS_USER t where 1=1
and scbz='0'
and username=#{userName}
and password=#{password}
......
......@@ -279,6 +279,55 @@ function openDialog(rybh,username){
var tops = $(document).scrollTop();//当页面滚动时,把当前距离赋值给页面,这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
function openDialogToZljc(rybh,username){
$('#bhg-dialog').dialog({
buttons:[{
//确定生成表头配置信息,并重新加载表格数据
text:'确定保存',
handler:function(){
$('#bhg-dialog').dialog('close');
$(document).unbind("scroll");
var bzs = $("#bzs").val();
$("#bz").val(bzs);
$("#jcjg").val("1");
$.ajax({
url:"/saveJcjg?rybh="+$("#rybhStr").val()+"&zwbh="+$("#szzwbhStr").val()+"&RGdzw="+$("#RGdzw").val()+"&RPmzw="+$("#RPmzw").val()+"&RRx="+$("#RRx").val()+"&wzxx="+$("#wzxx").val()+"&bz="+$("#bz").val()+"&jcjg="+$("#jcjg").val(),
type:"POST",
success:function(data){
if(data){
$.messager.alert( '提示',"检查结果保存成功!","",function (r) {
debugger;
$('#bhg-dialog').dialog('close');
$(document).unbind("scroll");
ajax_updateCloesQual($("#jcjg").val(),$("#szzwbhStr").val(),$("#username").val(),$("#unitcode").val());
window.opener.location.reload();
window.close();
});
}else{
$.messager.alert( '提示',"检查结果保存失败!");
}
}
});
}
},{
text:'取消关闭',
handler:function(){
$('#bhg-dialog').dialog('close');
$(document).unbind("scroll");
}
}],
onClose: function () {
$(document).unbind("scroll");
}
});
$('#bhg-dialog').show().dialog('open');
$("#bhg-dialog").window('center');
var tops = $(document).scrollTop();//当页面滚动时,把当前距离赋值给页面,这样保持页面滚动条不动
$(document).bind("scroll",function (){$(document).scrollTop(tops); });
}
function clearZwbz(obj){
$(obj).parents("table").find("input").val("");
}
......@@ -387,7 +436,6 @@ function saveZljc(jcjg){
$.messager.alert( '提示',"人像未检查完成!");
return;
}
debugger;
$("#jcjg").val(jcjg);
var clue = jcjg=="0"?"合格":"不合格";
if(jcjg=="0"){
......@@ -420,8 +468,18 @@ function saveZljc(jcjg){
}
function ajax_updateCloesQual(jg,barcode,username,unitcode){
//$.post("zljcjgjson!zljcjg.action",{zwbh:barcode,jcjg:jg},getReturn_CheckQuality);
$.post("http://10.142.16.216:7070/XZZYXT/zljcjgjsonweb!zljcjg.action",{zwbh:barcode,jcjg:jg,username:username,unitcode:unitcode},getReturn_CheckQuality);
debugger;
$.post("zljcjg",{zwbh:barcode,jcjg:jg},getReturn_CheckQuality);
//$.post("http://10.142.16.216:7070/XZZYXT/zljcjgjsonweb!zljcjg.action",{zwbh:barcode,jcjg:jg,username:username,unitcode:unitcode},getReturn_CheckQuality);
//window.open("http://10.142.16.216:7070/XZZYXT/zljcjgjsonweb!zljcjg.action?zwbh="+barcode+"&jcjg="+jg+"&username="+username+"&unitcode="+unitcode);
//$.ajax({
// url:"http://10.142.16.216:7070/XZZYXT/zljcjgjsonweb!zljcjg.action?zwbh="+barcode+"&jcjg="+jg+"&username="+username+"&unitcode="+unitcode,
// type:"POST",
// success:function(data){
// alert(data.result+"==data=="+data);
// getReturn_CheckQuality(data)
// }
//});
}
function getReturn_CheckQuality(result){
......
......@@ -11,17 +11,19 @@
<link rel="stylesheet" type="text/css" href="static/xtba/login/css/login.css">
<link rel="stylesheet" type="text/css" href="static/xtba/login/css/animate.min.css">
<link rel="stylesheet" type="text/css" href="static/xtba/login/css/font-awesome.css">
</head>
<body style="background: url(static/xtba/login/images/1.jpg);background-size: cover;">
<div class="banner-top">
<div class="top-left">
<div class="touxiang">
<img src="static/xtba/login/images/user.jpg">
</div>
<div class="info">
<span>欢迎您:</span><span>新疆自治区公安厅</span>
<a href=""><span style="color:#f60;">系统管理员</span></a>
<input type="hidden" id="unitcode" th:value="${unitcode}"/>
<input type="hidden" id="username" th:value="${username}"/>
<span>欢迎您:</span><span id="unitname" th:text="${unitname}"></span>
<a href=""><span style="color:#f60;" id="truename" th:text="${truename}"></span></a>
</div>
</div>
<div class="top-right">
......@@ -36,7 +38,7 @@
</a>
<a onclick=""><span class="message" title="我的消息"><i class="fa fa-bell fa-2x fa-fw"></i><span class="mess_num">3</span></span></a>
<a onclick=""><span class="message" title="时尚桌面"><i class="fa fa-at fa-2x fa-fw"></i></span></a>
<a onclick=""><span class="out" title="退出"><i class="fa fa-power-off fa-2x fa-fw"></i></span></a>
<a onclick="closeWwindow()"><span class="out" title="退出"><i class="fa fa-power-off fa-2x fa-fw"></i></span></a>
</div>
</div>
......@@ -336,6 +338,13 @@
function cjsq(){
window.open("/sheb",'_blank');
}
function closeWwindow(){
var r=confirm("确定需要退出登录?")
if (r==true)
{
window.open('/noLogin',"_parent");
}
}
</script>
<!-- 权限机制
<div style="display: none" id="perurl" th:text="${session.perurl}"></div>
......
......@@ -439,10 +439,10 @@ function openNew(rybh,szzwbh,cjsj){
$.messager.alert( '提示',"该人员指纹采集不成功,请重新进行采集!");
}
if (-1==data){
$.messager.alert( '提示',"指纹库没有相关人员,请过一会再查看!");
$.messager.alert( '提示',"指纹库无有相关人员,请稍后查看!");
}
if (-2==data){
$.messager.alert( '提示',"指纹信息待入库,请过一会再查看!");
$.messager.alert( '提示',"指纹信息待入库,请稍后查看!");
}
} else
{
......@@ -471,10 +471,10 @@ function openXq(rybh,szzwbh,cjsj){
$.messager.alert( '提示',"该人员指纹采集不成功,请重新进行采集!");
}
if (-1==data){
$.messager.alert( '提示',"指纹库没有相关人员,请过一会再查看!");
$.messager.alert( '提示',"指纹库无相关人员,请稍后查看!");
}
if (-2==data){
$.messager.alert( '提示',"指纹信息待入库,请过一会再查看!");
$.messager.alert( '提示',"指纹信息待入库,请稍后查看!");
}
} else
{
......
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