From 146e2ca5a1172d727be55166d85c80744315dba8 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 13 Jun 2024 16:57:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=9F=E4=B8=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E8=88=8D=E5=BC=83=E5=8D=95=E7=8B=AC=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/BpmDevReportStatusListener.java | 27 --------- .../BpmGeneralSurveyStatusListener.java | 27 --------- .../BpmQuitRunningDeviceStatusListener.java | 28 --------- .../BpmSupervisionPlanStatusListener.java | 27 --------- .../BpmSupervisionStatusListener.java | 37 ++++++++++++ .../business/BpmSurveyPlanStatusListener.java | 28 --------- .../business/BpmSurveyTestStatusListener.java | 27 --------- .../BpmTempLineDebugStatusListener.java | 27 --------- .../BpmTempLineRunTestStatusListener.java | 28 --------- .../business/BpmTempLineStatusListener.java | 27 --------- .../BpmUserReportNormalStatusListener.java | 28 --------- ...pmUserReportNormalTreatStatusListener.java | 27 --------- .../business/BpmUserReportStatusListener.java | 27 --------- .../BpmWarningLeafletStatusListener.java | 28 --------- .../api/BusinessCommonFeignClient.java | 28 +++++++++ .../api/DeVReportManageFeignClient.java | 22 ------- .../api/GeneralSurveyFeignClient.java | 22 ------- .../api/QuitRunningDeviceFeignClient.java | 22 ------- .../api/SupervisionPlanFeignClient.java | 22 ------- .../api/SurveyPlanFeignClient.java | 22 ------- .../api/SurveyTestFeignClient.java | 23 -------- .../api/TempLineDebugFeignClient.java | 22 ------- .../supervision/api/TempLineFeignClient.java | 22 ------- .../api/TempLineRunTestFeignClient.java | 6 -- .../api/UserReportFeignClient.java | 23 -------- .../api/UserReportNormalFeignClient.java | 22 ------- .../api/WarningLeafletFeignClient.java | 23 -------- ...nessCommonFeignClientFallbackFactory.java} | 11 ++-- ...eportManageFeignClientFallbackFactory.java | 37 ------------ ...neralSurveyFeignClientFallbackFactory.java | 37 ------------ ...nningDeviceFeignClientFallbackFactory.java | 37 ------------ ...rvisionPlanFeignClientFallbackFactory.java | 37 ------------ .../SurveyPlanFeignClientFallbackFactory.java | 37 ------------ .../SurveyTestFeignClientFallbackFactory.java | 37 ------------ ...mpLineDebugFeignClientFallbackFactory.java | 37 ------------ .../TempLineFeignClientFallbackFactory.java | 37 ------------ ...LineRunTestFeignClientFallbackFactory.java | 12 +--- .../UserReportFeignClientFallbackFactory.java | 38 ------------ ...eportNoramlFeignClientFallbackFactory.java | 37 ------------ .../supervision/enums/SupervisionKeyEnum.java | 16 ++++- .../enums/SupervisionResponseEnum.java | 1 + .../controller/BusinessCommonController.java | 58 +++++++++++++++++++ .../survey/impl/SurveyPlanServiceImpl.java | 2 +- 43 files changed, 147 insertions(+), 996 deletions(-) delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmDevReportStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmGeneralSurveyStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmQuitRunningDeviceStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionPlanStatusListener.java create mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyPlanStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineDebugStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineRunTestStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportStatusListener.java delete mode 100644 pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmWarningLeafletStatusListener.java create mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/BusinessCommonFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/DeVReportManageFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/GeneralSurveyFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/QuitRunningDeviceFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SupervisionPlanFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyPlanFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineDebugFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportNormalFeignClient.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/WarningLeafletFeignClient.java rename pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/{WarningLeafletFeignClientFallbackFactory.java => BusinessCommonFeignClientFallbackFactory.java} (73%) delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/DeVReportManageFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/GeneralSurveyFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/QuitRunningDeviceFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SupervisionPlanFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyPlanFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineDebugFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java delete mode 100644 pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportNoramlFeignClientFallbackFactory.java create mode 100644 pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmDevReportStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmDevReportStatusListener.java deleted file mode 100644 index c789c4425..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmDevReportStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.DeVReportManageFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmDevReportStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private DeVReportManageFeignClient deVReportManageFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "device_info_add"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - deVReportManageFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmGeneralSurveyStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmGeneralSurveyStatusListener.java deleted file mode 100644 index acf51749c..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmGeneralSurveyStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.GeneralSurveyFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmGeneralSurveyStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private GeneralSurveyFeignClient generalSurveyFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "harmonic_survey"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - generalSurveyFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmQuitRunningDeviceStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmQuitRunningDeviceStatusListener.java deleted file mode 100644 index 0b1c441f8..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmQuitRunningDeviceStatusListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.QuitRunningDeviceFeignClient; -import com.njcn.supervision.api.UserReportFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmQuitRunningDeviceStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private QuitRunningDeviceFeignClient quitRunningDeviceFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "quit_running_device"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - quitRunningDeviceFeignClient.updateDeviceStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionPlanStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionPlanStatusListener.java deleted file mode 100644 index f9d007adf..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionPlanStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.SupervisionPlanFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmSupervisionPlanStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private SupervisionPlanFeignClient supervisionPlanFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "sup_plan_add"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - supervisionPlanFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionStatusListener.java new file mode 100644 index 000000000..8fbbb08f8 --- /dev/null +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSupervisionStatusListener.java @@ -0,0 +1,37 @@ +package com.njcn.bpm.listener.business; + +import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; +import com.njcn.supervision.api.BusinessCommonFeignClient; +import com.njcn.supervision.enums.SupervisionKeyEnum; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Component +public class BpmSupervisionStatusListener implements ApplicationListener { + + @Resource + private BusinessCommonFeignClient businessCommonFeignClient; + + @Override + public final void onApplicationEvent(BpmProcessInstanceStatusEvent event) { + System.out.println(event); + //判断当前流程定义的key，是否包含在技术监督的枚举内，没有直接return，否则调用远程接口更新状态 + if(SupervisionKeyEnum.containBusinessKye(event.getProcessDefinitionKey())){ + onEvent(event); + } + } + + + + /** + * 处理事件 + * + * @param event 事件 + */ + protected void onEvent(BpmProcessInstanceStatusEvent event) { + businessCommonFeignClient.updateProcessStatus(event.getProcessDefinitionKey(),event.getBusinessKey(), event.getStatus()); + } + +} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyPlanStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyPlanStatusListener.java deleted file mode 100644 index 95db9e1c8..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyPlanStatusListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.DeVReportManageFeignClient; -import com.njcn.supervision.api.SurveyPlanFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmSurveyPlanStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private SurveyPlanFeignClient surveyPlanFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "survey_plan"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - surveyPlanFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java deleted file mode 100644 index 9164990e3..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmSurveyTestStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.SurveyTestFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmSurveyTestStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private SurveyTestFeignClient surveyTestFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "survey_test"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - surveyTestFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineDebugStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineDebugStatusListener.java deleted file mode 100644 index d5e757c8f..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineDebugStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.TempLineDebugFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmTempLineDebugStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private TempLineDebugFeignClient tempLineDebugFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "temp_line_debug"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - tempLineDebugFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineRunTestStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineRunTestStatusListener.java deleted file mode 100644 index 85a6131e2..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineRunTestStatusListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.TempLineDebugFeignClient; -import com.njcn.supervision.api.TempLineRunTestFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmTempLineRunTestStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private TempLineRunTestFeignClient tempLineRunTestFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "line_run_test"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - tempLineRunTestFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineStatusListener.java deleted file mode 100644 index f46aed92c..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmTempLineStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.TempLineFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmTempLineStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private TempLineFeignClient tempLineFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "line_info_add"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - tempLineFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalStatusListener.java deleted file mode 100644 index 7ca16c39b..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalStatusListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.UserReportFeignClient; -import com.njcn.supervision.api.UserReportNormalFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmUserReportNormalStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private UserReportNormalFeignClient userReportNormalFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "user_go_net"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - userReportNormalFeignClient.updateUserReportNormalStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java deleted file mode 100644 index 2179bce18..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportNormalTreatStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.UserReportNormalFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmUserReportNormalTreatStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private UserReportNormalFeignClient userReportNormalFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "user_treat_check"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - userReportNormalFeignClient.updateUserReportNormalStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportStatusListener.java deleted file mode 100644 index e1082b64e..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmUserReportStatusListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.UserReportFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmUserReportStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private UserReportFeignClient userReportFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "build_user_info"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - userReportFeignClient.updateUserReportStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmWarningLeafletStatusListener.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmWarningLeafletStatusListener.java deleted file mode 100644 index ee1395a0e..000000000 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/listener/business/BpmWarningLeafletStatusListener.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.bpm.listener.business; - -import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; -import com.njcn.bpm.listener.BpmProcessInstanceStatusEventListener; -import com.njcn.supervision.api.DeVReportManageFeignClient; -import com.njcn.supervision.api.WarningLeafletFeignClient; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - - -@Component -public class BpmWarningLeafletStatusListener extends BpmProcessInstanceStatusEventListener { - - @Resource - private WarningLeafletFeignClient warningLeafletFeignClient; - - @Override - protected String getProcessDefinitionKey() { - return "warn_leaflet"; - } - - @Override - protected void onEvent(BpmProcessInstanceStatusEvent event) { - warningLeafletFeignClient.updateStatus(event.getBusinessKey(), event.getStatus()); - } - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/BusinessCommonFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/BusinessCommonFeignClient.java new file mode 100644 index 000000000..b3b369f1e --- /dev/null +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/BusinessCommonFeignClient.java @@ -0,0 +1,28 @@ +package com.njcn.supervision.api; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.supervision.api.fallback.BusinessCommonFeignClientFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + + +/** + * 流程实例 Api 接口 + * + * @author 芋道源码 + */ +@FeignClient(value = ServerInfo.SUPERVISION, path = "/supervision", fallbackFactory = BusinessCommonFeignClientFallbackFactory.class) +public interface BusinessCommonFeignClient { + + /** + * 根据流程key,业务id去实时更新流程状态 + * @param processKey 流程定义key + * @param businessId 业务id + * @param status 目标状态 + */ + @GetMapping("/updateProcessStatus") + HttpResult updateProcessStatus(@RequestParam("processKey") String processKey,@RequestParam("businessId") String businessId, @RequestParam("status")Integer status); + +} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/DeVReportManageFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/DeVReportManageFeignClient.java deleted file mode 100644 index 6096522a9..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/DeVReportManageFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.DeVReportManageFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/deVReport", fallbackFactory = DeVReportManageFeignClientFallbackFactory.class) -public interface DeVReportManageFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/GeneralSurveyFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/GeneralSurveyFeignClient.java deleted file mode 100644 index 58f509f9c..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/GeneralSurveyFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.GeneralSurveyFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/generalSurvey", fallbackFactory = GeneralSurveyFeignClientFallbackFactory.class) -public interface GeneralSurveyFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/QuitRunningDeviceFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/QuitRunningDeviceFeignClient.java deleted file mode 100644 index fdf58d9be..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/QuitRunningDeviceFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.QuitRunningDeviceFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author hongawen - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/quitRunningDevice", fallbackFactory = QuitRunningDeviceFeignClientFallbackFactory.class) -public interface QuitRunningDeviceFeignClient { - - @GetMapping("/updateDeviceStatus") - HttpResult updateDeviceStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SupervisionPlanFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SupervisionPlanFeignClient.java deleted file mode 100644 index cb93566ed..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SupervisionPlanFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.SupervisionPlanFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author hongawen - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/superPlan", fallbackFactory = SupervisionPlanFeignClientFallbackFactory.class) -public interface SupervisionPlanFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyPlanFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyPlanFeignClient.java deleted file mode 100644 index 54703180a..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyPlanFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.SurveyPlanFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/surveyPlan", fallbackFactory = SurveyPlanFeignClientFallbackFactory.class) -public interface SurveyPlanFeignClient { - - @GetMapping("/updateSurveyPlanStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java deleted file mode 100644 index 2efeda304..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/SurveyTestFeignClient.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.SurveyPlanFeignClientFallbackFactory; -import com.njcn.supervision.api.fallback.SurveyTestFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/surveyTest", fallbackFactory = SurveyTestFeignClientFallbackFactory.class) -public interface SurveyTestFeignClient { - - @GetMapping("/updateSurveyTestStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineDebugFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineDebugFeignClient.java deleted file mode 100644 index d59a16956..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineDebugFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.TempLineDebugFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/tempLinedebug", fallbackFactory = TempLineDebugFeignClientFallbackFactory.class) -public interface TempLineDebugFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineFeignClient.java deleted file mode 100644 index 14105d8ae..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.TempLineFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/tempLine", fallbackFactory = TempLineFeignClientFallbackFactory.class) -public interface TempLineFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java index b227161ac..08bfea2d1 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/TempLineRunTestFeignClient.java @@ -1,24 +1,18 @@ package com.njcn.supervision.api; import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.TempLineDebugFeignClientFallbackFactory; import com.njcn.supervision.api.fallback.TempLineRunTestFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; /** * 流程实例 Api 接口 * - * @author 芋道源码 */ @FeignClient(value = ServerInfo.SUPERVISION, path = "/supervisionTempLineRunTest", fallbackFactory = TempLineRunTestFeignClientFallbackFactory.class) public interface TempLineRunTestFeignClient { - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); @GetMapping("/isTestRunStartOrEnd") void isTestRunStartOrEnd(); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java deleted file mode 100644 index c2ad5c000..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.UserReportFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author hongawen - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReport", fallbackFactory = UserReportFeignClientFallbackFactory.class) -public interface UserReportFeignClient { - - @GetMapping("/updateUserReportStatus") - HttpResult updateUserReportStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportNormalFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportNormalFeignClient.java deleted file mode 100644 index 779e743f6..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportNormalFeignClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.UserReportNoramlFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author hongawen - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReportNormal", fallbackFactory = UserReportNoramlFeignClientFallbackFactory.class) -public interface UserReportNormalFeignClient { - - @GetMapping("/updateUserReportNormalStatus") - HttpResult updateUserReportNormalStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/WarningLeafletFeignClient.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/WarningLeafletFeignClient.java deleted file mode 100644 index a1e4a8442..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/WarningLeafletFeignClient.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.supervision.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.fallback.DeVReportManageFeignClientFallbackFactory; -import com.njcn.supervision.api.fallback.WarningLeafletFeignClientFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - - -/** - * 流程实例 Api 接口 - * - * @author 芋道源码 - */ -@FeignClient(value = ServerInfo.SUPERVISION, path = "/warningLeaflet", fallbackFactory = WarningLeafletFeignClientFallbackFactory.class) -public interface WarningLeafletFeignClient { - - @GetMapping("/updateStatus") - HttpResult updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status); - -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/WarningLeafletFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/BusinessCommonFeignClientFallbackFactory.java similarity index 73% rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/WarningLeafletFeignClientFallbackFactory.java rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/BusinessCommonFeignClientFallbackFactory.java index 74f3e31bb..6be6d8217 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/WarningLeafletFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/BusinessCommonFeignClientFallbackFactory.java @@ -3,17 +3,18 @@ package com.njcn.supervision.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.WarningLeafletFeignClient; +import com.njcn.supervision.api.BusinessCommonFeignClient; import com.njcn.supervision.utils.SupervisionEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; + @Slf4j @Component -public class WarningLeafletFeignClientFallbackFactory implements FallbackFactory { +public class BusinessCommonFeignClientFallbackFactory implements FallbackFactory { @Override - public WarningLeafletFeignClient create(Throwable throwable) { + public BusinessCommonFeignClient create(Throwable throwable) { //判断抛出异常是否为解码器抛出的业务异常 Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; if (throwable.getCause() instanceof BusinessException) { @@ -21,9 +22,9 @@ public class WarningLeafletFeignClientFallbackFactory implements FallbackFactory exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); } Enum finalExceptionEnum = exceptionEnum; - return new WarningLeafletFeignClient() { + return new BusinessCommonFeignClient() { @Override - public HttpResult updateStatus(String businessKey, Integer status) { + public HttpResult updateProcessStatus(String processKey,String businessId, Integer status) { log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/DeVReportManageFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/DeVReportManageFeignClientFallbackFactory.java deleted file mode 100644 index 6107b5072..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/DeVReportManageFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.DeVReportManageFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class DeVReportManageFeignClientFallbackFactory implements FallbackFactory { - @Override - public DeVReportManageFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new DeVReportManageFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/GeneralSurveyFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/GeneralSurveyFeignClientFallbackFactory.java deleted file mode 100644 index ac042dc2b..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/GeneralSurveyFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.GeneralSurveyFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class GeneralSurveyFeignClientFallbackFactory implements FallbackFactory { - @Override - public GeneralSurveyFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new GeneralSurveyFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新普测计划流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/QuitRunningDeviceFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/QuitRunningDeviceFeignClientFallbackFactory.java deleted file mode 100644 index c62e5c476..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/QuitRunningDeviceFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.QuitRunningDeviceFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class QuitRunningDeviceFeignClientFallbackFactory implements FallbackFactory { - @Override - public QuitRunningDeviceFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new QuitRunningDeviceFeignClient() { - @Override - public HttpResult updateDeviceStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新退运装置数据流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SupervisionPlanFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SupervisionPlanFeignClientFallbackFactory.java deleted file mode 100644 index 20f89d899..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SupervisionPlanFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.SupervisionPlanFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class SupervisionPlanFeignClientFallbackFactory implements FallbackFactory { - @Override - public SupervisionPlanFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new SupervisionPlanFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新退运装置数据流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyPlanFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyPlanFeignClientFallbackFactory.java deleted file mode 100644 index d2002ac23..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyPlanFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.SurveyPlanFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class SurveyPlanFeignClientFallbackFactory implements FallbackFactory { - @Override - public SurveyPlanFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new SurveyPlanFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新普测计划流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java deleted file mode 100644 index 495a50f35..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/SurveyTestFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.SurveyTestFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class SurveyTestFeignClientFallbackFactory implements FallbackFactory { - @Override - public SurveyTestFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new SurveyTestFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新退运装置数据流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineDebugFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineDebugFeignClientFallbackFactory.java deleted file mode 100644 index 77411cd3a..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineDebugFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.TempLineDebugFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class TempLineDebugFeignClientFallbackFactory implements FallbackFactory { - @Override - public TempLineDebugFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new TempLineDebugFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineFeignClientFallbackFactory.java deleted file mode 100644 index 3f167771d..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.TempLineFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class TempLineFeignClientFallbackFactory implements FallbackFactory { - @Override - public TempLineFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new TempLineFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java index f9f9a3918..46d338d0e 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/TempLineRunTestFeignClientFallbackFactory.java @@ -3,18 +3,13 @@ package com.njcn.supervision.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.TempLineFeignClient; import com.njcn.supervision.api.TempLineRunTestFeignClient; import com.njcn.supervision.utils.SupervisionEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ + @Slf4j @Component public class TempLineRunTestFeignClientFallbackFactory implements FallbackFactory { @@ -28,11 +23,6 @@ public class TempLineRunTestFeignClientFallbackFactory implements FallbackFactor } Enum finalExceptionEnum = exceptionEnum; return new TempLineRunTestFeignClient() { - @Override - public HttpResult updateStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } @Override public void isTestRunStartOrEnd() { diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java deleted file mode 100644 index 4151504dd..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.UserReportFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class UserReportFeignClientFallbackFactory implements FallbackFactory { - @Override - public UserReportFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new UserReportFeignClient() { - @Override - public HttpResult updateUserReportStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新用户数据流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportNoramlFeignClientFallbackFactory.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportNoramlFeignClientFallbackFactory.java deleted file mode 100644 index 8431089e8..000000000 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportNoramlFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.supervision.api.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.supervision.api.UserReportNormalFeignClient; -import com.njcn.supervision.utils.SupervisionEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022/3/16 - */ -@Slf4j -@Component -public class UserReportNoramlFeignClientFallbackFactory implements FallbackFactory { - @Override - public UserReportNormalFeignClient create(Throwable throwable) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) throwable.getCause(); - exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult()); - } - Enum finalExceptionEnum = exceptionEnum; - return new UserReportNormalFeignClient() { - @Override - public HttpResult updateUserReportNormalStatus(String businessKey, Integer status) { - log.error("{}异常，降级处理，异常为：{}", "更新用户数据流程状态", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java index 99aefcae9..b20009acc 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java @@ -42,6 +42,7 @@ public enum SupervisionKeyEnum { } private static final String packagePrefix = "com.njcn.supervision.service."; + private static final String packageMiddle = ".impl."; /** * 根据流程key获取类的全路径，用于获取spring中的对象 @@ -49,9 +50,22 @@ public enum SupervisionKeyEnum { public static String getFullServicePathByKey(String key){ for (SupervisionKeyEnum superviceKeyEnum : SupervisionKeyEnum.values()) { if (superviceKeyEnum.key.equalsIgnoreCase(key)) { - return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(StrPool.DOT).concat(superviceKeyEnum.clazzName); + return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(packageMiddle).concat(superviceKeyEnum.clazzName); } } return null; } + + + /** + * 判断流程key是否在当前枚举内 + */ + public static boolean containBusinessKye(String key){ + for (SupervisionKeyEnum superviceKeyEnum : SupervisionKeyEnum.values()) { + if (superviceKeyEnum.key.equalsIgnoreCase(key)) { + return true; + } + } + return false; + } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java index 53368ea8a..1db837948 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java @@ -17,6 +17,7 @@ public enum SupervisionResponseEnum { */ SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"), IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"), + SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失，清查看类路径配置"), DATA_NOT_EXISTS("A00550","数据不存在"), NO_POWER("A00550","不能操作非自己创建的任务！") ; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java new file mode 100644 index 000000000..2a58265e9 --- /dev/null +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/BusinessCommonController.java @@ -0,0 +1,58 @@ +package com.njcn.supervision.controller; + +import cn.hutool.extra.spring.SpringUtil; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.supervision.enums.SupervisionKeyEnum; +import com.njcn.supervision.enums.SupervisionResponseEnum; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; +import com.njcn.bpm.service.IBpmService; + +@Slf4j +@RestController +@RequestMapping("/supervision") +@Api(tags = "所有业务流程公共方法管理") +@AllArgsConstructor +@ApiIgnore +public class BusinessCommonController extends BaseController { + + + @ApiIgnore + @GetMapping("/updateProcessStatus") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("更新流程状态") + public HttpResult updateProcessStatus(String processKey,String businessId, Integer status) { + String methodDescribe = getMethodDescribe("updateProcessStatus"); + IBpmService iBpmService = getBpmServiceByBusinessKey(processKey); + iBpmService.updateProcessStatus(businessId, status); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + /** + * 根据业务流key获取实现类对象 + * @param processKey 业务流key + */ + private IBpmService getBpmServiceByBusinessKey(String processKey) { + String fullServicePath = SupervisionKeyEnum.getFullServicePathByKey(processKey); + IBpmService executor; + try { + executor = (IBpmService) SpringUtil.getBean(Class.forName(fullServicePath)); + } catch (ClassNotFoundException e) { + throw new BusinessException(SupervisionResponseEnum.SUPERVISION_SERVICE_NOT_FOUND); + } + return executor; + } + +} diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index d84a920ef..ec18a0987 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -72,7 +72,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl surveyPlanVOQueryWrapper = new QueryWrapper<>(); if (Objects.nonNull(surveyPlanQueryParam)) { //添加上时间范围 - surveyPlanVOQueryWrapper.between("supervision_survey_plan.Create_Time", + surveyPlanVOQueryWrapper.between("supervision_survey_plan.plan_start_time", DateUtil.beginOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchEndTime()))); //根据工程名称模糊搜索