Merge remote-tracking branch 'origin/master'

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,
+    public R<Boolean> updateTaskStatus(@RequestParam(value = "waylineId",required = false) String waylineId,@RequestParam(value =  "status",required = false) String status,
-                                 @RequestParam("jobId")String jobId,@RequestParam("jobName") String jobName) {
+                                          @RequestParam(value = "jobId",required = false)String jobId,@RequestParam(value = "jobName",required = false) String jobName) {
-
+        log.info("----------------------------开始调用feign---------------------");
-        businessTaskService.updateTaskStatus(waylineId,status,jobId,jobName);
+        Boolean updateTaskStatus = businessTaskService.updateTaskStatus(waylineId, status, jobId, jobName);
+        log.info("----------------------------调用feign结束---------------------");
+        return R.ok(updateTaskStatus);
     }
 
 }

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);
 }

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java

@@ -159,7 +159,8 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
     }
 
     @Override
-    public void updateTaskStatus(String waylineId, String status, String jobId, String jobName) {
+    public Boolean updateTaskStatus(String waylineId, String status, String jobId, String jobName) {
+        try {
             BusinessTaskVo businessTaskVo = this.queryBusinessTask(waylineId);
             if(businessTaskVo != null){
                 BusinessTask businessTask = new BusinessTask();
@@ -172,5 +173,9 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
                 }
                this.update(businessTask);
             }
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
     }
 }

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")