diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java index 48991178..a4d91f54 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/CgformUtil.java @@ -31,6 +31,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -160,110 +161,122 @@ public class CgformUtil { try { var5 = DbTableUtil.getDatabaseType(); - } catch (SQLException var15) { + } catch (SQLException | DBException var15) { var15.printStackTrace(); - } catch (DBException var16) { - var16.printStackTrace(); } Map var6 = QueryGenerator.getRuleMap(var3); - for (Map.Entry entry : var6.entrySet()) { - String var8 = entry.getKey(); - if (oConvertUtils.isNotEmpty(var8) && var8.startsWith("SQL_RULES_COLUMN")) { - var4.append(AND_L).append(QueryGenerator.getSqlRuleValue(entry.getValue().getRuleValue())).append(")"); - } - } + getVar6(var4, var6); Iterator var7 = var0.iterator(); while(true) { while(true) { - String var9; - String var10; - Object var11; - OnlCgformField var17; + if (getVar17(var1, var2, var4, var5, var6, var7)) { + return var4.toString(); + } + } + } + } + + private static boolean getVar17(Map var1, List var2, StringBuilder var4, String var5, Map var6, Iterator var7) { + String var9; + String var10; + Object var11; + OnlCgformField var17; + do { + while(true) { do { - while(true) { - do { - if (!var7.hasNext()) { - return var4.toString(); - } - - var17 = var7.next(); - var9 = var17.getDbFieldName(); - var10 = var17.getDbType(); - if (var6.containsKey(var9) || var6.containsKey(oConvertUtils.camelNames(var9))) { - a(var5, var6.get(var9), var9, var10, var4); - } - - if (var2 != null && var2.contains(var9)) { - var17.setIsQuery(1); - var17.setQueryMode(SINGLE); - } - - if (oConvertUtils.isNotEmpty(var17.getMainField()) && oConvertUtils.isNotEmpty(var17.getMainTable())) { - var17.setIsQuery(1); - var17.setQueryMode(SINGLE); - } - } while(1 != var17.getIsQuery()); - - if (SINGLE.equals(var17.getQueryMode())) { - var11 = var1.get(var9); - break; - } - - var11 = var1.get(var9 + "_begin"); - if (var11 != null) { - var4.append(AND).append(var9).append(">="); - if (OnlineDbHandler.a(var10)) { - var4.append(var11.toString()); - } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { - var4.append(a(var11.toString())); - } else { - var4.append("'").append(var11.toString()).append("'"); - } - } - - Object var12 = var1.get(var9 + "_end"); - if (var12 != null) { - var4.append(AND).append(var9).append("<="); - if (OnlineDbHandler.a(var10)) { - var4.append(var12.toString()); - } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { - var4.append(a(var12.toString())); - } else { - var4.append("'").append(var12.toString()).append("'"); - } - } - } - } while(var11 == null); - - String var13; - if (LIST_MULTI.equals(var17.getFieldShowType())) { - String[] var18 = var11.toString().split(","); - var13 = ""; - - for(int var14 = 0; var14 < var18.length; ++var14) { - if (oConvertUtils.isNotEmpty(var13)) { - var13 = var13 + " or " + var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; - } else { - var13 = var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; - } + if (!var7.hasNext()) { + return true; } - var4.append(AND_L).append(var13).append(")"); + var17 = var7.next(); + var9 = var17.getDbFieldName(); + var10 = var17.getDbType(); + getVar17(var2, var4, var5, var6, var9, var10, var17); + } while(1 != var17.getIsQuery()); + + if (SINGLE.equals(var17.getQueryMode())) { + var11 = var1.get(var9); + break; } - if (POPUP.equals(var17.getFieldShowType())) { - var4.append(AND_L).append(b(var9, var11.toString())).append(")"); - } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { - var4.append(AND).append(var9).append("=").append(a(var11.toString())); + var11 = var1.get(var9 + "_begin"); + getVar4(var4, var5, var9, var10, var11, ">="); + + Object var12 = var1.get(var9 + "_end"); + getVar4(var4, var5, var9, var10, var12, "<="); + } + } while(var11 == null); + + getVar13(var4, var5, var9, var10, var11, var17); + return false; + } + + private static void getVar17(List var2, StringBuilder var4, String var5, Map var6, String var9, String var10, OnlCgformField var17) { + if (var6.containsKey(var9) || var6.containsKey(oConvertUtils.camelNames(var9))) { + a(var5, var6.get(var9), var9, var10, var4); + } + + if (var2 != null && var2.contains(var9)) { + var17.setIsQuery(1); + var17.setQueryMode(SINGLE); + } + + if (oConvertUtils.isNotEmpty(var17.getMainField()) && oConvertUtils.isNotEmpty(var17.getMainTable())) { + var17.setIsQuery(1); + var17.setQueryMode(SINGLE); + } + } + + private static void getVar13(StringBuilder var4, String var5, String var9, String var10, Object var11, OnlCgformField var17) { + String var13; + if (LIST_MULTI.equals(var17.getFieldShowType())) { + String[] var18 = var11.toString().split(","); + var13 = ""; + + for(int var14 = 0; var14 < var18.length; ++var14) { + if (oConvertUtils.isNotEmpty(var13)) { + var13 = var13 + " or " + var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; } else { - boolean var19 = !OnlineDbHandler.a(var10); - var13 = QueryGenerator.getSingleQueryConditionSql(var9, "", var11, var19); - var4.append(AND).append(var13); + var13 = var9 + LIKE + "'%" + var18[var14] + ",%'" + " or " + var9 + LIKE + "'%," + var18[var14] + "%'"; } } + + var4.append(AND_L).append(var13).append(")"); + } + + if (POPUP.equals(var17.getFieldShowType())) { + var4.append(AND_L).append(b(var9, var11.toString())).append(")"); + } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { + var4.append(AND).append(var9).append("=").append(a(var11.toString())); + } else { + boolean var19 = !OnlineDbHandler.a(var10); + var13 = QueryGenerator.getSingleQueryConditionSql(var9, "", var11, var19); + var4.append(AND).append(var13); + } + } + + private static void getVar4(StringBuilder var4, String var5, String var9, String var10, Object var11, String s) { + if (var11 != null) { + var4.append(AND).append(var9).append(s); + if (OnlineDbHandler.a(var10)) { + var4.append(var11.toString()); + } else if (ORACLE.equals(var5) && var10.toLowerCase().contains(DATE)) { + var4.append(a(var11.toString())); + } else { + var4.append("'").append(var11.toString()).append("'"); + } + } + } + + private static void getVar6(StringBuilder var4, Map var6) { + for (Entry entry : var6.entrySet()) { + String var8 = entry.getKey(); + if (oConvertUtils.isNotEmpty(var8) && var8.startsWith("SQL_RULES_COLUMN")) { + var4.append(AND_L).append(QueryGenerator.getSqlRuleValue(entry.getValue().getRuleValue())).append(")"); + } } } @@ -441,16 +454,13 @@ public class CgformUtil { public static Map a(HttpServletRequest var0) { Map var1 = var0.getParameterMap(); HashMap var2 = new HashMap<>(); - Iterator> var3 = var1.entrySet().iterator(); String var5 = ""; String var6 = ""; - - for(Object var7; var3.hasNext(); var2.put(var5, var6)) { - Entry var4 = var3.next(); - var5 = var4.getKey(); - var7 = var4.getValue(); + for(Map.Entry entry : var1.entrySet()) { + var5 = entry.getKey(); + String[] var7 = entry.getValue(); if (!"_t".equals(var5) && null != var7) { - String[] var8 = (String[]) var7; + String[] var8 = var7; for(int var9 = 0; var9 < var8.length; ++var9) { var6 = var8[var9] + ","; @@ -460,6 +470,7 @@ public class CgformUtil { } else { var6 = ""; } + var2.put(var5, var6); } return var2; @@ -480,6 +491,17 @@ public class CgformUtil { return true; } + public static void main(String[] args) { + List var0 = new ArrayList<>(); + OnlCgformField onlCgformField = new OnlCgformField(); + onlCgformField.setDbFieldName("ss"); + OnlCgformField onlCgformField1 = new OnlCgformField(); + onlCgformField1.setDbFieldName("id"); + var0.add(onlCgformField); + var0.add(onlCgformField1); + a(var0, new ArrayList<>(), new TreeSelectColumn()); + } + public static JSONObject a(List var0, List var1, TreeSelectColumn var2) { new JSONObject(); ArrayList var4 = new ArrayList<>(); @@ -488,153 +510,217 @@ public class CgformUtil { OnlCgformHeadMapper var7 = SpringContextUtils.getBean(OnlCgformHeadMapper.class); ArrayList var8 = new ArrayList<>(); Iterator var9 = var0.iterator(); - + CgformEntity cgformEntity = new CgformEntity(); + cgformEntity.setVar0(var0); + cgformEntity.setVar1(var1); + cgformEntity.setVar2(var2); while(true) { - OnlCgformField var10; - String var11; + JSONObject var3 = getJsonObject(cgformEntity, var4, var5, var6, var7, var8, var9); + if (var3 != null) { + return var3; + } + } + } + + @Nullable + private static JSONObject getJsonObject(CgformEntity cgformEntity, ArrayList var4, ArrayList var5, ISysBaseAPI var6, OnlCgformHeadMapper var7, ArrayList var8, Iterator var9) { + OnlCgformField var10; + String var11; + do { do { - do { - if (!var9.hasNext()) { - JSONObject var3; - JsonSchemaDescrip var23; - if (!var4.isEmpty()) { - var23 = new JsonSchemaDescrip(var4); - var3 = JsonschemaUtil.getJsonSchema(var23, var5); - } else { - var23 = new JsonSchemaDescrip(); - var3 = JsonschemaUtil.getJsonSchema(var23, var5); - } - - return var3; - } - - var10 = var9.next(); - var11 = var10.getDbFieldName(); - } while("id".equals(var11)); - } while(var8.contains(var11)); - - String var12 = var10.getDbFieldTxt(); - if ("1".equals(var10.getFieldMustInput())) { - var4.add(var11); - } - - String var13 = var10.getFieldShowType(); - CommonProperty var14; - if (SWITCH.equals(var13)) { - var14 = new SwitchProperty(var11, var12, var10.getFieldExtendJson()); - } else if (c(var13)) { - Object var30 = new ArrayList<>(); - if (oConvertUtils.isNotEmpty(var10.getDictTable())) { - var30 = var6.queryTableDictItemsByCode(var10.getDictTable(), var10.getDictText(), var10.getDictField()); - } else if (oConvertUtils.isNotEmpty(var10.getDictField())) { - var30 = var6.queryDictItemsByCode(var10.getDictField()); - } - - var14 = new StringProperty(var11, var12, var13, var10.getDbLength(), (List)var30); - if (OnlineDbHandler.a(var10.getDbType())) { - var14.setType(NUMBER); - } - } else if (OnlineDbHandler.a(var10.getDbType())) { - NumberProperty var29 = new NumberProperty(var11, var12, NUMBER); - if (CgformValidPatternEnum.INTEGER.getType().equals(var10.getFieldValidType())) { - var29.setPattern(CgformValidPatternEnum.INTEGER.getPattern()); - } - - var14 = var29; - } else { - String var16; - if (!POPUP.equals(var13)) { - if (SEL_SEARCH.equals(var13)) { - var14 = new DictProperty(var11, var12, var10.getDictTable(), var10.getDictField(), var10.getDictText()); - } else if ("link_down".equals(var13)) { - LinkDownProperty var27 = new LinkDownProperty(var11, var12, var10.getDictTable()); - a(var27, var0, var8); - var14 = var27; + if (!var9.hasNext()) { + JSONObject var3; + JsonSchemaDescrip var23; + if (!var4.isEmpty()) { + var23 = new JsonSchemaDescrip(var4); + var3 = JsonschemaUtil.getJsonSchema(var23, var5); } else { - String var25; - String var32; - if ("sel_tree".equals(var13)) { - var25 = var10.getDictText(); - String[] var31 = var25.split(","); - var32 = var10.getDictTable() + "," + var31[2] + "," + var31[0]; - TreeSelectProperty var34 = new TreeSelectProperty(var11, var12, var32, var31[1], var10.getDictField()); - if (var31.length > 3) { - var34.setHasChildField(var31[3]); - } - - var14 = var34; - } else if (CAT_TREE.equals(var13)) { - var25 = var10.getDictText(); - var16 = var10.getDictField(); - var32 = "0"; - if (oConvertUtils.isNotEmpty(var16) && !"0".equals(var16)) { - var32 = var7.queryCategoryIdByCode(var16); - } - - if (oConvertUtils.isEmpty(var25)) { - var14 = new TreeSelectProperty(var11, var12, var32); - } else { - var14 = new TreeSelectProperty(var11, var12, var32, var25); - HiddenProperty var33 = new HiddenProperty(var25, var25); - var5.add(var33); - } - } else if (var2 != null && var11.equals(var2.getFieldName())) { - var25 = var2.getTableName() + "," + var2.getTextField() + "," + var2.getCodeField(); - TreeSelectProperty var28 = new TreeSelectProperty(var11, var12, var25, var2.getPidField(), var2.getPidValue()); - var28.setHasChildField(var2.getHsaChildField()); - var28.setPidComponent(1); - var14 = var28; - } else { - StringProperty var24 = new StringProperty(var11, var12, var13, var10.getDbLength()); - if (oConvertUtils.isNotEmpty(var10.getFieldValidType())) { - CgformValidPatternEnum var26 = CgformValidPatternEnum.getPatternInfoByType(var10.getFieldValidType()); - if (var26 != null) { - if (CgformValidPatternEnum.NOTNULL == var26) { - var4.add(var11); - } else { - var24.setPattern(var26.getPattern()); - var24.setErrorInfo(var26.getMsg()); - } - } else { - var24.setPattern(var10.getFieldValidType()); - var24.setErrorInfo("输入的值不合法"); - } - } - - var14 = var24; - } - } - } else { - PopupProperty var15 = new PopupProperty(var11, var12, var10.getDictTable(), var10.getDictText(), var10.getDictField()); - var16 = var10.getDictText(); - if (var16 != null && !var16.equals("")) { - String[] var17 = var16.split(","); - String[] var18 = var17; - int var19 = var17.length; - - for(int var20 = 0; var20 < var19; ++var20) { - String var21 = var18[var20]; - if (!a(var21, var0)) { - HiddenProperty var22 = new HiddenProperty(var21, var21); - var22.setOrder(var10.getOrderNum()); - var5.add(var22); - } - } + var23 = new JsonSchemaDescrip(); + var3 = JsonschemaUtil.getJsonSchema(var23, var5); } - var14 = var15; + return var3; + } + + var10 = var9.next(); + var11 = var10.getDbFieldName(); + } while("id".equals(var11)); + } while(var8.contains(var11)); + cgformEntity.setVar10(var10); + cgformEntity.setVar11(var11); + + getVar14(var4, var5, var6, var7, var8, cgformEntity); + return null; + } + + private static void getVar14(ArrayList var4, ArrayList var5, ISysBaseAPI var6, OnlCgformHeadMapper var7, ArrayList var8, CgformEntity cgformEntity) { + List var1 = cgformEntity.getVar1(); + OnlCgformField var10 = cgformEntity.getVar10(); + String var11 = cgformEntity.getVar11(); + + String var12 = var10.getDbFieldTxt(); + getVar14(var4, var10, var11); + + String var13 = var10.getFieldShowType(); + CommonProperty var14; + if (SWITCH.equals(var13)) { + var14 = new SwitchProperty(var11, var12, var10.getFieldExtendJson()); + } else if (c(var13)) { + Object var30 = getVar30(var6, var10); + + var14 = new StringProperty(var11, var12, var13, var10.getDbLength(), (List)var30); + if (OnlineDbHandler.a(var10.getDbType())) { + var14.setType(NUMBER); + } + } else if (OnlineDbHandler.a(var10.getDbType())) { + NumberProperty var29 = new NumberProperty(var11, var12, NUMBER); + if (CgformValidPatternEnum.INTEGER.getType().equals(var10.getFieldValidType())) { + var29.setPattern(CgformValidPatternEnum.INTEGER.getPattern()); + } + + var14 = var29; + } else { + var14 = getCommonProperty(var4, var5, var7, var8, cgformEntity, var12, var13); + } + + if (var10.getIsReadOnly() == 1 || var1 != null && var1.contains(var11)) { + var14.setDisabled(true); + } + + var14.setOrder(var10.getOrderNum()); + var14.setDefVal(var10.getFieldDefaultValue()); + var14.setFieldExtendJson(var10.getFieldExtendJson()); + var14.setDbPointLength(var10.getDbPointLength()); + var5.add(var14); + } + + @NotNull + private static CommonProperty getCommonProperty(ArrayList var4, ArrayList var5, OnlCgformHeadMapper var7, ArrayList var8, CgformEntity cgformEntity, String var12, String var13) { + List var0 = cgformEntity.getVar0(); + OnlCgformField var10 = cgformEntity.getVar10(); + String var11 = cgformEntity.getVar11(); + CommonProperty var14; + String var16; + if (!POPUP.equals(var13)) { + var14 = getSelSearch(var4, var5, var7, var8, var12, var13, cgformEntity); + } else { + PopupProperty var15 = new PopupProperty(var11, var12, var10.getDictTable(), var10.getDictText(), var10.getDictField()); + var16 = var10.getDictText(); + if (var16 != null && !var16.equals("")) { + String[] var17 = var16.split(","); + String[] var18 = var17; + int var19 = var17.length; + + for(int var20 = 0; var20 < var19; ++var20) { + String var21 = var18[var20]; + if (!a(var21, var0)) { + HiddenProperty var22 = new HiddenProperty(var21, var21); + var22.setOrder(var10.getOrderNum()); + var5.add(var22); + } } } - if (var10.getIsReadOnly() == 1 || var1 != null && var1.contains(var11)) { - var14.setDisabled(true); - } + var14 = var15; + } + return var14; + } - var14.setOrder(var10.getOrderNum()); - var14.setDefVal(var10.getFieldDefaultValue()); - var14.setFieldExtendJson(var10.getFieldExtendJson()); - var14.setDbPointLength(var10.getDbPointLength()); - var5.add(var14); + @NotNull + private static CommonProperty getSelSearch(ArrayList var4, ArrayList var5, OnlCgformHeadMapper var7, ArrayList var8, String var12, String var13, CgformEntity cgformEntity) { + List var0 = cgformEntity.getVar0(); + TreeSelectColumn var2 = cgformEntity.getVar2(); + OnlCgformField var10 = cgformEntity.getVar10(); + String var11 = cgformEntity.getVar11(); + CommonProperty var14; + String var16; + if (SEL_SEARCH.equals(var13)) { + var14 = new DictProperty(var11, var12, var10.getDictTable(), var10.getDictField(), var10.getDictText()); + } else if ("link_down".equals(var13)) { + LinkDownProperty var27 = new LinkDownProperty(var11, var12, var10.getDictTable()); + a(var27, var0, var8); + var14 = var27; + } else { + String var25; + String var32; + if ("sel_tree".equals(var13)) { + var25 = var10.getDictText(); + String[] var31 = var25.split(","); + var32 = var10.getDictTable() + "," + var31[2] + "," + var31[0]; + TreeSelectProperty var34 = new TreeSelectProperty(var11, var12, var32, var31[1], var10.getDictField()); + if (var31.length > 3) { + var34.setHasChildField(var31[3]); + } + + var14 = var34; + } else if (CAT_TREE.equals(var13)) { + var25 = var10.getDictText(); + var16 = var10.getDictField(); + var32 = "0"; + var14 = getVar16(var5, var7, var12, var11, var16, var25, var32); + } else if (var2 != null && var11.equals(var2.getFieldName())) { + var25 = var2.getTableName() + "," + var2.getTextField() + "," + var2.getCodeField(); + TreeSelectProperty var28 = new TreeSelectProperty(var11, var12, var25, var2.getPidField(), var2.getPidValue()); + var28.setHasChildField(var2.getHsaChildField()); + var28.setPidComponent(1); + var14 = var28; + } else { + StringProperty var24 = new StringProperty(var11, var12, var13, var10.getDbLength()); + getFieldValidType(var4, var10, var11, var24); + + var14 = var24; + } + } + return var14; + } + + @NotNull + private static CommonProperty getVar16(ArrayList var5, OnlCgformHeadMapper var7, String var12, String var11, String var16, String var25, String var32) { + CommonProperty var14; + if (oConvertUtils.isNotEmpty(var16) && !"0".equals(var16)) { + var32 = var7.queryCategoryIdByCode(var16); + } + + if (oConvertUtils.isEmpty(var25)) { + var14 = new TreeSelectProperty(var11, var12, var32); + } else { + var14 = new TreeSelectProperty(var11, var12, var32, var25); + HiddenProperty var33 = new HiddenProperty(var25, var25); + var5.add(var33); + } + return var14; + } + + private static void getFieldValidType(ArrayList var4, OnlCgformField var10, String var11, StringProperty var24) { + if (oConvertUtils.isNotEmpty(var10.getFieldValidType())) { + CgformValidPatternEnum var26 = CgformValidPatternEnum.getPatternInfoByType(var10.getFieldValidType()); + if (var26 != null) { + if (CgformValidPatternEnum.NOTNULL == var26) { + var4.add(var11); + } else { + var24.setPattern(var26.getPattern()); + var24.setErrorInfo(var26.getMsg()); + } + } else { + var24.setPattern(var10.getFieldValidType()); + var24.setErrorInfo("输入的值不合法"); + } + } + } + + private static Object getVar30(ISysBaseAPI var6, OnlCgformField var10) { + Object var30 = new ArrayList<>(); + if (oConvertUtils.isNotEmpty(var10.getDictTable())) { + var30 = var6.queryTableDictItemsByCode(var10.getDictTable(), var10.getDictText(), var10.getDictField()); + } else if (oConvertUtils.isNotEmpty(var10.getDictField())) { + var30 = var6.queryDictItemsByCode(var10.getDictField()); + } + return var30; + } + + private static void getVar14(ArrayList var4, OnlCgformField var10, String var11) { + if ("1".equals(var10.getFieldMustInput())) { + var4.add(var11); } } @@ -716,86 +802,97 @@ public class CgformUtil { } public static Map a(String var0, List var1, JSONObject var2) { - StringBuilder var3 = new StringBuilder(); - StringBuilder var4 = new StringBuilder(); + String var5 = ""; try { var5 = DbTableUtil.getDatabaseType(); - } catch (SQLException var15) { + } catch (SQLException | DBException var15) { var15.printStackTrace(); - } catch (DBException var16) { - var16.printStackTrace(); } - HashMap var6 = new HashMap<>(); - boolean var7 = false; - String var8 = null; LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if (var9 == null) { throw new JeroBootException(ONLINE_NOT_LOGIN_INFO); } else { - Set var10 = a(var1); - Iterator var11 = var1.iterator(); + return getVar6(var0, var1, var2, var5, var9); + } + } - while(true) { - while(var11.hasNext()) { - OnlCgformField var12 = var11.next(); - String var13 = var12.getDbFieldName(); - if (null == var13) { - log.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId()); - } else if (Objects.equals("id",var13.toLowerCase())) { - var7 = true; - var8 = var2.getString(var13); - } else { - a(var12, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); - if (Objects.equals("bpm_status",var13.toLowerCase())) { - var3.append(",").append(var13); - var4.append(",'1'"); - } else { - String var14; - if (var10.contains(var13)) { - var3.append(",").append(var13); - var14 = OnlineDbHandler.a(var5, var12, var2, var6); - var4.append(",").append(var14); - } else if (var12.getIsShowForm() == 1 || !oConvertUtils.isEmpty(var12.getMainField()) || !oConvertUtils.isEmpty(var12.getDbDefaultVal())) { - if (var2.get(var13) == null) { - if (oConvertUtils.isEmpty(var12.getDbDefaultVal())) { - continue; - } + @NotNull + private static Map getVar6(String var0, List var1, JSONObject var2, String var5, LoginUser var9) { + Set var10 = a(var1); + Iterator var11 = var1.iterator(); + StringBuilder var3 = new StringBuilder(); + StringBuilder var4 = new StringBuilder(); + HashMap var6 = new HashMap<>(); + boolean var7 = false; + String var8 = null; - var2.put(var13, var12.getDbDefaultVal()); - } - - if ("".equals(var2.get(var13))) { - var14 = var12.getDbType(); - if (OnlineDbHandler.a(var14) || OnlineDbHandler.b(var14)) { - continue; - } - } - - var3.append(",").append(var13); - var14 = OnlineDbHandler.a(var5, var12, var2, var6); - var4.append(",").append(var14); - } - } - } - } - - if (var7) { - if (oConvertUtils.isEmpty(var8)) { - var8 = a(); - } + while(var11.hasNext()) { + OnlCgformField var12 = var11.next(); + String var13 = var12.getDbFieldName(); + if (null == var13) { + log.info("--------online保存表单数据遇见空名称的字段------->>" + var12.getId()); + } else if (Objects.equals("id",var13.toLowerCase())) { + var7 = true; + var8 = var2.getString(var13); + } else { + a(var12, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); + if (Objects.equals("bpm_status",var13.toLowerCase())) { + var3.append(",").append(var13); + var4.append(",'1'"); } else { - var8 = a(); + String var14; + if (var10.contains(var13)) { + var3.append(",").append(var13); + var14 = OnlineDbHandler.a(var5, var12, var2, var6); + var4.append(",").append(var14); + } else if (var12.getIsShowForm() == 1 || !oConvertUtils.isEmpty(var12.getMainField()) || !oConvertUtils.isEmpty(var12.getDbDefaultVal())) { + getVar2(var2, var5, var3, var4, var6, var12, var13); + } } - - String var17 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; - var6.put(EXECUTE_SQL_STRING, var17); - log.info("--动态表单保存sql-->" + var17); - return var6; } } + + var8 = getVar8(var7, var8); + + String var17 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; + var6.put(EXECUTE_SQL_STRING, var17); + log.info("--动态表单保存sql-->" + var17); + return var6; + } + + private static void getVar2(JSONObject var2, String var5, StringBuilder var3, StringBuilder var4, HashMap var6, OnlCgformField var12, String var13) { + String var14; + if (var2.get(var13) == null) { + if (oConvertUtils.isEmpty(var12.getDbDefaultVal())) { + return; + } + + var2.put(var13, var12.getDbDefaultVal()); + } + + if ("".equals(var2.get(var13))) { + var14 = var12.getDbType(); + if (OnlineDbHandler.a(var14) || OnlineDbHandler.b(var14)) { + return; + } + } + + var3.append(",").append(var13); + var14 = OnlineDbHandler.a(var5, var12, var2, var6); + var4.append(",").append(var14); + } + + @NotNull + private static String getVar8(boolean var7, String var8) { + if (var7) { + var8 = getString(var8, oConvertUtils.isEmpty(var8), a()); + } else { + var8 = a(); + } + return var8; } public static Map b(String var0, List var1, JSONObject var2) { @@ -805,10 +902,8 @@ public class CgformUtil { try { var5 = DbTableUtil.getDatabaseType(); - } catch (SQLException var12) { + } catch (SQLException | DBException var12) { var12.printStackTrace(); - } catch (DBException var13) { - var13.printStackTrace(); } LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); @@ -820,30 +915,7 @@ public class CgformUtil { while(true) { while(var8.hasNext()) { - OnlCgformField var9 = var8.next(); - String var10 = var9.getDbFieldName(); - if (null == var10) { - log.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId()); - } else { - a(var9, var6, var2, UPDATE_BY, UPDATE_TIME); - String var11; - if (var7.contains(var10) && var2.get(var10) != null && !"".equals(var2.getString(var10))) { - var11 = OnlineDbHandler.a(var5, var9, var2, var4); - var3.append(var10).append("=").append(var11).append(","); - } else if (var9.getIsShowForm() == 1 && !"id".equals(var10)) { - if ("".equals(var2.get(var10))) { - var11 = var9.getDbType(); - if (OnlineDbHandler.a(var11) || OnlineDbHandler.b(var11)) { - continue; - } - } - - if (!oConvertUtils.isNotEmpty(var9.getMainTable()) || !oConvertUtils.isNotEmpty(var9.getMainField())) { - var11 = OnlineDbHandler.a(var5, var9, var2, var4); - var3.append(var10).append("=").append(var11).append(","); - } - } - } + getVar8(var2, var3, var4, var5, var6, var7, var8); } String var14 = var3.toString(); @@ -859,6 +931,38 @@ public class CgformUtil { } } + private static void getVar8(JSONObject var2, StringBuilder var3, HashMap var4, String var5, LoginUser var6, Set var7, Iterator var8) { + OnlCgformField var9 = var8.next(); + String var10 = var9.getDbFieldName(); + if (null == var10) { + log.info("--------online修改表单数据遇见空名称的字段------->>" + var9.getId()); + } else { + a(var9, var6, var2, UPDATE_BY, UPDATE_TIME); + String var11; + if (var7.contains(var10) && var2.get(var10) != null && !"".equals(var2.getString(var10))) { + var11 = OnlineDbHandler.a(var5, var9, var2, var4); + var3.append(var10).append("=").append(var11).append(","); + } else if (var9.getIsShowForm() == 1 && !"id".equals(var10)) { + if ("".equals(var2.get(var10))) { + var11 = var9.getDbType(); + if (OnlineDbHandler.a(var11) || OnlineDbHandler.b(var11)) { + return; + } + } + + getVar11(var2, var3, var4, var5, var9, var10); + } + } + } + + private static void getVar11(JSONObject var2, StringBuilder var3, HashMap var4, String var5, OnlCgformField var9, String var10) { + String var11; + if (!oConvertUtils.isNotEmpty(var9.getMainTable()) || !oConvertUtils.isNotEmpty(var9.getMainField())) { + var11 = OnlineDbHandler.a(var5, var9, var2, var4); + var3.append(var10).append("=").append(var11).append(","); + } + } + public static String a(String var0, List var1, String var2) { return a(var0, var1, "id", var2); } @@ -1662,8 +1766,6 @@ public class CgformUtil { } public static Map c(String var0, List var1, JSONObject var2) { - StringBuilder var3 = new StringBuilder(); - StringBuilder var4 = new StringBuilder(); String var5 = ""; try { @@ -1672,52 +1774,70 @@ public class CgformUtil { var14.printStackTrace(); } - HashMap var6 = new HashMap<>(); - boolean var7 = false; - String var8 = null; LoginUser var9 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); if (var9 == null) { throw new JeroBootException(ONLINE_NOT_LOGIN_INFO); } else { - Iterator var10 = var1.iterator(); + return getStringObjectMap(var0, var1, var2, var5, var9); + } + } - while(true) { - while(var10.hasNext()) { - OnlCgformField var11 = var10.next(); - String var12 = var11.getDbFieldName(); - if (null == var12) { - log.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId()); - } else if (var2.get(var12) != null || CREATE_BY.equalsIgnoreCase(var12) || CREATE_TIME.equalsIgnoreCase(var12) || SYS_ORG_CODE.equalsIgnoreCase(var12)) { - a(var11, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); - String var13; - if ("".equals(var2.get(var12))) { - var13 = var11.getDbType(); - if (OnlineDbHandler.a(var13) || OnlineDbHandler.b(var13)) { - continue; - } - } - - if (Objects.equals("id",var12.toLowerCase())) { - var7 = true; - var8 = var2.getString(var12); - } else { - var3.append(",").append(var12); - var13 = OnlineDbHandler.a(var5, var11, var2, var6); - var4.append(",").append(var13); - } - } + @NotNull + private static Map getStringObjectMap(String var0, List var1, JSONObject var2, String var5, LoginUser var9) { + Iterator var10 = var1.iterator(); + StringBuilder var3 = new StringBuilder(); + StringBuilder var4 = new StringBuilder(); + HashMap var6 = new HashMap<>(); + boolean var7 = false; + String var8 = null; + while(var10.hasNext()) { + OnlCgformField var11 = var10.next(); + String var12 = var11.getDbFieldName(); + if (null == var12) { + log.info("--------online保存表单数据遇见空名称的字段------->>" + var11.getId()); + } else if (var2.get(var12) != null || CREATE_BY.equalsIgnoreCase(var12) || CREATE_TIME.equalsIgnoreCase(var12) || SYS_ORG_CODE.equalsIgnoreCase(var12)) { + a(var11, var9, var2, CREATE_BY, CREATE_TIME, SYS_ORG_CODE); + String var13; + if (getVar12(var2, var11, var12)) { + continue; } - if (!var7 || oConvertUtils.isEmpty(var8)) { - var8 = a(); + if (Objects.equals("id",var12.toLowerCase())) { + var7 = true; + var8 = var2.getString(var12); + } else { + var3.append(",").append(var12); + var13 = OnlineDbHandler.a(var5, var11, var2, var6); + var4.append(",").append(var13); } - - String var16 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; - var6.put(EXECUTE_SQL_STRING, var16); - log.info("--表单设计器表单保存sql-->" + var16); - return var6; } } + + var8 = getString(var8, !var7 || oConvertUtils.isEmpty(var8), a()); + + String var16 = "insert into " + f(var0) + "(" + "id" + var3.toString() + ") values(" + "'" + var8 + "'" + var4.toString() + ")"; + var6.put(EXECUTE_SQL_STRING, var16); + log.info("--表单设计器表单保存sql-->" + var16); + return var6; + } + + private static boolean getVar12(JSONObject var2, OnlCgformField var11, String var12) { + String var13; + if ("".equals(var2.get(var12))) { + var13 = var11.getDbType(); + if (OnlineDbHandler.a(var13) || OnlineDbHandler.b(var13)) { + return true; + } + } + return false; + } + + @NotNull + private static String getString(String var8, boolean b, String a) { + if (b) { + var8 = a; + } + return var8; } public static Map d(String var0, List var1, JSONObject var2) {