From 6d05cbbf7741a1283d51e92e063565f311907c2c Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 18:30:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/service/impl/IdcServiceImpl.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index b76fc6fc..099d14bd 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -216,11 +216,11 @@ public class IdcServiceImpl implements IdcService { List> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; - Map map = new HashMap(); - String sqlWhere = "not exists (select fkId from idc_record where type='"+tnames[2]+"' and fkId="+tnames[2]+"."+keyColumn+")"; + String sqlWhere = ""; if(!StringUtils.isEmpty(tnames[6])) { - sqlWhere+=" and "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; + sqlWhere+=" "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; } else { + sqlWhere = "not exists (select fkId from idc_record where type='"+tnames[2]+"' and fkId="+tnames[2]+"."+keyColumn+")"; map.put("isEnd", "1"); } map.put("sqlWhere", sqlWhere); @@ -523,16 +523,17 @@ public class IdcServiceImpl implements IdcService { } recordSql+=!StringUtils.isEmpty(recordSql) ? "," : ""; recordSql+="('"+UUID.randomUUID().toString().replaceAll("-", "")+"','"+tableName+"','"+list.get(m).get(keyColumn)+"','"+isEnd+"',now())"; - if(childNum>-1&¶ms.get("masterLinkColumn")!=null&&!StringUtils.isEmpty(params.get("masterLinkColumn").toString())&& - params.get("subLinkColumn")!=null&&!StringUtils.isEmpty(params.get("subLinkColumn").toString())) { + if(childNum>-1) { for(int z=0;z childMap = new HashMap<>(); - childMap.put(params.get("subLinkColumn").toString(), keyValue); - List> childList = getList(chidTnames[2],childMap); - list.get(m).put("tableName"+z, chidTnames[2]); - list.get(m).put("data"+z, childList); + if(!StringUtils.isEmpty(chidTnames[4])&&!StringUtils.isEmpty(chidTnames[5])) { + String keyValue = list.get(i).get(chidTnames[4]).toString(); + Map childMap = new HashMap<>(); + childMap.put(chidTnames[5], keyValue); + List> childList = getList(chidTnames[2],childMap); + list.get(m).put("tableName"+z, chidTnames[2]); + list.get(m).put("data"+z, childList); + } } } } From 79b0ab98b302e53027273ea360d4e1deccbb88af Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 18:30:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 099d14bd..ec102693 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -216,6 +216,7 @@ public class IdcServiceImpl implements IdcService { List> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; + Map map = new HashMap(); String sqlWhere = ""; if(!StringUtils.isEmpty(tnames[6])) { sqlWhere+=" "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; From 2a962c04a50386c2b6528c4ecf3254b7ae7d98ca Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 18:32:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index ec102693..332e9f00 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -217,6 +217,7 @@ public class IdcServiceImpl implements IdcService { List> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; Map map = new HashMap(); + String sqlWhere = ""; if(!StringUtils.isEmpty(tnames[6])) { sqlWhere+=" "+tnames[6]+">=cast('"+lastUpdateTime+"' as datetime)"; From 65ce284d32fad7c902a2e0b1d9ed1e2d768aa9a3 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 18:38:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 332e9f00..9956dac8 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -210,7 +210,7 @@ public class IdcServiceImpl implements IdcService { boolean sync = true; String[] tnames = t.split("/"); - String lastUpdateTime = getUpdateTime(tnames[0]); + String lastUpdateTime = getUpdateTime(tnames[2]); Date nowUpdateTime = new Date(); if(!StringUtils.isEmpty(tnames[0])) { From bfddf6ae5b898d67d0eb3a9b9b6227fd8980027b Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 18:56:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 9956dac8..0b99bf21 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -539,7 +539,7 @@ public class IdcServiceImpl implements IdcService { } } } - + data.replace("data", list); orderNum++; if(isUpload) {