Skip to content

X
xzxt-api-report
Commit ccd86618 by liulianglang
Options

在逃版本二

parent 43a6154b
Showing with 213 additions and 55 deletions
src/main/java/com/founder/model/ZtryParam.java
......@@ -102,6 +102,18 @@ public class ZtryParam extends BaseModel {
private String larqEnd;
private String ladwGajgjgdm;//立案单位_公安机关机构代码
@Override
public String getXxdjdwGajgjgdm() {
return xxdjdwGajgjgdm;
}
@Override
public void setXxdjdwGajgjgdm(String xxdjdwGajgjgdm) {
this.xxdjdwGajgjgdm = xxdjdwGajgjgdm;
}
private String xxdjdwGajgjgdm;
private String ladw_gajgmc;//立案单位_公安机关名称
private String ajlbdm;//案件类别代码
......@@ -263,6 +275,25 @@ public class ZtryParam extends BaseModel {
private String djspdwGajgjgdm;//登记审批单位_公安机关机构代码
public String getDjspdwGajgjgdm2() {
return djspdwGajgjgdm2;
}
public void setDjspdwGajgjgdm2(String djspdwGajgjgdm2) {
this.djspdwGajgjgdm2 = djspdwGajgjgdm2;
}
private String djspdwGajgjgdm2;
public boolean isIfbszttj() {
return ifbszttj;
}
public void setIfbszttj(boolean ifbszttj) {
this.ifbszttj = ifbszttj;
}
//为true：查询户籍地或者信息登记43
private boolean ifbszttj;
private String djspdw_gajgmc;//登记审批单位_公安机关名称
private String djspr_xm;//登记审批人_姓名
......
src/main/java/com/founder/service/impl/ZtryServiceImpl.java
......@@ -41,16 +41,16 @@ public class ZtryServiceImpl implements ZtryService {
// bqXyr.must(termQueryBuilderXxsc);
//ssdw
if (StringUtils.isNotEmpty(ztry.getSsdw())) {
// WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm.keyword", ztry.getSsdw() + "*");
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", ztry.getSsdw() + "*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw() + "*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
}
// if (StringUtils.isNotEmpty(ztry.getSsdw())) {
//// WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm.keyword", ztry.getSsdw() + "*");
// BoolQueryBuilder should = QueryBuilders.boolQuery();
// WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", ztry.getSsdw() + "*");
// WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw() + "*");
// should.should(hjdzXzqhdm);
// should.should(ladwGajgjgdm);
// bqXyr.must(should);
//
// }
//在逃状态
if (StringUtils.isNotEmpty(ztry.getRyzt())) {
if("0".equals(ztry.getRyzt())){
......@@ -71,7 +71,17 @@ public class ZtryServiceImpl implements ZtryService {
}
}
if (StringUtils.isNotEmpty(ztry.getBdhj())) {
if ("0".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
bqXyr.must(wildcardQueryBuilder);
} else if ("1".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
bqXyr.mustNot(wildcardQueryBuilder);
}
}
//性别
if (StringUtils.isNotEmpty(ztry.getXbdm())) {
......@@ -89,28 +99,70 @@ public class ZtryServiceImpl implements ZtryService {
bqXyr.must(termQueryBuilder);
}
}
// //立案单位
// if (StringUtils.isNotEmpty(ztry.getLadwGajgjgdm())) {
// String unitcode = ztry.getLadwGajgjgdm();
// if(!"222".equals(unitcode)&&!"111".equals(unitcode)&&!"999".equals(unitcode)){
// WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", unitcode + "*");
// bqXyr.must(wildcardQueryBuilder);
// }else if("222".equals(unitcode)){
// WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw()+ "*");
// bqXyr.must(wildcardQueryBuilder);
// }else if("111".equals(unitcode)){
// WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw() + "*");
// bqXyr.mustNot(wildcardQueryBuilder);
// }else if("999".equals(unitcode)){
// //立案单位为null
// BoolQueryBuilder queryExist = new BoolQueryBuilder();
// ExistsQueryBuilder existsQueryBuilder = QueryBuilders.existsQuery("ladwGajgjgdm");
// queryExist.mustNot(existsQueryBuilder);
// bqXyr.must(queryExist);
//
// }
//
// }
//立案单位
if (StringUtils.isNotEmpty(ztry.getLadwGajgjgdm())) {
String unitcode = ztry.getLadwGajgjgdm();
if(!"222".equals(unitcode)&&!"111".equals(unitcode)&&!"999".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}else if("222".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw()+ "*");
bqXyr.must(wildcardQueryBuilder);
}else if("111".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", ztry.getSsdw() + "*");
bqXyr.mustNot(wildcardQueryBuilder);
}else if("999".equals(unitcode)){
if (unitcode.endsWith("0000000000")) {
unitcode = unitcode.substring(0, 2);
}
// 市局
else if (unitcode.endsWith("00000000")) {
unitcode = unitcode.substring(0, 4);
}
// 分局
else if (unitcode.endsWith("000000")) {
unitcode = unitcode.substring(0, 6);
}
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
//xxdjdwGajgjgdm
if (StringUtils.isNotEmpty(ztry.getXxdjdwGajgjgdm())) {
String unitcode = ztry.getXxdjdwGajgjgdm();
if(!"222".equals(unitcode)&&!"111".equals(unitcode)&&!"999".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}else if("222".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+ "*");
bqXyr.must(wildcardQueryBuilder);
}else if("111".equals(unitcode)){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw() + "*");
bqXyr.mustNot(wildcardQueryBuilder);
}else if("999".equals(unitcode)){
//立案单位为null
BoolQueryBuilder queryExist = new BoolQueryBuilder();
ExistsQueryBuilder existsQueryBuilder = QueryBuilders.existsQuery("ladwGajgjgdm");
queryExist.mustNot(existsQueryBuilder);
bqXyr.must(queryExist);
BoolQueryBuilder queryExist = new BoolQueryBuilder();
ExistsQueryBuilder existsQueryBuilder = QueryBuilders.existsQuery("xxdjdwGajgjgdm");
queryExist.mustNot(existsQueryBuilder);
bqXyr.must(queryExist);
}
}
}
// 户籍地行政区划
if (StringUtils.isNotEmpty(ztry.getHjdzXzqhdm())) {
String zhfzxyrHjdzXzqhdm = ztry.getHjdzXzqhdm();
......@@ -305,6 +357,15 @@ public class ZtryServiceImpl implements ZtryService {
bqXyr.must(should);
}
}
if(ztry.isIfbszttj()){
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
}
//上网单位
if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm())) {
String unitcode = ztry.getDjspdwGajgjgdm();
......@@ -322,6 +383,24 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("djspdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
//上网单位
if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm2())) {
String unitcode = ztry.getDjspdwGajgjgdm2();
if (unitcode.endsWith("0000000000")) {
unitcode = unitcode.substring(0, 2);
}
// 市局
else if (unitcode.endsWith("00000000")) {
unitcode = unitcode.substring(0, 4);
}
// 分局
else if (unitcode.endsWith("000000")) {
unitcode = unitcode.substring(0, 6);
}
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
// 案件类别代码模糊查询
if (StringUtils.isNotEmpty(ztry.getAjlbdm())) {
// 根据规则截取前三位
......@@ -386,14 +465,16 @@ public class ZtryServiceImpl implements ZtryService {
}
if (StringUtils.isNotEmpty(ztry.getBdhj())) {
if("0".equals(ztry.getBdhj())){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
if ("0".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
bqXyr.must(wildcardQueryBuilder);
}else if("1".equals(ztry.getBdhj())){
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
} else if ("1".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
bqXyr.mustNot(wildcardQueryBuilder);
}
}
//人员编号
if (StringUtils.isNotEmpty(ztry.getZtrybh())) {
System.out.println(ztry.getZtrybh());
......@@ -487,6 +568,23 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
//getXxdjdwGajgjgdm
if (StringUtils.isNotEmpty(ztry.getXxdjdwGajgjgdm())) {
String unitcode = ztry.getXxdjdwGajgjgdm();
if (unitcode.endsWith("0000000000")) {
unitcode = unitcode.substring(0, 2);
}
// 市局
else if (unitcode.endsWith("00000000")) {
unitcode = unitcode.substring(0, 4);
}
// 分局
else if (unitcode.endsWith("000000")) {
unitcode = unitcode.substring(0, 6);
}
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
//抓获单位
if (StringUtils.isNotEmpty(ztry.getZhdwGajgjgdm())) {
String unitcode = ztry.getZhdwGajgjgdm();
......@@ -523,7 +621,14 @@ public class ZtryServiceImpl implements ZtryService {
}
}
if(ztry.isIfbszttj()){
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
}
//上网单位
if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm())) {
......@@ -542,6 +647,23 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("djspdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
//上网单位
if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm2())) {
String unitcode = ztry.getDjspdwGajgjgdm2();
if (unitcode.endsWith("0000000000")) {
unitcode = unitcode.substring(0, 2);
}
// 市局
else if (unitcode.endsWith("00000000")) {
unitcode = unitcode.substring(0, 4);
}
// 分局
else if (unitcode.endsWith("000000")) {
unitcode = unitcode.substring(0, 6);
}
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("djspdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder);
}
// 案件类别代码模糊查询
if (StringUtils.isNotEmpty(ztry.getAjlbdm())) {
// 根据规则截取前三位
......@@ -818,6 +940,8 @@ public class ZtryServiceImpl implements ZtryService {
ztssdw = ssdw.substring(0,2);
}
ztryParam.setSsdw(ztssdw);
// ztryParam.setDjspdwGajgjgdm2("430000000000");
ztryParam.setIfbszttj(true);
Date date = new Date();
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar= Calendar.getInstance();
......@@ -825,6 +949,7 @@ public class ZtryServiceImpl implements ZtryService {
String ryzt = "";//在逃人员状态
String xbdm = "";//性别
String ladw_gajgjgdm = "";//本地上网在逃人员
String xxdjdw="";
String hjdz_xzqhdm = "";//户籍地本地在逃人员
String nld = "";//年龄段
String tpsc = "";//逃跑时长
......@@ -834,7 +959,7 @@ public class ZtryServiceImpl implements ZtryService {
if(xxrbksj == null || "".equals(xxrbksj)) {
ztryParam.setTpsc("nopara");
}
ladw_gajgjgdm = ztryParam.getLadwGajgjgdm();
ladw_gajgjgdm = ztryParam.getXxdjdwGajgjgdm();
if(ladw_gajgjgdm != null && !"".equals(ladw_gajgjgdm)){
String gajgdm = ladw_gajgjgdm;
String ladm = "";
......@@ -847,21 +972,21 @@ public class ZtryServiceImpl implements ZtryService {
}else if(gajgdm.endsWith("0000")){
ladm = ladw_gajgjgdm.substring(0,8);
}
ztryParam.setLadwGajgjgdm(ladm);
ztryParam.setXxdjdwGajgjgdm(ladm);
Integer ladwCount =(int) geFxTjCount(ztryParam);
//其他 数据中立案单位为空的
ztryParam.setLadwGajgjgdm("999");
ztryParam.setXxdjdwGajgjgdm("999");
Integer qtladwCount =(int) geFxTjCount(ztryParam);
ztryParam.setLadwGajgjgdm(ladm);
ztryParam.setXxdjdwGajgjgdm(ladm);
String pdla = ladw_gajgjgdm.substring(0,2);
if(pdla==ztssdw||ztssdw.equals(pdla)){
resultMap.put("ladwCount", ladwCount);
resultMap.put("fladwCount", 0);
resultMap.put("qtladwCount", qtladwCount);
resultMap.put("qtladwCount", 0);
}else{
resultMap.put("ladwCount", 0);
resultMap.put("fladwCount", ladwCount);
resultMap.put("qtladwCount", qtladwCount);
resultMap.put("qtladwCount", 0);
}
}
hjdz_xzqhdm = ztryParam.getHjdzXzqhdm();
......@@ -883,11 +1008,11 @@ public class ZtryServiceImpl implements ZtryService {
if(pdhj==ztssdw||ztssdw.equals(pdhj)){
resultMap.put("hjdzCount", hjdCount);
resultMap.put("fhjdzCount", 0);
resultMap.put("qthjdzCount", qthjdzCount);
resultMap.put("qthjdzCount", 0);
}else{
resultMap.put("hjdzCount", 0);
resultMap.put("fhjdzCount", hjdCount);
resultMap.put("qthjdzCount", qthjdzCount);
resultMap.put("qthjdzCount", 0);
}
}
ryzt = ztryParam.getRyzt();
......@@ -1031,7 +1156,7 @@ public class ZtryServiceImpl implements ZtryService {
Integer qthjdzCount = (int) geFxTjCount(ztryParam);
hjdz_xzqhdm = "";
ztryParam.setHjdzXzqhdm("");
resultMap.put("qthjdzCount",qthjdzCount);
resultMap.put("qthjdzCount",0);
}
}
......@@ -1039,28 +1164,28 @@ public class ZtryServiceImpl implements ZtryService {
if(ladw_gajgjgdm == null || "".equals(ladw_gajgjgdm)) {
ladw_gajgjgdm = "222";
if (ladw_gajgjgdm=="222"||"222".equals(ladw_gajgjgdm)) {
ztryParam.setLadwGajgjgdm("222");
ztryParam.setXxdjdwGajgjgdm("222");
Integer ladwCount = (int) geFxTjCount(ztryParam);
ladw_gajgjgdm = "";
ztryParam.setLadwGajgjgdm("");
ztryParam.setXxdjdwGajgjgdm("");
resultMap.put("ladwCount", ladwCount);
}
//其他（上网单位为空）
ladw_gajgjgdm = "999";
if (ladw_gajgjgdm=="999"||"999".equals(ladw_gajgjgdm)) {
ztryParam.setLadwGajgjgdm("999");
ztryParam.setXxdjdwGajgjgdm("999");
Integer qtladwCount = (int) geFxTjCount(ztryParam);
ladw_gajgjgdm = "";
ztryParam.setLadwGajgjgdm("");
resultMap.put("qtladwCount", qtladwCount);
ztryParam.setXxdjdwGajgjgdm("");
resultMap.put("qtladwCount", 0);
}
//非本地上网
ladw_gajgjgdm = "111";
if (ladw_gajgjgdm=="111"||"111".equals(ladw_gajgjgdm)) {
ztryParam.setLadwGajgjgdm("111");
ztryParam.setXxdjdwGajgjgdm("111");
Integer fladwCount = (int) geFxTjCount(ztryParam);
ladw_gajgjgdm = "";
ztryParam.setLadwGajgjgdm("");
ztryParam.setXxdjdwGajgjgdm("");
resultMap.put("fladwCount", fladwCount);
}
}
......
src/main/resources/application-dev.yml
......@@ -13,16 +13,16 @@ spring:
jdbc-url: jdbc:oracle:thin:@47.92.129.99:1600:orcl
type: com.alibaba.druid.pool.DruidDataSource
mysql:
#driver-class-name: com.mysql.cj.jdbc.Driver
#username: xzxt
#password: Hn_Xzxt43
#jdbc-url: jdbc:mysql://65.26.10.145:4306/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
username: xzxt
password: xzxt
jdbc-url: jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
password: Hn_Xzxt43
jdbc-url: jdbc:mysql://10.142.16.191:4306/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
type: com.alibaba.druid.pool.DruidDataSource
# driver-class-name: com.mysql.cj.jdbc.Driver
# username: xzxt
# password: xzxt
# jdbc-url: jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
# type: com.alibaba.druid.pool.DruidDataSource
#配置jpa 使其展示sql语句
jpa:
......
src/main/resources/application.yml
......@@ -62,4 +62,6 @@ moduleName: ajsearch
gabesUrl: http://10.2.164.221:7998/api/es/
gabUrl: http://10.2.164.221:7998/api/search/
gabBzhUrl: http://10.2.164.221:7998/api/bzh/
\ No newline at end of file
gabBzhUrl: http://10.2.164.221:7998/api/bzh/
hnztryIndex: hnqgztry
\ 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