Merge remote-tracking branch 'origin/dev' into dev

dk-modules/sample/src/main/java/org/dromara/sample/feign/BusinessTaskFeign.java

@@ -1,15 +0,0 @@
-package org.dromara.sample.feign;
-
-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 BusinessTaskFeign {
-
-    @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/fegin/RemoteBusinessTaskFeign.java → dk-modules/sample/src/main/java/org/dromara/sample/feign/RemoteBusinessTaskFeign.java

@@ -1,4 +1,4 @@
-package org.dromara.sample.fegin;
+package org.dromara.sample.feign;
 
 import org.dromara.common.core.domain.R;
 import org.springframework.cloud.openfeign.FeignClient;

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

@@ -13,7 +13,7 @@ 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.feign.RemoteBusinessTaskFeign;
 import org.dromara.sample.manage.mapper.IDeviceQrtzDateMapper;
 import org.dromara.sample.manage.mapper.IDeviceQrtzFileMapper;
 import org.dromara.sample.manage.mapper.IDeviceQrtzMapper;

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java

@@ -1,43 +1,28 @@
 package org.dromara.sample.wayline.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.tdunning.math.stats.Sort;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.poi.ss.formula.functions.T;
-import org.dromara.business.api.RemoteBusinessTaskService;
 import org.dromara.common.core.constant.AiCompareStatusConstants;
 import org.dromara.common.core.constant.BusinessConstants;
 import org.dromara.common.core.utils.DateUtils;
-import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.sample.fegin.RemoteBusinessTaskFeign;
+import org.dromara.sample.feign.RemoteBusinessTaskFeign;
 import org.dromara.sample.media.mapper.IFileMapper;
 import org.dromara.sample.media.model.MediaFileEntity;
 import org.dromara.sample.wayline.mapper.IAiCompareQueueMapper;
 import org.dromara.sample.wayline.mapper.IWaylineJobMapper;
-import org.dromara.sample.wayline.model.dto.AiCompareDTO;
 import org.dromara.sample.wayline.model.dto.AiCompareQueueDTO;
-import org.dromara.sample.wayline.model.entity.AiCompareEntity;
 import org.dromara.sample.wayline.model.entity.AiCompareQueueEntity;
 import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
 import org.dromara.sample.wayline.service.IAiCompareQueueService;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @auther yq