From b20b70a753c3dac8973befba5854853187b6925b Mon Sep 17 00:00:00 2001 From: zz052831 Date: Mon, 29 Aug 2022 21:43:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/db/parser/DbTemplateParser.java | 116 ++++++++---------- 1 file changed, 51 insertions(+), 65 deletions(-) diff --git a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java index a2b62f81e..00b16cf73 100644 --- a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java +++ b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java @@ -70,57 +70,54 @@ public class DbTemplateParser extends AbstractTemplateParser { @Override public List convertShadowMsgWithTemplate(Integer dsType, Boolean isNewData, String cacheType, Converter.TemplateConverter.TemplateEnum templateEnum, ShadowTemplateSelect select) { List list = Lists.newArrayList(); - if (DsTypeEnum.SHADOW_TABLE.getCode().equals(dsType)) { list.add(new ListStyle()); - } else { - List attributeArray; - if (select.isNewVersion()) { - List dataSource_username = new ArrayList<>(); - dataSource_username.add(new InputWithSelectStyle.NodeDetail(key7, "1")); - dataSource_username.add(new InputWithSelectStyle.NodeDetail(key2, "2")); - List keys_username = Arrays.asList(key3, key4); - InputWithSelectStyle.NodeInfo nodeInfo_username = new InputWithSelectStyle.NodeInfo(keys_username, dataSource_username); - InputWithSelectStyle selectStyle_username = new InputWithSelectStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, - StyleEnums.SELECT_WITH_INPUT.getCode(), nodeInfo_username); - list.add(selectStyle_username); - } else { - list.add(new InputStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, StyleEnums.INPUT.getCode())); - } - list.add(new InputStyle(INPUT_FILE_NAME_URL, INPUT_FILE_NAME_URL_CONTEXT, StyleEnums.INPUT.getCode())); - if (select.isNewVersion()) { - List dataSource_pwd = new ArrayList<>(); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); - - List keys_pwd = Arrays.asList(key3, key4); - InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); - InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, - StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); - list.add(selectStyle_pwd); - } else { - list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); - } + return list; + } - if (Objects.nonNull(isNewData) && BooleanUtil.isFalse(isNewData)) { - attributeArray = this.reflex(); - } else { - attributeArray = this.getAttributeArray(templateEnum); - } - attributeArray.forEach(key -> { - List dataSource = new ArrayList<>(); - dataSource.add(new InputWithSelectStyle.NodeDetail(key1, "1")); - dataSource.add(new InputWithSelectStyle.NodeDetail(key2, "2")); - - List keys = Arrays.asList(key3, key4); - InputWithSelectStyle.NodeInfo nodeInfo = new InputWithSelectStyle.NodeInfo(keys, dataSource); - InputWithSelectStyle selectStyle = new InputWithSelectStyle(key, Objects.equals(DRIVER_CLASSNAME, key) ? DRIVER_CLASSNAME_SHOW_NAME : key, - StyleEnums.SELECT_WITH_INPUT.getCode(), nodeInfo); - list.add(selectStyle); - }); + if (select.isNewVersion()) { + List dataSource_username = new ArrayList<>(); + dataSource_username.add(new InputWithSelectStyle.NodeDetail(key7, "1")); + dataSource_username.add(new InputWithSelectStyle.NodeDetail(key2, "2")); + List keys_username = Arrays.asList(key3, key4); + InputWithSelectStyle.NodeInfo nodeInfo_username = new InputWithSelectStyle.NodeInfo(keys_username, dataSource_username); + InputWithSelectStyle selectStyle_username = new InputWithSelectStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT.getCode(), nodeInfo_username); + list.add(selectStyle_username); + } else { + list.add(new InputStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, StyleEnums.INPUT.getCode())); + } + list.add(new InputStyle(INPUT_FILE_NAME_URL, INPUT_FILE_NAME_URL_CONTEXT, StyleEnums.INPUT.getCode())); + if (select.isNewVersion()) { + List dataSource_pwd = new ArrayList<>(); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); + + List keys_pwd = Arrays.asList(key3, key4); + InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); + InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); + list.add(selectStyle_pwd); + } else { + list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); + } + List attributeArray; + if (Objects.nonNull(isNewData) && BooleanUtil.isFalse(isNewData)) { + attributeArray = this.reflex(); + } else { + attributeArray = this.getAttributeArray(templateEnum); } + attributeArray.forEach(key -> { + List dataSource = new ArrayList<>(); + dataSource.add(new InputWithSelectStyle.NodeDetail(key1, "1")); + dataSource.add(new InputWithSelectStyle.NodeDetail(key2, "2")); + + List keys = Arrays.asList(key3, key4); + InputWithSelectStyle.NodeInfo nodeInfo = new InputWithSelectStyle.NodeInfo(keys, dataSource); + InputWithSelectStyle selectStyle = new InputWithSelectStyle(key, Objects.equals(DRIVER_CLASSNAME, key) ? DRIVER_CLASSNAME_SHOW_NAME : key, StyleEnums.SELECT_WITH_INPUT.getCode(), nodeInfo); + list.add(selectStyle); + }); + return list; } @@ -145,19 +142,15 @@ public ShadowDetailResponse convertDetailByTemplate(Long recordId, String appNam shadowDetailResponse.setIsManual(convert.getSource()); String shaDowFileExtedn = convert.getShaDowFileExtedn(); - if (StringUtils.isBlank(convert.getShaDowFileExtedn()) - || DsTypeEnum.SHADOW_TABLE.getCode().equals(convert.getDsType())) { + if (StringUtils.isBlank(convert.getShaDowFileExtedn()) || DsTypeEnum.SHADOW_TABLE.getCode().equals(convert.getDsType())) { shaDowFileExtedn = this.convertData(convert.getFileExtedn(), convert.getConnPoolName()); } - if (StringUtils.isNotBlank(shaDowFileExtedn) && - (DsTypeEnum.SHADOW_REDIS_SERVER.getCode().equals(convert.getDsType()) - || DsTypeEnum.SHADOW_DB.getCode().equals(convert.getDsType()))) { + if (StringUtils.isNotBlank(shaDowFileExtedn) && (DsTypeEnum.SHADOW_REDIS_SERVER.getCode().equals(convert.getDsType()) || DsTypeEnum.SHADOW_DB.getCode().equals(convert.getDsType()))) { shaDowFileExtedn = buildNewShadow(shaDowFileExtedn, appName); } shadowDetailResponse.setShadowInfo(shaDowFileExtedn); shadowDetailResponse.setConnectionPool(convert.getConnPoolName()); - List tableInfos = this.buildTableData(convert.getApplicationId(), - convert.getUrl(), convert.getUserName()); + List tableInfos = this.buildTableData(convert.getApplicationId(), convert.getUrl(), convert.getUserName()); shadowDetailResponse.setTables(tableInfos); return shadowDetailResponse; } @@ -194,10 +187,10 @@ public String buildNewShadow(String shaDowFileExtedn, String appName) { String shadowPwdStr = extObj.getString("shadowPwd"); if (StringUtils.isBlank(shadowPwdStr)) { pwdMap.put("tag", "1"); - } else if("true".equals(extFlag)){ + } else if ("true".equals(extFlag)) { pwdMap.put("tag", "2"); pwdMap.put("context", shadowPwdStr); - } else if("3".equals(extFlag)){ + } else if ("3".equals(extFlag)) { pwdMap.put("tag", "3"); pwdMap.put("context", shadowPwdStr); } @@ -213,10 +206,7 @@ public List buildTableData(Long appId, String ur List amdbTableDatas = applicationClient.getApplicationTable(detailResult.getApplicationName(), url, userName); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(amdbTableDatas)) { - list.addAll(amdbTableDatas - .stream() - .map(x -> new ShadowDetailResponse.TableInfo(x.getBizDatabase(), x.getTableName())) - .collect(Collectors.toList())); + list.addAll(amdbTableDatas.stream().map(x -> new ShadowDetailResponse.TableInfo(x.getBizDatabase(), x.getTableName())).collect(Collectors.toList())); } List results = dsDbTableDAO.getList(url, appId, userName); @@ -224,10 +214,7 @@ public List buildTableData(Long appId, String ur return list; } - List resultsConvert = results - .stream() - .map(x -> new ShadowDetailResponse.TableInfo(x.getBizDataBase(), x.getBizTable(), x.getManualTag(), x.getShadowTable(), x.getIsCheck())) - .collect(Collectors.toList()); + List resultsConvert = results.stream().map(x -> new ShadowDetailResponse.TableInfo(x.getBizDataBase(), x.getBizTable(), x.getManualTag(), x.getShadowTable(), x.getIsCheck())).collect(Collectors.toList()); Map map = new HashMap<>(); list.forEach(x -> { @@ -311,8 +298,7 @@ private List getAttributeArray(Converter.TemplateConverter.TemplateEnum return attributeArray; } Object t = templateEnum.getaClass().newInstance(); - if (Template.class.isAssignableFrom(t - .getClass())) { + if (Template.class.isAssignableFrom(t.getClass())) { Template tem = (Template) t; ConnectpoolConfigTemplateDetailResult template = connectpoolConfigTemplateDAO.queryOne(tem.getName()); if (Objects.nonNull(template) && StringUtils.isNotBlank(template.getShadowdbAttribute())) { From 9225828b74f1ccb53d6c54f5059a25a829abeda6 Mon Sep 17 00:00:00 2001 From: zz052831 Date: Mon, 29 Aug 2022 22:00:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=B1=E5=AD=90?= =?UTF-8?q?=E5=BA=93=E4=B8=89=E6=96=B9key=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/db/parser/DbTemplateParser.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java index 00b16cf73..8e7b4b23e 100644 --- a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java +++ b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java @@ -87,19 +87,19 @@ public List convertShadowMsgWithTemplate(Integer dsType list.add(new InputStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, StyleEnums.INPUT.getCode())); } list.add(new InputStyle(INPUT_FILE_NAME_URL, INPUT_FILE_NAME_URL_CONTEXT, StyleEnums.INPUT.getCode())); - if (select.isNewVersion()) { - List dataSource_pwd = new ArrayList<>(); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); - - List keys_pwd = Arrays.asList(key3, key4); - InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); - InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); - list.add(selectStyle_pwd); - } else { - list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); - } +// if (select.isNewVersion()) { + List dataSource_pwd = new ArrayList<>(); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); + + List keys_pwd = Arrays.asList(key3, key4); + InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); + InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); + list.add(selectStyle_pwd); +// } else { +// list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); +// } List attributeArray; if (Objects.nonNull(isNewData) && BooleanUtil.isFalse(isNewData)) { From a3776025c5f81f83ef20c2165cef850610d911d1 Mon Sep 17 00:00:00 2001 From: zz052831 Date: Tue, 30 Aug 2022 15:27:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=B1=E5=AD=90=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E4=B8=89=E6=96=B9key=E8=AE=BE=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/db/parser/DbTemplateParser.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java index 8e7b4b23e..00b16cf73 100644 --- a/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java +++ b/takin-web-biz-service/src/main/java/io/shulie/takin/web/biz/convert/db/parser/DbTemplateParser.java @@ -87,19 +87,19 @@ public List convertShadowMsgWithTemplate(Integer dsType list.add(new InputStyle(INPUT_FILE_NAME_USER_NAME, INPUT_FILE_NAME_USER_NAME_CONTEXT, StyleEnums.INPUT.getCode())); } list.add(new InputStyle(INPUT_FILE_NAME_URL, INPUT_FILE_NAME_URL_CONTEXT, StyleEnums.INPUT.getCode())); -// if (select.isNewVersion()) { - List dataSource_pwd = new ArrayList<>(); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); - dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); - - List keys_pwd = Arrays.asList(key3, key4); - InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); - InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); - list.add(selectStyle_pwd); -// } else { -// list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); -// } + if (select.isNewVersion()) { + List dataSource_pwd = new ArrayList<>(); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key8, "1")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key2, "2")); + dataSource_pwd.add(new InputWithSelectStyle.NodeDetail(key9, "3")); + + List keys_pwd = Arrays.asList(key3, key4); + InputWithSelectStyle.NodeInfo nodeInfo_pwd = new InputWithSelectStyle.NodeInfo(keys_pwd, dataSource_pwd); + InputWithSelectStyle selectStyle_pwd = new InputWithSelectStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.SELECT_WITH_INPUT_PWD.getCode(), nodeInfo_pwd); + list.add(selectStyle_pwd); + } else { + list.add(new InputStyle(PWD_FILE_NAME, PWD_FILE_NAME_CONTEXT, StyleEnums.PWD_INPUT.getCode())); + } List attributeArray; if (Objects.nonNull(isNewData) && BooleanUtil.isFalse(isNewData)) {