elink-star
/
epmet-cloud-zhengwu-yantai
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

公安部接口调整

feature/evaluate
sunyuchao 3 years ago
parent
52f9eded1c
commit
3c72c57956
3 changed files with 15 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java
  2. 1
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
  3. 32
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java

15
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java
View File

@ -13,22 +13,7 @@ import java.util.List;
@Data
public class YtSfhyxxcxdsjjResDTO {
private int code = 200;
private String msg = "请求成功";
/**
* 响应数据
*/
private YtSfhyxxcxdsjjDetail data;
private int total;
@Data
public static class YtSfhyxxcxdsjjDetail {
private String status = "000";
private String statusMsg = "正常返回";
private String count = "1";
//结果数量
private String total;
private List<Result> result;
}
@Data
public static class Result {
//身份证号

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
View File

@ -257,7 +257,6 @@ public class YtHsResUtils {
log.error(String.format("烟台公民基本信息查询异常gmsfhm:%s", gmsfhm), e);
}
YtSfhyxxcxdsjjResDTO resultResult = new YtSfhyxxcxdsjjResDTO();
resultResult.setData(new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail());
return resultResult;
}

32
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java
View File

@ -101,14 +101,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
recordEntity.setIsComparison("1");
YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = YtHsResUtils.sfhyxxcxdsjj(entity.getIdCard(), entity.getName());
/*YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = new YtSfhyxxcxdsjjResDTO();
YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail f = new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail();
List<YtSfhyxxcxdsjjResDTO.Result> l = new ArrayList<>();
YtSfhyxxcxdsjjResDTO.Result d = new YtSfhyxxcxdsjjResDTO.Result();
d.setGMSFHM("371424188808087654");
d.setXM("小二");
l.add(d);
f.setResult(l);
sfhyxxcxdsjjResult.setData(f);*/
sfhyxxcxdsjjResult.setResult(l);*/
if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) {
recordEntity.setComparisonResult("公安部接口调用失败");
resultDTO.setResult(true);
@ -116,7 +114,7 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
return resultDTO;
} else {
//公安部不存在的数据
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getResult())) {
recordEntity.setComparisonResult("公安部身份证号对应数据不存在");
//数据不一致的赋值为未处理信息不一致(空)
recordEntity.setType("0");
@ -125,10 +123,10 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
resultDTO.setResult(true);
resultDTO.setResultExplain("公安部身份证号对应数据不存在");
} else {//在公安部查询到了数据
recordEntity.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM());
recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
recordEntity.setPoliceName(sfhyxxcxdsjjResult.getResult().get(0).getXM());
recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getResult().get(0).getGMSFHM());
//公安部跟居民库姓名不一致
if (!entity.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
if (!entity.getName().equals(sfhyxxcxdsjjResult.getResult().get(0).getXM())) {
//姓名不一致的赋值为未处理信息不一致(否)
recordEntity.setType("0");
recordEntity.setIdentical("0");
@ -184,17 +182,17 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
recordEntity.setComparisonResult("接口调用失败");
} else {
//公安部不存在的数据
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getResult())) {
recordEntity.setComparisonResult("公安部身份证号对应数据不存在");
//数据不一致的赋值为未处理信息不一致(空)
recordEntity.setType("0");
//代表程序干活了
recordEntity.setIdentical("2");
} else {//在公安部查询到了数据
recordEntity.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM());
recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
recordEntity.setPoliceName(sfhyxxcxdsjjResult.getResult().get(0).getXM());
recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getResult().get(0).getGMSFHM());
//公安部跟居民库姓名不一致
if (!o.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
if (!o.getName().equals(sfhyxxcxdsjjResult.getResult().get(0).getXM())) {
//姓名不一致的赋值为未处理信息不一致(否)
recordEntity.setType("0");
recordEntity.setIdentical("0");
@ -283,29 +281,27 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom
o.setIsComparison("1");
YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = YtHsResUtils.sfhyxxcxdsjj(o.getResiIdCard(), o.getResiName());
/*YtSfhyxxcxdsjjResDTO sfhyxxcxdsjjResult = new YtSfhyxxcxdsjjResDTO();
YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail f = new YtSfhyxxcxdsjjResDTO.YtSfhyxxcxdsjjDetail();
List<YtSfhyxxcxdsjjResDTO.Result> l = new ArrayList<>();
YtSfhyxxcxdsjjResDTO.Result d = new YtSfhyxxcxdsjjResDTO.Result();
d.setGMSFHM("371424188808087654");
d.setXM("小二");
l.add(d);
f.setResult(l);
sfhyxxcxdsjjResult.setData(f);*/
sfhyxxcxdsjjResult.setResult(l);*/
if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) {
o.setComparisonResult("接口调用失败");
} else {
//公安部不存在的数据
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) {
if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getResult())) {
o.setComparisonResult("公安部身份证号对应数据不存在");
//数据不一致的赋值为未处理信息不一致(空)
o.setType("0");
//代表程序干活了
o.setIdentical("2");
} else {//在公安部查询到了数据
o.setPoliceName(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM());
o.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM());
o.setPoliceName(sfhyxxcxdsjjResult.getResult().get(0).getXM());
o.setPoliceIdCard(sfhyxxcxdsjjResult.getResult().get(0).getGMSFHM());
//公安部跟居民库姓名不一致
if (!o.getResiName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) {
if (!o.getResiName().equals(sfhyxxcxdsjjResult.getResult().get(0).getXM())) {
//姓名不一致的赋值为未处理信息不一致(否)
o.setType("0");
o.setIdentical("0");

Write Preview
Loading…
Cancel
Save