Commit 1821e0cb by lilei

案件提取不到时调用思悦快照接口

parent b8efe672
......@@ -506,9 +506,10 @@
and (now() - la.SPSJ) <![CDATA[>]]> '5'
</if>
</if>
<!--案件业务状态查询条件-->
<if test="ajzt!=null and ajzt!=''" >
<if test="laywsjztList !=null and zczjywsjztList == null" >
AND ((
and ((
<foreach collection="laywsjztList" item="item" open="(" separator="or" close=")">
<if test="item == '00'">
asjcz.laywsjzt is null or asjcz.laywsjzt = '' or asjcz.laywsjzt = #{item , jdbcType=VARCHAR }
......@@ -527,7 +528,7 @@
and asjcz.laywsjzt = '05'
</if>
<if test="zczjywsjztList != null and laywsjztList == null" >
AND (( asjcz.laywsjzt = '02' and
and (( asjcz.laywsjzt = '02' and
<foreach collection="zczjywsjztList" item="item" open="(" separator="or" close=")">
<if test="item == '00'">
asjcz.zczjywsjzt is null or asjcz.zczjywsjzt = '' or asjcz.zczjywsjzt =
......@@ -543,7 +544,7 @@
)
</if>
<if test="zczjywsjztList != null and laywsjztList != null" >
AND ((
and ((
<foreach collection="laywsjztList" item="item" open="(" separator="or" close=")">
<if test="item == '00'">
asjcz.laywsjzt is null or asjcz.laywsjzt = '' or asjcz.laywsjzt = #{item , jdbcType=VARCHAR }
......
......@@ -14,6 +14,7 @@ import org.springblade.founder.glasjry.service.ITbGlAsjRyService;
import org.springblade.founder.rybh.entity.XwRybh;
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.zbfzxyr.entity.XwZbfzxyr;
import org.springblade.founder.zbfzxyr.service.IXwZbfzxyrService;
......@@ -22,7 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.awt.*;
import java.util.*;
import java.util.List;
import org.springblade.founder.utils.DataFormatUtil;
......@@ -207,7 +210,7 @@ public class StAsjXxtqService {
}
return R.ok().data("data",data);
}else{
String detailUrl = getDetailUrl(asjbh,token);
String detailUrl = getDetailUrl(asjbh);
return R.error().data("detailUrl",detailUrl).message("案件信息为空,无法提取。"+getLxrAndLxfs());
}
}
......@@ -283,7 +286,7 @@ public class StAsjXxtqService {
if(!StringUtils.isEmpty(errorMsg)){
msg += "<br/>"+errorMsg;
}
String detailUrl = getDetailUrl(asjbh,token);
String detailUrl = getDetailUrl(asjbh);
return R.error().data("detailUrl",detailUrl).message(msg);
}else{
if(!StringUtils.isEmpty(errorMsg)){
......@@ -294,7 +297,7 @@ public class StAsjXxtqService {
}
}
}else{
String detailUrl = getDetailUrl(asjbh,token);
String detailUrl = getDetailUrl(asjbh);
return R.error().data("detailUrl",detailUrl).message("全国基础库抓捕犯罪嫌疑人信息无数据,暂时无法提取。"+getLxrAndLxfs());
}
}
......@@ -370,7 +373,7 @@ public class StAsjXxtqService {
if(!StringUtils.isEmpty(errorMsg)){
msg += "<br/>"+errorMsg;
}
String detailUrl = getDetailUrl(asjbh,token);
String detailUrl = getDetailUrl(asjbh);
return R.error().data("detailUrl",detailUrl).message(msg);
}else{
if(!StringUtils.isEmpty(errorMsg)){
......@@ -381,7 +384,7 @@ public class StAsjXxtqService {
}
}
}else{
String detailUrl = getDetailUrl(asjbh,token);
String detailUrl = getDetailUrl(asjbh);
return R.error().data("detailUrl",detailUrl).message("全国基础库被害人信息无数据,暂时无法提取。"+getLxrAndLxfs());
}
}
......@@ -438,11 +441,43 @@ public class StAsjXxtqService {
}
//获取思悦数据详情页面地址
private String getDetailUrl(String asjbh,String token) {
private String getDetailUrl(String asjbh) {
String url = "http://10.2.164.178:8058/db/fzAj/"+asjbh;
System.out.println("url*************:"+url);
String resultStr = null;
try {
System.out.println( "延时前:"+new Date().toString() );
Thread.sleep(3000);
System.out.println( "延时后:"+new Date().toString() );
resultStr = HttpUtil.doGet(url);
System.out.println("resultStr*****************:"+resultStr);
} catch (Exception e) {
e.printStackTrace();
}
String upid = null;
if(!StringUtils.isEmpty(resultStr)){
try {
JSONObject result = JSON.parseObject(resultStr);
System.out.println("result**************:"+result);
if(result!=null){
upid = result.getString("data");
System.out.println("upid******************"+upid);
}else{
System.out.println("获取思悦数据详情页面upid返回值没有data。返回结果:"+resultStr);
}
} catch (Exception e) {
System.out.println("解析思悦数据详情页面upid返回值发生异常。"+resultStr);
e.printStackTrace();
}
}else{
System.out.println("获取思悦数据详情页面upid没有返回值。");
}
System.out.println("upid-------------------------------"+upid);
String detailUrl = "";
if (token!=null){
detailUrl = "http://10.2.164.178:8086/dataDetection/#/testing?ajbh="+asjbh+"&token="+token;
if (upid!=null){
detailUrl = "http://10.2.164.178:8086/dataDetection/#/testing?upid="+upid;
}
System.out.println("============================get upid success:"+detailUrl+"===========================");
return detailUrl;
}
......
......@@ -160,13 +160,13 @@ public class AjspServiceImpl implements IAjspService {
deteilMap.put("zczjyj",sfNotNull(tbStAsj.getZczjZcxwyjms()));
deteilMap.put("pasd",sfNotNull(tbStAsj.getPasddm()));
String fayy = tbStAsj.getZadjdm();//发案原因
if(StringUtils.isNotEmpty(fayy) && !"待定".equals(fayy)&&!"其他".equals(fayy)){
if(StringUtils.isNotEmpty(fayy) && !"待定".equals(fayy)){
deteilMap.put("fayy","1");
}else {
deteilMap.put("fayy","0");
}
String zasd = tbStAsj.getTssddm();//作案手段(作案工具)
if(StringUtils.isNotEmpty(zasd) && !"待定".equals(zasd)&&!"其他".equals(zasd)){
if(StringUtils.isNotEmpty(zasd) && !"待定".equals(zasd)){
deteilMap.put("zasd","1");
}else {
deteilMap.put("zasd","0");
......@@ -194,7 +194,7 @@ public class AjspServiceImpl implements IAjspService {
deteilMap.put("ajdy",sfNotNull(tbStAsj.getAsjfsddDylbdm()));
deteilMap.put("sacs",sfNotNull(tbStAsj.getAsjfsddSacsSacslbdm()));
String zasd = tbStAsj.getTssddm();//作案手段(作案工具)
if(StringUtils.isNotEmpty(zasd) && !"待定".equals(zasd)&&!"其他".equals(zasd)){
if(StringUtils.isNotEmpty(zasd) && !"待定".equals(zasd)){
deteilMap.put("zasd","1");
}else {
deteilMap.put("zasd","0");
......@@ -224,7 +224,7 @@ public class AjspServiceImpl implements IAjspService {
deteilMap.put("pasd",sfNotNull(tbStAsj.getPasddm()));
String fayy = tbStAsj.getZadjdm();//发案原因
if(StringUtils.isNotEmpty(fayy) && !"待定".equals(fayy)&&!"其他".equals(fayy)){
if(StringUtils.isNotEmpty(fayy) && !"待定".equals(fayy)){
deteilMap.put("fayy","1");
}else {
deteilMap.put("fayy","0");
......
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