From 9a951b53dd6d2cda5b3256900161f9e01c8a7704 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 8 Jun 2020 17:28:16 +0800 Subject: [PATCH] update --- .../operate/web/facade/ApplyOrderFacade.java | 288 ++++++++++----------- 1 file changed, 136 insertions(+), 152 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index fa06e51..4ef33d7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -448,86 +448,92 @@ public class ApplyOrderFacade { //先查询本院是否已申请 //List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); //if (CollectionUtils.isEmpty(list1)) { - //增加产筛 - applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); + //增加产筛 + applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); - /** 改为已使用状态 */ - if (StringUtils.isNotBlank(sieveApplyOrderAddRequest.getCouponCode())) { - couponService.use(hospitalId, sieveApplyOrderAddRequest.getCouponCode(), userId, sieveApplyOrderModel.getId()); - } + /** 改为已使用状态 */ + if (StringUtils.isNotBlank(sieveApplyOrderAddRequest.getCouponCode())) { + couponService.use(hospitalId, sieveApplyOrderAddRequest.getCouponCode(), userId, sieveApplyOrderModel.getId()); + } - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); - - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); - sieveApplyOrderQuery.setStatus(0); - sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); - //查询转诊申请单 - List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if (CollectionUtils.isNotEmpty(list)) { - List idList = new ArrayList<>(); - for (SieveApplyOrderModel orderModel : list) { - if (null != orderModel.getParentId()) { - Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); - if (null != patients) { - SieveQuery sieveQuery = new SieveQuery(); - sieveQuery.setYn(YnEnums.YES.getId()); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); + + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setStatus(0); //标识是否同步过数据 0 表示未同步 1表示已同步 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); + //查询转诊申请单 + List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + if (CollectionUtils.isNotEmpty(list)) { + List idList = new ArrayList<>(); + for (SieveApplyOrderModel orderModel : list) { + Map map = new HashMap(); + if (null != orderModel.getParentId()) { + Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); + SieveModel sieveModel = null; + if (null != patients) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setStatus(1);//20200608 wtt 修改后可以实现 产筛申请添加第二时候产前筛查也会添加 // sieveQuery.setHospitalId(hospitalId); - sieveQuery.setParentId(patients.getId()); - List modelList = sieveService.queryList(sieveQuery); - if (CollectionUtils.isEmpty(modelList)) { - SieveModel sieveModel = patientsService.convertToModel(patients); - sieveModel.setReviceStatus(1); - sieveModel.setFrom("2"); - sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); - sieveModel.setApplyHospitalId(hospitalId); - sieveModel.setHospitalId(orderModel.getHospitalId()); - SieveService.handOrder(sieveModel); - sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); - sieveModel.setCostType(sieveApplyOrderModel.getCostType()); - sieveService.addChanQianSieve(sieveModel); - - operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); - } + sieveQuery.setParentId(patients.getId()); + List modelList = sieveService.queryList(sieveQuery); + if (CollectionUtils.isEmpty(modelList)) { + sieveModel = patientsService.convertToModel(patients); + sieveModel.setReviceStatus(1);//接收状态 1未接收 2接收 + sieveModel.setFrom("2");//数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来 + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); + sieveModel.setApplyHospitalId(hospitalId); + sieveModel.setHospitalId(orderModel.getHospitalId()); + SieveService.handOrder(sieveModel); + sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); + sieveModel.setCostType(sieveApplyOrderModel.getCostType()); + sieveService.addChanQianSieve(sieveModel); + + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); } - idList.add(orderModel.getId()); } + map.put("orderModelid", orderModel.getId()); + map.put("sieveModelid", sieveModel.getId()); + idList.add(map); } - SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel(); + } + SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel(); + sieveApplyOrderModel1.setStatus(1); //标识是否同步过数据 0 表示未同步 1表示已同步 + for (Map str : idList) { + sieveApplyOrderModel1.setId(str.get("orderModelid").toString()); + sieveApplyOrderModel1.setModified(new Date()); sieveApplyOrderModel1.setStatus(1); - for (String str : idList) { - sieveApplyOrderModel1.setId(str); - sieveApplyOrderModel1.setModified(new Date()); - sieveApplyOrderModel1.setStatus(1); - SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); - sieveApplyOrderQuery2.setId(str); - List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); - applyOrderService.updateSieve(sieveApplyOrderModel1); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); - } + sieveApplyOrderModel1.setRedundancy(str.get("sieveModelid").toString()); + SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery2.setId(str.get("orderModelid").toString()); + List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); + applyOrderService.updateSieve(sieveApplyOrderModel1); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); } - SieveQuery sieveQuery = new SieveQuery(); - sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); - List sieveModels = sieveService.queryList(sieveQuery); - if (CollectionUtils.isNotEmpty(sieveModels)) { - SieveModel sieveModel = sieveModels.get(0); - sieveModel.setReviceStatus(1); - sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); - sieveModel.setApplyHospitalId(hospitalId); - sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime()); - sieveModel.setStatus(2); - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) { - sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate())); - } - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate()); - sieveModel.setDueWeek(days); - SieveService.handOrder(sieveModel); - sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); - sieveModel.setCostType(sieveApplyOrderModel.getCostType()); - sieveService.updateOneChanQianDiaSieve(sieveModel); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查"); + } + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); + List sieveModels = sieveService.queryList(sieveQuery); + if (CollectionUtils.isNotEmpty(sieveModels)) { + SieveModel sieveModel = sieveModels.get(0); + sieveModel.setReviceStatus(1);//接收状态 1未接收 2接收 + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); + sieveModel.setApplyHospitalId(hospitalId); + sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime()); + sieveModel.setStatus(2); //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) { + sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate())); } + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), sieveModel.getApplyDate()); + sieveModel.setDueWeek(days); + SieveService.handOrder(sieveModel); + sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); + sieveModel.setCostType(sieveApplyOrderModel.getCostType()); + sieveService.updateOneChanQianDiaSieve(sieveModel); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查"); + } // 调用华大接口 Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId); String number = sieveApplyOrderModel.getNumber(); @@ -547,8 +553,7 @@ public class ApplyOrderFacade { String number = sieveApplyOrderModel.getNumber(); //为空的情况先不验证是否重复 - if (StringUtils.isEmpty(number)) - { + if (StringUtils.isEmpty(number)) { return false; } @@ -583,7 +588,7 @@ public class ApplyOrderFacade { Boolean result = null; if ("4".equals(HIS_VERSION) || "30".equals(HIS_VERSION)) { result = false; - try{ + try { if (StringUtils.isNotEmpty(sieveType) && "2".equals(sieveType)) { final String productCode = "DX1331"; HuadaSieveApplyOrderAddRequest request = new HuadaSieveApplyOrderAddRequest(); @@ -607,7 +612,7 @@ public class ApplyOrderFacade { // EDTA：EDTA // K牌采血管：K牌采血管 // G牌采血管：G牌采血管 - String d = "1".equals(sieveApplyOrderModel.getFetusNum()) || "4".equals(sieveApplyOrderModel.getFetusNum()) ? "D" :""; + String d = "1".equals(sieveApplyOrderModel.getFetusNum()) || "4".equals(sieveApplyOrderModel.getFetusNum()) ? "D" : ""; request.setTubeType(sieveApplyOrderModel.getYpglx() + d); // 孕周（格式：18w+1）注：“w”必须小写，“+”号后面的天数必须是0~6 request.setGestationalWeeks(DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); @@ -690,16 +695,11 @@ public class ApplyOrderFacade { //本次妊娠情况 String pregnancy = null; - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation())) - { + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getImprenation()) && "1".equals(sieveApplyOrderModel.getImprenation())) { pregnancy = "0"; - } - else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction())) - { + } else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getOvulationInduction()) && "1".equals(sieveApplyOrderModel.getOvulationInduction())) { pregnancy = "1"; - } - else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui())) - { + } else if (StringUtils.isNotEmpty(sieveApplyOrderModel.getIui()) && "1".equals(sieveApplyOrderModel.getIui())) { pregnancy = "2"; } request.setPregnancy(pregnancy); @@ -711,13 +711,9 @@ public class ApplyOrderFacade { request.setNativePlace(addressRegister); - - - - if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek())) - { + if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek())) { //nt测定孕周 - request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周","w").replace("天","")); + request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周", "w").replace("天", "")); } @@ -727,19 +723,15 @@ public class ApplyOrderFacade { request.setNtValue(sieveApplyOrderModel.getUltrasonicNtVal()); //0/高风险 1/低风险 2/临界风险 String srisk = sieveApplyOrderModel.getSerumScreeningRisk(); - if (StringUtils.isNotEmpty(srisk)) - { - int week = DateUtil.getWeek(patients.getLastMenses(),new Date()); - if (week < 13) - { + if (StringUtils.isNotEmpty(srisk)) { + int week = DateUtil.getWeek(patients.getLastMenses(), new Date()); + if (week < 13) { //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险 request.setMotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1")); //早期 request.setTrisomy21(sieveApplyOrderModel.getSyndrome21()); request.setTrisomy18(sieveApplyOrderModel.getSyndrome18()); - } - else - { + } else { //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险 request.setMmotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1")); //中期 @@ -779,18 +771,15 @@ public class ApplyOrderFacade { // request.put("pcountry", getBasicConfig(patients.getPcountryId())); // map.put("pnation", getBasicConfig(patients.getPnationId())); - if ("4".equals(HIS_VERSION)) - { + if ("4".equals(HIS_VERSION)) { result = huadaSaveSampleInfo(request); - } - else - { + } else { result = hsHuadaSaveSampleInfo(request); } } - }catch (Exception e){ - ExceptionUtils.catchException(e,"调用华大接口失败"); + } catch (Exception e) { + ExceptionUtils.catchException(e, "调用华大接口失败"); } } return result; @@ -1340,15 +1329,15 @@ public class ApplyOrderFacade { map.put("create", DateUtil.getyyyy_MM_dd(reOrderModel.getCreated())); String hospital1 = ""; - if(!isNumeric(reOrderModel.getTransferredHospital())){ - map.put("zhuanRname",reOrderModel.getTransferredHospital()); - }else{ + if (!isNumeric(reOrderModel.getTransferredHospital())) { + map.put("zhuanRname", reOrderModel.getTransferredHospital()); + } else { if (org.apache.commons.lang.StringUtils.isNotEmpty(reOrderModel.getTransferredHospital())) { Organization organization = organizationService.getOrganization(Integer.parseInt(reOrderModel.getTransferredHospital())); if (organization != null && organization.getYn() == YnEnums.YES.getId()) { hospital1 = organization.getName(); } - map.put("zhuanRname",hospital1); + map.put("zhuanRname", hospital1); } } if (NumberUtils.isNumber(reOrderModel.getRecDoctor())) { @@ -1366,10 +1355,11 @@ public class ApplyOrderFacade { return null; } - public static boolean isNumeric(String str){ + public static boolean isNumeric(String str) { Pattern pattern = Pattern.compile("[0-9]*"); return pattern.matcher(str).matches(); } + public BaseResponse getEnums() { Map map = new HashMap<>(); map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); @@ -1755,6 +1745,7 @@ public class ApplyOrderFacade { /** * 调用衡水华大保存申请单 + * * @param sieveHuada * @return */ @@ -1788,25 +1779,23 @@ public class ApplyOrderFacade { map.put("timestamp", timestamp); String json = JsonUtil.obj2JsonString(map); - System.out.println("saveSampleInfo param="+json); - ExceptionUtils.catchException("saveSampleInfo param="+json); + System.out.println("saveSampleInfo param=" + json); + ExceptionUtils.catchException("saveSampleInfo param=" + json); String s = HttpClientUtil.doPostSSL(HUADA_URL + "/external/saveSampleInfos.do", json); - ExceptionUtils.catchException("saveSampleInfo param=" + json+ "=======result"+s); + ExceptionUtils.catchException("saveSampleInfo param=" + json + "=======result" + s); JSONObject jsonObject = JSONObject.parseObject(s); Object codeObj = jsonObject.get("code"); - if (codeObj != null && "200".equals(codeObj.toString()) && s.contains("true")) - { + if (codeObj != null && "200".equals(codeObj.toString()) && s.contains("true")) { return true; } } catch (Exception e) { - ExceptionUtils.catchException(e,"error"); + ExceptionUtils.catchException(e, "error"); } return false; } - public Map huadaCallback(String syscode, String sign, String timestamp, String params) { Map map = new HashMap(); System.out.println("syscode:" + syscode + "sign:" + sign + "timestamp:" + timestamp); @@ -1932,10 +1921,13 @@ public class ApplyOrderFacade { put("valueTwo", split13[1]); put("valueKey", huadaCallbackModel.getZ13ZScore()); }}); - newModel.setTszhzValue(new HashMap(){{ - put("valueOne", split21[0]);put("valueTwo", split21[1]);put("valueKey", huadaCallbackModel.getZ21ZScore()); }}); + newModel.setTszhzValue(new HashMap() {{ + put("valueOne", split21[0]); + put("valueTwo", split21[1]); + put("valueKey", huadaCallbackModel.getZ21ZScore()); + }}); - String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId()); + String reportTypeStr = StringUtils.isNotEmpty(huadaCallbackModel.getReportType()) ? huadaCallbackModel.getReportType() : huadaGetReportType(newModel.getSampleReportId()); String reportType = "1"; if ("正式报告".equals(reportTypeStr)) { reportType = "1"; @@ -1949,7 +1941,7 @@ public class ApplyOrderFacade { return newModel; } - public void huadaFtp(String sampleReportId,HttpServletResponse response) { + public void huadaFtp(String sampleReportId, HttpServletResponse response) { try { Map signParams = getSignParams(SYSCODE, SECRET); @@ -1958,8 +1950,7 @@ public class ApplyOrderFacade { String sign1 = signParams.get("sign").toString(); HashMap map1 = new HashMap<>(); String data = null; - if ("30".equals(HIS_VERSION)) - { + if ("30".equals(HIS_VERSION)) { Map mapParams = new HashMap<>(); mapParams.put("sampleNum", sampleReportId); mapParams.put("syscode", syscode1); @@ -1968,15 +1959,13 @@ public class ApplyOrderFacade { data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/downloadReport.do", JsonUtil.obj2Str(mapParams)); JSONObject respJSON = JSON.parseObject(data); if ("200".equals(respJSON.get("code").toString())) { - Object rowsJSON =respJSON.get("data"); + Object rowsJSON = respJSON.get("data"); if (rowsJSON != null) { byte[] bytes = rowsJSON.toString().getBytes("iso8859-1"); - getFile(bytes,response); + getFile(bytes, response); } } - } - else - { + } else { timestamp1 = timestamp1.replaceAll(" ", "%20"); Map mapParams = new HashMap<>(); mapParams.put("sampleReportId", sampleReportId); @@ -1985,10 +1974,10 @@ public class ApplyOrderFacade { data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=downloadReport&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1); JSONObject respJSON = JSON.parseObject(data); if ("200".equals(respJSON.get("code").toString())) { - Object rowsJSON =respJSON.get("rows"); + Object rowsJSON = respJSON.get("rows"); if (rowsJSON != null) { byte[] bytes = rowsJSON.toString().getBytes("iso8859-1"); - getFile(bytes,response); + getFile(bytes, response); } } } @@ -1998,6 +1987,7 @@ public class ApplyOrderFacade { } } + public String huadaGetReportType(String sampleReportId) { try { Map signParams = getSignParams(SYSCODE, SECRET); @@ -2011,12 +2001,12 @@ public class ApplyOrderFacade { JSONObject jsonMapParams = new JSONObject(mapParams); map1.put("params", jsonMapParams.toString()); String data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=getReportType&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1); - if(!data.isEmpty()){ + if (!data.isEmpty()) { net.sf.json.JSONObject jsonObject11 = net.sf.json.JSONObject.fromObject(data); - net.sf.json.JSONArray rows = (net.sf.json.JSONArray)jsonObject11.get("rows"); - net.sf.json.JSONObject reporttype = (net.sf.json.JSONObject)rows.get(0); + net.sf.json.JSONArray rows = (net.sf.json.JSONArray) jsonObject11.get("rows"); + net.sf.json.JSONObject reporttype = (net.sf.json.JSONObject) rows.get(0); String reporttype1 = reporttype.get("REPORTTYPE").toString(); - return reporttype1; + return reporttype1; } } catch (Exception e) { e.printStackTrace(); @@ -2024,6 +2014,7 @@ public class ApplyOrderFacade { } return ""; } + /** * 根据byte数组，生成文件 */ @@ -2109,7 +2100,7 @@ public class ApplyOrderFacade { Query query = Query.query(Criteria.where("sampleReportId").is(sampleReportId)); SieveResultModel resultModel = mongoTemplate.findOne(query, SieveResultModel.class); if (resultModel != null) { - Integer printSize = (resultModel.getPrintSize() == null ? 0 : resultModel.getPrintSize())+1; + Integer printSize = (resultModel.getPrintSize() == null ? 0 : resultModel.getPrintSize()) + 1; Update update = new Update(); update.set("printSize", printSize); @@ -2125,14 +2116,14 @@ public class ApplyOrderFacade { /** * 回调 + * * @param sampleNum * @param token * @return */ public BaseResponse resultCallback(final String sampleNum, String token) { BaseResponse baseResponse = new BaseResponse(); - if (!"uc0d98e79de93d6e49521deab9b0d9eb7a".equals(token)) - { + if (!"uc0d98e79de93d6e49521deab9b0d9eb7a".equals(token)) { return baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("Authorization错误"); } @@ -2157,35 +2148,29 @@ public class ApplyOrderFacade { map.put("syscode", syscode); map.put("sign", sign); map.put("timestamp", timestamp); - System.out.println("query report param "+JsonUtil.obj2Str(map)); + System.out.println("query report param " + JsonUtil.obj2Str(map)); //重试三次 - for (int i = 0; i <3 ; i++) - { + for (int i = 0; i < 3; i++) { try { String data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/getReport.do", JsonUtil.obj2Str(map)); - if (StringUtils.isNotEmpty(data)) - { + if (StringUtils.isNotEmpty(data)) { System.out.println(data); JSONObject jsonObject = JSONObject.parseObject(data); Object codeObj = jsonObject.get("code"); - if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success")) - { + if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success")) { dohandleResult(jsonObject.get("data")); break; } } - }catch (Exception e) - { - System.out.println(e.getMessage()+" getReport.do fail "+i); + } catch (Exception e) { + System.out.println(e.getMessage() + " getReport.do fail " + i); try { Thread.sleep(1000); - }catch (Exception e1) - { + } catch (Exception e1) { } - if (i == 2) - { + if (i == 2) { return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("获取报告失败"); } continue; @@ -2196,8 +2181,7 @@ public class ApplyOrderFacade { } private void dohandleResult(final Object dataObj) { - if (dataObj == null) - { + if (dataObj == null) { return; } new Thread(new Runnable() { -- 1.8.3.1