Commit 19b5d0c5 by yangliang

添加指纹比中信息管理功能,修改人员采集

parent aed9e35f
...@@ -62,4 +62,5 @@ public interface IAjswtzService { ...@@ -62,4 +62,5 @@ public interface IAjswtzService {
* @return * @return
*/ */
TbXsjszyZwZwbzJbxx getZwBzxx(String xxzjbh); TbXsjszyZwZwbzJbxx getZwBzxx(String xxzjbh);
TbXsjszyZwZwbzJbxx getRyccBzxx(String xxzjbh);
} }
...@@ -84,7 +84,7 @@ public class AjswtzServiceImpl implements IAjswtzService { ...@@ -84,7 +84,7 @@ public class AjswtzServiceImpl implements IAjswtzService {
list = stamsisDao.getZwbzJbxx(map); list = stamsisDao.getZwbzJbxx(map);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("根据指纹比中的指纹编号查询基本详情信息异常"+e); System.out.println("根据指纹比中的指纹编号查询(正倒查)基本详情信息异常"+e);
} }
return list; return list;
...@@ -100,7 +100,7 @@ public class AjswtzServiceImpl implements IAjswtzService { ...@@ -100,7 +100,7 @@ public class AjswtzServiceImpl implements IAjswtzService {
list = stamsisDao.getCcbzJbxx(map); list = stamsisDao.getCcbzJbxx(map);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("根据指纹比中的指纹编号查询基本详情信息异常"+e); System.out.println("根据指纹比中的指纹编号查询(查重)基本详情信息异常"+e);
} }
return list; return list;
...@@ -117,7 +117,7 @@ public class AjswtzServiceImpl implements IAjswtzService { ...@@ -117,7 +117,7 @@ public class AjswtzServiceImpl implements IAjswtzService {
list = stamsisDao.getXsjsbdxqJbxx(map); list = stamsisDao.getXsjsbdxqJbxx(map);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("根据指纹比中的指纹编号查询基本详情信息异常"+e); System.out.println("根据指纹比中的指纹编号查询(比对)基本详情信息异常"+e);
} }
return list; return list;
...@@ -207,6 +207,25 @@ public class AjswtzServiceImpl implements IAjswtzService { ...@@ -207,6 +207,25 @@ public class AjswtzServiceImpl implements IAjswtzService {
} }
@Override @Override
public TbXsjszyZwZwbzJbxx getRyccBzxx(String xxzjbh){
TbXsjszyZwZwbzJbxx bzxx = new TbXsjszyZwZwbzJbxx();
Map<String, Object> map = new HashMap<String, Object>();
bzxx.setId(xxzjbh);
map.put("entity", bzxx);
List<TbXsjszyZwZwbzJbxx> list = null;
try {
list = amsisDao.getCcbzJbxx(map);
if(list != null&&list.size()>0){
bzxx = list.get(0);
}
} catch (Exception e) {
System.out.println("根据指纹比中的指纹编号查询指纹图片异常"+e);
}
return bzxx;
}
@Override
public List<TbXsjszyZwZwbzCase> getXsjsbdxqCaseZwAll(String xczwbh){ public List<TbXsjszyZwZwbzCase> getXsjsbdxqCaseZwAll(String xczwbh){
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("xczwbh", xczwbh); map.put("xczwbh", xczwbh);
......
...@@ -2121,14 +2121,18 @@ public class TbXwRycjController { ...@@ -2121,14 +2121,18 @@ public class TbXwRycjController {
@ResponseBody @ResponseBody
@RequestMapping("/getGdimages") @RequestMapping("/getGdimages")
public Map<String,Object> testAsyncReturnGdImg(String zwbh) throws ExecutionException, InterruptedException { public Map<String,Object> testAsyncReturnGdImg(String zwbh) throws ExecutionException, InterruptedException {
/*
//调用指纹获取压缩图接口获取指纹图片 //调用指纹获取压缩图接口获取指纹图片
HttpClientUtil hu = new HttpClientUtil(); HttpClientUtil hu = new HttpClientUtil();
String imgstrs = null; String imgstrs = null;
try { try {
long startTime=System.currentTimeMillis();//获取开始时间 long startTime=System.currentTimeMillis();//获取开始时间
//imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh); if(zwbh!=null&&zwbh.indexOf("4302")==0){
imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh="+zwbh); imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh);
}else{
//imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh);
imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh="+zwbh);
}
long endTime=System.currentTimeMillis();//获取结束时间 long endTime=System.currentTimeMillis();//获取结束时间
System.out.println("接口调用滚动指纹返回时长: "+(endTime-startTime)+"ms"); System.out.println("接口调用滚动指纹返回时长: "+(endTime-startTime)+"ms");
log.info("接口调用滚动指纹返回时长: "+(endTime-startTime)+"ms"); log.info("接口调用滚动指纹返回时长: "+(endTime-startTime)+"ms");
...@@ -2166,14 +2170,14 @@ public class TbXwRycjController { ...@@ -2166,14 +2170,14 @@ public class TbXwRycjController {
for(int i = 0; i < zws.length; i++){ for(int i = 0; i < zws.length; i++){
//rstmap.put("rfpimg"+zws[i],null); //rstmap.put("rfpimg"+zws[i],null);
} }
*/ /*
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Map<String,Object> rstmap = new HashMap<String,Object>(); Map<String,Object> rstmap = new HashMap<String,Object>();
for(int i=1;i<=10;i++){ for(int i=1;i<=10;i++){
Future<String> future = asyncTask.doGdzwReturn(zwbh, i); Future<String> future = asyncTask.doGdzwReturn(zwbh, i);
rstmap.put("rfpimg"+i,(String)future.get()); rstmap.put("rfpimg"+i,(String)future.get());
} }
*/
return rstmap; return rstmap;
} }
...@@ -2181,14 +2185,18 @@ public class TbXwRycjController { ...@@ -2181,14 +2185,18 @@ public class TbXwRycjController {
@RequestMapping("/getPmimages") @RequestMapping("/getPmimages")
@ResponseBody @ResponseBody
public Map<String,Object> testAsyncReturnPmImg(String zwbh) throws ExecutionException, InterruptedException { public Map<String,Object> testAsyncReturnPmImg(String zwbh) throws ExecutionException, InterruptedException {
/*
//调用指纹获取压缩图接口获取指纹图片 //调用指纹获取压缩图接口获取指纹图片
HttpClientUtil hu = new HttpClientUtil(); HttpClientUtil hu = new HttpClientUtil();
String imgstrs = null; String imgstrs = null;
try { try {
long startTime=System.currentTimeMillis();//获取开始时间 long startTime=System.currentTimeMillis();//获取开始时间
//imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNPlainByRybh?rybh="+zwbh); if(zwbh!=null&&zwbh.indexOf("4302")==0){
imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNPlainByRybh?rybh="+zwbh); imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNPlainByRybh?rybh="+zwbh);
}else{
//imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNPlainByRybh?rybh="+zwbh);
imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNPlainByRybh?rybh="+zwbh);
}
long endTime=System.currentTimeMillis();//获取结束时间 long endTime=System.currentTimeMillis();//获取结束时间
System.out.println("接口调用平面指纹返回时长: "+(endTime-startTime)+"ms"); System.out.println("接口调用平面指纹返回时长: "+(endTime-startTime)+"ms");
log.info("接口调用平面指纹返回时长: "+(endTime-startTime)+"ms"); log.info("接口调用平面指纹返回时长: "+(endTime-startTime)+"ms");
...@@ -2226,7 +2234,7 @@ public class TbXwRycjController { ...@@ -2226,7 +2234,7 @@ public class TbXwRycjController {
for(int i = 0; i < zws.length; i++){ for(int i = 0; i < zws.length; i++){
//rstmap.put("pfpimg"+zws[i],null); //rstmap.put("pfpimg"+zws[i],null);
} }
*/ /*
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String rst=""; String rst="";
Map<String,Object> rstmap = new HashMap<String,Object>(); Map<String,Object> rstmap = new HashMap<String,Object>();
...@@ -2234,7 +2242,7 @@ public class TbXwRycjController { ...@@ -2234,7 +2242,7 @@ public class TbXwRycjController {
Future<String> future = asyncTask.doPmzwReturn(zwbh, i); Future<String> future = asyncTask.doPmzwReturn(zwbh, i);
rstmap.put("pfpimg"+i,(String)future.get()); rstmap.put("pfpimg"+i,(String)future.get());
} }
*/
return rstmap; return rstmap;
...@@ -3253,8 +3261,12 @@ public class TbXwRycjController { ...@@ -3253,8 +3261,12 @@ public class TbXwRycjController {
} }
@RequestMapping(value="/singleLoginAct",method = {RequestMethod.POST,RequestMethod.GET}) @RequestMapping(value="/singleLoginAct",method = {RequestMethod.POST,RequestMethod.GET})
public String singleLoginAct(HttpServletRequest request, HttpServletResponse response,Model model,String paramval,String asjxgrybh,String rybh,String username,String sfhlcjy,String cjxm){ public String singleLoginAct(HttpServletRequest request,Model model,String paramval,String asjxgrybh,String rybh,String username,String sfhlcjy,String cjxm){
String userId=request.getParameter("userId"); String userId=request.getParameter("userId");
String pv = request.getParameter("paramval");
if(paramval==null||"".equals(paramval)){
paramval = pv;
}
if(asjxgrybh==null||"".equals(asjxgrybh)){ if(asjxgrybh==null||"".equals(asjxgrybh)){
asjxgrybh = rybh; asjxgrybh = rybh;
} }
......
...@@ -60,6 +60,11 @@ public class TbXsjszyZwZwbzJbxx implements Serializable { ...@@ -60,6 +60,11 @@ public class TbXsjszyZwZwbzJbxx implements Serializable {
private String fbzsj; //比中时间开始时间 private String fbzsj; //比中时间开始时间
private String ebzsj; //比中时间结束时间 private String ebzsj; //比中时间结束时间
private String sourcebarcode; //查重源条码 private String sourcebarcode; //查重源条码
private String bdyxm; //源条码姓名
private String bdyzjhm; //源条码证件号码
private String bdmbxm; //目标条码姓名
private String bdmbzjhm; //目标条码证件号码
private String ajmc; //比中案件名称
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
...@@ -448,4 +453,44 @@ public class TbXsjszyZwZwbzJbxx implements Serializable { ...@@ -448,4 +453,44 @@ public class TbXsjszyZwZwbzJbxx implements Serializable {
public void setSourcebarcode(String sourcebarcode) { public void setSourcebarcode(String sourcebarcode) {
this.sourcebarcode = sourcebarcode; this.sourcebarcode = sourcebarcode;
} }
public String getBdyxm() {
return bdyxm;
}
public void setBdyxm(String bdyxm) {
this.bdyxm = bdyxm;
}
public String getBdyzjhm() {
return bdyzjhm;
}
public void setBdyzjhm(String bdyzjhm) {
this.bdyzjhm = bdyzjhm;
}
public String getBdmbxm() {
return bdmbxm;
}
public void setBdmbxm(String bdmbxm) {
this.bdmbxm = bdmbxm;
}
public String getBdmbzjhm() {
return bdmbzjhm;
}
public void setBdmbzjhm(String bdmbzjhm) {
this.bdmbzjhm = bdmbzjhm;
}
public String getAjmc() {
return ajmc;
}
public void setAjmc(String ajmc) {
this.ajmc = ajmc;
}
} }
...@@ -5,58 +5,60 @@ ...@@ -5,58 +5,60 @@
<id column="RYBH" property="rybh" jdbcType="VARCHAR"/> <id column="RYBH" property="rybh" jdbcType="VARCHAR"/>
<result column="ASJBH" property="asjbh" jdbcType="VARCHAR"/> <result column="ASJBH" property="asjbh" jdbcType="VARCHAR"/>
<result column="XM" property="xm" jdbcType="VARCHAR"/> <result column="XM" property="xm" jdbcType="VARCHAR"/>
<result column="XMHYPY" property="xmhypy" jdbcType="VARCHAR"/>
<result column="WWXM" property="wwxm" jdbcType="VARCHAR"/>
<result column="CYM" property="cym" jdbcType="VARCHAR"/> <result column="CYM" property="cym" jdbcType="VARCHAR"/>
<result column="BMCH" property="bmch" jdbcType="VARCHAR"/> <result column="BMCH" property="bmch" jdbcType="VARCHAR"/>
<result column="CYZJDM" property="cyzjdm" jdbcType="VARCHAR"/> <result column="CYZJDM" property="cyzjdm" jdbcType="VARCHAR"/>
<result column="GMSFHM" property="gmsfhm" jdbcType="VARCHAR"/>
<result column="ZJHM" property="zjhm" jdbcType="VARCHAR"/> <result column="ZJHM" property="zjhm" jdbcType="VARCHAR"/>
<result column="CSRQ_QSRQ" property="csrqQsrq" jdbcType="TIMESTAMP"/> <result column="CSRQ" property="csrqQsrq" jdbcType="TIMESTAMP"/>
<result column="CSRQ_JZRQ" property="csrqJzrq" jdbcType="TIMESTAMP"/>
<result column="XBDM" property="xbdm" jdbcType="VARCHAR"/> <result column="XBDM" property="xbdm" jdbcType="VARCHAR"/>
<result column="GJDM" property="gjdm" jdbcType="VARCHAR"/> <result column="GJDM" property="gjdm" jdbcType="VARCHAR"/>
<result column="JGSSXDM" property="jgssxdm" jdbcType="VARCHAR"/>
<result column="MZDM" property="mzdm" jdbcType="VARCHAR"/> <result column="MZDM" property="mzdm" jdbcType="VARCHAR"/>
<result column="CSD_XZQHDM" property="csdXzqhdm" jdbcType="VARCHAR"/> <result column="CSDXZQH" property="csdXzqhdm" jdbcType="VARCHAR"/>
<result column="CSD_DZMC" property="csdDzmc" jdbcType="VARCHAR"/> <result column="CSDXZ" property="csdDzmc" jdbcType="VARCHAR"/>
<result column="HJDZ_XZQHDM" property="hjdzXzqhdm" jdbcType="VARCHAR"/> <result column="HJDXZQH" property="hjdzXzqhdm" jdbcType="VARCHAR"/>
<result column="HJDZ_DZMC" property="hjdzDzmc" jdbcType="VARCHAR"/> <result column="HJDXZ" property="hjdzDzmc" jdbcType="VARCHAR"/>
<result column="XZZ_XZQHDM" property="xzzXzqhdm" jdbcType="VARCHAR"/> <result column="XZDXZQH" property="xzzXzqhdm" jdbcType="VARCHAR"/>
<result column="XZZ_DZMC" property="xzzDzmc" jdbcType="VARCHAR"/> <result column="XZDXZ" property="xzzDzmc" jdbcType="VARCHAR"/>
<result column="JWZZ_GJHDQDM" property="jwzzGjhdqdm" jdbcType="VARCHAR"/> <result column="LXDH" property="lxdm" jdbcType="VARCHAR"/>
<result column="JWZZ_DZMC" property="jwzzDzmc" jdbcType="VARCHAR"/> <result column="GRSFDM" property="sarysfdm" jdbcType="VARCHAR"/>
<result column="SGSX" property="sgsx" jdbcType="INTEGER"/> <result column="ZJXYDM" property="zjxydm" jdbcType="VARCHAR"/>
<result column="SGXX" property="sgxx" jdbcType="INTEGER"/> <result column="ZZMMDM" property="zzmmdm" jdbcType="VARCHAR"/>
<result column="TZSX" property="tzsx" jdbcType="INTEGER"/> <result column="XLDM" property="xldm" jdbcType="VARCHAR"/>
<result column="TZXX" property="tzxx" jdbcType="INTEGER"/> <result column="HYZKDM" property="jyzkdm" jdbcType="VARCHAR"/>
<result column="TSSFDM" property="tssfdm" jdbcType="VARCHAR"/>
<result column="WFFZJLMS" property="wffzjlms" jdbcType="VARCHAR"/>
<result column="SG" property="sgsx" jdbcType="INTEGER"/>
<result column="TZ" property="tzsx" jdbcType="INTEGER"/>
<result column="ZC" property="zc" jdbcType="INTEGER"/> <result column="ZC" property="zc" jdbcType="INTEGER"/>
<result column="TMTZMS" property="tmtzms" jdbcType="VARCHAR"/> <result column="TMTZMS" property="tmtzms" jdbcType="VARCHAR"/>
<result column="ZHSJ" property="zhsj" jdbcType="TIMESTAMP"/>
<result column="ZHDXZQH" property="zhddqh" jdbcType="VARCHAR"/>
<result column="ZHDXZ" property="zhddxz" jdbcType="VARCHAR"/>
<result column="ZHDWDM" property="zhdwdm" jdbcType="VARCHAR"/>
<result column="DAZT" property="daztdm" jdbcType="VARCHAR"/>
<result column="IP" property="ip" jdbcType="VARCHAR"/>
<result column="TBBJMS" property="tbbjms" jdbcType="VARCHAR"/> <result column="TBBJMS" property="tbbjms" jdbcType="VARCHAR"/>
<result column="RQTTZMS" property="rqttzms" jdbcType="VARCHAR"/> <result column="RQTTZMS" property="rqttzms" jdbcType="VARCHAR"/>
<result column="JGSSXDM" property="jgssxdm" jdbcType="VARCHAR"/>
<result column="FWCS" property="fwcs" jdbcType="VARCHAR"/> <result column="FWCS" property="fwcs" jdbcType="VARCHAR"/>
<result column="LXDM" property="lxdm" jdbcType="VARCHAR"/>
<result column="XXDM" property="xxdm" jdbcType="VARCHAR"/> <result column="XXDM" property="xxdm" jdbcType="VARCHAR"/>
<result column="ZJXYDM" property="zjxydm" jdbcType="VARCHAR"/>
<result column="ZZMMDM" property="zzmmdm" jdbcType="VARCHAR"/>
<result column="XLDM" property="xldm" jdbcType="VARCHAR"/>
<result column="JYZKDM" property="jyzkdm" jdbcType="VARCHAR"/>
<result column="BYZKDM" property="byzkdm" jdbcType="VARCHAR"/> <result column="BYZKDM" property="byzkdm" jdbcType="VARCHAR"/>
<result column="ZYLBDM" property="zylbdm" jdbcType="VARCHAR"/> <result column="ZYLBDM" property="zylbdm" jdbcType="VARCHAR"/>
<result column="ZYLBDMBCMS" property="zylbdmbcms" jdbcType="VARCHAR"/> <result column="ZYLBDMBCMS" property="zylbdmbcms" jdbcType="VARCHAR"/>
<result column="ZHFSDM" property="zhfsdm" jdbcType="VARCHAR"/> <result column="ZHFSDM" property="zhfsdm" jdbcType="VARCHAR"/>
<result column="ZHFSDMBCMS" property="zhfsdmbcms" jdbcType="VARCHAR"/> <result column="ZHFSDMBCMS" property="zhfsdmbcms" jdbcType="VARCHAR"/>
<result column="ZHSJ" property="zhsj" jdbcType="TIMESTAMP"/>
<result column="ZHDDQH" property="zhddqh" jdbcType="VARCHAR"/>
<result column="ZHDDXZ" property="zhddxz" jdbcType="VARCHAR"/>
<result column="ZHDWDM" property="zhdwdm" jdbcType="VARCHAR"/>
<result column="DAZT" property="daztdm" jdbcType="VARCHAR"/>
<result column="XYRDW" property="sadwzydm" jdbcType="VARCHAR"/> <result column="XYRDW" property="sadwzydm" jdbcType="VARCHAR"/>
<result column="SARYSFDM" property="sarysfdm" jdbcType="VARCHAR"/>
<result column="SARYSFDMBCMS" property="sarysfdmbcms" jdbcType="VARCHAR"/> <result column="SARYSFDMBCMS" property="sarysfdmbcms" jdbcType="VARCHAR"/>
<result column="TSZCDM" property="tszcdm" jdbcType="VARCHAR"/> <result column="TSZCDM" property="tszcdm" jdbcType="VARCHAR"/>
<result column="TSZCDMBCMS" property="tszcdmbcms" jdbcType="VARCHAR"/> <result column="TSZCDMBCMS" property="tszcdmbcms" jdbcType="VARCHAR"/>
<result column="JL" property="jl" jdbcType="VARCHAR"/> <result column="JL" property="jl" jdbcType="VARCHAR"/>
<result column="WFFZJLMS" property="wffzjlms" jdbcType="VARCHAR"/>
<result column="ZWWFCJSM" property="zwwfcjsm" jdbcType="VARCHAR"/> <result column="ZWWFCJSM" property="zwwfcjsm" jdbcType="VARCHAR"/>
<result column="WZJYYDM" property="wzjyydm" jdbcType="VARCHAR"/> <result column="WZJYYDM" property="wzjyydm" jdbcType="VARCHAR"/>
<result column="SFSZ" property="sfszryPdbz" jdbcType="VARCHAR"/> <result column="SFSZ" property="sfszryPdbz" jdbcType="VARCHAR"/>
...@@ -101,10 +103,7 @@ ...@@ -101,10 +103,7 @@
<result column="ZJ" property="zj" jdbcType="VARCHAR"/> <result column="ZJ" property="zj" jdbcType="VARCHAR"/>
<result column="SW" property="sw" jdbcType="VARCHAR"/> <result column="SW" property="sw" jdbcType="VARCHAR"/>
<result column="YHK" property="yhk" jdbcType="VARCHAR"/> <result column="YHK" property="yhk" jdbcType="VARCHAR"/>
<result column="GMSFHM" property="gmsfhm" jdbcType="VARCHAR"/>
<result column="XMHYPY" property="xmhypy" jdbcType="VARCHAR"/>
<result column="WWXM" property="wwxm" jdbcType="VARCHAR"/>
<result column="TSSFDM" property="tssfdm" jdbcType="VARCHAR"/>
<result column="DNAYBLXDM" property="dnayblxdm" jdbcType="VARCHAR"/> <result column="DNAYBLXDM" property="dnayblxdm" jdbcType="VARCHAR"/>
<result column="ZJLXDM" property="zjlxdm" jdbcType="VARCHAR"/> <result column="ZJLXDM" property="zjlxdm" jdbcType="VARCHAR"/>
<result column="XDHWDM" property="xdhwdm" jdbcType="VARCHAR"/> <result column="XDHWDM" property="xdhwdm" jdbcType="VARCHAR"/>
......
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
</select> </select>
<!--查询指纹比中信息详情--> <!--查询指纹比中信息详情-->
<select id="getCcbzJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx"> <select id="getCcbzJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx">
select ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID from AA_MATCHCAND t where select ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID,srcseqno,destseqno from AA_MATCHCAND t where
1=1 1=1
<include refid="queryWhere"/> <include refid="queryWhere"/>
</select> </select>
<sql id="queryWhere"> <sql id="queryWhere">
<if test="entity.id != null and entity.id != ''"> AND ID = #{entity.id , jdbcType=VARCHAR } </if>
<if test="entity.srcbarcode != null and entity.srcbarcode != ''"> AND SRCBARCODE = #{entity.srcbarcode , jdbcType=VARCHAR } </if> <if test="entity.srcbarcode != null and entity.srcbarcode != ''"> AND SRCBARCODE = #{entity.srcbarcode , jdbcType=VARCHAR } </if>
<if test="entity.sourcebarcode != null and entity.sourcebarcode != ''"> AND SOURCEBARCODE = #{entity.sourcebarcode , jdbcType=VARCHAR } </if> <if test="entity.sourcebarcode != null and entity.sourcebarcode != ''"> AND SOURCEBARCODE = #{entity.sourcebarcode , jdbcType=VARCHAR } </if>
<if test="entity.destbarcode != null and entity.destbarcode != ''"> AND DESTBARCODE = #{entity.destbarcode , jdbcType=VARCHAR } </if> <if test="entity.destbarcode != null and entity.destbarcode != ''"> AND DESTBARCODE = #{entity.destbarcode , jdbcType=VARCHAR } </if>
...@@ -46,7 +47,9 @@ ...@@ -46,7 +47,9 @@
<select id="queryZwbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map"> <select id="queryZwbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map">
<![CDATA[SELECT t.* FROM ( <![CDATA[SELECT t.* FROM (
SELECT a.* , rownum r FROM (]]> SELECT a.* , rownum r FROM (]]>
SELECT t.* SELECT t.*,(select m.name from person m where (t.la_type = 'LA' and m.barcode=t.DESTBARCODE) or (t.la_type = 'AL' and m.barcode=t.SRCBARCODE)) as bdyxm,
(select m.idnumber from person m where (t.la_type = 'LA' and m.barcode=t.DESTBARCODE) or (t.la_type = 'AL' and m.barcode=t.SRCBARCODE)) as bdyzjhm,
(select c.casename from case c where (t.la_type = 'AL' and c.barcode=t.DESTBARCODE) or (t.la_type = 'LA' and c.barcode=t.SRCBARCODE)) as ajmc
from LA_MATCHCAND t where 1=1 from LA_MATCHCAND t where 1=1
<include refid="queryWhere"/> <include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a <![CDATA[ order by ${sort} ${order} ) a
...@@ -63,7 +66,12 @@ ...@@ -63,7 +66,12 @@
<select id="queryCcbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map"> <select id="queryCcbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map">
<![CDATA[SELECT t.* FROM ( <![CDATA[SELECT t.* FROM (
SELECT a.* , rownum r FROM (]]> SELECT a.* , rownum r FROM (]]>
SELECT ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID from AA_MATCHCAND t where 1=1 SELECT ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID,
(select m.name from person m where m.barcode=t.SOURCEBARCODE) as bdyxm,
(select m.idnumber from person m where m.barcode=t.SOURCEBARCODE) as bdyzjhm,
(select m.name from person m where m.barcode=t.DESTBARCODE) as bdmbxm,
(select m.idnumber from person m where m.barcode=t.DESTBARCODE) as bdmbzjhm
from AA_MATCHCAND t where 1=1
<include refid="queryWhere"/> <include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a <![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t WHERE ROWNUM <= #{ end } ) t
......
...@@ -16,4 +16,66 @@ ...@@ -16,4 +16,66 @@
<select id="getXsjsbdxqJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx"> <select id="getXsjsbdxqJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx">
select t.* from LA_MATCHCAND t where (t.SRCBARCODE= #{xczwbh} and t.DESTBARCODE= #{nyzwbh} and t.LA_TYPE ='LA') or (t.SRCBARCODE= #{nyzwbh} and t.DESTBARCODE= #{xczwbh} and t.LA_TYPE ='AL') select t.* from LA_MATCHCAND t where (t.SRCBARCODE= #{xczwbh} and t.DESTBARCODE= #{nyzwbh} and t.LA_TYPE ='LA') or (t.SRCBARCODE= #{nyzwbh} and t.DESTBARCODE= #{xczwbh} and t.LA_TYPE ='AL')
</select> </select>
<!--查询指纹比中信息详情-->
<select id="getZwbzJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx">
select t.* from LA_MATCHCAND t where
1=1
<include refid="queryWhere"/>
</select>
<!--查询指纹比中信息详情-->
<select id="getCcbzJbxx" parameterType="java.util.Map" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx">
select ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID,srcseqno,destseqno from AA_MATCHCAND t where
1=1
<include refid="queryWhere"/>
</select>
<sql id="queryWhere">
<if test="entity.id != null and entity.id != ''"> AND ID = #{entity.id , jdbcType=VARCHAR } </if>
<if test="entity.srcbarcode != null and entity.srcbarcode != ''"> AND SRCBARCODE = #{entity.srcbarcode , jdbcType=VARCHAR } </if>
<if test="entity.sourcebarcode != null and entity.sourcebarcode != ''"> AND SOURCEBARCODE = #{entity.sourcebarcode , jdbcType=VARCHAR } </if>
<if test="entity.destbarcode != null and entity.destbarcode != ''"> AND DESTBARCODE = #{entity.destbarcode , jdbcType=VARCHAR } </if>
<if test="entity.affirmunitcode != null and entity.affirmunitcode != ''"> AND AFFIRMUNITCODE = #{entity.affirmunitcode , jdbcType=VARCHAR } </if>
<if test="entity.la_type != null and entity.la_type != ''"> AND LA_TYPE = #{entity.la_type , jdbcType=VARCHAR } </if>
<if test="entity.fbzsj != null and entity.fbzsj != ''"> AND AFFIRMTIME <![CDATA[>=]]> to_date(#{entity.fbzsj , jdbcType=VARCHAR },'yyyy-mm-dd') </if>
<if test="entity.ebzsj != null and entity.ebzsj != ''"> AND AFFIRMTIME <![CDATA[<]]> to_date(#{entity.ebzsj , jdbcType=VARCHAR },'yyyy-mm-dd')+1 </if>
</sql>
<select id="queryZwbzPageCount" resultType="int" parameterType="map">
select count(1) from LA_MATCHCAND where
1=1
<include refid="queryWhere"/>
</select>
<select id="queryZwbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map">
<![CDATA[SELECT t.* FROM (
SELECT a.* , rownum r FROM (]]>
SELECT t.*,(select m.name from person m where (t.la_type = 'LA' and m.barcode=t.DESTBARCODE) or (t.la_type = 'AL' and m.barcode=t.SRCBARCODE)) as bdyxm,
(select m.idnumber from person m where (t.la_type = 'LA' and m.barcode=t.DESTBARCODE) or (t.la_type = 'AL' and m.barcode=t.SRCBARCODE)) as bdyzjhm,
(select c.casename from case c where (t.la_type = 'AL' and c.barcode=t.DESTBARCODE) or (t.la_type = 'LA' and c.barcode=t.SRCBARCODE)) as ajmc
from LA_MATCHCAND t where 1=1
<include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t
WHERE r > #{ begin } ]]>
</select>
<select id="queryCcbzPageCount" resultType="int" parameterType="map">
select count(1) from AA_MATCHCAND t where
1=1
<include refid="queryWhere"/>
</select>
<select id="queryCcbzPageList" resultType="com.founder.model.amsis.TbXsjszyZwZwbzJbxx" parameterType="map">
<![CDATA[SELECT t.* FROM (
SELECT a.* , rownum r FROM (]]>
SELECT ID,SOURCEBARCODE,DESTBARCODE,AFFIRMUNITCODE,AFFIRMTIME,AFFIRMUSERID,
(select m.name from person m where m.barcode=t.SOURCEBARCODE) as bdyxm,
(select m.idnumber from person m where m.barcode=t.SOURCEBARCODE) as bdyzjhm,
(select m.name from person m where m.barcode=t.DESTBARCODE) as bdmbxm,
(select m.idnumber from person m where m.barcode=t.DESTBARCODE) as bdmbzjhm
from AA_MATCHCAND t where 1=1
<include refid="queryWhere"/>
<![CDATA[ order by ${sort} ${order} ) a
WHERE ROWNUM <= #{ end } ) t
WHERE r > #{ begin } ]]>
</select>
</mapper> </mapper>
\ No newline at end of file
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!--标题--> <!--标题-->
<div class="login-header" style="margin-top:50px;"> <div class="login-header" style="margin-top:50px;">
<h2><img /><img src="static/xtba/login/images/index-login.png" style="margin-left:80px;"/><img /></h2> <h2><img /><img src="static/xtba/login/images/hunan.png" style="margin-left:80px;"/><img /></h2>
</div> </div>
<!--content--> <!--content-->
<div class="wrap-content"> <div class="wrap-content">
...@@ -239,6 +239,11 @@ ...@@ -239,6 +239,11 @@
<script type="text/javascript" src="static/xtba/login/js/goods.js" ></script> <script type="text/javascript" src="static/xtba/login/js/goods.js" ></script>
<script type="text/javascript" src="static/xtba/login/js/swiper.animate.min.js" ></script> <script type="text/javascript" src="static/xtba/login/js/swiper.animate.min.js" ></script>
<script> <script>
window.onload = function () {
setInterval(function () {
window.location.reload()
},180000)
}
$(function(){ $(function(){
getHeight(); getHeight();
$(window).resize(function(){ $(window).resize(function(){
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<body> <body>
<!--标题--> <!--标题-->
<div class="login-header"> <div class="login-header">
<h2><img src="static/xtba/login/images/login-title-bg-l.png"/><img src="static/xtba/login/images/index-login.png" style="margin-left:80px;"/><img src="static/xtba/login/images/login-title-bg-r.png"/></h2> <h2><img src="/static/xtba/login/images/login-title-bg-l.png"/><img src="static/xtba/login/images/hunan.png" style="margin-left:80px;"/><img src="static/xtba/login/images/login-title-bg-r.png"/></h2>
</div> </div>
<!--content--> <!--content-->
<div class="wrap-content"> <div class="wrap-content">
......
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<html lang="en"> <html lang="en">
<head> <head>
...@@ -1423,7 +1423,7 @@ ...@@ -1423,7 +1423,7 @@
}; };
ws.onclose = function(e) { ws.onclose = function(e) {
//意外中断,再连接 //意外中断,再连接
if (e.code == '1006' || e.code == '1002') { if (e.code == '1002') {
tozjcj(); tozjcj();
} }
} }
...@@ -1442,7 +1442,7 @@ ...@@ -1442,7 +1442,7 @@
$("#zjrightflag").val("0"); $("#zjrightflag").val("0");
} }
ws.close(); ws.close();
return; alert( "采集完成!");
}else if (data.Code < 0) {//采集发生错误 }else if (data.Code < 0) {//采集发生错误
ws.close(); ws.close();
return; return;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- <script type="text/javascript" src="easyui-window/js/jquery.easyui.min.js"></script>--> <!-- <script type="text/javascript" src="easyui-window/js/jquery.easyui.min.js"></script>-->
<script type="text/javascript" src="static/easyui-window/js/function.js"></script> <script type="text/javascript" src="static/easyui-window/js/function.js"></script>
</head> </head>
<body onload="pop();"> <body >
<div id="nipic_search"> <div id="nipic_search">
<div id="header"> <div id="header">
<h5 class="h_title_rycx" style="background: url(static/xtba/ythcj/img/ryxxcx.png);width:400px;"></h5> <h5 class="h_title_rycx" style="background: url(static/xtba/ythcj/img/ryxxcx.png);width:400px;"></h5>
...@@ -283,6 +283,15 @@ ...@@ -283,6 +283,15 @@
<!--<script type="text/javascript" src="static/ajgl/js/jquery.easyui.min.js"></script>--> <!--<script type="text/javascript" src="static/ajgl/js/jquery.easyui.min.js"></script>-->
<script type="text/javascript" src="static/xtba/zljc/js/zljc.js"></script> <script type="text/javascript" src="static/xtba/zljc/js/zljc.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var numcot = 1;
window.onload = function () {
pop();
setInterval(function () {
console.log("=====页面第 "+numcot+" 次自动刷新!=====");
numcot++;
doQuery();
},180000)
}
openCombotree('hjdzXzqhdm'); openCombotree('hjdzXzqhdm');
openCombotree('lrdwdw'); openCombotree('lrdwdw');
$(function(){ $(function(){
......
...@@ -268,6 +268,14 @@ ...@@ -268,6 +268,14 @@
<script type="text/javascript" src="static/xtba/zljc/js/qlayertips.js"></script> <script type="text/javascript" src="static/xtba/zljc/js/qlayertips.js"></script>
<script src="static/xtba/zljc/layer/layer.js"></script> <script src="static/xtba/zljc/layer/layer.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var numcot = 1;
window.onload = function () {
setInterval(function () {
console.log("=====页面第 "+numcot+" 次自动刷新!=====");
numcot++;
doQuery();
},180000)
}
openCombotree('RCjdw'); openCombotree('RCjdw');
$(function(){ $(function(){
$("#Table").datagrid({ $("#Table").datagrid({
......
...@@ -137,16 +137,42 @@ ...@@ -137,16 +137,42 @@
} }
}); });
var table_title = [ var table_title = [
{title:"源条码",field:"srcbarcode",align:'center',width:180,formatter:function(val,row,index){ {title:"现场指纹编号",field:"srcbarcode",align:'center',width:150,formatter:function(val,row,index){
var srcbarcode=row.srcbarcode; var srcbarcode=row.srcbarcode;
return srcbarcode; var destbarcode=row.destbarcode;
var la_type=row.la_type;
var xczwbh = "";
var nyzwbh = "";
if(la_type=="LA"){
xczwbh = srcbarcode;
nyzwbh = destbarcode;
}else{
xczwbh = destbarcode;
nyzwbh = srcbarcode;
}
return "<span style='cursor:pointer;' title='" + xczwbh + "' onclick=\"toXsjsDetail(\'" + nyzwbh + "\',\'"+xczwbh+"\')\">" + xczwbh + "</span>";
}}, }},
{title:"目标条码",field:"destbarcode",align:'center',width:180,formatter:function(val,row,index){ {title:"案件名称",field:"ajmc",align:'center',width:200},
{title:"捺印指纹编号",field:"destbarcode",align:'center',width:150,formatter:function(val,row,index){
var destbarcode=row.destbarcode; var destbarcode=row.destbarcode;
return destbarcode; var srcbarcode=row.srcbarcode;
var la_type=row.la_type;
var xczwbh = "";
var nyzwbh = "";
if(la_type=="LA"){
xczwbh = srcbarcode;
nyzwbh = destbarcode;
}else{
xczwbh = destbarcode;
nyzwbh = srcbarcode;
}
return "<span style='cursor:pointer;' title='" + nyzwbh + "' onclick=\"toXsjsDetail(\'" + nyzwbh + "\',\'"+xczwbh+"\')\">" + nyzwbh + "</span>";
}}, }},
{title:"比中类型",field:"la_type",align:'center',width:100,formatter:function(val,row,index){ {title:"姓名",field:"bdyxm",align:'center',width:120},
{title:"证件号码",field:"bdyzjhm",align:'center',width:140},
{title:"比中类型",field:"la_type",align:'center',width:80,formatter:function(val,row,index){
var la_type=row.la_type; var la_type=row.la_type;
var rstStr = "";
if(la_type=="LA"){ if(la_type=="LA"){
rstStr = "正查"; rstStr = "正查";
}else{ }else{
...@@ -154,11 +180,11 @@ ...@@ -154,11 +180,11 @@
} }
return rstStr; return rstStr;
}}, }},
{title:"比中时间",field:"affirmtime",align:'center',width:150,formatter:function(val,row,index){ {title:"比中时间",field:"affirmtime",align:'center',width:130,formatter:function(val,row,index){
var affirmtime=row.affirmtime; var affirmtime=row.affirmtime;
return affirmtime; return affirmtime;
}}, }},
{title:"比中单位",field:"affirmunitcode",align:'center',width:250,formatter:function(val,row,index){ {title:"比中单位",field:"affirmunitcode",align:'center',width:200,formatter:function(val,row,index){
var affirmunitcode=row.affirmunitcode; var affirmunitcode=row.affirmunitcode;
var affirmunitname=""; var affirmunitname="";
affirmunitname=codeFormatter(affirmunitcode,"CODE_UNIT"); affirmunitname=codeFormatter(affirmunitcode,"CODE_UNIT");
...@@ -227,6 +253,9 @@ ...@@ -227,6 +253,9 @@
return codeName; return codeName;
} }
function toXsjsDetail(nyzwbh, xczwbh) {
window.open("/getXsjsbdxq?nyzwbh=" +nyzwbh+"&xczwbh="+xczwbh);
}
</script> </script>
</body> </body>
......
...@@ -131,14 +131,20 @@ ...@@ -131,14 +131,20 @@
} }
}); });
var table_title = [ var table_title = [
{title:"源条码",field:"sourcebarcode",align:'center',width:180,formatter:function(val,row,index){ {title:"源条码",field:"sourcebarcode",align:'center',width:150,formatter:function(val,row,index){
var sourcebarcode=row.sourcebarcode; var sourcebarcode=row.sourcebarcode;
return sourcebarcode; var destbarcode=row.destbarcode;
var id=row.id;
return "<span style='cursor:pointer;' onclick=\"toXsjsRyccDetail(\'" + id + "\',\'"+sourcebarcode+"\',\'"+destbarcode+"\')\">" + sourcebarcode + "</span>";
}}, }},
{title:"目标条码",field:"destbarcode",align:'center',width:180,formatter:function(val,row,index){ {title:"目标条码",field:"destbarcode",align:'center',width:150,formatter:function(val,row,index){
var sourcebarcode=row.sourcebarcode;
var destbarcode=row.destbarcode; var destbarcode=row.destbarcode;
return destbarcode; var id=row.id;
return "<span style='cursor:pointer;' onclick=\"toXsjsRyccDetail(\'" + id + "\',\'"+sourcebarcode+"\',\'"+destbarcode+"\')\">" + destbarcode + "</span>";
}}, }},
{title:"姓名",field:"bdyxm",align:'center',width:120},
{title:"证件号码",field:"bdyzjhm",align:'center',width:150},
{title:"比中类型",field:"affirmuserid",align:'center',width:100,formatter:function(val,row,index){ {title:"比中类型",field:"affirmuserid",align:'center',width:100,formatter:function(val,row,index){
return "查重"; return "查重";
}}, }},
...@@ -146,7 +152,7 @@ ...@@ -146,7 +152,7 @@
var affirmtime=row.affirmtime; var affirmtime=row.affirmtime;
return affirmtime; return affirmtime;
}}, }},
{title:"比中单位",field:"affirmunitcode",align:'center',width:250,formatter:function(val,row,index){ {title:"比中单位",field:"affirmunitcode",align:'center',width:200,formatter:function(val,row,index){
var affirmunitcode=row.affirmunitcode; var affirmunitcode=row.affirmunitcode;
var affirmunitname=""; var affirmunitname="";
affirmunitname=codeFormatter(affirmunitcode,"CODE_UNIT"); affirmunitname=codeFormatter(affirmunitcode,"CODE_UNIT");
...@@ -215,6 +221,9 @@ ...@@ -215,6 +221,9 @@
return codeName; return codeName;
} }
function toXsjsRyccDetail(id,bdynyzwbh,bdmbnyzwbh) {
window.open("/getXsjsbdxxByRycc?xxzjbh="+id+"&bdynyzwbh=" +bdynyzwbh+"&bdmbnyzwbh="+bdmbnyzwbh);
}
</script> </script>
</body> </body>
......
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