From 247d1a20201466a0157a55a57f35a3d04bfb5b8d Mon Sep 17 00:00:00 2001 From: chengqf <584883665@139.com> Date: Sun, 9 Apr 2023 09:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/idc/service/IdcService.java | 1 - .../idc/service/impl/IdcServiceImpl.java | 21 ++++++------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java index 932968c..9586871 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java @@ -31,7 +31,6 @@ public interface IdcService { BaseResponse downlaodSuccess(HttpServletRequest request,Map params); - public void asyncIdcTask(); void asyncUdiTask(); void asyncSpsTask(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java index e4fbcc6..bea9fec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java @@ -85,6 +85,7 @@ public class IdcServiceImpl implements IdcService { @Resource private ScheduledDao scheduledDao; + /*获取拉取任务列表*/ @Override public BaseResponse taskList(HttpServletRequest request, Map params) { Map map = new HashMap(); @@ -93,6 +94,7 @@ public class IdcServiceImpl implements IdcService { return ResultVOUtils.success(list); } + /*下载任务*/ @Override public BaseResponse download(HttpServletRequest request, Map params) { String id = ""; @@ -103,7 +105,6 @@ public class IdcServiceImpl implements IdcService { id = params.get("id").toString(); } - Map map = map = dbDao.get("select * from " + tableName + " where id='" + id + "'"); if (map == null) @@ -138,13 +139,14 @@ public class IdcServiceImpl implements IdcService { asyncDataTask(false); } - /*拉取前一级中继服务数据*/ + /*UDI系统拉取前一级中继服务或自助平台数据*/ @Async @Override public void asyncFetchUdiTask() { fetchTask(false); } + /*中继服务拉取任务*/ @Async @Override public void asyncFetchTask() { @@ -157,6 +159,7 @@ public class IdcServiceImpl implements IdcService { } + /*任务拉取,isIdc 是否中继服务*/ private void fetchTask(boolean isIdc) { String host = getNextHost(); @@ -165,10 +168,8 @@ public class IdcServiceImpl implements IdcService { if (map != null && map.get("syncIp") != null) host = map.get("syncIp").toString(); } - logger.info("fetch from ip:" + host); if (!StringUtils.isEmpty(host)) { String result = IDCUtils.post(host + "/spssync/common/list", null); - if (IDCUtils.isJson(result)) { JSONObject json = JSON.parseObject(result); if (json != null && json.getInteger("code") == 20000 && json.getString("data") != null) { @@ -185,17 +186,7 @@ public class IdcServiceImpl implements IdcService { } } - @Async - @Override - public void asyncIdcTask() { - initTable(); - Map map = dbDao.get("select * from idc_var where code='system_type'"); - if (map == null) { - dbDao.save("insert into idc_var (code,content) values ('system_type','IDC')"); - } - } - - + private void asyncDataTask(boolean isUpload) { initTable(); Map map = dbDao.get("select * from sync_data_set limit 1");