diff --git a/src/main/java/com/xydl/cac/adapter/BusiAdapter.java b/src/main/java/com/xydl/cac/adapter/BusiAdapter.java index bd592ab..e3b32d5 100644 --- a/src/main/java/com/xydl/cac/adapter/BusiAdapter.java +++ b/src/main/java/com/xydl/cac/adapter/BusiAdapter.java @@ -21,7 +21,9 @@ import java.util.Map; @Slf4j public class BusiAdapter { - @Value("${cac.busi-url}") + @Value("${cac.i2.enable}") + public boolean enable; + @Value("${cac.i2.url}") public String url; @Resource I2DataTransformer dataTransformer; diff --git a/src/main/java/com/xydl/cac/controller/I2syncController.java b/src/main/java/com/xydl/cac/controller/I2syncController.java index 8923bf9..3542d3d 100644 --- a/src/main/java/com/xydl/cac/controller/I2syncController.java +++ b/src/main/java/com/xydl/cac/controller/I2syncController.java @@ -1,6 +1,7 @@ package com.xydl.cac.controller; import com.alibaba.excel.util.StringUtils; +import com.xydl.cac.adapter.BusiAdapter; import com.xydl.cac.entity.I2syncConfig; import com.xydl.cac.entity.I2syncField; import com.xydl.cac.entity.I2syncRecord; @@ -23,9 +24,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; @RestController @Api(tags = {"I2同步数据相关接口"}) @@ -37,6 +36,17 @@ public class I2syncController extends BasicController { I2syncService service; @Resource ModevTypeService modevTypeService; + @Resource + BusiAdapter busiAdapter; + + @GetMapping("status") + @ApiOperation("查询状态") + public Response> status() { + Map map = new HashMap<>(); + map.put("enable", busiAdapter.enable); + map.put("url", busiAdapter.url); + return Response.success(map); + } @GetMapping("listFieldConfig") @ApiOperation("查询字段映射") diff --git a/src/main/java/com/xydl/cac/task/I2syncTask.java b/src/main/java/com/xydl/cac/task/I2syncTask.java index 1176a5a..76a6973 100644 --- a/src/main/java/com/xydl/cac/task/I2syncTask.java +++ b/src/main/java/com/xydl/cac/task/I2syncTask.java @@ -41,7 +41,7 @@ public class I2syncTask { @Scheduled(initialDelay = 60 * 1000, fixedDelay = 30 * 60 * 1000) public void syncAll() { List configList = i2syncService.listConfig(); - if (!CollectionUtils.isEmpty(configList)) { + if (busiAdapter.enable && !CollectionUtils.isEmpty(configList)) { log.info("I2syncTask.syncAll 开始."); try { if (StringUtils.isBlank(busiAdapter.url)) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 431c813..f24b498 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -30,7 +30,9 @@ spring: size: 5 cac: - busi-url: http://192.168.1.190:8080/busi-back-ws/service/XydlService + i2: + enable: false + url: http://192.168.1.190:8080/busi-back-ws/service/XydlService dingding: send: true token: e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3820a22..befd5dc 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -30,7 +30,9 @@ spring: size: 5 cac: - busi-url: http://192.168.1.190:8080/busi-back-ws/service/XydlService + i2: + enable: false + url: http://192.168.1.190:8080/busi-back-ws/service/XydlService dingding: send: false token: e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328