Skip to content

X
xzxt-api-report
Commit e3e1bd11 by liulianglang
Options

接口修改

parent fb6c57c8
Showing with 168 additions and 36 deletions
src/main/java/com/founder/controller/GjController.java
......@@ -613,10 +613,10 @@ public class GjController {
reslt.setStatus("fail");
return reslt;
}
if(StringUtils.isEmpty(xyrParam.getZjhm()) ){
if(StringUtils.isEmpty(xyrParam.getSjhm()) && StringUtils.isEmpty(xyrParam.getZjhm()) ){
reslt.setData(new ArrayList<>());
reslt.setMsg("没有传入人员证件号码，不能查询！");
reslt.setMsg("没有传入手机号码或证件号码，不能查询！");
reslt.setStatus("fail");
return reslt;
}
......
src/main/java/com/founder/service/impl/GjServiceImpl.java
......@@ -83,12 +83,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getCzxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT ZJHM,XM,HPHM,CLLY,ZT,JLRKSJ,SYQ,DJRQ,CLLX " +
"FROM people_trail01 where _type= " +
"'jdc' and " +
"HPHM = '" + xyrParam.getCphm() + "' limit 0,1000 ";
"HPHM = '" + xyrParam.getCphm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -133,12 +142,20 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getMhXx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT KSSJ,JSSJ,SFD,MDD,DD,WZ,HKGSMC,ZJHM,XM FROM " +
"people_trail01 where _type= " +
"'mhjcgall' and " +
"ZJHM = '" +xyrParam.getZjhm() +"' limit 0,1000 ";
"ZJHM = '" +xyrParam.getZjhm() +"' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -182,12 +199,20 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getHcxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT KSSJ,XIBIE,SFD,MDD,DD,WZ,CXH,HPHM,ZJHM,XM FROM " +
"people_trail01 where GJLX= 'hc'" +
" and " +
"ZJHM = '" +xyrParam.getZjhm() +"' limit 0,1000 ";
"ZJHM = '" +xyrParam.getZjhm() +"' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -234,12 +259,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getLgxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT KSSJ,DD,DZ,JSSJ,LGXQ,WZ,XM,ZJHM,LDDM FROM " +
"people_trail01 where (_type= 'lg' or GJLX='lg' )" +
" and " +
"ZJHM = '" +xyrParam.getZjhm() +"' limit 0,1000 ";
"ZJHM = '" +xyrParam.getZjhm() +"' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -365,11 +399,20 @@ public class GjServiceImpl implements GjService {
public Map<String, Object> getPoxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT YWLX,DJRQ,POXM,POXB,POZJHM FROM " +
"people_type01 where _type= " +
"'mzhydjxx' and YXBZ = '有效' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by DJRQ desc";
" ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by DJRQ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -413,11 +456,20 @@ public class GjServiceImpl implements GjService {
public Map<String, Object> getClxxByZjhm(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT CSYS,SYQ,JLRKSJ,SJHM,ZT,ZJHM,XM,HPHM,CLLY,DJRQ,HPZL,CLPP1,CLXH " +
"FROM " +
"people_trail01 where _type= 'jdc' and " +
"ZJHM = '" + xyrParam.getZjhm() + "' limit 0,1000 ";
"ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -727,8 +779,9 @@ public class GjServiceImpl implements GjService {
if (StringUtils.isNotBlank(xyrParam.getSjhm())) {
sql += " AND SJHM = '" + xyrParam.getSjhm() + "'";
}
sql += " limit 0,100";
// sql += " limit 0,100";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -766,12 +819,20 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getCzfwxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT CZFWBH,XM,ZJHM,XB,LXDH,FWBH,CZFWBPBM,CZYZ,SJZZRS,HX,FWZT,CZZZSJ,ZXHQSJ,CZSJ FROM " +
"people_type01 where _type= " +
"'bs_sqjw_czfw' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by DJSJ desc";
" ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by DJSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -963,12 +1024,37 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getDdsjxsxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT HPHM,XM,DZ,ZJHM,FWLX,SJHM,MDD,SFD,CLLX,DISTANCE,PASSENGERPHONE,KSSJ,JSSJ FROM " +
"people_type01 where _type= " +
"'ddsjxsxx' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by RKSJ desc";
"'ddsjxsxx' " ;
// " ZJHM = '" + xyrParam.getZjhm() + "' ";
if (StringUtils.isNotBlank(xyrParam.getZjhm())) {
sql += "AND ZJHM = '" + xyrParam.getZjhm() + "' ";
}
if (StringUtils.isNotBlank(xyrParam.getSjhm())) {
String[] hms=xyrParam.getSjhm().split(",");
sql += "AND PASSENGERPHONE in ( ";
for(int i=0;i<hms.length;i++){
if(i==hms.length-1){
sql += " '" + hms[i] + "' ";
}else {
sql += " '" + hms[i] + "', ";
}
}
sql+= " )" ;
}
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
System.out.println("sql:"+sql);
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -1027,12 +1113,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getShgxxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT RYBH,YDDH,LXDH,ZJHM,SHGXRXM,SHGXRMS,MZ,XZQH,ZJLX,XM,XB FROM " +
String sql = "SELECT RYBH,YDDH,LXDH,ZJHM,SHGXRXM,SHGXRMS,MZ,XZQH,ZJLX,XM,XB,KSSJ FROM " +
"people_type01 where _type= " +
"'fkshgx' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by RKSJ desc";
" ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -1054,6 +1149,7 @@ public class GjServiceImpl implements GjService {
String xzqh=job.getString("XZQH"); //行政区划
String zjlx=job.getString("ZJLX"); //证件类型
String kssj=job.getString("KSSJ"); //采集时间
String xm=job.getString("XM"); //姓名
String xb=job.getString("XB"); //性别
......@@ -1072,7 +1168,7 @@ public class GjServiceImpl implements GjService {
mapnr.put("xm",xm);
mapnr.put("xb",xb);
mapnr.put("kssj",EsDateToStr(kssj));
result.add(mapnr);
}
}
......@@ -1087,12 +1183,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getZyshgxrxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT XZQH,SHGXRXM,SHGXRMS,GXRSFZH,YDDH,LXDH,RYBH,ZJHM,MZ,ZJLX,XM,XB FROM " +
String sql = "SELECT XZQH,SHGXRXM,SHGXRMS,GXRSFZH,YDDH,LXDH,RYBH,ZJHM,MZ,ZJLX,XM,XB,KSSJ FROM " +
"people_type01 where _type= " +
"'fkzyshgx' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by RKSJ desc";
" ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by KSSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -1118,7 +1223,7 @@ public class GjServiceImpl implements GjService {
String xm=job.getString("XM"); //姓名
String xb=job.getString("XB"); //性别
String kssj=job.getString("KSSJ"); //采集时间
mapnr.put("rybh",rybh);
mapnr.put("yddh",yddh);
......@@ -1133,7 +1238,7 @@ public class GjServiceImpl implements GjService {
mapnr.put("zjlx",zjlx);
mapnr.put("xm",xm);
mapnr.put("xb",xb);
mapnr.put("kssj",EsDateToStr(kssj));
result.add(mapnr);
}
......@@ -1149,12 +1254,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getCzcxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT CLLX,SZSWQH,XZQH,LXFS,CLXH,NJYXQ,HPHM,ZJHM,XM FROM " +
"vehicle_type01 where _type= " +
"'bs_jj_czc' and" +
" ZJHM = '" + xyrParam.getZjhm() + "' limit 0,100 order by JLRKSJ desc";
" ZJHM = '" + xyrParam.getZjhm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -1209,12 +1323,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getKybcxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT BZ,LJSCBJ,KYGSJGDMBH,KYGSMC,CLLX,HPZL,HPHM,CFD,DDD FROM " +
"vehicle_type01 where _type= " +
"'bs_jj_kybcxx' and" +
" HPHM = '" + xyrParam.getCphm() + "' limit 0,100 order by JLRKSJ desc";
" HPHM = '" + xyrParam.getCphm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......@@ -1267,12 +1390,21 @@ public class GjServiceImpl implements GjService {
@Override
public Map<String, Object> getTccxx(HttpServletRequest request, XyrParam xyrParam) throws Exception {
Map<String, Object> returnMap = new HashMap<>();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPage(xyrParam.getPage());
easyUIPage.setPagePara(xyrParam.getLimit());
int begin = easyUIPage.getBegin();
int end = easyUIPage.getEnd();
xyrParam.setPage(begin);
xyrParam.setLimit(end);
String sql = "SELECT SZSWQH,TGDW,XXZYFL,HPHM,HPZL,SSQH,TCCDZ,TCCMC,LJSCBJ,BZ,KSSJ,JSSJ FROM " +
"vehicle_type01 where _type= " +
"'bs_jj_tccxx' and" +
" HPHM = '" + xyrParam.getCphm() + "' limit 0,100 order by JLRKSJ desc";
" HPHM = '" + xyrParam.getCphm() + "' ";
sql += " limit " + xyrParam.getPage() + "," + xyrParam.getLimit() + " " +
"order by JLRKSJ desc";
Map<String, Object> map = EsUtils.newQueryEs(request, sql);
//查询全国常口信息
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
......
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