Skip to content

H
hnxtbaboot
Commit 35531dfd by yangliang
Options

增加指纹比中反馈，修改右下角弹窗提示详情

parent f5952bd7
Showing with 109 additions and 14 deletions
src/main/java/com/founder/controller/RyfkController.java
......@@ -3,10 +3,13 @@ package com.founder.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.founder.domain.TbFwXxdl;
import com.founder.hnxzasj.TbStasjService;
import com.founder.model.*;
import com.founder.news.service.INewsService;
import com.founder.ryswtz.service.RyxxService;
import com.founder.service.AfisQualityService;
import com.founder.socketio.service.IMessageService;
import com.founder.util.HttpClientUtil;
import com.founder.util.Maputil;
import com.founder.utils.PropertiesUtil;
......@@ -43,7 +46,10 @@ public class RyfkController {
@Autowired
private AfisQualityService afisQualityService;
@Autowired
private IMessageService messageService;
@Autowired
private INewsService newsService;
@GetMapping("/toRyfkDetail/{zjhm}")
......@@ -152,6 +158,18 @@ public class RyfkController {
}
}
}
if(bzcs>0){
boolean flg = newsService.ifNews(zjhm);
if(!flg){
TbFwXxdl tbFwXxdl = new TbFwXxdl();
tbFwXxdl.setJsdwDm(user.getUnitcode());
tbFwXxdl.setFsrName(user.getUsername());
tbFwXxdl.setXxbt(zjhm+":指纹比中");
tbFwXxdl.setXxlx("1");
tbFwXxdl.setXxnr("身份证号码为："+zjhm+"的嫌疑人有指纹比中信息！");
String Message = messageService.sendMessage(tbFwXxdl);
}
}
ResultMap lzwbzMap=new ResultMap();
lzwbzMap.setCount(bzcs);
lzwbzMap.setData(lzwbzxx);
......@@ -269,10 +287,12 @@ public class RyfkController {
JSONObject jsonObject = (JSONObject) JSONObject.parse(imgstrs);
String code = jsonObject.getString("code");
String msg = jsonObject.getString("message");
String ret = jsonObject.getString("ret");
if(ret!=null){
JSONObject jsonret = (JSONObject) JSONObject.parse(ret);
rwbh = jsonret.getString("rwbh");
if("0".equals(code)){
String ret = jsonObject.getString("ret");
if(ret!=null){
JSONObject jsonret = (JSONObject) JSONObject.parse(ret);
rwbh = jsonret.getString("rwbh");
}
}
}
if(rwbh!=null&&rwbh!=null){
......
src/main/java/com/founder/controller/ZjCjController.java
......@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.founder.domain.TbFwXxdl;
import com.founder.model.*;
import com.founder.module.redis.service.IDicItemService;
import com.founder.news.service.INewsService;
import com.founder.ryswtz.service.RyxxService;
import com.founder.service.*;
import com.founder.socketio.service.IMessageService;
......@@ -60,6 +61,8 @@ public class ZjCjController {
@Autowired
private RyxxService ryxxService; // 人员基本信息
@Autowired
private INewsService newsService;
@RequestMapping("/toZjCj")
public ModelAndView toTest(ModelAndView model, HttpServletRequest request,HttpServletResponse response) {
......@@ -976,14 +979,17 @@ public class ZjCjController {
zjbzxx.setXxzjbh(UUID.randomUUID().toString().replace("-", ""));
bool = zjbzxxService.SaveZjxxbdjg(zjbzxx);
if(bool){
TbFwXxdl tbFwXxdl = new TbFwXxdl();
AutoTbStRy ryxx = rycjService.getRyxxByRybh(request.getParameter("rybh"));
tbFwXxdl.setJsdwDm(ryxx.getLrdwdm());
tbFwXxdl.setFsrName(ryxx.getLrr());
tbFwXxdl.setXxbt("足迹比中");
tbFwXxdl.setXxlx("1");
tbFwXxdl.setXxnr("嫌疑人："+ryxx.getXm()+",人员编号："+ryxx.getRybh()+" 有足迹比中信息！");
String Message = messageService.sendMessage(tbFwXxdl);
//boolean flg = newsService.ifNews(ryxx.getGmsfhm());
//if(!flg) {
TbFwXxdl tbFwXxdl = new TbFwXxdl();
tbFwXxdl.setJsdwDm(ryxx.getLrdwdm());
tbFwXxdl.setFsrName(ryxx.getLrr());
tbFwXxdl.setXxbt("足迹比中");
tbFwXxdl.setXxlx("1");
tbFwXxdl.setXxnr("嫌疑人：" + ryxx.getXm() + ",人员编号：" + ryxx.getRybh() + " 有足迹比中信息！");
String Message = messageService.sendMessage(tbFwXxdl);
//}
}
return bool;
}
......
src/main/java/com/founder/news/dao/NewsDao.java
......@@ -46,6 +46,7 @@ public interface NewsDao {
void updateYdById(String xxid);
void deleteNews(String id);
List<TbFwXxdl> ifNews(String sfzh);
//根据单位代码获取单位用户列表
List<User> getUserListByUnitCode(String receiveUnitCode);
......
src/main/java/com/founder/news/service/INewsService.java
......@@ -62,4 +62,6 @@ public interface INewsService {
//根据消息编号和类型获取采比反消息详情
Cbffk getCbffkByXxbh(String xxbh, String sjlx);
boolean ifNews(String sfzh);
}
src/main/java/com/founder/news/service/impl/NewsServiceImpl.java
......@@ -195,6 +195,16 @@ public class NewsServiceImpl implements INewsService {
}
@Override
public boolean ifNews(String sfzh) {
List<TbFwXxdl> xxs = newsDao.ifNews(sfzh);
if(xxs!=null&&xxs.size()>0){
return true;
}else{
return false;
}
}
@Override
public List<TbFwXxdl> findZxXxWdlList(String xxlx, User user, int begin, int end) {
TbFwXxdl tbFwXxdl = new TbFwXxdl();
List<TbFwXxdl> TbFwXxdls = null;
......
src/main/resources/mapper/newsDao.xml
......@@ -200,6 +200,10 @@
XXSC_PDBZ='1',SCSJ=sysdate where xxid = #{value,jdbcType=VARCHAR}
</update>
<update id="ifNews" parameterType="java.lang.String">
select * from TB_FW_XXDL where xxbt like '%指纹比中%' and (XXSC_PDBZ=0 or XXSC_PDBZ is null) and xxnr like '%'||#{value,jdbcType=VARCHAR}||'%' and fssj > sysdate-3
</update>
<!-- 根据单位代码查询本单位用户列表 -->
<select id="getUserListByUnitCode" parameterType="java.lang.String" resultType="com.founder.model.User">
SELECT * FROM sys_user WHERE unitcode=#{value} AND SCBZ='0' AND IDENTITYCARD IS NOT NULL
......
src/main/resources/templates/home.html
......@@ -471,7 +471,14 @@
for (var i = 0; i < data[key].length; i++) {
var list = data[key];
console.log("输出list中的title值" + list[i]['xxid']);
newsHtml += "<li id='sc_" + list[i]['xxid'] + "' data-xxid='" + list[i]['xxid'] + "'><span class='msg-lis' onclick='openRyxxfk('"+list[i]['xxbt']+"')'>" + list[i]['xxnr'] + "1111</span>&nbsp;&nbsp;&nbsp;&nbsp;<span class='msg-time'>" + list[i]['fssj'] + "</span></li>";
var msgs = list[i]['xxbt'];
var zjhm = "";
if(msgs.length>18){
zjhm = msgs.substring(0,18);
}else{
zjhm = msgs;
}
newsHtml += "<li id='sc_" + list[i]['xxid'] + "' data-xxid='" + list[i]['xxid'] + "'><span class='msg-lis' onclick='openRyxxfk(\""+zjhm+"\")'>" + list[i]['xxnr'] + "</span>&nbsp;&nbsp;&nbsp;&nbsp;<span class='msg-time'>" + list[i]['fssj'] + "</span></li>";
}
}
}
......
src/main/resources/templates/rygl/ryxxlist.html
......@@ -11,7 +11,6 @@
<link rel="stylesheet" type="text/css" href="static/xtba/zljc/css/buttons.css">
<script type="text/javascript" src="static/ajgl/js/jquery.easyui.min.js"></script>
<link rel="stylesheet" type="text/css" href="static/ajgl/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="static/ajgl/css/easyui.css">
<link rel="stylesheet" type="text/css" href="static/ajgl/css/icon.css">
......@@ -328,6 +327,7 @@
var numcot = 1;
window.onload = function () {
pop();
getMessage();
setInterval(function () {
console.log("=====页面第 "+numcot+" 次自动刷新！=====");
numcot++;
......@@ -1029,6 +1029,50 @@
function closeLayer(){
layer.closeAll("tips");
}
function getMessage(){
debugger;
var begin = "0";
var end = "5";
$.ajax({
type: "POST",
url: "getMessage?begin="+begin+"&end="+end,
//async:false,
dataType: "json",
success:function(data){
debugger;
if(data!=null&&data!=""){
if(data["code"]!=1){
return;
}
var newsHtml = "";
for(var key in data) {
console.log("输出key值:" + key);
if(key=="tbFwXxdls"){
for (var i = 0; i < data[key].length; i++) {
var list = data[key];
console.log("输出list中的title值" + list[i]['xxid']);
newsHtml += "<li id='sc_" + list[i]['xxid'] + "' data-xxid='" + list[i]['xxid'] + "'><span class='msg-lis' onclick='openRyxxfk('"+list[i]['xxbt']+"')'>" + list[i]['xxnr'] + "1111</span>&nbsp;&nbsp;&nbsp;&nbsp;<span class='msg-time'>" + list[i]['fssj'] + "</span></li>";
}
}
}
/*右下角弹出最新消息提示*/
$.messager.show({
title: '我的消息',
height: '20%',
msg: newsHtml,
timeout: 60000,
showType: 'slide'
});
}else{
alert("无消息！");
}
},
error:function(e){
console.log("error="+JSON.stringify(e));
}
});
}
</script>
</body>
</html>
\ No newline at end of file
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