From 645d45bd27a80c569acf4658846689917515bca0 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 17 Feb 2023 10:15:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=BD=AE=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=A0=B8=E9=94=80=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/HttpUtil.java | 4 ++++ .../modules/seeyon/service/SeeYonService.java | 2 ++ .../service/impl/SeeYonServiceImpl.java | 10 ++++++++ .../modules/tbs/common/TbsSeeYonConst.java | 1 + .../controller/TbsCostApplyController.java | 1 + .../service/impl/TbsCostApplyServiceImpl.java | 1 + .../controller/VtbVerificationController.java | 2 ++ .../service/VtbVerificationApplication.java | 24 +++++++++---------- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/qs/serve/common/util/HttpUtil.java b/src/main/java/com/qs/serve/common/util/HttpUtil.java index b6562716..ffb62687 100644 --- a/src/main/java/com/qs/serve/common/util/HttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/HttpUtil.java @@ -115,6 +115,10 @@ public class HttpUtil { public static R doGetResult(String url,HashMap headers){ String result = HttpUtil.doGet(url,headers); + log.debug("url:{},result:{}",url,result); + if(result==null){ + Assert.throwEx("远程服务连接失败"); + } JSONObject jsonObject = JSONObject.parseObject(result); Integer status = jsonObject.getInteger("status"); String msg = jsonObject.getString("msg"); diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index 461311bc..48a73836 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -21,6 +21,8 @@ public interface SeeYonService { R commonCommit(TbsAffairCommitBo affairCommit,String formCode); + boolean testConnection(); + /** * 通用的创建流程接口 * @param createProcessBo diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java index 52c35c76..2d6599ad 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonServiceImpl.java @@ -67,6 +67,16 @@ public class SeeYonServiceImpl implements SeeYonService { return result; } + @Override + public boolean testConnection() { + R result = syBaseService.getBase(TbsSeeYonConst.API_TEST,"测试连接"); + if(result!=null&&result.getStatus().equals(200)){ + return true; + }else { + return false; + } + } + @Override public R baseCreateProcess(BaseCreateProcessBo createProcessBo) { String title = "创建流程"; diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 0f5c3466..89267629 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -17,6 +17,7 @@ public interface TbsSeeYonConst { String COST_APPLY_TMP_ID = "3018014149748736162"; String VERIFICATION_TMP_ID = "8370474123848467567"; + String API_TEST = "/testConnection"; String API_PROCESS_CREATE = "/process/create"; String API_PROCESS_CREATE_CALLBACK = "/process/createCallback"; String API_PROCESS_COMMIT = "/process/commit"; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index e83440a0..adbfbefb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -375,6 +375,7 @@ public class TbsCostApplyController { @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @PreAuthorize("hasRole('tbs:costApply:commit')") public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ + seeYonService.testConnection(); TbsCostApply costApply = tbsCostApplyService.getById(affairCommit.getCostApplyId()); if(!costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){ return R.error("费用申请处于未非审批状态!"); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index c4e865e3..a9e6d053 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -56,6 +56,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl commit(@RequestBody @Valid VtbVerificationBo param){ + seeYonService.testConnection(); vtbVerificationService.commit(param); return R.ok(); } @@ -231,6 +232,7 @@ public class VtbVerificationController { @SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE) @PreAuthorize("hasRole('tbs:costApply:commit')") public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ + seeYonService.testConnection(); return verificationApplication.commitAffair(affairCommit); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 3da7577e..1458d141 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -150,34 +150,32 @@ public class VtbVerificationApplication { BigDecimal lastAmount = currVs.getUsedAmount(); yardItem.setLastAmount(lastAmount); - yardItem.setLastSession(currVs.getCountSession()); - yardItem.setCurrSession(currVs.getCountSession()); + Integer lastSession = currVs.getCountSession(); + yardItem.setLastSession(lastSession); + yardItem.setCurrSession(lastSession); if(countSession != null){ - Integer lastSession = currVs.getCountSession(); + yardItem.setCurrSession(countSession); if(!countSession.equals(lastSession)){ - yardItem.setLastSession(lastSession); - yardItem.setCurrSession(countSession); VtbVerificationSubject verSub4Upd = new VtbVerificationSubject(); verSub4Upd.setId(currVs.getId()); - verSub4Upd.setCountPerson(countSession); + verSub4Upd.setCountSession(countSession); verSubject4Update.add(verSub4Upd); if(lastSession!=null){ if(lastSession > countSession){ - yardItem.setRemark2("减少场次："+ (currVs.getCountSession() - countSession)); + yardItem.setRemark2("减少场次："+ (lastSession - countSession)); }else { - yardItem.setRemark2("增加场次："+ (countSession - currVs.getCountSession())); + yardItem.setRemark2("增加场次："+ (countSession - lastSession)); } } } } - yardItem.setLastSession(currVs.getCountSession()); - yardItem.setCurrSession(currVs.getCountSession()); + Integer lastPerson = currVs.getCountPerson(); + yardItem.setLastPerson(lastPerson); + yardItem.setCurrPerson(lastPerson); if( countPerson != null ){ - Integer lastPerson = currVs.getCountPerson(); + yardItem.setCurrPerson(countPerson); if(!countPerson.equals(lastPerson)){ - yardItem.setLastPerson(lastPerson); - yardItem.setCurrPerson(countPerson); VtbVerificationSubject verSub4Upd = new VtbVerificationSubject(); verSub4Upd.setId(currVs.getId()); verSub4Upd.setCountPerson(countPerson);