Skip to content

X
xzxt-api-report
Commit 7565d7fc by wuchengwu
Options

添加笔记，随身物品接口

parent f9bde9fd
Showing with 140 additions and 187 deletions
src/main/java/com/founder/controller/XtbacxController.java
......@@ -149,21 +149,6 @@ public class XtbacxController {
reslt.setMsg(RECORD_NOT_EXIST.getMessage());
reslt.setStatus(RECORD_NOT_EXIST.getCode());
} else {
Map<String, Object> map = new HashMap<>();
map.put("rybh", tbStRyVO.getRybh());
List<AutoTbRyZp> tbRyRyzpByRybh = tbRyRyzpService.getTbRyRyzpByRybh(map, tbStRyVO.getLrdwdm());
AutoTbStRyVO finalTbStRyVO = tbStRyVO;
tbRyRyzpByRybh.stream().forEach((p) -> {
if (TWO.equals(p.getZpbw())) {
finalTbStRyVO.setZmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (THREE.equals(p.getZpbw())) {
finalTbStRyVO.setCmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (FOUR.equals(p.getZpbw())) {
finalTbStRyVO.setYcmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (ONE.equals(p.getZpbw())) {
finalTbStRyVO.setEdzzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
}
});
if (StringUtils.isEmpty(tbStRyVO.getCyzjdm())) {
tbStRyVO.setCyzjdm("111");
}
......@@ -178,7 +163,6 @@ public class XtbacxController {
reslt.setMsg(SUCCESS.getMessage());
reslt.setStatus(SUCCESS.getCode());
}
} catch (Exception e) {
reslt.setData(tbStRyVO);
reslt.setMsg(SERVICES_FAILED.getMessage());
......@@ -192,6 +176,70 @@ public class XtbacxController {
}
/**
* 查询人像信息
*
* @param ryVO
* @return
*/
@RequestMapping("/rxxxcx")
@ResponseBody
public Result queryRxxx(@RequestBody AutoTbStRyVO ryVO) {
log.info("人像信息查询参数为{}", LogsUtil.getNotEmptyFiled(ryVO).toString());
String rzpdbz = "0";
Result reslt = new Result();
HttpServletRequest request = IpADdress.getRequest();
String header = request.getHeader("founder.authorization");
if (StringUtils.isEmpty(header) || !author.equals(header)) {
reslt.setData(new ArrayList<>());
reslt.setMsg(AUTHORIZATION_CODE_VALIDATION_FAILED.getMessage());
reslt.setStatus(AUTHORIZATION_CODE_VALIDATION_FAILED.getCode());
return reslt;
}
if (!ipADressLock.getIpAddress(request)) {
reslt.setData(new ArrayList<>());
reslt.setMsg(UN_ACCESS_IP.getMessage());
reslt.setStatus(UN_ACCESS_IP.getCode());
return reslt;
}
AutoTbStRyRxVO rxVO = new AutoTbStRyRxVO();
try {
if (StringUtils.isEmpty(ryVO.getRybh())) {
reslt.setData(new ArrayList<>());
reslt.setMsg("查询参数为空，不能查询！");
reslt.setStatus("fail");
return reslt;
}
Map<String, Object> map = new HashMap<>();
map.put("rybh", ryVO.getRybh());
List<AutoTbRyZp> tbRyRyzpByRybh = tbRyRyzpService.getTbRyRyzpByRybh(map);
tbRyRyzpByRybh.stream().forEach((p) -> {
if (TWO.equals(p.getZpbw())) {
rxVO.setZmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (THREE.equals(p.getZpbw())) {
rxVO.setCmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (FOUR.equals(p.getZpbw())) {
rxVO.setYcmzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
} else if (ONE.equals(p.getZpbw())) {
rxVO.setEdzzpStr64(Base64Utils.getImageStrsByByte(p.getDzwjnr()));
}
});
reslt.setData(rxVO);
reslt.setMsg(SUCCESS.getMessage());
reslt.setStatus(SUCCESS.getCode());
} catch (Exception e) {
reslt.setData(rxVO);
reslt.setMsg(SERVICES_FAILED.getMessage());
reslt.setStatus(SERVICES_FAILED.getCode());
rzpdbz = "1";
log.error("人像查询错误信息为：{}\n,{}\n,查询参数为：{}", e.getMessage(), e.getStackTrace(), LogsUtil.getNotEmptyFiled(ryVO).toString());
} finally {
sysGnsyrzOpenApiService.insertGNSYRZOPENAPI("01", "基础信息-人像采集信息表", LogsUtil.getNotEmptyFiled(ryVO).toString(), "", "", ryVO.getPtSsdw(), ryVO.getPtName(), ryVO.getPtLxdh(), ipADressLock.getAddressIp(request), "1", rzpdbz);
}
return reslt;
}
/**
* 指纹信息查询
*/
@RequestMapping("/zwxxcx")
......
src/main/java/com/founder/model/AutoTbStRy.java
......@@ -95,16 +95,12 @@ public class AutoTbStRy implements Serializable {
private String ycmzplj;
private String zjleftlj;
private String zjrightlj;
private String edzzpxxbh;
private String edzzpStr64;
/**
* //二代证照片编号
*/
private String zmzpxxbh;
private String zmzpStr64;
private String cmzpxxbh;
private String cmzpStr64;
private String ycmzpxxbh;
private String ycmzpStr64;
private String zjlxdm;
private String xdhwdm;
......@@ -139,10 +135,6 @@ public class AutoTbStRy implements Serializable {
*/
private String r_sjlxdh;
/**
* //指纹反馈信息
*/
private String zwfkxx;
/**
* //指纹采集方式
*/
private String zwcjfs;
......@@ -167,10 +159,6 @@ public class AutoTbStRy implements Serializable {
*/
private String plp;
/**
* //增加人员同步标志
*/
private String tbbz;
/**
* //涉案人员代码
*/
private String saryjsdm = null;
......@@ -250,14 +238,6 @@ public class AutoTbStRy implements Serializable {
*/
private String gxsjStr;
/**
* //删除标志
*/
private String scbz;
/**
* //删除原因
*/
private String scyy;
/**
* //案件
*/
private String asjbh;
......@@ -750,14 +730,6 @@ public class AutoTbStRy implements Serializable {
this.ifhb = ifhb;
}
public String getScyy() {
return scyy;
}
public void setScyy(String scyy) {
this.scyy = scyy;
}
public String getXxbh() {
return xxbh;
}
......@@ -1198,38 +1170,6 @@ public class AutoTbStRy implements Serializable {
this.ycmzplj = ycmzplj;
}
public String getEdzzpxxbh() {
return edzzpxxbh;
}
public void setEdzzpxxbh(String edzzpxxbh) {
this.edzzpxxbh = edzzpxxbh;
}
public String getZmzpxxbh() {
return zmzpxxbh;
}
public void setZmzpxxbh(String zmzpxxbh) {
this.zmzpxxbh = zmzpxxbh;
}
public String getCmzpxxbh() {
return cmzpxxbh;
}
public void setCmzpxxbh(String cmzpxxbh) {
this.cmzpxxbh = cmzpxxbh;
}
public String getYcmzpxxbh() {
return ycmzpxxbh;
}
public void setYcmzpxxbh(String ycmzpxxbh) {
this.ycmzpxxbh = ycmzpxxbh;
}
public String getR_sjlxdh() {
return r_sjlxdh;
}
......@@ -1238,14 +1178,6 @@ public class AutoTbStRy implements Serializable {
this.r_sjlxdh = r_sjlxdh;
}
public String getZwfkxx() {
return zwfkxx;
}
public void setZwfkxx(String zwfkxx) {
this.zwfkxx = zwfkxx;
}
public String getZwcjfs() {
return zwcjfs;
}
......@@ -1286,14 +1218,6 @@ public class AutoTbStRy implements Serializable {
this.plp = plp;
}
public String getTbbz() {
return tbbz;
}
public void setTbbz(String tbbz) {
this.tbbz = tbbz;
}
public String getSaryjsdm() {
return saryjsdm;
}
......@@ -1510,14 +1434,6 @@ public class AutoTbStRy implements Serializable {
this.gxsj = gxsj;
}
public String getScbz() {
return scbz;
}
public void setScbz(String scbz) {
this.scbz = scbz;
}
public String getAsjbh() {
return asjbh;
}
......
src/main/java/com/founder/model/AutoTbStRyRxVO.java 0 → 100644
package com.founder.model;
/**
* @Author: wcw
* @Date: 2022/7/8 9:12
*/
public class AutoTbStRyRxVO {
private String edzzpStr64;
/**
* //二代证照片编号
*/
private String zmzpStr64;
private String cmzpStr64;
private String ycmzpStr64;
public String getEdzzpStr64() {
return edzzpStr64;
}
public void setEdzzpStr64(String edzzpStr64) {
this.edzzpStr64 = edzzpStr64;
}
public String getZmzpStr64() {
return zmzpStr64;
}
public void setZmzpStr64(String zmzpStr64) {
this.zmzpStr64 = zmzpStr64;
}
public String getCmzpStr64() {
return cmzpStr64;
}
public void setCmzpStr64(String cmzpStr64) {
this.cmzpStr64 = cmzpStr64;
}
public String getYcmzpStr64() {
return ycmzpStr64;
}
public void setYcmzpStr64(String ycmzpStr64) {
this.ycmzpStr64 = ycmzpStr64;
}
}
src/main/java/com/founder/model/AutoTbStRyVO.java
......@@ -113,10 +113,6 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
*/
private String dnabh;
/**
* 二代证照片编号
*/
private String zmzpxxbh;
/**
* 涉案人员代码
*/
private String saryjsdm = null;
......@@ -149,29 +145,9 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
*/
private String lrdwmc;
/**
* 二代证
*/
private String edzzpStr64;
/**
* 右侧面
*/
private String ycmzpStr64;
/**
* 正面
*/
private String zmzpStr64;
/**
* 左侧面
*/
private String cmzpStr64;
/**
* 足长
*/
private String zc;
/**
* 指纹反馈信息
*/
private String zwfkxx;
/**
* 民族代码
......@@ -193,6 +169,18 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
* 录入结束时间
*/
private String elrsjStr;
/**
* 是否查询新增人员
*/
private String sfxz;
public String getSfxz() {
return sfxz;
}
public void setSfxz(String sfxz) {
this.sfxz = sfxz;
}
public String getRybh() {
return rybh;
......@@ -402,13 +390,6 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
this.dnabh = dnabh;
}
public String getZmzpxxbh() {
return zmzpxxbh;
}
public void setZmzpxxbh(String zmzpxxbh) {
this.zmzpxxbh = zmzpxxbh;
}
public String getSaryjsdm() {
return saryjsdm;
......@@ -474,37 +455,6 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
this.lrdwmc = lrdwmc;
}
public String getEdzzpStr64() {
return edzzpStr64;
}
public void setEdzzpStr64(String edzzpStr64) {
this.edzzpStr64 = edzzpStr64;
}
public String getYcmzpStr64() {
return ycmzpStr64;
}
public void setYcmzpStr64(String ycmzpStr64) {
this.ycmzpStr64 = ycmzpStr64;
}
public String getZmzpStr64() {
return zmzpStr64;
}
public void setZmzpStr64(String zmzpStr64) {
this.zmzpStr64 = zmzpStr64;
}
public String getCmzpStr64() {
return cmzpStr64;
}
public void setCmzpStr64(String cmzpStr64) {
this.cmzpStr64 = cmzpStr64;
}
public String getZc() {
return zc;
......@@ -514,13 +464,6 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
this.zc = zc;
}
public String getZwfkxx() {
return zwfkxx;
}
public void setZwfkxx(String zwfkxx) {
this.zwfkxx = zwfkxx;
}
public String getMzdm() {
return mzdm;
......@@ -591,7 +534,6 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
", sarysfdm='" + sarysfdm + '\'' +
", szzwbh='" + szzwbh + '\'' +
", dnabh='" + dnabh + '\'' +
", zmzpxxbh='" + zmzpxxbh + '\'' +
", saryjsdm='" + saryjsdm + '\'' +
", jyaq='" + jyaq + '\'' +
", ajlbdm='" + ajlbdm + '\'' +
......@@ -600,12 +542,7 @@ public class AutoTbStRyVO extends Rzpt implements Serializable {
", lrsjStr='" + lrsjStr + '\'' +
", lrdwdm='" + lrdwdm + '\'' +
", lrdwmc='" + lrdwmc + '\'' +
", edzzpStr64='" + edzzpStr64 + '\'' +
", ycmzpStr64='" + ycmzpStr64 + '\'' +
", zmzpStr64='" + zmzpStr64 + '\'' +
", cmzpStr64='" + cmzpStr64 + '\'' +
", zc='" + zc + '\'' +
", zwfkxx='" + zwfkxx + '\'' +
", mzdm='" + mzdm + '\'' +
", jzrybh='" + jzrybh + '\'' +
", cyzjdm='" + cyzjdm + '\'' +
......
src/main/java/com/founder/service/ITbRyRyzpService.java
......@@ -39,10 +39,9 @@ public interface ITbRyRyzpService {
/**
* 根据人员编号查询人员照片
* @param map
* @param ssdw
* @return
*/
public List<AutoTbRyZp> getTbRyRyzpByRybh(Map<String, Object> map, String ssdw);
public List<AutoTbRyZp> getTbRyRyzpByRybh(Map<String, Object> map);
/**
* 更新足迹照片
......
src/main/java/com/founder/service/impl/TbRyRyzpServiceImpl.java
......@@ -56,7 +56,7 @@ public class TbRyRyzpServiceImpl implements ITbRyRyzpService {
return bool;
};
public List<AutoTbRyZp> getTbRyRyzpByRybh(Map<String, Object> map, String ssdw){
public List<AutoTbRyZp> getTbRyRyzpByRybh(Map<String, Object> map){
return mapper.getRyRyzpInfo(map);
};
......
src/main/resources/application-dev.yml
......@@ -4,7 +4,7 @@ spring:
driver-class-name: oracle.jdbc.OracleDriver
username: XZXT
password: XZXT
jdbc-url: jdbc:oracle:thin:@47.92.129.99:1600:orcl
jdbc-url: jdbc:oracle:thin:@127.0.0.1:1521:ORCL
type: com.alibaba.druid.pool.DruidDataSource
manager:
driver-class-name: oracle.jdbc.OracleDriver
......@@ -22,7 +22,7 @@ spring:
password: p!ssw0rd1
ipWhite: 127.0.0.1,192.168.197.2
ftpserverip: 47.92.129.99
nginxport: 9053
ftpport: 4546
......
src/main/resources/application-prod.yml
......@@ -15,7 +15,7 @@ spring:
password: p!ssw0rd1
ipWhite: 127.0.0.1,192.168.197.2
ftpserverip: 47.92.129.99
ftpport: 4546
ftpuser: ftpuser
......
src/main/resources/application.yml
......@@ -24,7 +24,7 @@ logging:
springboot.dao: info
path: /opt/log/xzxt-api-report/log
jslocation: E:/sysDictJs/common/dict/
ssdw: 140000000000
ssdw: 430000000000
server:
port: 9061
......
src/main/resources/mybatis/mapper/AutoTbXwRycjSqlMap.xml
......@@ -76,10 +76,6 @@
<result column="LRSJ" property="lrsj" jdbcType="TIMESTAMP"/>
<result column="GXSJ" property="gxsj" jdbcType="TIMESTAMP"/>
<result column="JZRYBH" property="jzrybh" jdbcType="VARCHAR"/>
<result column="EDZZPXXBH" property="edzzpxxbh" jdbcType="VARCHAR"/>
<result column="ZMZPXXBH" property="zmzpxxbh" jdbcType="VARCHAR"/>
<result column="CMZPXXBH" property="cmzpxxbh" jdbcType="VARCHAR"/>
<result column="YCMZPXXBH" property="ycmzpxxbh" jdbcType="VARCHAR"/>
<result column="AJLBDM" property="ajlbdm" jdbcType="VARCHAR"/>
<result column="AJLBDMSTR" property="ajlbdmStr" jdbcType="VARCHAR"/>
<result column="CJR_LXDH" property="cjRlxdh" jdbcType="VARCHAR"/>
......@@ -88,7 +84,6 @@
<result column="ZWCJSJ" property="zwcjsj" jdbcType="TIMESTAMP"/>
<result column="ZWCJSJSTR" property="zwcjsjStr" jdbcType="VARCHAR"/>
<result column="ZWCJFS" property="zwcjfs" jdbcType="VARCHAR"/>
<result column="ZWFKXX" property="zwfkxx" jdbcType="VARCHAR"/>
<result column="R_GDZW" property="RGdzw" jdbcType="VARCHAR"/>
<result column="R_WZXX" property="RWzxx" jdbcType="VARCHAR"/>
<result column="R_PMZW" property="RPmzw" jdbcType="VARCHAR"/>
......@@ -131,6 +126,17 @@
<if test="elrsjStr != null and elrsjStr != ''">AND LRSJ <![CDATA[<]]>
to_date(#{elrsjStr , jdbcType=VARCHAR },'yyyy-mm-dd')+1
</if>
<if test="elrsjStr != null and elrsjStr != ''">AND LRSJ <![CDATA[<]]>
to_date(#{elrsjStr , jdbcType=VARCHAR },'yyyy-mm-dd')+1
</if>
<!-- 人员查询新增-->
<if test="sfxz != null and sfxz != ''">
AND (tbbz = '0' or tbbz is null)
</if>
<!-- 查询执法平台-->
<if test="sfxz == null or sfxz == ''">
AND tbbz = '1'
</if>
</sql>
<select id="queryPageCount" resultType="int" parameterType="map">
select count(1) from TB_RY_RYCJ,AFIS_QUALITY_CK where TB_RY_RYCJ.RYBH=AFIS_QUALITY_CK.R_RYBH(+) AND
......
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