diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ThsSuperviseJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ThsSuperviseJob.java index bbbf285e2..066628cc9 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ThsSuperviseJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ThsSuperviseJob.java @@ -24,6 +24,6 @@ public class ThsSuperviseJob { public void thsSuperviseJob() { SuperviseParam superviseParam = new SuperviseParam(); superviseParam.setInitType(0); - thsSuperviseClient.initSupervise(superviseParam); + thsSuperviseClient.creatSupervise(superviseParam); } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java index 15f4ac271..da1bbb0ac 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java @@ -16,11 +16,21 @@ import org.springframework.web.bind.annotation.RequestBody; ) public interface ThsSuperviseClient { /** - * 预警/告警事务的生成 + * 预警/告警事务的初始化 * * @param superviseParam * @return */ @PostMapping("/initSupervise") HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam); + + + /** + * 预警/告警事务的生成 + * + * @param superviseParam + * @return + */ + @PostMapping("/creatSupervise") + HttpResult creatSupervise(@RequestBody @Validated SuperviseParam superviseParam); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java index 9e06ff23a..28234c0d0 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java @@ -26,6 +26,12 @@ public class ThsSuperviseClientFallbackFactory implements FallbackFactory initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { + log.error("{}异常,降级处理,异常为:{}", "预警/告警事务的初始化: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult creatSupervise(SuperviseParam superviseParam) { log.error("{}异常,降级处理,异常为:{}", "预警/告警事务的生成: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java index ecc52fafa..5febf357e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/ThsSuperviseController.java @@ -1,7 +1,9 @@ package com.njcn.prepare.harmonic.controller.line; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.SuperviseParam; import com.njcn.prepare.harmonic.service.mysql.line.ThsSuperviseService; import com.njcn.web.controller.BaseController; @@ -27,13 +29,23 @@ public class ThsSuperviseController extends BaseController { @Autowired private ThsSuperviseService thsSuperviseService; - @ApiOperation("预警/告警事务生成") - @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) + @ApiOperation("预警/告警事务手动初始化") + @ApiImplicitParam(name = "superviseParam", value = "新建技术监督参数", required = true) @PostMapping("/initSupervise") @ResponseBody public HttpResult initSupervise(@RequestBody @Validated SuperviseParam superviseParam) { - HttpResult superviceRunLogVoHttpResult = thsSuperviseService.initSupervise(superviseParam); - return superviceRunLogVoHttpResult; + return thsSuperviseService.initSupervise(superviseParam); + } + + + @ApiOperation("预警/告警事务自动生成") + @ApiImplicitParam(name = "superviseParam", value = "创建技术监督参数", required = true) + @PostMapping("/creatSupervise") + @ResponseBody + public HttpResult creatSupervise(@RequestBody @Validated SuperviseParam superviseParam) { + String methodDescribe = getMethodDescribe("creatSupervise"); + thsSuperviseService.creatSupervise(superviseParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java index bb15b83ae..bac431b43 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java @@ -36,6 +36,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -78,6 +79,13 @@ public class ThsSuperviseServiceImpl extends ServiceImpl initSupervise(SuperviseParam superviseParam) { SuperviceRunLogVo superviceRunLogVo = new SuperviceRunLogVo(); @@ -215,6 +223,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { */ void creatData(Dept dept, ThsSupervise thsSupervise, List overRunLogList); + /** + * 创建技术监督 + * + * @param superviseParam + * @return + */ + void creatSupervise(SuperviseParam superviseParam); }