Browse Source

no message

ly 1 year ago
parent
commit
6dddacec6d

+ 22 - 31
src/main/java/cn/ezhizao/framework/enbust/EntrustTask.java

@@ -26,39 +26,30 @@ public class EntrustTask {
     @Resource
     private ITenantService tenantService;
 
-    public void next() {
-        {
-            try {
-
-
-                //非工厂 -- 门店  !4
-                List<Tenant> storeList = tenantService.list(new LambdaQueryWrapper<Tenant>().in(Tenant::getVersionId, Arrays.asList(1, 2)));
-                if (storeList != null) {
-                    for (Tenant tenant : storeList) {
-                        entrustFeignClient.transNext(tenant.getId());
-                    }
-                }
-                log.info("非工厂执行完毕"+ new Date());
-
-
-
-
-                //工厂   4
-                List<Tenant> factoryList = tenantService.list(new LambdaQueryWrapper<Tenant>().eq(Tenant::getVersionId, 4));
-                if (factoryList != null) {
-                    for (Tenant tenant : factoryList) {
-                        entrustFeignClient.transNextFactory(tenant.getId());
-                    }
-
-                }
-                log.info("工厂执行完毕" + new Date());
-
+    public void start() {
+        System.out.println(111);
+    }
 
-                log.info("定时任务成功");
-            } catch (Exception e) {
-                log.info("定时任务出错"+e.getMessage());
+    public void next() {
+        try {
+            log.info("定时任务开始执行" + new Date());
+            //非工厂 -- 门店  !4
+            List<Tenant> storeList = tenantService.list(new LambdaQueryWrapper<Tenant>().in(Tenant::getVersionId, Arrays.asList(1, 2)));
+            if (storeList != null) {
+                entrustFeignClient.transNext(storeList);
             }
-
+//            log.info("非工厂执行完毕" + new Date());
+            //工厂   4
+//                List<Tenant> factoryList = tenantService.list(new LambdaQueryWrapper<Tenant>().eq(Tenant::getVersionId, 4));
+//                if (factoryList != null) {
+//                    for (Tenant tenant : factoryList) {
+//                        entrustFeignClient.transNextFactory(tenant.getId());
+//                    }
+//                }
+//                log.info("工厂执行完毕" + new Date());
+            log.info("定时任务成功" + new Date());
+        } catch (Exception e) {
+            log.info("定时任务出错" + e.getMessage());
         }
     }
 

+ 15 - 0
src/main/java/cn/ezhizao/project/fegin/FeignConfig.java

@@ -0,0 +1,15 @@
+package cn.ezhizao.project.fegin;
+
+import feign.Retryer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FeignConfig {
+
+    @Bean
+    public Retryer feignRetryer() {
+        return new Retryer.Default(100, 1000, 4); // 最大重试间隔1000ms,最多重试4次
+    }
+
+}

+ 9 - 3
src/main/java/cn/ezhizao/project/fegin/IFeignClient.java

@@ -1,19 +1,25 @@
 package cn.ezhizao.project.fegin;
 
 import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.tenant.domain.Tenant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(name = "ezhizao-yzbh-entrust")
 public interface IFeignClient {
 
-    @GetMapping("/business/workOrderCurrent/transNext")
-    AjaxResult transNext(@RequestParam("tenantId") Long tenantId);
+    @PostMapping("/business/workOrderCurrent/transNextTask")
+    AjaxResult transNext(@RequestBody List<Tenant> storeList);
 
     @GetMapping("/business/workOrderCurrent/transNextForFactory")
     AjaxResult transNextFactory(@RequestParam("tenantId") Long tenantId);
 
-
+    @PostMapping("/business/workOrderCurrent/test")
+    AjaxResult test(@RequestBody List<Tenant> storeList);
 
 }