Commit 1be86539 by caojingji

Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1

parents cf8616fb f0c32f31
......@@ -473,6 +473,74 @@ public class AbutmentController {
}
/**
* 案件侦办跳转新德汇审批页面
* @param asjbh
* @param sfzh
* @param jh
* @param xxly
* @param response
*/
@RequestMapping(value = "/toAjzbSpJsp",method = {RequestMethod.GET,RequestMethod.POST})
public void toSpJsp2(String asjbh,String sfzh,String jh,String xxly,HttpServletResponse response){
String xm = null,lxdh = null,dldwmc = null,dldwdm = null,sqbt = null;
try{
JSONObject jsonObject = new JSONObject();
if(sfzh != null || jh != null){
User user = getUserInfo(sfzh,jh);
System.out.println("USER ==========" + user.toString());
xm = user.getTrue_name();
lxdh = user.getPhone_no();
dldwdm = user.getJz_dwdm();
dldwmc = user.getJz_dwmc();
}
if(xxly.equals("ajzb")){
System.out.println("sfzh =======" + sfzh + "jh ======="+jh);
jsonObject.put("sqly","信息布控");
sqbt = "案件侦办申请:案事件编号为"+asjbh+";侦办对象为:"+asjbh+";申请人是:"+xm+",警号为:"+jh+",身份证号为:"+sfzh;
System.out.println("sqbt======" + sqbt);
xxly = "案件侦办";
}
LinkedHashMap<String, Object> params = new LinkedHashMap<>();
params.put("sysname", "HCZZ-SQSP"); //参数
jsonObject.put("ajbh", asjbh);
jsonObject.put("sfzh", sfzh);
jsonObject.put("sqdx", asjbh);//审批对象为案件,则审批对象暂时定为asjbh
jsonObject.put("sqbt", sqbt);
jsonObject.put("level","2");
params.put("sysparam", jsonObject.toJSONString()); //参数
String url = UnifiedServiceUtil.sendRequest(bizCode,cjServiceId,params);
if(!StringUtil.ckeckEmpty(url)){
//添加审批日志
SpLog spLog = new SpLog();
spLog.setXxzjbh(KeyUtil.getUniqueKey("SPL"));
spLog.setAsjbh(asjbh);
spLog.setCqrSfzh(sfzh);
spLog.setCqrXm(xm);
spLog.setCqrJh(jh);
spLog.setCqrLxdh(lxdh);
spLog.setDldwdm(dldwdm);
spLog.setDldwmc(dldwmc);
spLog.setCqrIp("");
spLog.setSpbsh(asjbh);//审批对象为案件,则审批对象暂时定为asjbh
spLog.setBshlxdm("ajzb");//审批对象为案件,则申请对象类型代码暂时定为ajzb
spLog.setBshlxmc("案件侦办");//审批对象为案件,则申请对象类型名称暂时定为案件侦办
spLog.setSpTitle(sqbt);
spLog.setSpzt("2"); //正在审批
spLog.setXxly(xxly);
spLogService.saveSpLog(spLog);
//跳转
response.sendRedirect(url);
}
}catch (Exception e){
e.printStackTrace();
throw new InterServiceException(55,"发生未知错误!");
}
}
/**
* 调用新德汇接口获取审批结果
* @param asjbh
* @param sfzh
......
......@@ -20,6 +20,6 @@ public interface WffzkyxsMapper {
TbStWffzkyxs getByXxzjbh(String xxzjbh) throws Exception;
List<TbStWffzkyxs> getWffzkyxsList(Map<String,Object> map) throws Exception;
List<TbStWffzkyxs> getWffzkyxsList(TbStWffzkyxs tbStWffzkyxs) throws Exception;
}
......@@ -28,4 +28,7 @@ public class RelationFilter {
private String kssj;
private String jssj;
private Date djsj;
private String value;
private String name;
private String type;
}
......@@ -3,6 +3,8 @@ package com.founder.interservice.ryhx.controller;
import com.founder.interservice.model.AutoTbStRy;
import com.founder.interservice.model.Relation;
import com.founder.interservice.model.SysDictitem;
import com.founder.interservice.querymodel.RelationFilter;
import com.founder.interservice.service.DataService;
import com.founder.interservice.service.SysDictService;
import com.founder.interservice.util.Qgckzp;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -12,11 +14,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.List;
@Controller
@CrossOrigin
public class RyhxController {
@Autowired
private SysDictService sysDictService;
@Autowired
private DataService dataService;
List<RelationFilter> relationInList = new ArrayList<RelationFilter>();
RelationFilter relationFilter = new RelationFilter();
String flag = "0";
int z = 0;
@RequestMapping(value = "/toRyhxJsp",method = {RequestMethod.GET,RequestMethod.POST})
public ModelAndView toRyhxJsp(String zjhm){
......@@ -84,11 +95,97 @@ public class RyhxController {
/*虚拟信息查询
根据身份证编号查询RELATION表查询该用户的相关虚拟信息:QQ、微信、银行卡号等等*/
@RequestMapping(value = "/getXnxx",method = {RequestMethod.GET,RequestMethod.POST})
public Relation getXnxx(String zjhm){
Relation relation = new Relation();
return relation;
public ModelAndView getXnxx(String zjhm){
relationInList = getXnxxList(zjhm);
ModelAndView modelAndView = new ModelAndView("ryhx/ryhx");
modelAndView.addObject("relationInList",relationInList);
modelAndView.addObject("relationFilter",relationFilter);
return modelAndView;
}
public List<RelationFilter> getXnxxList(String zjhm){
int k = 0;
int m = 0;
z = z + 1;
RelationFilter relaFilter = new RelationFilter();
List<Relation> relationList = new ArrayList<Relation>();
String oftvalue = "";
String oftname = "";
String ottvalue = "";
String ottname = "";
String firvalue = "";
try {
if (flag == "0") {
relationFilter.setName("身份证号码");
relationFilter.setValue(zjhm);
}
if(zjhm != null && !"".equals(zjhm)){
relationFilter.setObjectfromvalue(zjhm);
relationList = dataService.queryRelationsList(relationFilter);
if (relationList != null && relationList.size() > 0 && flag != "1") {
flag = "1";
for (int i = 0; i < relationList.size(); i++) {
//此时Objectfromvalue为身份证号码,则用ottvalue(Objecttovalue)作为查询条件继续查询
ottname = relationList.get(i).getObjecttotypename();
ottvalue = relationList.get(i).getObjecttovalue();
k = k + 1;
m = relationList.size();
relaFilter.setObjecttovalue(ottvalue);
relaFilter.setObjecttotypename(ottname);
relationInList.add(relaFilter);
System.out.print("relationInList111=====" + relationInList);
}
if (relationInList.size() > 0) {
for (int n = 0; n < relationInList.size(); n++) {
System.out.print("relationInList111的size=====" + relationInList.size());
//for(int j = 0; j < relationList.size(); j++) {
if (k == m) {
firvalue = relationInList.get(n).getObjecttovalue();
if (z < 6) {
getXnxxList(firvalue);
}
}
}
// }
}
} else {
relationFilter.setObjectfromvalue(null);
relationFilter.setObjecttovalue(zjhm);
relationList = dataService.queryRelationsList(relationFilter);
if (relationList != null && relationList.size() > 0 && flag != "2") {
flag = "2";
for (int i = 0; i < relationList.size(); i++) {
//此时Objecttovalue为身份证号码,则用oftvalue(Objectfromvalue)为条件进行查询
oftname = relationList.get(i).getObjectfromtypename();
oftvalue = relationList.get(i).getObjectfromvalue();
k = k + 1;
m = relationList.size();
relaFilter.setObjectfromvalue(oftvalue);
relaFilter.setObjectfromtypename(oftname);
relationInList.add(relaFilter);
System.out.print("relationInList222=====" + relationInList);
}
if (relationInList.size() > 0) {
for (int n = 0; n < relationInList.size(); n++) {
System.out.print("relationInList222的size=====" + relationInList.size());
//for(int j = 0; j < relationList.size(); j++) {
if (k == m) {
firvalue = relationInList.get(n).getObjectfromvalue();
if (z < 6) {
getXnxxList(firvalue);
}
}
}
// }
}
}
}
}
}catch (Exception e){
e.printStackTrace();
}
System.out.print("relationInList888====="+relationInList);
return relationInList;
}
}
......@@ -120,16 +120,23 @@ public class WffzkyxsController {
/**
* 通过线索类型或案事件编号查询违法犯罪可疑线索
* @param objType 线索类型 (001)
* @param asjbh 案事件编号
* @param xszl 线索种类 (001)
* @param asjbh 案事件编号
* @param sfzh 身份证号
* @param xslx 线索类型(0102)
* @return
*/
@RequestMapping(value = "/getWffzkyxsList",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public ResultVO getWffzkyxsList(String objType,String asjbh){
public ResultVO getWffzkyxsList(String xszl,String asjbh,String sfzh,String xslx){
ResultVO resultVO = null;
try {
resultVO = wffzkyxsService.getWffzkyxsList(objType,asjbh);
TbStWffzkyxs tbStWffzkyxs = new TbStWffzkyxs();
tbStWffzkyxs.setAsjbh(asjbh);
tbStWffzkyxs.setXxdjrSfzh(sfzh);
tbStWffzkyxs.setXslx(xslx);
tbStWffzkyxs.setXszl(xszl);
resultVO = wffzkyxsService.getWffzkyxsList(tbStWffzkyxs);
}catch (InterServiceException e){
e.printStackTrace();
resultVO = ResultVOUtil.error(e.getCode(),e.getMessage());
......
......@@ -5,6 +5,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.Map;
@Data
public class TbStWffzkyxs {
......@@ -26,5 +27,12 @@ public class TbStWffzkyxs {
private String xxdjrLxdh; //信息登记人_联系电话
private String djsj; //登记时间
private String xgsj; //修改时间
private String ryCsdDzmc; //人员出生地地址名称
private String ryZplj; //人员照片路径
private String ryXm; //人员姓名
private String rySex; //人员性别
private Date ryCsrqRq; //人员出生日期
private String ryCyzjZjhm; //人员常用证件证件编号
private String ryXzzDzmc; //人员现住址地址名称
}
......@@ -18,5 +18,5 @@ public interface WffzkyxsService {
TbStWffzkyxs getByXxzjbh(String xxzjbh) throws InterServiceException;
ResultVO getWffzkyxsList(String objType,String asjbh);
ResultVO getWffzkyxsList(TbStWffzkyxs tbStWffzkyxs);
}
package com.founder.interservice.wffzkyxs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.founder.interservice.VO.ResultVO;
import com.founder.interservice.enums.ResultEnum;
import com.founder.interservice.exception.InterServiceException;
import com.founder.interservice.mapper.xzxt.WffzkyxsMapper;
import com.founder.interservice.model.AutoTbStRy;
import com.founder.interservice.util.Qgckzp;
import com.founder.interservice.util.ResultVOUtil;
import com.founder.interservice.util.StringUtil;
import com.founder.interservice.wffzkyxs.model.TbStWffzkyxs;
import com.founder.interservice.wffzkyxs.service.WffzkyxsService;
import org.apache.commons.collections.CollectionUtils;
......@@ -90,14 +94,43 @@ public class WffzkyxsServiceImpl implements WffzkyxsService{
}
@Override
public ResultVO getWffzkyxsList(String objType, String asjbh) {
public ResultVO getWffzkyxsList(TbStWffzkyxs tbStWffzkyxs) {
ResultVO resultVO = ResultVOUtil.success();
try{
Map<String,Object> selectMap = new HashMap<>();
selectMap.put("objType",objType);
selectMap.put("asjbh",asjbh);
List<TbStWffzkyxs> wffzkyxsList = wffzkyxsMapper.getWffzkyxsList(selectMap);
List<TbStWffzkyxs> wffzkyxsList = wffzkyxsMapper.getWffzkyxsList(tbStWffzkyxs);
if(wffzkyxsList.size()>0){
for (int i = 0 ;i<wffzkyxsList.size();i++){
TbStWffzkyxs tsw = wffzkyxsList.get(i);
String xszl = tsw.getXszl();//只有身份证类型才会调用 004:身份证号
if(xszl.equals("004")){
String xsvalue = tsw.getXsvalue();
Map<String,Object> map = new HashMap<>();
//获取身份证号
AutoTbStRy tbStRy = new Qgckzp().getQgckAllxxXml(xsvalue);//通过身份证号码获取二代证信息
tsw.setRyCsdDzmc(tbStRy.getCsdDzmc());//户籍地址名称(出生地)
tsw.setRyCsrqRq(tbStRy.getCsrqRqgzxx());//出生日期
tsw.setRyCyzjZjhm(tbStRy.getCyzjZjhm());
tsw.setRyXm(tbStRy.getXm());//姓名
tsw.setRyXzzDzmc(tbStRy.getXzzDzmc());
String sex = "";
String imgJson = StringUtil.ckeckEmpty(tbStRy.getEdzzplj())?"":tbStRy.getEdzzplj();
String sexStr = StringUtil.ckeckEmpty(tbStRy.getXbdm())?"":tbStRy.getXbdm();
switch(sexStr){
default:
sex = "未知的性别";break;
case "0":
sex = "未知的性别";break;
case "1":
sex = "男";break;
case "2":
sex = "女";break;
case "9":
sex = "未说明的性别";break;
}
tsw.setRySex(sex);
tsw.setRyZplj(imgJson);
}
}
resultVO.setData(wffzkyxsList);
}
}catch (Exception e){
......
......@@ -14,6 +14,9 @@
<if test="objecttotype != null and objecttotype != ''">
and r.objecttotype = #{objecttotype}
</if>
<if test="objecttovalue != null and objecttovalue != ''">
and r.objecttovalue = #{objecttovalue}
</if>
<if test="kssj != null and kssj != ''">
and to_date(r.timestamp,'yyyy-MM-dd HH24:mi:ss') <![CDATA[>=]]> to_date(#{kssj},'yyyy-MM-dd HH24:mi:ss')
</if>
......
......@@ -122,7 +122,7 @@
t.DJSJ as djsj
from TB_ST_WFFZKYXS t where t.XXZJBH=#{xxzjbh}
</select>
<select id="getWffzkyxsList" parameterType="java.util.Map" resultType="com.founder.interservice.wffzkyxs.model.TbStWffzkyxs">
<select id="getWffzkyxsList" parameterType="com.founder.interservice.wffzkyxs.model.TbStWffzkyxs" resultType="com.founder.interservice.wffzkyxs.model.TbStWffzkyxs">
select
t.XXZJBH as xxzjbh,
t.ASJBH as asjbh,
......@@ -144,8 +144,10 @@
from
TB_ST_WFFZKYXS t
<where>
<if test="objType !=null and objType !=''">and t.XSZL = #{objType}</if>
<if test="xszl !=null and xszl !=''">and t.XSZL = #{xszl}</if>
<if test="asjbh !=null and asjbh !=''">and t.ASJBH = #{asjbh}</if>
<if test="xxdjrSfzh !=null and xxdjrSfzh !=''">and t.XXDJR_SFZH = #{xxdjrSfzh}</if>
<if test="xslx !=null and xslx !=''">and t.XSLX = #{xslx}</if>
</where>
</select>
......
......@@ -26,8 +26,8 @@
<!--title start-->
<!--菜单-->
<ul class="hx-menu">
<li class="current" onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
<li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>虚拟信息</li>
<li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>基本信息</li>
<li class="current" onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>虚拟信息</li>
<li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>轨迹信息</li>
<li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>背景信息</li>
<li onclick="toggle(this)"><img src="/images/mebu1.png" class="mebu-bg"/><img src="/images/mebu3.png" class="mebu-bg-long"/>涉案信息</li>
......@@ -73,34 +73,29 @@
<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>
</div>
<div id="content2" class="content" style="display:none;">
<div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
<span class="tbs-title">Q&nbsp;Q</span>
<div class="tbs-cont">
<div class="fl count" onclick="tips(this)">3</div>
<div class="fl ajbh">747836970</div>
<div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
<span class="tbs-title">${relationFilter.name}</span>
<div class="tbs-cont">
<div class="fl count" onclick="tips(this)">3</div>
<div class="fl ajbh">${relationFilter.value}</div>
</div>
</div>
</div>
<div class="new2 tabs-o animated pulse" style="margin-left: -317px;margin-top: -132px;">
<span class="tbs-title">微信</span>
<c:forEach var="xnxx" items="${relationInList}">
<div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
<span class="tbs-title">${xnxx.objectfromtypename}</span>
<div class="tbs-cont">
<div class="fl count" onclick="tips(this)">3</div>
<div class="fl ajbh">747836970</div>
<div class="fl ajbh">${xnxx.objectfromvalue}</div>
</div>
</div>
<div class="new3 tabs-o animated pulse" style="margin-left: 106px;">
<span class="tbs-title">手机号码</span>
<div class="tbs-cont">
<div class="fl count" onclick="tips(this)">3</div>
<div class="fl ajbh">13747836970</div>
</div>
</div>
<div class="new4 tabs-o animated pulse" style="margin-left: 128px;">
<span class="tbs-title">银行卡</span>
<div class="new1 tabs-o animated pulse" style="margin-left: -298px;margin-top: -266px;">
<span class="tbs-title">${xnxx.objecttotypename}</span>
<div class="tbs-cont">
<div class="fl count" onclick="tips(this)">3</div>
<div class="fl ajbh">工商银行:6217220502000666413</div>
<div class="fl ajbh">${xnxx.objecttovalue}</div>
</div>
</div>
</div>
</c:forEach>
</div>
<div id="content3" class="content" style="display:none;">
<div class="new1 tabs-o animated pulse" style="margin-left: -298px;">
......
......@@ -74,18 +74,18 @@
<input type="hidden" name="xxdjrGajgjgmc" id = "xxdjrGajgjgmc" value="${user.jz_dwmc}" />
<input type="hidden" name="xxdjrLxdh" id = "xxdjrLxdh" value="${user.phone_no}" />
<tr>
<td class="ar" width="13.3%"><span class="red">*</span>标识号类型:</td>
<td width="20%">
<span class="textbox" style="border:none;">
<input type="text" id="xszl" name="xszl" class="val easyui-combotree" value="${tbStWffzkyxs.xszl}" data-options="method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>标识号:</td>
<td width="20%">
<span class="textbox">
<input type="text" name="xsvalue" id = "xsvalue" value="${tbStWffzkyxs.xsvalue}">
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>线索种类:</td>
<td width="20%">
<span class="textbox" style="border:none;">
<input type="text" id="xszl" name="xszl" class="val easyui-combotree" value="${tbStWffzkyxs.xszl}" data-options="method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>发现时间:</td>
<td width="20%">
<span class="textbox" style="border:none;">
......@@ -114,6 +114,12 @@
<input type="text" value="${user.true_name}" disabled="disabled" />
</span>
</td>
<td class="ar" width="13.3%">联系电话:</td>
<td width="20%">
<span class="textbox">
<input type="text" value="${user.phone_no}" disabled="disabled" />
</span>
</td>
</tr>
<tr>
<td colspan="6" style="text-align: center;height:50px;">
......
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