Merge remote-tracking branch 'origin/main'

ruoyi-api/tuoheng-api-airline/src/main/java/com/ruoyi/airline/api/domain/AirlineMarkerVO.java

@@ -6,8 +6,6 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.List;
-
 /**
  * 标注 VO
  *
@@ -52,9 +50,9 @@ public class AirlineMarkerVO extends BaseEntity {
     private Integer fontSize;
 
     /**
-     * 经纬度，格式：[经,纬,asl高度]
+     * 坐标JSON
      */
-    private List<PointInfo> coordinates;
+    private Object coordinates;
 
     /**
      * 简介
@@ -66,24 +64,6 @@ public class AirlineMarkerVO extends BaseEntity {
      */
     private Long groupId;
 
-    @Data
-    public static class PointInfo {
-        /**
-         * 纬度
-         */
-        private Double latitude;
-
-        /**
-         * 经度
-         */
-        private Double longitude;
-
-        /**
-         * 海拔高度
-         */
-        private Double asl;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java

@@ -3,6 +3,7 @@ package com.ruoyi.task.api;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.task.api.domain.TaskResultVO;
 import com.ruoyi.task.api.domain.TaskVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
 import com.ruoyi.task.api.enums.StatusEnum;
@@ -121,8 +122,10 @@ public interface RemoteTaskService
      * @param source 请求来源
      * @return 结果
      */
-    @PutMapping("/task/status/{taskId}")
-    R<Boolean> updateTaskStatus(@PathVariable("taskId") Long taskId, @RequestParam("status") StatusEnum status, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/task/status/{taskId}")
+    R<Boolean> updateTaskStatus(@PathVariable("taskId") Long taskId,
+                                @RequestBody() TaskResultVO status,
+                                @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 设置 recovery 为 true

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskResultVO.java

@@ -0,0 +1,70 @@
+package com.ruoyi.task.api.domain;
+
+import com.ruoyi.task.api.enums.StatusEnum;
+
+public class TaskResultVO {
+
+    /** 状态 */
+    private StatusEnum status;
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
+
+    public StatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(StatusEnum status) {
+        this.status = status;
+    }
+
+    /**
+     * 错误原因
+     */
+    private String errMsg;
+
+    public  static TaskResultVO  Checking(){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.CHECKING;
+        return vo;
+    }
+
+    public  static TaskResultVO  Checking(String errMsg){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.CHECKING;
+        vo.setErrMsg(errMsg);
+        return vo;
+    }
+
+    public  static TaskResultVO  Completed(){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.COMPLETED;
+        return vo;
+    }
+
+    public  static TaskResultVO  Completed(String errMsg){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.COMPLETED;
+        vo.setErrMsg(errMsg);
+        return vo;
+    }
+
+    public  static TaskResultVO  Error(String errMsg){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.FAILED;
+        vo.errMsg = errMsg;
+        return vo;
+    }
+
+    public  static TaskResultVO  Running(){
+        TaskResultVO vo = new TaskResultVO();
+        vo.status = StatusEnum.RUNNING;
+
+        return vo;
+    }
+}

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java

@@ -2,6 +2,7 @@ package com.ruoyi.task.api.factory;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.task.api.RemoteTaskService;
+import com.ruoyi.task.api.domain.TaskResultVO;
 import com.ruoyi.task.api.domain.TaskVO;
 import com.ruoyi.task.api.domain.TaskTempVO;
 import com.ruoyi.task.api.enums.StatusEnum;
@@ -79,7 +80,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
 
 
             @Override
-            public R<Boolean> updateTaskStatus(Long taskId, StatusEnum status, String source) {
+            public R<Boolean> updateTaskStatus(Long taskId, TaskResultVO resultVO, String source) {
                 return R.fail("修改执行状态失败");
             }