From 6cee7c03b69894fbf34ecd72ad44360edd06499a Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 23 May 2023 15:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E5=AE=9A=E6=97=B6=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E8=93=9D=E5=9B=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/YtHsResUtils.java | 17 ++++++++---- .../impl/DataSyncConfigServiceImpl.java | 27 +++++++++++++------ 2 files changed, 31 insertions(+), 13 deletions(-) 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 7447713e01..1922af876a 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 @@ -144,8 +144,10 @@ public class YtHsResUtils { log.info("siWang api param:{}", param); - Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "mzt_hhrysj1", param); + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "swyxzhm", param); // String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; +// Result result = new Result().ok(mockData); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"head\\\\\\\":{\\\\\\\"message\\\\\\\":\\\\\\\"接口调用成功\\\\\\\",\\\\\\\"status\\\\\\\":\\\\\\\"0\\\\\\\"},\\\\\\\"data\\\\\\\":{\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"dataList\\\\\\\":[{\\\\\\\"certificateID\\\\\\\":\\\\\\\"526C74141A1C4B70B0A3DE2B1C3FC026-37060200620221727\\\\\\\",\\\\\\\"certificateName\\\\\\\":\\\\\\\"死亡医学证明\\\\\\\",\\\\\\\"certificateType\\\\\\\":\\\\\\\"死亡医学证明\\\\\\\",\\\\\\\"certificateHolder\\\\\\\":\\\\\\\"盖美英\\\\\\\",\\\\\\\"certificateHolderCode\\\\\\\":\\\\\\\"370602194312254323\\\\\\\",\\\\\\\"certificateHolderType\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"issueDept\\\\\\\":null,\\\\\\\"certificateNumber\\\\\\\":\\\\\\\"37060200620221727\\\\\\\",\\\\\\\"issueDeptCode\\\\\\\":null,\\\\\\\"certificateDeptCodeType\\\\\\\":null,\\\\\\\"issueDate\\\\\\\":\\\\\\\"2022-12-11 00:00:00.0\\\\\\\",\\\\\\\"certificateValidateStart\\\\\\\":null,\\\\\\\"certificateValidateEnd\\\\\\\":null,\\\\\\\"digitalSign\\\\\\\":null,\\\\\\\"surface\\\\\\\":[{\\\\\\\"name\\\\\\\":\\\\\\\"报告卡编号\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"37060200620221727\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"CARD_ID\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"死者姓名\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"盖美英\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"NAME\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"性别编码\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"9\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Integer\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"GENDER\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"证件类型\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Integer\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"IDCARD_TYPE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"证件号码\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"370602194312254323\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"IDCARD_CODE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"出生日期\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"1943-12-25 00:00:00\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Date\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"BIRTH_DATE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"年龄\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"1943-12-25 00:00:00.0\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Integer\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"AGE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"生前详细地址\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"山东省烟台市芝罘区世回尧街道南尧居委富尧街33内1号\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"OBODE_DETAIL\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"常住地址地区编码\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"3706021100\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"OBODE_CODE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"户籍地址\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"山东省烟台市芝罘区世回尧街道南尧居委富尧街33内1号\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\" :\\\\\\\"DOMICILE_DETAIL\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"户籍地址编码\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"3706021100\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"DOMICILE_CODE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"死亡时间\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"2022-12-11 00:00:00\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Date\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null},{\\\\\\\"name\\\\\\\":\\\\\\\"医生填卡日期\\\\\\\",\\\\\\\"value\\\\\\\":\\\\\\\"2022-12-11 00:00:00\\\\\\\",\\\\\\\"valueType\\\\\\\":\\\\\\\"Date\\\\\\\",\\\\\\\"columnName\\\\\\\":\\\\\\\"FILL_CARD_DATE\\\\\\\",\\\\\\\"orderNum\\\\\\\":null}],\\\\\\\"detail\\\\\\\":null}]}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}"; // Result result = new Result().ok(mockData); log.info("siWang api result:{}", JSON.toJSONString(result)); if (!result.success()) { @@ -162,12 +164,17 @@ public class YtHsResUtils { if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) { //第一层 JSONObject secondData = JSON.parseObject(firstData.getString("data")); - Object thirdData = ""; - if (secondData != null && secondData.getJSONArray("data") != null && secondData.getJSONArray("data").size() >0 ) { + + if (secondData != null && secondData.getString("data") != null ) { //第二层 data - thirdData = secondData.getJSONArray("data").get(0); + JSONObject thirdData = JSON.parseObject(secondData.getString("data")); + Object fourthData = ""; + if (thirdData != null && thirdData.getJSONArray("dataList") != null && thirdData.getJSONArray("dataList").size() >0) { + fourthData = thirdData.getJSONArray("dataList").get(0); + } + return new YtDataSyncResDTO(200, "", fourthData.toString()); } - return new YtDataSyncResDTO(200, "", thirdData.toString()); + } else { log.warn("siWang 调用蓝图接口成功但是蓝图的结果中 省平台失败"); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 3fdeea3b88..ab13fec3d5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -645,6 +645,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl0){ + jsonArray.forEach(json->{ + JSONObject jsonObject = JSON.parseObject(json.toString()); + if (jsonObject.get("name").equals("户籍地址")){ + entity.setAddress(jsonObject.get("value").toString()); + } + }); + + } } entity.setDealStatus(NumConstant.ZERO);