Skip to content

H
hnxtbaboot
Commit fdca2e0c by yangliang
Options

修改

parent 71af53d0
Showing with 100 additions and 9 deletions
src/main/java/com/founder/controller/RyfkController.java
......@@ -54,11 +54,14 @@ public class RyfkController {
@GetMapping("/toRyfkDetail/{zjhm}")
public String toRyfkDetail(@PathVariable("zjhm") String zjhm, Model model,HttpServletRequest request){
User user =(User)request.getSession().getAttribute("User");
//获取常口信息
Qgckzp qgckzp = new Qgckzp();
AutoTbStRy ryjbxx=new AutoTbStRy();
ryjbxx=qgckzp.getQgckAllxxXml(zjhm);
if("admin".equals(user.getUsername())&&(ryjbxx==null||ryjbxx.getZjhm()==null)){
ryjbxx=qgckzp.getQgckAllxxXml("610104198607138331");
}
//ryjbxx.setRybh("R4601085600002020075001");
//ryjbxx.setXm("赵永类");
//ryjbxx.setZjhm("140101199001010255");
......@@ -83,7 +86,7 @@ public class RyfkController {
}
model.addAttribute("ryjbxx",ryjbxx); //常口
model.addAttribute("rycjjbxx",xyrC);
User user =(User)request.getSession().getAttribute("User");
model.addAttribute("user",user);
return "ryfk/ryfk";
}
......
src/main/java/com/founder/controller/TbXwRycjController.java
......@@ -653,12 +653,12 @@ public class TbXwRycjController {
xyrC.setTstz2Base64(zpBase64);
}
File filejia41 = new File(filePath+"/"+rybhstr+"41.jpg");
if (filejia31.exists()) {
if (filejia41.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"41.jpg");
xyrC.setBj1Base64(zpBase64);
}
File filejia42 = new File(filePath+"/"+rybhstr+"42.jpg");
if (filejia32.exists()) {
if (filejia42.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"42.jpg");
xyrC.setBj2Base64(zpBase64);
}
......@@ -1493,6 +1493,16 @@ public class TbXwRycjController {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"32.jpg");
xyrC.setTstz2Base64(zpBase64);
}
File filejia41 = new File(filePath+"/"+rybhstr+"41.jpg");
if (filejia41.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"41.jpg");
xyrC.setBj1Base64(zpBase64);
}
File filejia42 = new File(filePath+"/"+rybhstr+"42.jpg");
if (filejia42.exists()) {
String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"42.jpg");
xyrC.setBj2Base64(zpBase64);
}
//if((xyrC.getR_hmLeftBase64()!=null&&!"".equals(xyrC.getR_hmLeftBase64()))||(xyrC.getR_hmRightBase64()!=null&&!"".equals(xyrC.getR_hmRightBase64()))){
// FileUtils.saveXmlFile(getHmpicXml(xyrC),xyrC.getRybh(),zplj,"HMXX-"+xyrC.getRybh()+".xml",user);
//}
......
src/main/java/com/founder/login/controller/LoginController.java
......@@ -203,6 +203,7 @@ public class LoginController {
request.getSession().setAttribute("xtflag",zhyyPath);//系统标志
System.out.println("doLogin的seesionid======="+request.getSession().getId());
if(user!=null){
returnMap.put("user",user);
returnMap.put("state","success");
returnMap.put("msg","登陆成功！");
//returnMap.put("user",user);
......
src/main/java/com/founder/ryswtz/controller/RyxxController.java
......@@ -667,9 +667,16 @@ public class RyxxController {
if(zjzpxxs!=null&&zjzpxxs.size()>0){
for(int i=0;i<zjzpxxs.size();i++){
AutoTbRyZp zjzp = zjzpxxs.get(i);
rstmap.put(zjzp.getZpbw(),GetImageStrsByByte(zjzp.getDzwjnr()));
if("11".equals(zjzp.getZpbw())){
rstmap.put("11",GetImageStrsByByte(zjzp.getDzwjnr()));
}else if(zjzpxxs.size()==2&&"12".equals(zjzp.getZpbw())){
rstmap.put("12",GetImageStrsByByte(zjzp.getDzwjnr()));
}else if(zjzpxxs.size()>2&&"21".equals(zjzp.getZpbw())){
rstmap.put("12",GetImageStrsByByte(zjzp.getDzwjnr()));
}
}
}
return rstmap;
}
......
src/main/resources/mapper/AutoTbXwRycjSqlMap.xml
......@@ -234,7 +234,7 @@
<select id="getRyxxByToday" resultMap="baseMap" parameterType="map">
select *
from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and lrsj>=sysdate-1
from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) AND (IFHB<![CDATA[<>]]>'1' OR IFHB IS NULL) and lrsj>=sysdate-1 order by lrsj desc
</select>
<select id="getRyxxByZjhm" resultMap="baseMap" parameterType="map">
......
src/main/resources/mapper/SysLogSystemSqlMapper.xml
......@@ -37,7 +37,7 @@
SCBZ
) values (
#{xxzjbh , jdbcType=VARCHAR },
to_date(#{rzsjStr , jdbcType=VARCHAR },'yyyy-mm-dd'),
sysdate,
#{yhjh , jdbcType=VARCHAR },
#{yhxm , jdbcType=VARCHAR },
#{yhidnum , jdbcType=VARCHAR },
......
src/main/resources/static/js/catchpic.chrome.js
......@@ -174,9 +174,9 @@ function setTP(tpCode,tpFile,tpShow,tpName,index){//将控件采集的信息放
frminput.tstzflag2.value = "0";
}
if(index==41){
frminput.zjflag1.value = "0";
frminput.bjflag1.value = "0";
}else if(index==42){
frminput.zjflag2.value = "0";
frminput.bjflag2.value = "0";
}
/*
......
src/main/resources/templates/login/login_hainan.html
......@@ -234,6 +234,7 @@
var msg=data.msg;
user=data.user;
if(state&&state=="success"){
addrz(user.unitcode,getCurrentTime(),user.trueName);
window.location.href="toHome";
}else{
alert(msg);
......@@ -243,6 +244,42 @@
// }
//});
}
function addrz(yhdwdm,rzsjstr,yhxm){
$.ajax({
url:"doAddsysLogs",
data:{"yhdwdm":yhdwdm,"rzsjStr":rzsjstr,"yhxm":yhxm,"rznr":"进行系统登录！"},
type:"post",
dataType:"json",
async: false,
success:function(data){
}
});
}
function getCurrentTime() {
var date = new Date();//当前时间
var month = zeroFill(date.getMonth() + 1);//月
var day = zeroFill(date.getDate());//日
var hour = zeroFill(date.getHours());//时
var minute = zeroFill(date.getMinutes());//分
var second = zeroFill(date.getSeconds());//秒
//当前时间
var curTime = date.getFullYear() + "-" + month + "-" + day
+ " " + hour + ":" + minute + ":" + second;
return curTime;
}
function zeroFill(i){
if (i >= 0 && i <= 9) {
return "0" + i;
} else {
return i;
}
}
function hide(){
$("#loadgif").hide();
}
......
src/main/resources/templates/rygl/addryxx.html
......@@ -364,9 +364,11 @@
if(id==""){
//新增
document.frminput.action = "/doAddRyxx";
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"进行人员新增操作，操作嫌疑人身份证号为："+$("#gmsfhm").val()+"！");
}else{
//修改
document.frminput.action = "/doEditRyxx";
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"对人员基本信息进行修改操作，修改嫌疑人人员编号为："+id+"！");
}
var rysx = $('input[name=rysx]:checked').val();
if(rysx=="02"||rysx=="03"||rysx=="04"){
......@@ -472,6 +474,18 @@
});
}
function addrz(yhdwdm,rzsjstr,yhxm,rznr){
$.ajax({
url:"doAddsysLogs",
data:{"yhdwdm":yhdwdm,"rzsjStr":rzsjstr,"yhxm":yhxm,"rznr":rznr},
type:"post",
dataType:"json",
async: false,
success:function(data){
}
});
}
function addRyzpimg() {//初始化数据
var FileReader = window.FileReader;
if (FileReader) {//chrome浏览器处理
......@@ -522,6 +536,16 @@
if(tstz2Base64!=null&&tstz2Base64!=""){
$("#imghead32").attr("src","data:image/jpg;base64,"+tstz2Base64);
}
var bj1Base64 = $("#bj1Base64").val();
if(bj1Base64!=null&&bj1Base64!=""){
$("#imghead41").attr("src","data:image/jpg;base64,"+bj1Base64);
$("#bjifcj").attr("src","/static/rygl/img/yes.png");
}
var bj2Base64 = $("#bj2Base64").val();
if(bj2Base64!=null&&bj2Base64!=""){
$("#imghead42").attr("src","data:image/jpg;base64,"+bj2Base64);
$("#bjifcj").attr("src","/static/rygl/img/yes.png");
}
}else {//IE等其他浏览器处理
var edzzplj = $("#edzzplj").val();
if(edzzplj!=null&&edzzplj!=""){
......@@ -1256,6 +1280,7 @@
$("#szzwbh").val(result.message);
}
$("#zwifcj").attr("src","/static/rygl/img/yes.png");
addrz($("#unitcode").val(),"2021-07-12",$("#truename").val(),"进行指纹采集操作，嫌疑人人员编号为："+$("#rybh").val()+"！");
$.messager.alert( '提示',"指纹采集成功！");
zwcjjss = 0;
clearInterval(timer);
......
src/main/resources/templates/rygl/demo.html
......@@ -40,6 +40,14 @@
window.parent.document.getElementById("imghead32").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("tstz2Base64").value=tishixingxi;
window.parent.document.getElementById("tstzflag2").value="0";
}else if(zpbw==41){
window.parent.document.getElementById("imghead41").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj1Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag1").value="0";
}else if(zpbw==42){
window.parent.document.getElementById("imghead42").src=document.getElementById("thisimg").src;
window.parent.document.getElementById("bj2Base64").value=tishixingxi;
window.parent.document.getElementById("bjflag2").value="0";
}
}
function cjwc() {
......
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