Skip to content

X
xzxt-app-report
Commit 97bd1935 by lilei
Options

案件提取时增加日志

parent de431718
Showing with 126 additions and 67 deletions
src/main/java/org/springblade/founder/asj/controller/StAsjXxtqController.java
......@@ -383,11 +383,5 @@ public class StAsjXxtqController extends BladeController {
}
}
@RequestMapping("/addSjjc")
@ResponseBody
public R addSjjc(){
xxtqService.getMyCzrz();
return R.ok();
}
}
src/main/java/org/springblade/founder/asj/service/StAsjXxtqService.java
......@@ -16,14 +16,19 @@ import org.springblade.founder.rybh.service.IXwRybhService;
import org.springblade.founder.utils.HttpClientUtil;
import org.springblade.founder.utils.HttpUtil;
import org.springblade.founder.utils.R;
import org.springblade.founder.xtrz.entity.SysGnsyrz;
import org.springblade.founder.xtrz.mapper.XtrzMapper;
import org.springblade.founder.xtrz.service.IXtrzService;
import org.springblade.founder.zbfzxyr.entity.XwZbfzxyr;
import org.springblade.founder.zbfzxyr.service.IXwZbfzxyrService;
import org.springblade.modules.auth.utils.TokenUtil;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.awt.*;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
......@@ -38,6 +43,8 @@ public class StAsjXxtqService {
@Autowired
private ITbXwBaService tbXwBaService;
@Autowired
private IXtrzService xtrzService;
@Autowired
private IXwRybhService xwRybhService;
@Autowired
private ITbGlAsjRyService glAsjRyService;
......@@ -195,6 +202,8 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj==null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息",asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null){
......@@ -225,6 +234,8 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取犯罪嫌疑人信息信息",asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null && !data.isEmpty()){
......@@ -312,6 +323,8 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息",asjbh);
getSysjjcUrl(asjbh,token);
}
if(data!=null && !data.isEmpty()){
......@@ -444,13 +457,36 @@ public class StAsjXxtqService {
private String getDetailUrl(String asjbh) {
String url = "http://10.2.164.178:8058/db/fzAj/"+asjbh;
System.out.println("url*************:"+url);
String upid = getUpid(url);
for (int i = 1; i < 5; i++){
if (!StringUtils.isEmpty(upid)) {
if ("0".equals(upid)) {
System.out.println("upid正在入库：" + upid);
upid = getUpid(url);
}else {
System.out.println("upid已获取到：" + upid);
break;
}
}else {
System.out.println("获取upid失败");
break;
}
}
System.out.println("upid-------------------------------"+upid);
String detailUrl = "";
if (upid!=null&&!"0".equals(upid)){
detailUrl = "http://10.2.164.178:8086/dataDetection/#/testing?upid="+upid;
System.out.println("============================get upid success:"+detailUrl+"===========================");
}
return detailUrl;
}
//获取思悦日志快照的upid
private String getUpid(String url){
String resultStr = null;
try {
System.out.println( "延时前:"+new Date().toString() );
Thread.sleep(3000);
System.out.println( "延时后:"+new Date().toString() );
Thread.sleep(1000);
resultStr = HttpUtil.doGet(url);
System.out.println("resultStr*****************:"+resultStr);
} catch (Exception e) {
e.printStackTrace();
}
......@@ -461,7 +497,6 @@ public class StAsjXxtqService {
System.out.println("result**************:"+result);
if(result!=null){
upid = result.getString("data");
System.out.println("upid******************"+upid);
}else{
System.out.println("获取思悦数据详情页面upid返回值没有data。返回结果："+resultStr);
}
......@@ -472,15 +507,11 @@ public class StAsjXxtqService {
}else{
System.out.println("获取思悦数据详情页面upid没有返回值。");
}
System.out.println("upid-------------------------------"+upid);
String detailUrl = "";
if (upid!=null){
detailUrl = "http://10.2.164.178:8086/dataDetection/#/testing?upid="+upid;
}
System.out.println("============================get upid success:"+detailUrl+"===========================");
return detailUrl;
return upid;
}
//根据思悦给的地址生成Token
private String getToken(){
XzxtUser xzxtUser = SecureUtil.getUserXzxt();
......@@ -514,7 +545,7 @@ public class StAsjXxtqService {
}
//请求思悦数据检测详情页面地址
//请求思悦记录数据检测日志接口
public void getSysjjcUrl(String asjbh,String token){
String url = "http://10.2.164.178:8058/db/fzAj";
String json = "{\"ajbh\":\""+asjbh+"\"}";
......@@ -612,31 +643,4 @@ public class StAsjXxtqService {
return ajDetailService.getAsjByAsjbh(asjbh);
}
public void getMyCzrz(){
List<TbStAsj> list = ajDetailService.getAsjByRsksj();
for (TbStAsj tbStAsj:list) {
String asjbh = tbStAsj.getAsjbh();
String zjhm = tbStAsj.getXxdjryGmsfhm();
String tokenYrl="http://10.2.164.178:8058/sys/oauth2/token";
Map<String,String> param = new HashMap<>();
param.put("username",zjhm);
String resultStr = null;
try {
resultStr = HttpClientUtil.doGet(tokenYrl,param);
} catch (Exception e) {
e.printStackTrace();
}
String token = null;
JSONObject result = JSON.parseObject(resultStr);
if(result!=null){
token = result.getString("data");
}else{
System.out.println("获取思悦数据详情页面token返回值没有data。返回结果："+resultStr);
}
getSysjjcUrl(asjbh,token);
}
}
}
src/main/java/org/springblade/founder/xtrz/controller/XtrzController.java
......@@ -4,15 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.utils.R;
import org.springblade.founder.xtrz.service.xtrzService;
import org.springblade.founder.xtrz.service.IXtrzService;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
/**
* Created by libin on 2018/4/12.
* 登录控制类
......@@ -22,7 +20,7 @@ public class XtrzController {
private Logger log= LoggerFactory.getLogger(this.getClass());
@Autowired
private xtrzService loginService;
private IXtrzService loginService;
@RequestMapping("/addSysDlrz")
@ResponseBody
......
src/main/java/org/springblade/founder/xtrz/service/xtrzService.java → src/main/java/org/springblade/founder/xtrz/service/IXtrzService.java
......@@ -6,7 +6,9 @@ import org.springblade.modules.system.entity.XzxtUser;
/**
* Created by libin on 2018/4/12.
*/
public interface xtrzService {
public interface IXtrzService {
String saveSysDlrz(XzxtUser user) throws Exception;
void addAjtqGnsyrz(XzxtUser user,String czxxLbdm,String yymcJyqk,String czxxParam);
}
src/main/java/org/springblade/founder/xtrz/service/impl/XtrzServiceImpl.java → src/main/java/org/springblade/founder/xtrz/service/impl/IXtrzServiceImpl.java
package org.springblade.founder.xtrz.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.xtrz.entity.SysDlrz;
import org.springblade.founder.xtrz.entity.SysGnsyrz;
import org.springblade.founder.xtrz.mapper.XtrzMapper;
import org.springblade.founder.xtrz.service.xtrzService;
import org.springblade.founder.xtrz.service.IXtrzService;
import org.springblade.modules.auth.utils.TokenUtil;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -18,7 +17,7 @@ import java.util.*;
* Created by libin on 2018/4/12.
*/
@Service
public class XtrzServiceImpl implements xtrzService {
public class IXtrzServiceImpl implements IXtrzService {
@Autowired
private XtrzMapper loginDao;
......@@ -63,16 +62,78 @@ public class XtrzServiceImpl implements xtrzService {
return rzlsh;
}
public static String getOrderIdByUUId() {
int machineId = 1;//最大支持1-9个集群机器部署
int hashCodeV = UUID.randomUUID().toString().hashCode();
if(hashCodeV < 0) {//有可能是负数
hashCodeV = - hashCodeV;
}
// 0 代表前面补充0
// 4 代表长度为4
// d 代表参数为正数型
return machineId + String.format("%015d", hashCodeV);
}
//记录功能使用日志
@Override
@DS("db1")
public void addAjtqGnsyrz(XzxtUser user,
String czxxLbdm,
String yymcJyqk, String czxxParam) {
//拼接日志流水号
//公安机关机构代码（前6位）
String qlw = user.getUnitcode().substring(0, 6);
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
//8位年月日
String sjdate = formatter.format(new Date());
String lsh = getOrderIdByUUId();
String yrzlsh = qlw + sjdate + lsh;
String rzlsh = yrzlsh.replace(" ", "");
SysGnsyrz sysGnsyrz = new SysGnsyrz();
sysGnsyrz.setRzlsh(rzlsh);
sysGnsyrz.setYymcJyqk(yymcJyqk);
sysGnsyrz.setYhGmsfhm(user.getIdentitycard());
// 1.6新增字段
sysGnsyrz.setYhXm(user.getRealname());
sysGnsyrz.setYymcdm("");
sysGnsyrz.setYwbhlxdm("");
sysGnsyrz.setYwbh("");
sysGnsyrz.setCxnrlbdm("");
sysGnsyrz.setCxnrbh("");
sysGnsyrz.setCxxxjg("");
String ip = "";
try {
ip = TokenUtil.getIp();
}catch (Exception e) {
e.printStackTrace();
}
sysGnsyrz.setYhIp(ip);
sysGnsyrz.setYhdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setYhdwGajgmc(user.getUnitname());
sysGnsyrz.setCzlxdm(czxxLbdm);
sysGnsyrz.setCzxxJyqk(czxxParam);
sysGnsyrz.setXxscPdbz("0");
sysGnsyrz.setXxdjdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setXxdjdwGajgmc(user.getUnitname());
sysGnsyrz.setXxdjryXm(user.getRealname());
sysGnsyrz.setXxdjryGmsfhm(user.getIdentitycard());
sysGnsyrz.setXxdjryLxdh(user.getPhone());
sysGnsyrz.setXxczdwGajgjgdm(user.getUnitcode());
sysGnsyrz.setXxczdwGajgmc(user.getUnitname());
sysGnsyrz.setXxczryXm(user.getRealname());
sysGnsyrz.setXxczryGmsfhm(user.getIdentitycard());
sysGnsyrz.setXxlyms("系统功能日志");
sysGnsyrz.setXtlx("MAXT");
try {
loginDao.addGnsyrz(sysGnsyrz);
} catch (Exception e) {
e.printStackTrace();
}
}
public static String getOrderIdByUUId() {
int machineId = 1;//最大支持1-9个集群机器部署
int hashCodeV = UUID.randomUUID().toString().hashCode();
if(hashCodeV < 0) {//有可能是负数
hashCodeV = - hashCodeV;
}
// 0 代表前面补充0
// 4 代表长度为4
// d 代表参数为正数型
return machineId + String.format("%015d", hashCodeV);
}
}
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