diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java index 8863619d26..ede3d3b5ba 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtSfhyxxcxdsjjResDTO.java @@ -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; - } + private List result; @Data public static class Result { //身份证号 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 371aa8b95b..6e968d3af8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -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; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java index 78b76b12f7..06b57e2fbe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiComparisonRecordServiceImpl.java @@ -101,14 +101,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl 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 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");