diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java index 841a2a8..1f34056 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java @@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.extern.slf4j.Slf4j; import org.dromara.business.domain.bo.BusinessTaskBo; import org.dromara.business.domain.vo.BusinessTaskVo; import org.dromara.business.service.IBusinessTaskService; @@ -31,6 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * @author LionLi * @date 2025-02-26 */ +@Slf4j @Validated @RequiredArgsConstructor @RestController @@ -108,12 +110,13 @@ public class BusinessTaskController extends BaseController { } - @Log(title = "预约工单更新", businessType = BusinessType.UPDATE) @PostMapping("/update/status") - public void updateTaskStatus(@RequestParam("waylineId") String waylineId,@RequestParam("status") String status, - @RequestParam("jobId")String jobId,@RequestParam("jobName") String jobName) { - - businessTaskService.updateTaskStatus(waylineId,status,jobId,jobName); + public R updateTaskStatus(@RequestParam(value = "waylineId",required = false) String waylineId,@RequestParam(value = "status",required = false) String status, + @RequestParam(value = "jobId",required = false)String jobId,@RequestParam(value = "jobName",required = false) String jobName) { + log.info("----------------------------开始调用feign---------------------"); + Boolean updateTaskStatus = businessTaskService.updateTaskStatus(waylineId, status, jobId, jobName); + log.info("----------------------------调用feign结束---------------------"); + return R.ok(updateTaskStatus); } } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java index 22d5cc0..0ec7969 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java @@ -72,5 +72,5 @@ public interface IBusinessTaskService { BusinessTaskVo queryBusinessTask(String waylineId); - void updateTaskStatus(String waylineId, String status, String jobId, String jobName); + Boolean updateTaskStatus(String waylineId, String status, String jobId, String jobName); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index 894b93e..ffb23af 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java @@ -159,18 +159,23 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService { } @Override - public void updateTaskStatus(String waylineId, String status, String jobId, String jobName) { - BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId); - if(businessTaskVo != null){ - BusinessTask businessTask = new BusinessTask(); - businessTask.setId(businessTaskVo.getId()); - businessTask.setStatus(status); - if(BusinessConstants.TASK_STATUS_3.equals(status)){ - businessTask.setJobId(jobId); - businessTask.setJobName(jobName); - businessTask.setCompleteTime(new Date()); + public Boolean updateTaskStatus(String waylineId, String status, String jobId, String jobName) { + try { + BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId); + if(businessTaskVo != null){ + BusinessTask businessTask = new BusinessTask(); + businessTask.setId(businessTaskVo.getId()); + businessTask.setStatus(status); + if(BusinessConstants.TASK_STATUS_3.equals(status)){ + businessTask.setJobId(jobId); + businessTask.setJobName(jobName); + businessTask.setCompleteTime(new Date()); + } + this.update(businessTask); } - this.update(businessTask); + } catch (Exception e) { + return false; } + return true; } } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java b/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java index f06d5dd..f77e0f1 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java @@ -4,7 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient(name = "business") +@FeignClient(name = "gateway",path = "business") public interface RemoteBusinessTaskFeign { @PostMapping("/update/status")