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 f5ea958..04af18d 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 @@ -39,7 +39,8 @@ public class TBasicWebService implements ITBasicWebService { @Autowired private AfInterfaceCollectMapper afInterfaceCollectMapper; - private Logger log= LogManager.getLogger(TBasicWebService.class); + private Logger log = LogManager.getLogger(TBasicWebService.class); + /** * 获取jar包所在位置 * @@ -69,41 +70,40 @@ public class TBasicWebService implements ITBasicWebService { @Override public String OUT_HOS_REG(String tbasic) { - log.info("打印底层xml"+tbasic); + log.info("住院成员信息新增xml" + tbasic); try { //解析xml HashMap tBasicMap = new HashMap<>(); HashMap tBasicSubMap = new HashMap<>(); - parseXml(tbasic,tBasicMap,tBasicSubMap); + parseXml(tbasic, tBasicMap, tBasicSubMap); //处理业务 TBasic tBasic; if (tBasicMap != null && tBasicMap.size() > 0) { tBasic = JSON.parseObject(JSON.toJSONString(tBasicMap), TBasic.class); tBasic.setCreateTime(new Date()); - try { - itBasicService.savaAndSub(tBasic, tBasicSubMap); - this.saveAndCall(tBasic); - } catch (RuntimeException e) { - insertLog(tbasic); - log.error("OUT_HOS_REG方法中错误信息:"+e.getMessage()); - return ResultUtils.fail(e.getMessage()); - } + itBasicService.savaAndSub(tBasic, tBasicSubMap); + this.saveAndCall(tBasic); } else { insertLog(tbasic); log.info("请提供完整的xml"); return ResultUtils.fail("请提供完整的xml"); } + } catch (RuntimeException e) { + insertLog(tbasic); + log.error("OUT_HOS_REG方法中错误信息:" + e.getMessage()); + return ResultUtils.fail(e.getMessage()); } catch (Exception e) { e.printStackTrace(); - log.error("OUT_HOS_REG方法中错误信息:"+e.getMessage()); + log.error("OUT_HOS_REG方法中错误信息:" + e.getMessage()); return ResultUtils.fail(); } - log.info("返回结果:"+ResultUtils.success().asXML()); + log.info("返回结果:" + ResultUtils.success().asXML()); return ResultUtils.success().asXML(); } /** * 解析xml + * * @param tbasic * @param tBasicMap * @param tBasicSubMap @@ -127,7 +127,7 @@ public class TBasicWebService implements ITBasicWebService { value = xmlUtils.getElementText(selectColumn.getQualityColumn()) == null ? null : String.valueOf(xmlUtils.getElementText(selectColumn.getQualityColumn())); } catch (RuntimeException e) { String message = e.getMessage(); - log.error("解析xml出现:"+message); + log.error("解析xml出现:" + message); throw new RuntimeException(message); } if (StringUtils.isBlank(value)) { @@ -148,13 +148,14 @@ public class TBasicWebService implements ITBasicWebService { } } } + @Override public String OUT_HOS_CAN(String tbasic) { - log.info("打印底层xml"+tbasic); + log.info("住院成员信息修改xml" + tbasic); try { HashMap tBasicMap = new HashMap<>(); HashMap tBasicSubMap = new HashMap<>(); - parseXml(tbasic,tBasicMap,tBasicSubMap); + parseXml(tbasic, tBasicMap, tBasicSubMap); //处理业务 TBasic tBasic; if (tBasicMap != null && tBasicMap.size() > 0) { @@ -171,7 +172,7 @@ public class TBasicWebService implements ITBasicWebService { } catch (RuntimeException e) { insertLog(tbasic); e.printStackTrace(); - log.error("OUT_HOS_CAN方法中错误信息:"+e.getMessage()); + log.error("OUT_HOS_CAN方法中错误信息:" + e.getMessage()); return ResultUtils.fail(e.getMessage()); } } else { @@ -180,40 +181,42 @@ public class TBasicWebService implements ITBasicWebService { } } catch (Exception e) { e.printStackTrace(); - log.error("OUT_HOS_CAN方法中错误信息:"+e.getMessage()); + log.error("OUT_HOS_CAN方法中错误信息:" + e.getMessage()); return ResultUtils.fail(); } - log.info("OUT_HOS_CAN方法运行结果:"+ResultUtils.success().asXML()); + log.info("OUT_HOS_CAN方法运行结果:" + ResultUtils.success().asXML()); return ResultUtils.success().asXML(); } + + public void saveAndCall(TBasic tBasic) throws URISyntaxException { - log.info("病案对象"+tBasic.toString()); + log.info("病案对象" + tBasic.toString()); //解析json映射文件 String json = JsonUtils.readJsonFile(CurrentPath() + Codes.JSON_COLLECTLIST.getMessage()); if (StringUtils.isNotBlank(json)) { Map jsonMap = JSON.parseObject(json, Map.class); //任务数 - Integer task_count= JSON.parseObject(String.valueOf(jsonMap.get(Codes.JSON_TASK_COUNT.getMessage())), Integer.class); + Integer task_count = JSON.parseObject(String.valueOf(jsonMap.get(Codes.JSON_TASK_COUNT.getMessage())), Integer.class); List collectLists = JSON.parseArray(String.valueOf(jsonMap.get(Codes.JSON_COLLECTLIST_ROOT.getMessage())), CollectList.class); //添加省中医病案采集 SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0); - AfInterfaceCollect afc=new AfInterfaceCollect(); - Long afcId=idWorker.nextId(); + AfInterfaceCollect afc = new AfInterfaceCollect(); + Long afcId = idWorker.nextId(); afc.setId(afcId); afc.setJzh(tBasic.getJzh()); afc.setTaskCount(task_count); afc.setCreateTime(new Date()); int i = afInterfaceCollectMapper.addAfInterfaceCollect(afc); - if (i<0) { + if (i < 0) { log.info("省中医病案采集表添加信息失败！"); } //添加省中医病案采集-子任务 - List list=new ArrayList<>(); + List list = new ArrayList<>(); for (CollectList collectList : collectLists) { AfInterfaceCollectSub afInterfaceCollectSub = new AfInterfaceCollectSub(); - Long afcsId= idWorker.nextId(); + Long afcsId = idWorker.nextId(); afInterfaceCollectSub.setId(afcsId); afInterfaceCollectSub.setAfInterfaceCollectId(afcId); afInterfaceCollectSub.setCollectsysCode(collectList.getCollectsys_code()); @@ -222,21 +225,21 @@ public class TBasicWebService implements ITBasicWebService { list.add(afInterfaceCollectSub); } int i1 = afInterfaceCollectMapper.addAfInterfaceCollectSub(list); - if (i1<0) { + if (i1 < 0) { log.info("省中医病案采集-子任务失败！"); } for (CollectList collectList : collectLists) { //调用http发送请求 - this.sendHttp(collectList,tBasic.getJzh()); + this.sendHttp(collectList, tBasic.getJzh()); } } } - private String sendHttp(CollectList collectList,String jzh) throws URISyntaxException { - Map params= new HashMap<>(); - params.put("empId",jzh); - params.put("collectSubId",String.valueOf(collectList.getId())); - return HttpUtils.get(collectList.getRequestUrl(),params); + private String sendHttp(CollectList collectList, String jzh) throws URISyntaxException { + Map params = new HashMap<>(); + params.put("empId", jzh); + params.put("collectSubId", String.valueOf(collectList.getId())); + return HttpUtils.get(collectList.getRequestUrl(), params); }