Skip to content

X
xzxt-app-report
Commit c165eb2d by lilei
Options

调用思悦接口的超时时间为10秒，增加嫌疑人、被害人删除的日志

parent 90c648e7
Showing with 93 additions and 16 deletions
src/main/java/org/springblade/founder/asj/service/StAsjXxtqService.java
......@@ -202,9 +202,9 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj==null){
String message = getSysjjcUrl(asjbh, token);
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
xtrzService.addAjtqGnsyrz(user,"01","提取案件基本信息"+message,asjbh,asjbh);
}
if(data!=null){
data.setXxlyms("信息来源于案件提取");
......@@ -234,9 +234,9 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
String message = getSysjjcUrl(asjbh, token);
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取犯罪嫌疑人信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
xtrzService.addAjtqGnsyrz(user,"01","提取犯罪嫌疑人信息"+message,asjbh,asjbh);
}
if(data!=null && !data.isEmpty()){
StAsj queryAsj = new StAsj();
......@@ -324,9 +324,9 @@ public class StAsjXxtqService {
String token = getToken();
TbStAsj tbStAsj = getTbStAsj(asjbh);
if (tbStAsj!=null){
String message = getSysjjcUrl(asjbh, token);
XzxtUser user = SecureUtil.getUserXzxt();
xtrzService.addAjtqGnsyrz(user,"01","提取案件被害人信息",asjbh,asjbh);
getSysjjcUrl(asjbh,token);
xtrzService.addAjtqGnsyrz(user,"01","提取案件被害人信息"+message,asjbh,asjbh);
}
if(data!=null && !data.isEmpty()){
StAsj queryAsj = new StAsj();
......@@ -487,7 +487,7 @@ public class StAsjXxtqService {
String resultStr = null;
try {
Thread.sleep(1000);
resultStr = HttpUtil.doGet(url);
resultStr = HttpClientUtil.doGet(url);
} catch (Exception e) {
e.printStackTrace();
}
......@@ -547,16 +547,21 @@ public class StAsjXxtqService {
//请求思悦记录数据检测日志接口
public void getSysjjcUrl(String asjbh,String token){
public String getSysjjcUrl(String asjbh,String token){
String url = "http://10.2.164.178:8058/db/fzAj";
String json = "{\"ajbh\":\""+asjbh+"\"}";
String resuleStr = null;
try {
String message = HttpClientUtil.doPostJson(url, json, token);
resuleStr = HttpClientUtil.doPostJson(url, json, token);
System.out.println("******************** success 1234566789 *****************************");
System.out.println(message);
} catch (Exception e) {
e.printStackTrace();
}
String message = "";
if (StringUtils.isEmpty(resuleStr)){
message = ",连接超时";
}
return message;
}
......
src/main/java/org/springblade/founder/rybh/controller/XwRybhController.java
......@@ -40,6 +40,7 @@ import org.springblade.founder.rybh.vo.XwRybhVOFz;
import org.springblade.founder.ryzp.entity.TbStRyZp;
import org.springblade.founder.ryzp.service.ITbStRyZpService;
import org.springblade.founder.utils.*;
import org.springblade.founder.xtrz.LogOper;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
......@@ -418,6 +419,7 @@ public class XwRybhController extends BladeController {
@GetMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除一条被害人信息以及关联的附件、照片信息", notes = "传入主键编号、人员编号、案事件编号")
@LogOper(czxxLbdm = "04",yymcJyqk = "删除被害人",ywbh = "#asjbh")
public R removeJa(@ApiParam(value = "信息主键编号", required = true) @RequestParam String xxzjbh, @RequestParam("asjxgrybh")String asjxgrybh,
@RequestParam("asjbh")String asjbh) {
if(StringUtils.isEmpty(xxzjbh) || StringUtils.isEmpty(asjxgrybh) || StringUtils.isEmpty(asjbh)){
......
src/main/java/org/springblade/founder/utils/HttpClientUtil.java
......@@ -57,7 +57,7 @@ public class HttpClientUtil {
// 创建http GET请求
HttpGet httpGet = new HttpGet(uri);
httpGet.setConfig(RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000).build());
// 执行请求
response = httpclient.execute(httpGet);
// 判断返回状态是否为200
......@@ -137,6 +137,7 @@ public class HttpClientUtil {
try {
// 创建Http Post请求
HttpPost httpPost = new HttpPost(url);
httpPost.setConfig(RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000).build());
httpPost.setHeader("Content-Type","application/json");
httpPost.setHeader("token",token);
// 创建请求内容
......@@ -144,7 +145,12 @@ public class HttpClientUtil {
httpPost.setEntity(entity);
// 执行http请求
response = httpClient.execute(httpPost);
resultString = EntityUtils.toString(response.getEntity(), "utf-8");
// 判断返回状态是否为200
if (response.getStatusLine().getStatusCode() == 200) {
resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
}else{
return resultString;
}
} catch (Exception e) {
e.printStackTrace();
} finally {
......
src/main/java/org/springblade/founder/xtrz/EventLogAspect.java
......@@ -9,6 +9,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.utils.R;
import org.springblade.founder.xtrz.mapper.XtrzMapper;
import org.springblade.founder.xtrz.entity.SysGnsyrz;
import org.springblade.modules.auth.utils.TokenUtil;
......@@ -16,6 +17,11 @@ import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
......@@ -35,8 +41,17 @@ import java.util.UUID;
@Component
@Slf4j
public class EventLogAspect {
/**
* 用于SpEL表达式解析.
*/
private static SpelExpressionParser parser = new SpelExpressionParser();
@Value("${gnsyrzFlag}")
/**
* 用于获取方法参数定义名字.
*/
private static DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
@Value("${gnsyrzFlag}")
private String gnsyrzFlag;
@Autowired
......@@ -74,6 +89,7 @@ public class EventLogAspect {
//CZLXDM 01 查询类，02 新增信息类，03 修改信息类，04删除信息类
String czxxLbdm = oper.czxxLbdm();
String czxxJyqk = oper.czxxJyqk();
String ywbh = oper.ywbh();
String czxxParam = "";
......@@ -81,6 +97,9 @@ public class EventLogAspect {
String[] parameterNames = methodSignature.getParameterNames();
Object[] objArray = joinPoint.getArgs();
StringBuilder objParam = new StringBuilder();
//将方法参数设置到上下文中
EvaluationContext context = getContext(joinPoint);
ywbh = generateKeyBySpEL(ywbh,context);
if (null != parameterNames && parameterNames.length > 0) {
for (int i = 0; i < parameterNames.length; i++) {
if(objArray[i] == null || objArray[i] == "" ||objArray[i] instanceof Byte
......@@ -134,14 +153,14 @@ public class EventLogAspect {
System.out.println(user);
if (user != null) {
insertSysLog(user, ip, czxxLbdm,
yymcJyqk, czxxParam);
yymcJyqk, czxxParam,ywbh);
}
}
private void insertSysLog(XzxtUser user, String ip,
String czxxLbdm,
String yymcJyqk, String czxxParam) {
String yymcJyqk, String czxxParam,String ywbh) {
//拼接日志流水号
//公安机关机构代码（前6位）
String qlw = user.getUnitcode().substring(0, 6);
......@@ -160,7 +179,7 @@ public class EventLogAspect {
sysGnsyrz.setYhXm(user.getRealname());
sysGnsyrz.setYymcdm("");
sysGnsyrz.setYwbhlxdm("");
sysGnsyrz.setYwbh("");
sysGnsyrz.setYwbh(ywbh);
sysGnsyrz.setCxnrlbdm("");
sysGnsyrz.setCxnrbh("");
sysGnsyrz.setCxxxjg("");
......@@ -238,4 +257,42 @@ public class EventLogAspect {
// d 代表参数为正数型
return machineId + String.format("%015d", hashCodeV);
}
private EvaluationContext getContext(JoinPoint joinPoint) {
// 通过joinPoint获取被注解方法
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
Method method = methodSignature.getMethod();
// 使用spring的DefaultParameterNameDiscoverer获取方法形参名数组
String[] paramNames = nameDiscoverer.getParameterNames(method);
// spring的表达式上下文对象
EvaluationContext context = new StandardEvaluationContext();
// 通过joinPoint获取被注解方法的形参
Object[] args = joinPoint.getArgs();
// 给上下文赋值
for (int i = 0; i < args.length; i++) {
context.setVariable(paramNames[i], args[i]);
}
return context;
}
private String generateKeyBySpEL(String spELString, EvaluationContext context) {
if(org.springframework.util.StringUtils.isEmpty(spELString)){
return "";
}
if(!spELString.startsWith("#")){
return spELString;
}
// 解析过后的Spring表达式对象
Expression expression = parser.parseExpression(spELString);
String expressionStr = "";
if (expression.getValue(context)!=null){
expressionStr = expression.getValue(context).toString();
}
return expressionStr;
}
}
src/main/java/org/springblade/founder/xtrz/LogOper.java
......@@ -24,4 +24,9 @@ public @interface LogOper {
*/
String czxxJyqk() default "";
/**
* @Description业务编号
*/
String ywbh() default "";
}
src/main/java/org/springblade/founder/zbfzxyr/controller/XwZbfzxyrController.java
......@@ -37,6 +37,7 @@ import org.springblade.founder.glasjry.service.ITbGlAsjRyService;
import org.springblade.founder.ryzp.entity.TbStRyZp;
import org.springblade.founder.ryzp.service.ITbStRyZpService;
import org.springblade.founder.utils.*;
import org.springblade.founder.xtrz.LogOper;
import org.springblade.founder.zbfzxyr.entity.XwZbfzxyrFz;
import org.springblade.founder.zbfzxyr.service.IXwZbfzxyrServiceFz;
import org.springblade.founder.zbfzxyr.vo.XwZbfzxyrVOFz;
......@@ -357,6 +358,7 @@ public class XwZbfzxyrController extends BladeController {
@GetMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除一条抓捕犯罪嫌疑人信息以及关联的附件、照片信息", notes = "传入主键编号、人员编号")
@LogOper(czxxLbdm = "04",yymcJyqk = "删除嫌疑人",ywbh = "#asjbh")
public R removeJa(@ApiParam(value = "信息主键编号", required = true) @RequestParam("xxzjbh") String xxzjbh,@RequestParam("asjxgrybh")String asjxgrybh,
@RequestParam("asjbh")String asjbh) {
if(StringUtils.isEmpty(xxzjbh) || StringUtils.isEmpty(asjxgrybh) || StringUtils.isEmpty(asjbh)){
......
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