diff --git a/docus-webservice/src/main/java/com/docus/webservice/entity/TBasic.java b/docus-webservice/src/main/java/com/docus/webservice/entity/TBasic.java index da6a19d..68b12bd 100644 --- a/docus-webservice/src/main/java/com/docus/webservice/entity/TBasic.java +++ b/docus-webservice/src/main/java/com/docus/webservice/entity/TBasic.java @@ -175,7 +175,7 @@ public class TBasic implements Serializable { return isDead; } - public void setIsDead(Integer isDead) { - this.isDead = isDead; - } +// public void setIsDead(Integer isDead) { +// this.isDead = isDead; +// } } diff --git a/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java b/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java index 606f72a..c22c16f 100644 --- a/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java +++ b/docus-webservice/src/main/java/com/docus/webservice/handler/TBasicWebService.java @@ -85,6 +85,10 @@ public class TBasicWebService implements ITBasicWebService { TBasic tBasic; if (tBasicMap != null && tBasicMap.size() > 0) { tBasic = JSON.parseObject(JSON.toJSONString(tBasicMap), TBasic.class); +// if(StringUtils.isNotBlank(String.valueOf(tBasicMap.get("isDead")))||StringUtils.isNotBlank(String.valueOf("is_dead"))){ +// String isDead=StringUtils.isNotBlank(String.valueOf(tBasicMap.get("isDead")))?String.valueOf(tBasicMap.get("isDead")):String.valueOf(tBasicMap.get("is_dead")); +// tBasic.setIsDead(isDead); +// } tBasic.setCreateTime(new Date()); itBasicService.savaAndSub(tBasic, tBasicSubMap); // this.saveAndCall(tBasic); @@ -166,6 +170,10 @@ public class TBasicWebService implements ITBasicWebService { TBasic tBasic; if (tBasicMap != null && tBasicMap.size() > 0) { tBasic = JSON.parseObject(JSON.toJSONString(tBasicMap), TBasic.class); +// if(StringUtils.isNotBlank(String.valueOf(tBasicMap.get("isDead")))||StringUtils.isNotBlank(String.valueOf("is_dead"))){ +// String isDead=StringUtils.isNotBlank(String.valueOf(tBasicMap.get("isDead")))?String.valueOf(tBasicMap.get("isDead")):String.valueOf(tBasicMap.get("is_dead")); +// tBasic.setIsDead(isDead); +// } if (StringUtils.isBlank(tBasic.getEmpId())) { insertLog(tbasic); log.info("emp_id字段不能为空值"); diff --git a/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java b/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java index 7c911ec..5a6d15d 100644 --- a/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java +++ b/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java @@ -80,6 +80,7 @@ public class PcmachineServiceImpl implements IPcmachineService { @Async("execCollector") @Override public void saveAndCall(TBasic tBasic) throws URISyntaxException { + log.info("--------------异步调用此方法---------------"); log.info("病案对象" + tBasic.toString()); //解析json映射文件 String json = JsonUtils.readJsonFile(CurrentPath() + Codes.JSON_COLLECTLIST.getMessage()); @@ -124,6 +125,7 @@ public class PcmachineServiceImpl implements IPcmachineService { } } + log.info("----------异步结束---------------"); } private String sendHttp(CollectList collectList, String jzh) throws URISyntaxException {