[feat]

1、增加预约工单feign调用

dk-common/common-web/pom.xml

@@ -51,6 +51,12 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- Spring Cloud OpenFeign 核心依赖 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-metrics</artifactId>

dk-modules/business/src/main/java/org/dromara/business/BusinessApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @auther yq
@@ -12,6 +13,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  */
 @EnableDubbo
 @SpringBootApplication()
+@EnableFeignClients
 public class BusinessApplication {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(BusinessApplication.class);

dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java

@@ -108,6 +108,12 @@ 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);
+    }
 
 }

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

@@ -72,4 +72,5 @@ public interface IBusinessTaskService {
     BusinessTaskVo queryBusinessTask(String waylineId);
 
 
+    void updateTaskStatus(String waylineId, String status, String jobId, String jobName);
 }

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

@@ -8,6 +8,7 @@ import org.dromara.business.domain.bo.BusinessTaskBo;
 import org.dromara.business.domain.vo.BusinessTaskVo;
 import org.dromara.business.mapper.BusinessTaskMapper;
 import org.dromara.business.service.IBusinessTaskService;
+import org.dromara.common.core.constant.BusinessConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -156,4 +157,20 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
     public BusinessTaskVo queryBusinessTask(String waylineId) {
         return baseMapper.queryBusinessTask(waylineId);
     }
+
+    @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());
+            }
+            this.update(businessTask);
+        }
+    }
 }

dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java

@@ -0,0 +1,13 @@
+package org.dromara.sample.fegin;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "business")
+public interface RemoteBusinessTaskFeign {
+
+    @PostMapping("/update/status")
+    void updateTaskStatus(@RequestParam("waylineId") String waylineId, @RequestParam("status") String status,
+                          @RequestParam("jobId")String jobId, @RequestParam("jobName") String jobName);
+}

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java

@@ -16,6 +16,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 
 import org.dromara.common.sdk.cloudapi.wayline.*;
+import org.dromara.sample.fegin.RemoteBusinessTaskFeign;
 import org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper;
 import org.dromara.sample.manage.mapper.IDeviceQrtzFileMapper;
 import org.dromara.sample.manage.mapper.IDeviceQrtzMapper;
@@ -66,8 +67,12 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
     private IWaylineFileMapper waylineFileMapper;
     @Autowired
     private IFlightTaskService flightTaskService;
-    @DubboReference
+//    @DubboReference
-    private RemoteBusinessTaskService remoteBusinessTaskService;
+//    private RemoteBusinessTaskService remoteBusinessTaskService;
+
+    @Autowired
+    RemoteBusinessTaskFeign remoteBusinessTaskFeign;
+
     @Override
     public TableDataInfo<DeviceQrtzEntity> listManageDeviceQrtz(Page page, DeviceQrtzDTO deviceQrtzDTO) {
         return TableDataInfo.build(deviceQrtzMapper.listManageDeviceQrtz(page, deviceQrtzDTO));
@@ -293,7 +298,8 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
                                  continue;
                              }
                              //获取是否是工单航线，是修改状态
-                             remoteBusinessTaskService.updateTaskStatus(deviceQrtzFileEntity.getWaylineId(), BusinessConstants.TASK_STATUS_2,null,null);
+
+                             remoteBusinessTaskFeign.updateTaskStatus(deviceQrtzFileEntity.getWaylineId(), BusinessConstants.TASK_STATUS_2,null,null);
                              CreateJobParam createJobParam = new CreateJobParam();
                              try {
                                  createJobParam.setName(deviceQrtzFileEntity.getWaylineName()+""+currentDate.format(formatterS));