Merge remote-tracking branch 'origin/master'

dk-common/common-web/pom.xml

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

dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java

@@ -3,6 +3,7 @@ package org.dromara.sample;
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableScheduling
 @ComponentScan("org.dromara")
+@EnableFeignClients
 public class CloudApiSampleApplication {
 
 	public static void main(String[] args) {

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

@@ -0,0 +1,15 @@
+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 = "gateway",path = "business")
+public interface RemoteBusinessTaskFeign {
+
+    @PostMapping("/update/status")
+    void updateTaskStatus(@RequestParam String waylineId,
+                          @RequestParam String status,
+                          @RequestParam(required = false) String jobId,
+                          @RequestParam(required = false) String jobName);
+}

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

@@ -6,12 +6,14 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.constant.BusinessConstants;
 import org.dromara.common.core.constant.DeviceQrtzConstants;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.RedisOpsUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.sdk.cloudapi.wayline.*;
 import org.dromara.common.sdk.common.HttpResultResponse;
+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;
@@ -38,8 +40,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @auther yq
@@ -60,12 +60,11 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
     @Autowired
     private IFlightTaskService flightTaskService;
 
-    Lock lock = new ReentrantLock();
-
 
     private ExecutorService executor = Executors.newFixedThreadPool(5);
 
-
+    @Autowired
+    RemoteBusinessTaskFeign remoteBusinessTaskFeign;
 
     @Override
     public TableDataInfo<DeviceQrtzEntity> listManageDeviceQrtz(Page page, DeviceQrtzDTO deviceQrtzDTO) {
@@ -300,7 +299,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
                             continue;
                         }
                         //获取是否是工单航线，是修改状态
-//                         remoteBusinessTaskFeign.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));