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

死亡定时：新的蓝图接口

master
lichao 2 years ago
parent
6a6c013753
commit
6cee7c03b6
2 changed files with 31 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
  2. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

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

@ -144,8 +144,10 @@ public class YtHsResUtils {
log.info("siWang api param:{}", param); log.info("siWang api param:{}", param);
Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "mzt_hhrysj1", param); Result<String> 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}"; // 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<String> result = new Result<String>().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<String> result = new Result<String>().ok(mockData); // Result<String> result = new Result<String>().ok(mockData);
log.info("siWang api result:{}", JSON.toJSONString(result)); log.info("siWang api result:{}", JSON.toJSONString(result));
if (!result.success()) { if (!result.success()) {
@ -162,12 +164,17 @@ public class YtHsResUtils {
if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) { if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) {
//第一层 //第一层
JSONObject secondData = JSON.parseObject(firstData.getString("data")); 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 //第二层 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, "", thirdData.toString()); return new YtDataSyncResDTO(200, "", fourthData.toString());
}
} else { } else {
log.warn("siWang 调用蓝图接口成功但是蓝图的结果中 省平台失败"); log.warn("siWang 调用蓝图接口成功但是蓝图的结果中 省平台失败");
} }

27
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
View File

@ -645,6 +645,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
break; break;
} }
hsjc(dbResiList, config.getCustomerId(), formDTO.getIsSync()); hsjc(dbResiList, config.getCustomerId(), formDTO.getIsSync());
log.info("======核酸检测信息拉取结束======"); log.info("======核酸检测信息拉取结束======");
break; break;
case CAN_JI: case CAN_JI:
@ -704,14 +705,24 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
entity.setIcResiUserId(dbResi.getUserId()); entity.setIcResiUserId(dbResi.getUserId());
//死亡未获取到数据 //死亡未获取到数据
if (thirdResultObject != null) { if (thirdResultObject != null) {
entity.setAge(thirdResultObject.getString("AGE")); // entity.setAge(thirdResultObject.getString("AGE"));
entity.setAddress(thirdResultObject.getString("FAMILY_ADD")); // entity.setAddress(thirdResultObject.getString("FAMILY_ADD"));
entity.setDeathDate(thirdResultObject.getString("DEATH_DATE")); entity.setDeathDate(thirdResultObject.getString("issueDate"));
entity.setCremationTime(thirdResultObject.getString("CREMATION_TIME")); // entity.setCremationTime(thirdResultObject.getString("CREMATION_TIME"));
entity.setMz(thirdResultObject.getString("FAMILY_ADD")); // entity.setMz(thirdResultObject.getString("FAMILY_ADD"));
entity.setOrganName(thirdResultObject.getString("CREATE_ORGAN_NAME")); // entity.setOrganName(thirdResultObject.getString("CREATE_ORGAN_NAME"));
entity.setNation(thirdResultObject.getString("NATION")); // entity.setNation(thirdResultObject.getString("NATION"));
entity.setThirdRecordId(thirdResultObject.getString("RECORD_ID")); entity.setThirdRecordId(thirdResultObject.getString("certificateID"));
JSONArray jsonArray = thirdResultObject.getJSONArray("surface");
if (jsonArray!=null && jsonArray.size()>0){
jsonArray.forEach(json->{
JSONObject jsonObject = JSON.parseObject(json.toString());
if (jsonObject.get("name").equals("户籍地址")){
entity.setAddress(jsonObject.get("value").toString());
}
});
}
} }
entity.setDealStatus(NumConstant.ZERO); entity.setDealStatus(NumConstant.ZERO);

Write Preview
Loading…
Cancel
Save