diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java index 5ebd9b9d..8b9cfd7b 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformField.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.util.Date; +import java.util.Objects; + import org.springframework.format.annotation.DateTimeFormat; @TableName("onl_cgform_field") @@ -435,525 +437,229 @@ public class OnlCgformField implements Serializable { if (!var2.canEqual(this)) { return false; } else { - label527: { - Integer var3 = this.getDbIsKey(); - Integer var4 = var2.getDbIsKey(); - if (var3 == null) { - if (var4 == null) { - break label527; - } - } else if (var3.equals(var4)) { - break label527; - } - + if (getOne(var2)) { return false; } - Integer var5 = this.getDbIsNull(); - Integer var6 = var2.getDbIsNull(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { + if (getTwo(var2)) { return false; } - Integer var7 = this.getDbLength(); - Integer var8 = var2.getDbLength(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - label506: { - Integer var9 = this.getDbPointLength(); - Integer var10 = var2.getDbPointLength(); - if (var9 == null) { - if (var10 == null) { - break label506; - } - } else if (var9.equals(var10)) { - break label506; - } - - return false; - } - - label499: { - Integer var11 = this.getFieldLength(); - Integer var12 = var2.getFieldLength(); - if (var11 == null) { - if (var12 == null) { - break label499; - } - } else if (var11.equals(var12)) { - break label499; - } - - return false; - } - - Integer var13 = this.getIsQuery(); - Integer var14 = var2.getIsQuery(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - Integer var15 = this.getIsShowForm(); - Integer var16 = var2.getIsShowForm(); - if (var15 == null) { - if (var16 != null) { - return false; - } - } else if (!var15.equals(var16)) { - return false; - } - - label478: { - Integer var17 = this.getIsShowList(); - Integer var18 = var2.getIsShowList(); - if (var17 == null) { - if (var18 == null) { - break label478; - } - } else if (var17.equals(var18)) { - break label478; - } - - return false; - } - - label471: { - Integer var19 = this.getIsReadOnly(); - Integer var20 = var2.getIsReadOnly(); - if (var19 == null) { - if (var20 == null) { - break label471; - } - } else if (var19.equals(var20)) { - break label471; - } - - return false; - } - - Integer var21 = this.getOrderNum(); - Integer var22 = var2.getOrderNum(); - if (var21 == null) { - if (var22 != null) { - return false; - } - } else if (!var21.equals(var22)) { - return false; - } - - label457: { - String var23 = this.getId(); - String var24 = var2.getId(); - if (var23 == null) { - if (var24 == null) { - break label457; - } - } else if (var23.equals(var24)) { - break label457; - } - - return false; - } - - String var25 = this.getCgformHeadId(); - String var26 = var2.getCgformHeadId(); - if (var25 == null) { - if (var26 != null) { - return false; - } - } else if (!var25.equals(var26)) { - return false; - } - - label443: { - String var27 = this.getDbFieldName(); - String var28 = var2.getDbFieldName(); - if (var27 == null) { - if (var28 == null) { - break label443; - } - } else if (var27.equals(var28)) { - break label443; - } - - return false; - } - - String var29 = this.getDbFieldTxt(); - String var30 = var2.getDbFieldTxt(); - if (var29 == null) { - if (var30 != null) { - return false; - } - } else if (!var29.equals(var30)) { - return false; - } - - String var31 = this.getDbFieldNameOld(); - String var32 = var2.getDbFieldNameOld(); - if (var31 == null) { - if (var32 != null) { - return false; - } - } else if (!var31.equals(var32)) { - return false; - } - - label422: { - String var33 = this.getDbType(); - String var34 = var2.getDbType(); - if (var33 == null) { - if (var34 == null) { - break label422; - } - } else if (var33.equals(var34)) { - break label422; - } - - return false; - } - - label415: { - String var35 = this.getDbDefaultVal(); - String var36 = var2.getDbDefaultVal(); - if (var35 == null) { - if (var36 == null) { - break label415; - } - } else if (var35.equals(var36)) { - break label415; - } - - return false; - } - - String var37 = this.getDictField(); - String var38 = var2.getDictField(); - if (var37 == null) { - if (var38 != null) { - return false; - } - } else if (!var37.equals(var38)) { - return false; - } - - String var39 = this.getDictTable(); - String var40 = var2.getDictTable(); - if (var39 == null) { - if (var40 != null) { - return false; - } - } else if (!var39.equals(var40)) { - return false; - } - - label394: { - String var41 = this.getDictText(); - String var42 = var2.getDictText(); - if (var41 == null) { - if (var42 == null) { - break label394; - } - } else if (var41.equals(var42)) { - break label394; - } - - return false; - } - - label387: { - String var43 = this.getFieldShowType(); - String var44 = var2.getFieldShowType(); - if (var43 == null) { - if (var44 == null) { - break label387; - } - } else if (var43.equals(var44)) { - break label387; - } - - return false; - } - - String var45 = this.getFieldHref(); - String var46 = var2.getFieldHref(); - if (var45 == null) { - if (var46 != null) { - return false; - } - } else if (!var45.equals(var46)) { - return false; - } - - String var47 = this.getFieldValidType(); - String var48 = var2.getFieldValidType(); - if (var47 == null) { - if (var48 != null) { - return false; - } - } else if (!var47.equals(var48)) { - return false; - } - - label366: { - String var49 = this.getFieldMustInput(); - String var50 = var2.getFieldMustInput(); - if (var49 == null) { - if (var50 == null) { - break label366; - } - } else if (var49.equals(var50)) { - break label366; - } - - return false; - } - - label359: { - String var51 = this.getFieldExtendJson(); - String var52 = var2.getFieldExtendJson(); - if (var51 == null) { - if (var52 == null) { - break label359; - } - } else if (var51.equals(var52)) { - break label359; - } - - return false; - } - - String var53 = this.getFieldDefaultValue(); - String var54 = var2.getFieldDefaultValue(); - if (var53 == null) { - if (var54 != null) { - return false; - } - } else if (!var53.equals(var54)) { - return false; - } - - label345: { - String var55 = this.getQueryMode(); - String var56 = var2.getQueryMode(); - if (var55 == null) { - if (var56 == null) { - break label345; - } - } else if (var55.equals(var56)) { - break label345; - } - - return false; - } - - String var57 = this.getMainTable(); - String var58 = var2.getMainTable(); - if (var57 == null) { - if (var58 != null) { - return false; - } - } else if (!var57.equals(var58)) { - return false; - } - - label331: { - String var59 = this.getMainField(); - String var60 = var2.getMainField(); - if (var59 == null) { - if (var60 == null) { - break label331; - } - } else if (var59.equals(var60)) { - break label331; - } - - return false; - } - - String var61 = this.getUpdateBy(); - String var62 = var2.getUpdateBy(); - if (var61 == null) { - if (var62 != null) { - return false; - } - } else if (!var61.equals(var62)) { - return false; - } - - Date var63 = this.getUpdateTime(); - Date var64 = var2.getUpdateTime(); - if (var63 == null) { - if (var64 != null) { - return false; - } - } else if (!var63.equals(var64)) { - return false; - } - - label310: { - Date var65 = this.getCreateTime(); - Date var66 = var2.getCreateTime(); - if (var65 == null) { - if (var66 == null) { - break label310; - } - } else if (var65.equals(var66)) { - break label310; - } - - return false; - } - - label303: { - String var67 = this.getCreateBy(); - String var68 = var2.getCreateBy(); - if (var67 == null) { - if (var68 == null) { - break label303; - } - } else if (var67.equals(var68)) { - break label303; - } - - return false; - } - - String var69 = this.getConverter(); - String var70 = var2.getConverter(); - if (var69 == null) { - if (var70 != null) { - return false; - } - } else if (!var69.equals(var70)) { - return false; - } - - String var71 = this.getQueryConfigFlag(); - String var72 = var2.getQueryConfigFlag(); - if (var71 == null) { - if (var72 != null) { - return false; - } - } else if (!var71.equals(var72)) { - return false; - } - - label282: { - String var73 = this.getQueryDefVal(); - String var74 = var2.getQueryDefVal(); - if (var73 == null) { - if (var74 == null) { - break label282; - } - } else if (var73.equals(var74)) { - break label282; - } - - return false; - } - - label275: { - String var75 = this.getQueryDictText(); - String var76 = var2.getQueryDictText(); - if (var75 == null) { - if (var76 == null) { - break label275; - } - } else if (var75.equals(var76)) { - break label275; - } - - return false; - } - - String var77 = this.getQueryDictField(); - String var78 = var2.getQueryDictField(); - if (var77 == null) { - if (var78 != null) { - return false; - } - } else if (!var77.equals(var78)) { - return false; - } - - String var79 = this.getQueryDictTable(); - String var80 = var2.getQueryDictTable(); - if (var79 == null) { - if (var80 != null) { - return false; - } - } else if (!var79.equals(var80)) { - return false; - } - - label254: { - String var81 = this.getQueryShowType(); - String var82 = var2.getQueryShowType(); - if (var81 == null) { - if (var82 == null) { - break label254; - } - } else if (var81.equals(var82)) { - break label254; - } - - return false; - } - - label247: { - String var83 = this.getQueryValidType(); - String var84 = var2.getQueryValidType(); - if (var83 == null) { - if (var84 == null) { - break label247; - } - } else if (var83.equals(var84)) { - break label247; - } - - return false; - } - - String var85 = this.getQueryMustInput(); - String var86 = var2.getQueryMustInput(); - if (var85 == null) { - if (var86 != null) { - return false; - } - } else if (!var85.equals(var86)) { - return false; - } - - String var87 = this.getSortFlag(); - String var88 = var2.getSortFlag(); - if (var87 == null) { - if (var88 != null) { - return false; - } - } else if (!var87.equals(var88)) { - return false; - } - - return true; + return !getThree(var2); } } } + private boolean getThree(OnlCgformField var2) { + if (getReturnString(this.getQueryMode(), var2.getQueryMode())) { + return true; + } + + if (getReturnString(this.getMainTable(), var2.getMainTable())) { + return true; + } + + if (getReturnString(this.getMainField(), var2.getMainField())) { + return true; + } + + if (getReturnString(this.getUpdateBy(), var2.getUpdateBy())) { + return true; + } + + if (getReturnDate(this.getUpdateTime(), var2.getUpdateTime())) { + return true; + } + + if (getReturnDate(this.getCreateTime(), var2.getCreateTime())) { + return true; + } + + if (getReturnString(this.getCreateBy(), var2.getCreateBy())) { + return true; + } + + if (getReturnString(this.getConverter(), var2.getConverter())) { + return true; + } + + if (getReturnString(this.getQueryConfigFlag(), var2.getQueryConfigFlag())) { + return true; + } + + if (getReturnString(this.getQueryDefVal(), var2.getQueryDefVal())) { + return true; + } + + if (getReturnString(this.getQueryDictText(), var2.getQueryDictText())) { + return true; + } + + if (getReturnString(this.getQueryDictField(), var2.getQueryDictField())) { + return true; + } + + if (getReturnString(this.getQueryDictTable(), var2.getQueryDictTable())) { + return true; + } + + if (getReturnString(this.getQueryShowType(), var2.getQueryShowType())) { + return true; + } + + return getReturnString(this.getQueryValidType(), var2.getQueryValidType()); + } + + private boolean getTwo(OnlCgformField var2) { + if (getReturnString(this.getDbFieldTxt(), var2.getDbFieldTxt())) { + return true; + } + + if (getReturnString(this.getDbFieldNameOld(), var2.getDbFieldNameOld())) { + return true; + } + + if (getReturnString(this.getDbType(), var2.getDbType())) { + return true; + } + + if (getReturnString(this.getDbDefaultVal(), var2.getDbDefaultVal())) { + return true; + } + + if (getReturnString(this.getDictField(), var2.getDictField())) { + return true; + } + + if (getReturnString(this.getDictTable(), var2.getDictTable())) { + return true; + } + + if (getReturnString(this.getDictText(), var2.getDictText())) { + return true; + } + + if (getReturnString(this.getFieldShowType(), var2.getFieldShowType())) { + return true; + } + + if (getReturnString(this.getFieldHref(), var2.getFieldHref())) { + return true; + } + + if (getReturnString(this.getFieldValidType(), var2.getFieldValidType())) { + return true; + } + + if (getReturnString(this.getFieldMustInput(), var2.getFieldMustInput())) { + return true; + } + + if (getReturnString(this.getFieldExtendJson(), var2.getFieldExtendJson())) { + return true; + } + + if (getReturnString(this.getFieldDefaultValue(), var2.getFieldDefaultValue())) { + return true; + } + if (getReturnString(this.getQueryMustInput(), var2.getQueryMustInput())) { + return true; + } + + return getReturnString(this.getSortFlag(), var2.getSortFlag()); + } + + private boolean getOne(OnlCgformField var2) { + if (getReturnInteger(this.getDbIsKey(), var2.getDbIsKey())) { + return true; + } + + if (getReturnInteger(this.getDbIsNull(), var2.getDbIsNull())) { + return true; + } + + if (getReturnInteger(this.getDbLength(), var2.getDbLength())) { + return true; + } + + if (getReturnInteger(this.getDbPointLength(), var2.getDbPointLength())) { + return true; + } + + if (getReturnInteger(this.getFieldLength(), var2.getFieldLength())) { + return true; + } + + if (getReturnInteger(this.getIsQuery(), var2.getIsQuery())) { + return true; + } + + if (getReturnInteger(this.getIsShowForm(), var2.getIsShowForm())) { + return true; + } + + if (getReturnInteger(this.getIsShowList(), var2.getIsShowList())) { + return true; + } + + if (getReturnInteger(this.getIsReadOnly(), var2.getIsReadOnly())) { + return true; + } + + if (getReturnInteger(this.getOrderNum(), var2.getOrderNum())) { + return true; + } + + if (getReturnString(this.getId(), var2.getId())) { + return true; + } + + if (getReturnString(this.getCgformHeadId(), var2.getCgformHeadId())) { + return true; + } + + return getReturnString(this.getDbFieldName(), var2.getDbFieldName()); + } + + private boolean getReturnDate(Date updateTime, Date updateTime2) { + Date var63 = updateTime; + Date var64 = updateTime2; + if (var63 == null) { + if (var64 != null) { + return true; + } + } else if (!Objects.equals(var63, var64)) { + return true; + } + return false; + } + + private boolean getReturnString(String id, String id2) { + String var23 = id; + String var24 = id2; + if (var23 == null) { + if (var24 != null) { + return true; + } + } else if (!Objects.equals(var23, var24)) { + return true; + } + return false; + } + + private boolean getReturnInteger(Integer dbIsKey, Integer dbIsKey2) { + Integer var3 = dbIsKey; + Integer var4 = dbIsKey2; + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!Objects.equals(var3, var4)) { + return true; + } + return false; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgformField; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformHead.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformHead.java index 95a3a025..31e8fd69 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformHead.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformHead.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.util.Date; +import java.util.Objects; + import org.springframework.format.annotation.DateTimeFormat; @TableName("onl_cgform_head") @@ -355,395 +357,185 @@ public class OnlCgformHead implements Serializable { if (!var2.canEqual(this)) { return false; } else { - label395: { - Integer var3 = this.getTableType(); - Integer var4 = var2.getTableType(); - if (var3 == null) { - if (var4 == null) { - break label395; - } - } else if (var3.equals(var4)) { - break label395; - } - - return false; - } - - Integer var5 = this.getTableVersion(); - Integer var6 = var2.getTableVersion(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - Integer var7 = this.getRelationType(); - Integer var8 = var2.getRelationType(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - label374: { - Integer var9 = this.getTabOrderNum(); - Integer var10 = var2.getTabOrderNum(); - if (var9 == null) { - if (var10 == null) { - break label374; - } - } else if (var9.equals(var10)) { - break label374; - } - - return false; - } - - label367: { - Integer var11 = this.getCopyType(); - Integer var12 = var2.getCopyType(); - if (var11 == null) { - if (var12 == null) { - break label367; - } - } else if (var11.equals(var12)) { - break label367; - } - - return false; - } - - label360: { - Integer var13 = this.getCopyVersion(); - Integer var14 = var2.getCopyVersion(); - if (var13 == null) { - if (var14 == null) { - break label360; - } - } else if (var13.equals(var14)) { - break label360; - } - - return false; - } - - Integer var15 = this.getScroll(); - Integer var16 = var2.getScroll(); - if (var15 == null) { - if (var16 != null) { - return false; - } - } else if (!var15.equals(var16)) { - return false; - } - - label346: { - String var17 = this.getId(); - String var18 = var2.getId(); - if (var17 == null) { - if (var18 == null) { - break label346; - } - } else if (var17.equals(var18)) { - break label346; - } - - return false; - } - - String var19 = this.getTableName(); - String var20 = var2.getTableName(); - if (var19 == null) { - if (var20 != null) { - return false; - } - } else if (!var19.equals(var20)) { - return false; - } - - label332: { - String var21 = this.getTableTxt(); - String var22 = var2.getTableTxt(); - if (var21 == null) { - if (var22 == null) { - break label332; - } - } else if (var21.equals(var22)) { - break label332; - } - - return false; - } - - String var23 = this.getIsCheckbox(); - String var24 = var2.getIsCheckbox(); - if (var23 == null) { - if (var24 != null) { - return false; - } - } else if (!var23.equals(var24)) { - return false; - } - - String var25 = this.getIsDbSynch(); - String var26 = var2.getIsDbSynch(); - if (var25 == null) { - if (var26 != null) { - return false; - } - } else if (!var25.equals(var26)) { - return false; - } - - label311: { - String var27 = this.getIsPage(); - String var28 = var2.getIsPage(); - if (var27 == null) { - if (var28 == null) { - break label311; - } - } else if (var27.equals(var28)) { - break label311; - } - - return false; - } - - label304: { - String var29 = this.getIsTree(); - String var30 = var2.getIsTree(); - if (var29 == null) { - if (var30 == null) { - break label304; - } - } else if (var29.equals(var30)) { - break label304; - } - - return false; - } - - String var31 = this.getIdSequence(); - String var32 = var2.getIdSequence(); - if (var31 == null) { - if (var32 != null) { - return false; - } - } else if (!var31.equals(var32)) { - return false; - } - - String var33 = this.getIdType(); - String var34 = var2.getIdType(); - if (var33 == null) { - if (var34 != null) { - return false; - } - } else if (!var33.equals(var34)) { - return false; - } - - label283: { - String var35 = this.getQueryMode(); - String var36 = var2.getQueryMode(); - if (var35 == null) { - if (var36 == null) { - break label283; - } - } else if (var35.equals(var36)) { - break label283; - } - - return false; - } - - String var37 = this.getSubTableStr(); - String var38 = var2.getSubTableStr(); - if (var37 == null) { - if (var38 != null) { - return false; - } - } else if (!var37.equals(var38)) { - return false; - } - - String var39 = this.getTreeParentIdField(); - String var40 = var2.getTreeParentIdField(); - if (var39 == null) { - if (var40 != null) { - return false; - } - } else if (!var39.equals(var40)) { - return false; - } - - label262: { - String var41 = this.getTreeIdField(); - String var42 = var2.getTreeIdField(); - if (var41 == null) { - if (var42 == null) { - break label262; - } - } else if (var41.equals(var42)) { - break label262; - } - - return false; - } - - label255: { - String var43 = this.getTreeFieldname(); - String var44 = var2.getTreeFieldname(); - if (var43 == null) { - if (var44 == null) { - break label255; - } - } else if (var43.equals(var44)) { - break label255; - } - - return false; - } - - label248: { - String var45 = this.getFormCategory(); - String var46 = var2.getFormCategory(); - if (var45 == null) { - if (var46 == null) { - break label248; - } - } else if (var45.equals(var46)) { - break label248; - } - - return false; - } - - String var47 = this.getFormTemplate(); - String var48 = var2.getFormTemplate(); - if (var47 == null) { - if (var48 != null) { - return false; - } - } else if (!var47.equals(var48)) { - return false; - } - - label234: { - String var49 = this.getThemeTemplate(); - String var50 = var2.getThemeTemplate(); - if (var49 == null) { - if (var50 == null) { - break label234; - } - } else if (var49.equals(var50)) { - break label234; - } - - return false; - } - - String var51 = this.getFormTemplateMobile(); - String var52 = var2.getFormTemplateMobile(); - if (var51 == null) { - if (var52 != null) { - return false; - } - } else if (!var51.equals(var52)) { - return false; - } - - label220: { - String var53 = this.getUpdateBy(); - String var54 = var2.getUpdateBy(); - if (var53 == null) { - if (var54 == null) { - break label220; - } - } else if (var53.equals(var54)) { - break label220; - } - - return false; - } - - Date var55 = this.getUpdateTime(); - Date var56 = var2.getUpdateTime(); - if (var55 == null) { - if (var56 != null) { - return false; - } - } else if (!var55.equals(var56)) { - return false; - } - - String var57 = this.getCreateBy(); - String var58 = var2.getCreateBy(); - if (var57 == null) { - if (var58 != null) { - return false; - } - } else if (!var57.equals(var58)) { - return false; - } - - label199: { - Date var59 = this.getCreateTime(); - Date var60 = var2.getCreateTime(); - if (var59 == null) { - if (var60 == null) { - break label199; - } - } else if (var59.equals(var60)) { - break label199; - } - - return false; - } - - label192: { - String var61 = this.getPhysicId(); - String var62 = var2.getPhysicId(); - if (var61 == null) { - if (var62 == null) { - break label192; - } - } else if (var61.equals(var62)) { - break label192; - } - - return false; - } - - String var63 = this.getIsDesForm(); - String var64 = var2.getIsDesForm(); - if (var63 == null) { - if (var64 != null) { - return false; - } - } else if (!var63.equals(var64)) { - return false; - } - - String var65 = this.getDesFormCode(); - String var66 = var2.getDesFormCode(); - if (var65 == null) { - if (var66 != null) { - return false; - } - } else if (!var65.equals(var66)) { - return false; - } - - return true; + return getOnlCgformHead(var2); } } } + private boolean getOnlCgformHead(OnlCgformHead var2) { + if (getOnlCgformHeadOne(var2)) { + return false; + } + + if (getOnlCgformHeadTwo(var2)) { + return false; + } + if (getReturnString(this.getIsDesForm(), var2.getIsDesForm())) { + return true; + } + + return !getReturnString(this.getDesFormCode(), var2.getDesFormCode()); + } + + private boolean getOnlCgformHeadTwo(OnlCgformHead var2) { + if (getReturnString(this.getIdType(), var2.getIdType())) { + return true; + } + + if (getReturnString(this.getQueryMode(), var2.getQueryMode())) { + return true; + } + + if (getReturnString(this.getSubTableStr(), var2.getSubTableStr())) { + return true; + } + + if (getReturnString(this.getTreeParentIdField(), var2.getTreeParentIdField())) { + return true; + } + + if (getReturnString(this.getTreeIdField(), var2.getTreeIdField())) { + return true; + } + + if (getReturnString(this.getTreeFieldname(), var2.getTreeFieldname())) { + return true; + } + + if (getReturnString(this.getFormCategory(), var2.getFormCategory())) { + return true; + } + + if (getReturnString(this.getFormTemplate(), var2.getFormTemplate())) { + return true; + } + + if (getReturnString(this.getThemeTemplate(), var2.getThemeTemplate())) { + return true; + } + + if (getReturnString(this.getFormTemplateMobile(), var2.getFormTemplateMobile())) { + return true; + } + + if (getReturnString(this.getUpdateBy(), var2.getUpdateBy())) { + return true; + } + + if (getReturnDate(this.getUpdateTime(), var2.getUpdateTime())) { + return true; + } + + if (getReturnString(this.getCreateBy(), var2.getCreateBy())) { + return true; + } + + if (getReturnDate(this.getCreateTime(), var2.getCreateTime())) { + return true; + } + + return getReturnString(this.getPhysicId(), var2.getPhysicId()); + } + + private boolean getOnlCgformHeadOne(OnlCgformHead var2) { + if (getRerturnInteger(this.getTableType(), var2.getTableType())) { + return true; + } + + if (getRerturnInteger(this.getTableVersion(), var2.getTableVersion())) { + return true; + } + + if (getRerturnInteger(this.getRelationType(), var2.getRelationType())) { + return true; + } + + if (getRerturnInteger(this.getTabOrderNum(), var2.getTabOrderNum())) { + return true; + } + + if (getRerturnInteger(this.getCopyType(), var2.getCopyType())) { + return true; + } + + if (getRerturnInteger(this.getCopyVersion(), var2.getCopyVersion())) { + return true; + } + + if (getRerturnInteger(this.getScroll(), var2.getScroll())) { + return true; + } + + if (getReturnString(this.getId(), var2.getId())) { + return true; + } + + if (getReturnString(this.getTableName(), var2.getTableName())) { + return true; + } + + if (getReturnString(this.getTableTxt(), var2.getTableTxt())) { + return true; + } + + if (getReturnString(this.getIsCheckbox(), var2.getIsCheckbox())) { + return true; + } + + if (getReturnString(this.getIsDbSynch(), var2.getIsDbSynch())) { + return true; + } + + if (getReturnString(this.getIsPage(), var2.getIsPage())) { + return true; + } + + if (getReturnString(this.getIsTree(), var2.getIsTree())) { + return true; + } + + return getReturnString(this.getIdSequence(), var2.getIdSequence()); + } + + private boolean getReturnDate(Date updateTime, Date updateTime2) { + Date var55 = updateTime; + Date var56 = updateTime2; + if (var55 == null) { + if (var56 != null) { + return true; + } + } else if (!Objects.equals(var55, var56)) { + return true; + } + return false; + } + + private boolean getReturnString(String id, String id2) { + String var17 = id; + String var18 = id2; + if (var17 == null) { + if (var18 != null) { + return true; + } + } else if (!Objects.equals(var17, var18)) { + return true; + } + return false; + } + + private boolean getRerturnInteger(Integer tableType, Integer tableType2) { + Integer var3 = tableType; + Integer var4 = tableType2; + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!Objects.equals(var3, var4)) { + return true; + } + return false; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgformHead; } @@ -751,72 +543,76 @@ public class OnlCgformHead implements Serializable { public int hashCode() { byte var2 = 1; Integer var3 = this.getTableType(); - int var35 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); + int var35 = var2 * 59 + getAnInt(var3 == null, var3.hashCode()); Integer var4 = this.getTableVersion(); - var35 = var35 * 59 + (var4 == null ? 43 : var4.hashCode()); + var35 = var35 * 59 + (getAnInt(var4 == null, var4.hashCode())); Integer var5 = this.getRelationType(); - var35 = var35 * 59 + (var5 == null ? 43 : var5.hashCode()); + var35 = var35 * 59 + (getAnInt(var5 == null, var5.hashCode())); Integer var6 = this.getTabOrderNum(); - var35 = var35 * 59 + (var6 == null ? 43 : var6.hashCode()); + var35 = var35 * 59 + (getAnInt(var6 == null, var6.hashCode())); Integer var7 = this.getCopyType(); - var35 = var35 * 59 + (var7 == null ? 43 : var7.hashCode()); + var35 = var35 * 59 + (getAnInt(var7 == null, var7.hashCode())); Integer var8 = this.getCopyVersion(); - var35 = var35 * 59 + (var8 == null ? 43 : var8.hashCode()); + var35 = var35 * 59 + (getAnInt(var8 == null, var8.hashCode())); Integer var9 = this.getScroll(); - var35 = var35 * 59 + (var9 == null ? 43 : var9.hashCode()); + var35 = var35 * 59 + (getAnInt(var9 == null, var9.hashCode())); String var10 = this.getId(); - var35 = var35 * 59 + (var10 == null ? 43 : var10.hashCode()); + var35 = var35 * 59 + (getAnInt(var10 == null, var10.hashCode())); String var11 = this.getTableName(); - var35 = var35 * 59 + (var11 == null ? 43 : var11.hashCode()); + var35 = var35 * 59 + (getAnInt(var11 == null, var11.hashCode())); String var12 = this.getTableTxt(); - var35 = var35 * 59 + (var12 == null ? 43 : var12.hashCode()); + var35 = var35 * 59 + (getAnInt(var12 == null, var12.hashCode())); String var13 = this.getIsCheckbox(); - var35 = var35 * 59 + (var13 == null ? 43 : var13.hashCode()); + var35 = var35 * 59 + (getAnInt(var13 == null, var13.hashCode())); String var14 = this.getIsDbSynch(); - var35 = var35 * 59 + (var14 == null ? 43 : var14.hashCode()); + var35 = var35 * 59 + (getAnInt(var14 == null, var14.hashCode())); String var15 = this.getIsPage(); - var35 = var35 * 59 + (var15 == null ? 43 : var15.hashCode()); + var35 = var35 * 59 + (getAnInt(var15 == null, var15.hashCode())); String var16 = this.getIsTree(); - var35 = var35 * 59 + (var16 == null ? 43 : var16.hashCode()); + var35 = var35 * 59 + (getAnInt(var16 == null, var16.hashCode())); String var17 = this.getIdSequence(); - var35 = var35 * 59 + (var17 == null ? 43 : var17.hashCode()); + var35 = var35 * 59 + (getAnInt(var17 == null, var17.hashCode())); String var18 = this.getIdType(); - var35 = var35 * 59 + (var18 == null ? 43 : var18.hashCode()); + var35 = var35 * 59 + (getAnInt(var18 == null, var18.hashCode())); String var19 = this.getQueryMode(); - var35 = var35 * 59 + (var19 == null ? 43 : var19.hashCode()); + var35 = var35 * 59 + (getAnInt(var19 == null, var19.hashCode())); String var20 = this.getSubTableStr(); - var35 = var35 * 59 + (var20 == null ? 43 : var20.hashCode()); + var35 = var35 * 59 + (getAnInt(var20 == null, var20.hashCode())); String var21 = this.getTreeParentIdField(); - var35 = var35 * 59 + (var21 == null ? 43 : var21.hashCode()); + var35 = var35 * 59 + (getAnInt(var21 == null, var21.hashCode())); String var22 = this.getTreeIdField(); - var35 = var35 * 59 + (var22 == null ? 43 : var22.hashCode()); + var35 = var35 * 59 + (getAnInt(var22 == null, var22.hashCode())); String var23 = this.getTreeFieldname(); - var35 = var35 * 59 + (var23 == null ? 43 : var23.hashCode()); + var35 = var35 * 59 + (getAnInt(var23 == null, var23.hashCode())); String var24 = this.getFormCategory(); - var35 = var35 * 59 + (var24 == null ? 43 : var24.hashCode()); + var35 = var35 * 59 + (getAnInt(var24 == null, var24.hashCode())); String var25 = this.getFormTemplate(); - var35 = var35 * 59 + (var25 == null ? 43 : var25.hashCode()); + var35 = var35 * 59 + (getAnInt(var25 == null, var25.hashCode())); String var26 = this.getThemeTemplate(); - var35 = var35 * 59 + (var26 == null ? 43 : var26.hashCode()); + var35 = var35 * 59 + (getAnInt(var26 == null, var26.hashCode())); String var27 = this.getFormTemplateMobile(); - var35 = var35 * 59 + (var27 == null ? 43 : var27.hashCode()); + var35 = var35 * 59 + (getAnInt(var27 == null, var27.hashCode())); String var28 = this.getUpdateBy(); - var35 = var35 * 59 + (var28 == null ? 43 : var28.hashCode()); + var35 = var35 * 59 + (getAnInt(var28 == null, var28.hashCode())); Date var29 = this.getUpdateTime(); - var35 = var35 * 59 + (var29 == null ? 43 : var29.hashCode()); + var35 = var35 * 59 + (getAnInt(var29 == null, var29.hashCode())); String var30 = this.getCreateBy(); - var35 = var35 * 59 + (var30 == null ? 43 : var30.hashCode()); + var35 = var35 * 59 + (getAnInt(var30 == null, var30.hashCode())); Date var31 = this.getCreateTime(); - var35 = var35 * 59 + (var31 == null ? 43 : var31.hashCode()); + var35 = var35 * 59 + (getAnInt(var31 == null, var31.hashCode())); String var32 = this.getPhysicId(); - var35 = var35 * 59 + (var32 == null ? 43 : var32.hashCode()); + var35 = var35 * 59 + (getAnInt(var32 == null, var32.hashCode())); String var33 = this.getIsDesForm(); - var35 = var35 * 59 + (var33 == null ? 43 : var33.hashCode()); + var35 = var35 * 59 + (getAnInt(var33 == null, var33.hashCode())); String var34 = this.getDesFormCode(); - var35 = var35 * 59 + (var34 == null ? 43 : var34.hashCode()); + var35 = var35 * 59 + (getAnInt(var34 == null, var34.hashCode())); return var35; } + private int getAnInt(boolean b, int i) { + return b ? 43 : i; + } + public String toString() { return "OnlCgformHead(id=" + this.getId() + ", tableName=" + this.getTableName() + ", tableType=" + this.getTableType() + ", tableVersion=" + this.getTableVersion() + ", tableTxt=" + this.getTableTxt() + ", isCheckbox=" + this.getIsCheckbox() + ", isDbSynch=" + this.getIsDbSynch() + ", isPage=" + this.getIsPage() + ", isTree=" + this.getIsTree() + ", idSequence=" + this.getIdSequence() + ", idType=" + this.getIdType() + ", queryMode=" + this.getQueryMode() + ", relationType=" + this.getRelationType() + ", subTableStr=" + this.getSubTableStr() + ", tabOrderNum=" + this.getTabOrderNum() + ", treeParentIdField=" + this.getTreeParentIdField() + ", treeIdField=" + this.getTreeIdField() + ", treeFieldname=" + this.getTreeFieldname() + ", formCategory=" + this.getFormCategory() + ", formTemplate=" + this.getFormTemplate() + ", themeTemplate=" + this.getThemeTemplate() + ", formTemplateMobile=" + this.getFormTemplateMobile() + ", updateBy=" + this.getUpdateBy() + ", updateTime=" + this.getUpdateTime() + ", createBy=" + this.getCreateBy() + ", createTime=" + this.getCreateTime() + ", copyType=" + this.getCopyType() + ", copyVersion=" + this.getCopyVersion() + ", physicId=" + this.getPhysicId() + ", hascopy=" + this.getHascopy() + ", scroll=" + this.getScroll() + ", taskId=" + this.getTaskId() + ", isDesForm=" + this.getIsDesForm() + ", desFormCode=" + this.getDesFormCode() + ")"; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformIndex.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformIndex.java index a56c3d5e..1ae64f42 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformIndex.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/entity/OnlCgformIndex.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.util.Date; +import java.util.Objects; + import org.springframework.format.annotation.DateTimeFormat; @TableName("onl_cgform_index") @@ -150,147 +152,99 @@ public class OnlCgformIndex implements Serializable { if (!var2.canEqual(this)) { return false; } else { - label143: { - Integer var3 = this.getDelFlag(); - Integer var4 = var2.getDelFlag(); - if (var3 == null) { - if (var4 == null) { - break label143; - } - } else if (var3.equals(var4)) { - break label143; - } - - return false; - } - - String var5 = this.getId(); - String var6 = var2.getId(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - String var7 = this.getCgformHeadId(); - String var8 = var2.getCgformHeadId(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - label122: { - String var9 = this.getIndexName(); - String var10 = var2.getIndexName(); - if (var9 == null) { - if (var10 == null) { - break label122; - } - } else if (var9.equals(var10)) { - break label122; - } - - return false; - } - - label115: { - String var11 = this.getIndexField(); - String var12 = var2.getIndexField(); - if (var11 == null) { - if (var12 == null) { - break label115; - } - } else if (var11.equals(var12)) { - break label115; - } - - return false; - } - - String var13 = this.getIsDbSynch(); - String var14 = var2.getIsDbSynch(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - String var15 = this.getIndexType(); - String var16 = var2.getIndexType(); - if (var15 == null) { - if (var16 != null) { - return false; - } - } else if (!var15.equals(var16)) { - return false; - } - - label94: { - String var17 = this.getCreateBy(); - String var18 = var2.getCreateBy(); - if (var17 == null) { - if (var18 == null) { - break label94; - } - } else if (var17.equals(var18)) { - break label94; - } - - return false; - } - - label87: { - Date var19 = this.getCreateTime(); - Date var20 = var2.getCreateTime(); - if (var19 == null) { - if (var20 == null) { - break label87; - } - } else if (var19.equals(var20)) { - break label87; - } - - return false; - } - - String var21 = this.getUpdateBy(); - String var22 = var2.getUpdateBy(); - if (var21 == null) { - if (var22 != null) { - return false; - } - } else if (!var21.equals(var22)) { - return false; - } - - Date var23 = this.getUpdateTime(); - Date var24 = var2.getUpdateTime(); - if (var23 == null) { - if (var24 != null) { - return false; - } - } else if (!var23.equals(var24)) { - return false; - } - - return true; + return getOnlCgformIndex(var2); } } } + private boolean getOnlCgformIndex(OnlCgformIndex var2) { + if (getReturnInteger(var2)) { + return false; + } + + if (getReturnString(this.getId(), var2.getId())) { + return false; + } + + if (getReturnString(this.getCgformHeadId(), var2.getCgformHeadId())) { + return false; + } + + if (getReturnString(this.getIndexName(), var2.getIndexName())) { + return false; + } + + if (getReturnString(this.getIndexField(), var2.getIndexField())) { + return false; + } + + if (getReturnString(this.getIsDbSynch(), var2.getIsDbSynch())) { + return false; + } + + if (getReturnString(this.getIndexType(), var2.getIndexType())) { + return false; + } + + if (getReturnString(this.getCreateBy(), var2.getCreateBy())) { + return false; + } + + if (getReturnDate(this.getCreateTime(), var2.getCreateTime())) { + return false; + } + + if (getReturnString(this.getUpdateBy(), var2.getUpdateBy())) { + return false; + } + + return !getReturnDate(this.getUpdateTime(), var2.getUpdateTime()); + } + + private boolean getReturnInteger(OnlCgformIndex var2) { + Integer var3 = this.getDelFlag(); + Integer var4 = var2.getDelFlag(); + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!Objects.equals(var3,var4)) { + return true; + } + return false; + } + + private boolean getReturnDate(Date createTime, Date createTime2) { + Date var19 = createTime; + Date var20 = createTime2; + if (var19 == null) { + if (var20 != null) { + return true; + } + } else if (!Objects.equals(var19, var20)) { + return true; + } + return false; + } + + private boolean getReturnString(String id, String id2) { + String var5 = id; + String var6 = id2; + if (var5 == null) { + if (var6 != null) { + return true; + } + } else if (!Objects.equals(var5, var6)) { + return true; + } + return false; + } + protected boolean canEqual(Object other) { return other instanceof OnlCgformIndex; } public int hashCode() { - boolean var1 = true; byte var2 = 1; Integer var3 = this.getDelFlag(); int var14 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java index 72af7a83..2e75e4a7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/OnlComplexModel.java @@ -4,6 +4,8 @@ package com.jero.generater.modules.online.cgform.model; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; + import com.jero.common.system.vo.DictModel; import com.jero.generater.modules.online.cgform.entity.OnlCgformButton; @@ -209,313 +211,271 @@ public class OnlComplexModel { if (!var2.a(this)) { return false; } else { - label263: { - Integer var3 = this.getTableType(); - Integer var4 = var2.getTableType(); - if (var3 == null) { - if (var4 == null) { - break label263; - } - } else if (var3.equals(var4)) { - break label263; - } - - return false; - } - - Integer var5 = this.getScrollFlag(); - Integer var6 = var2.getScrollFlag(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } - - label249: { - Integer var7 = this.getRelationType(); - Integer var8 = var2.getRelationType(); - if (var7 == null) { - if (var8 == null) { - break label249; - } - } else if (var7.equals(var8)) { - break label249; - } - - return false; - } - - String var9 = this.getCode(); - String var10 = var2.getCode(); - if (var9 == null) { - if (var10 != null) { - return false; - } - } else if (!var9.equals(var10)) { - return false; - } - - label235: { - String var11 = this.getFormTemplate(); - String var12 = var2.getFormTemplate(); - if (var11 == null) { - if (var12 == null) { - break label235; - } - } else if (var11.equals(var12)) { - break label235; - } - - return false; - } - - String var13 = this.getDescription(); - String var14 = var2.getDescription(); - if (var13 == null) { - if (var14 != null) { - return false; - } - } else if (!var13.equals(var14)) { - return false; - } - - label221: { - String var15 = this.getCurrentTableName(); - String var16 = var2.getCurrentTableName(); - if (var15 == null) { - if (var16 == null) { - break label221; - } - } else if (var15.equals(var16)) { - break label221; - } - - return false; - } - - label214: { - String var17 = this.getPaginationFlag(); - String var18 = var2.getPaginationFlag(); - if (var17 == null) { - if (var18 == null) { - break label214; - } - } else if (var17.equals(var18)) { - break label214; - } - - return false; - } - - String var19 = this.getCheckboxFlag(); - String var20 = var2.getCheckboxFlag(); - if (var19 == null) { - if (var20 != null) { - return false; - } - } else if (!var19.equals(var20)) { - return false; - } - - label200: { - List var21 = this.getColumns(); - List var22 = var2.getColumns(); - if (var21 == null) { - if (var22 == null) { - break label200; - } - } else if (var21.equals(var22)) { - break label200; - } - - return false; - } - - label193: { - List var23 = this.getHideColumns(); - List var24 = var2.getHideColumns(); - if (var23 == null) { - if (var24 == null) { - break label193; - } - } else if (var23.equals(var24)) { - break label193; - } - - return false; - } - - Map> var25 = this.getDictOptions(); - Map> var26 = var2.getDictOptions(); - if (var25 == null) { - if (var26 != null) { - return false; - } - } else if (!var25.equals(var26)) { - return false; - } - - List var27 = this.getCgButtonList(); - List var28 = var2.getCgButtonList(); - if (var27 == null) { - if (var28 != null) { - return false; - } - } else if (!var27.equals(var28)) { - return false; - } - - label172: { - List var29 = this.getFieldHrefSlots(); - List var30 = var2.getFieldHrefSlots(); - if (var29 == null) { - if (var30 == null) { - break label172; - } - } else if (var29.equals(var30)) { - break label172; - } - - return false; - } - - String var31 = this.getEnhanceJs(); - String var32 = var2.getEnhanceJs(); - if (var31 == null) { - if (var32 != null) { - return false; - } - } else if (!var31.equals(var32)) { - return false; - } - - List var33 = this.getForeignKeys(); - List var34 = var2.getForeignKeys(); - if (var33 == null) { - if (var34 != null) { - return false; - } - } else if (!var33.equals(var34)) { - return false; - } - - label151: { - String var35 = this.getPidField(); - String var36 = var2.getPidField(); - if (var35 == null) { - if (var36 == null) { - break label151; - } - } else if (var35.equals(var36)) { - break label151; - } - - return false; - } - - String var37 = this.getHasChildrenField(); - String var38 = var2.getHasChildrenField(); - if (var37 == null) { - if (var38 != null) { - return false; - } - } else if (!var37.equals(var38)) { - return false; - } - - label137: { - String var39 = this.getTextField(); - String var40 = var2.getTextField(); - if (var39 == null) { - if (var40 == null) { - break label137; - } - } else if (var39.equals(var40)) { - break label137; - } - - return false; - } - - String var41 = this.getIsDesForm(); - String var42 = var2.getIsDesForm(); - if (var41 == null) { - if (var42 != null) { - return false; - } - } else if (!var41.equals(var42)) { - return false; - } - - String var43 = this.getDesFormCode(); - String var44 = var2.getDesFormCode(); - if (var43 == null) { - if (var44 == null) { - return true; - } - } else if (var43.equals(var44)) { - return true; - } - - return false; + return getOnlComplexModel(var2); } } } + private boolean getOnlComplexModel(OnlComplexModel var2) { + if (getReturnInteger(this.getTableType(), var2.getTableType())) { + return false; + } + + if (getReturnInteger(this.getScrollFlag(), var2.getScrollFlag())) { + return false; + } + + if (getReturnInteger(this.getRelationType(), var2.getRelationType())) { + return false; + } + + if (getReturnString(this.getCode(), var2.getCode())) { + return false; + } + + if (getReturnString(this.getFormTemplate(), var2.getFormTemplate())) { + return false; + } + + if (getReturnString(this.getDescription(), var2.getDescription())) { + return false; + } + + if (getReturnString(this.getCurrentTableName(), var2.getCurrentTableName())) { + return false; + } + + if (getReturnString(this.getPaginationFlag(), var2.getPaginationFlag())) { + return false; + } + + if (getReturnString(this.getCheckboxFlag(), var2.getCheckboxFlag())) { + return false; + } + + if (getListAndMap(var2)) { + return false; + } + + if (getReturnString(this.getPidField(), var2.getPidField())) { + return false; + } + + if (getReturnString(this.getHasChildrenField(), var2.getHasChildrenField())) { + return false; + } + + if (getReturnString(this.getTextField(), var2.getTextField())) { + return false; + } + + if (getReturnString(this.getIsDesForm(), var2.getIsDesForm())) { + return false; + } + + return getReturn(var2); + } + + private boolean getListAndMap(OnlComplexModel var2) { + if (getOnlColumn(var2)) { + return true; + } + + if (getString(var2)) { + return true; + } + + if (getDictModel(var2)) { + return true; + } + + if (getOnlCgformButton(var2)) { + return true; + } + + if (getHrefSlots(var2)) { + return true; + } + + if (getReturnString(this.getEnhanceJs(), var2.getEnhanceJs())) { + return true; + } + + return getOnlForeignKey(var2); + } + + private boolean getOnlForeignKey(OnlComplexModel var2) { + List var33 = this.getForeignKeys(); + List var34 = var2.getForeignKeys(); + if (var33 == null) { + if (var34 != null) { + return true; + } + } else if (!Objects.equals(var33,var34)) { + return true; + } + return false; + } + + private boolean getHrefSlots(OnlComplexModel var2) { + List var29 = this.getFieldHrefSlots(); + List var30 = var2.getFieldHrefSlots(); + if (var29 == null) { + if (var30 == null) { + return true; + } + } else if (!Objects.equals(var29,var30)) { + return true; + } + return false; + } + + private boolean getOnlCgformButton(OnlComplexModel var2) { + List var27 = this.getCgButtonList(); + List var28 = var2.getCgButtonList(); + if (var27 == null) { + if (var28 != null) { + return true; + } + } else if (!Objects.equals(var27,var28)) { + return true; + } + return false; + } + + private boolean getDictModel(OnlComplexModel var2) { + Map> var25 = this.getDictOptions(); + Map> var26 = var2.getDictOptions(); + if (var25 == null) { + if (var26 != null) { + return true; + } + } else if (!Objects.equals(var25,var26)) { + return true; + } + return false; + } + + private boolean getString(OnlComplexModel var2) { + List var23 = this.getHideColumns(); + List var24 = var2.getHideColumns(); + if (var23 == null) { + if (var24 != null) { + return true; + } + } else if (!Objects.equals(var23,var24)) { + return true; + } + return false; + } + + private boolean getOnlColumn(OnlComplexModel var2) { + List var21 = this.getColumns(); + List var22 = var2.getColumns(); + if (var21 == null) { + if (var22 != null) { + return true; + } + } else if (!Objects.equals(var21,var22)) { + return true; + } + return false; + } + + private boolean getReturn(OnlComplexModel var2) { + String var43 = this.getDesFormCode(); + String var44 = var2.getDesFormCode(); + if (var43 == null) { + if (var44 == null) { + return true; + } + } else if (Objects.equals(var43,var44)) { + return true; + } + return false; + } + + private boolean getReturnString(String code, String code2) { + String var9 = code; + String var10 = code2; + if (var9 == null) { + if (var10 != null) { + return true; + } + } else if (!Objects.equals(var9, var10)) { + return true; + } + return false; + } + + private boolean getReturnInteger(Integer tableType, Integer tableType2) { + Integer var3 = tableType; + Integer var4 = tableType2; + if (var3 == null) { + if (var4 != null) { + return true; + } + } else if (!Objects.equals(var3, var4)) { + return true; + } + return false; + } + protected boolean a(Object var1) { return var1 instanceof OnlComplexModel; } public int hashCode() { - boolean var1 = true; byte var2 = 1; Integer var3 = this.getTableType(); - int var24 = var2 * 59 + (var3 == null ? 43 : var3.hashCode()); + int var24 = var2 * 59 + getAnInt(var3 == null, var3.hashCode()); Integer var4 = this.getScrollFlag(); - var24 = var24 * 59 + (var4 == null ? 43 : var4.hashCode()); + var24 = var24 * 59 + (getAnInt(var4 == null, var4.hashCode())); Integer var5 = this.getRelationType(); - var24 = var24 * 59 + (var5 == null ? 43 : var5.hashCode()); + var24 = var24 * 59 + (getAnInt(var5 == null, var5.hashCode())); String var6 = this.getCode(); - var24 = var24 * 59 + (var6 == null ? 43 : var6.hashCode()); + var24 = var24 * 59 + (getAnInt(var6 == null, var6.hashCode())); String var7 = this.getFormTemplate(); - var24 = var24 * 59 + (var7 == null ? 43 : var7.hashCode()); + var24 = var24 * 59 + (getAnInt(var7 == null, var7.hashCode())); String var8 = this.getDescription(); - var24 = var24 * 59 + (var8 == null ? 43 : var8.hashCode()); + var24 = var24 * 59 + (getAnInt(var8 == null, var8.hashCode())); String var9 = this.getCurrentTableName(); - var24 = var24 * 59 + (var9 == null ? 43 : var9.hashCode()); + var24 = var24 * 59 + (getAnInt(var9 == null, var9.hashCode())); String var10 = this.getPaginationFlag(); - var24 = var24 * 59 + (var10 == null ? 43 : var10.hashCode()); + var24 = var24 * 59 + (getAnInt(var10 == null, var10.hashCode())); String var11 = this.getCheckboxFlag(); - var24 = var24 * 59 + (var11 == null ? 43 : var11.hashCode()); + var24 = var24 * 59 + (getAnInt(var11 == null, var11.hashCode())); List var12 = this.getColumns(); - var24 = var24 * 59 + (var12 == null ? 43 : var12.hashCode()); + var24 = var24 * 59 + (getAnInt(var12 == null, var12.hashCode())); List var13 = this.getHideColumns(); - var24 = var24 * 59 + (var13 == null ? 43 : var13.hashCode()); + var24 = var24 * 59 + (getAnInt(var13 == null, var13.hashCode())); Map> var14 = this.getDictOptions(); - var24 = var24 * 59 + (var14 == null ? 43 : var14.hashCode()); + var24 = var24 * 59 + (getAnInt(var14 == null, var14.hashCode())); List var15 = this.getCgButtonList(); - var24 = var24 * 59 + (var15 == null ? 43 : var15.hashCode()); + var24 = var24 * 59 + (getAnInt(var15 == null, var15.hashCode())); List var16 = this.getFieldHrefSlots(); - var24 = var24 * 59 + (var16 == null ? 43 : var16.hashCode()); + var24 = var24 * 59 + (getAnInt(var16 == null, var16.hashCode())); String var17 = this.getEnhanceJs(); - var24 = var24 * 59 + (var17 == null ? 43 : var17.hashCode()); + var24 = var24 * 59 + (getAnInt(var17 == null, var17.hashCode())); List var18 = this.getForeignKeys(); - var24 = var24 * 59 + (var18 == null ? 43 : var18.hashCode()); + var24 = var24 * 59 + (getAnInt(var18 == null, var18.hashCode())); String var19 = this.getPidField(); - var24 = var24 * 59 + (var19 == null ? 43 : var19.hashCode()); + var24 = var24 * 59 + (getAnInt(var19 == null, var19.hashCode())); String var20 = this.getHasChildrenField(); - var24 = var24 * 59 + (var20 == null ? 43 : var20.hashCode()); + var24 = var24 * 59 + (getAnInt(var20 == null, var20.hashCode())); String var21 = this.getTextField(); - var24 = var24 * 59 + (var21 == null ? 43 : var21.hashCode()); + var24 = var24 * 59 + (getAnInt(var21 == null, var21.hashCode())); String var22 = this.getIsDesForm(); - var24 = var24 * 59 + (var22 == null ? 43 : var22.hashCode()); + var24 = var24 * 59 + (getAnInt(var22 == null, var22.hashCode())); String var23 = this.getDesFormCode(); - var24 = var24 * 59 + (var23 == null ? 43 : var23.hashCode()); + var24 = var24 * 59 + (getAnInt(var23 == null, var23.hashCode())); return var24; } + private int getAnInt(boolean b, int i) { + return b ? 43 : i; + } + public String toString() { return "OnlComplexModel(code=" + this.getCode() + ", formTemplate=" + this.getFormTemplate() + ", description=" + this.getDescription() + ", currentTableName=" + this.getCurrentTableName() + ", tableType=" + this.getTableType() + ", paginationFlag=" + this.getPaginationFlag() + ", checkboxFlag=" + this.getCheckboxFlag() + ", scrollFlag=" + this.getScrollFlag() + ", columns=" + this.getColumns() + ", hideColumns=" + this.getHideColumns() + ", dictOptions=" + this.getDictOptions() + ", cgButtonList=" + this.getCgButtonList() + ", fieldHrefSlots=" + this.getFieldHrefSlots() + ", enhanceJs=" + this.getEnhanceJs() + ", foreignKeys=" + this.getForeignKeys() + ", pidField=" + this.getPidField() + ", hasChildrenField=" + this.getHasChildrenField() + ", textField=" + this.getTextField() + ", isDesForm=" + this.getIsDesForm() + ", desFormCode=" + this.getDesFormCode() + ", relationType=" + this.getRelationType() + ")"; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java index 2b741ce6..cdd04526 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/ScopedSlots.java @@ -49,7 +49,6 @@ public class ScopedSlots { } public int hashCode() { - boolean var1 = true; byte var2 = 1; String var3 = this.getCustomRender(); return var2 * 59 + (var3 == null ? 43 : var3.hashCode()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java index b36b3ec2..4e24557c 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/model/TreeModel.java @@ -1,6 +1,8 @@ package com.jero.generater.modules.online.cgform.model; +import java.util.Objects; + public class TreeModel { private String label; private String store; @@ -49,57 +51,42 @@ public class TreeModel { } else if (!(o instanceof TreeModel)) { return false; } else { - TreeModel var2 = (TreeModel)o; - if (!var2.canEqual(this)) { + return getTreeModel((TreeModel) o); + } + } + + private boolean getTreeModel(TreeModel o) { + TreeModel var2 = o; + if (!var2.canEqual(this)) { + return false; + } else { + if (getReturn(this.getLabel(), var2.getLabel())) { return false; - } else { - label59: { - String var3 = this.getLabel(); - String var4 = var2.getLabel(); - if (var3 == null) { - if (var4 == null) { - break label59; - } - } else if (var3.equals(var4)) { - break label59; - } + } - return false; - } + if (getReturn(this.getStore(), var2.getStore())) { + return false; + } - String var5 = this.getStore(); - String var6 = var2.getStore(); - if (var5 == null) { - if (var6 != null) { - return false; - } - } else if (!var5.equals(var6)) { - return false; - } + if (getReturn(this.getId(), var2.getId())) { + return false; + } - String var7 = this.getId(); - String var8 = var2.getId(); - if (var7 == null) { - if (var8 != null) { - return false; - } - } else if (!var7.equals(var8)) { - return false; - } - - String var9 = this.getPid(); - String var10 = var2.getPid(); - if (var9 == null) { - if (var10 != null) { - return false; - } - } else if (!var9.equals(var10)) { - return false; - } + return !getReturn(this.getPid(), var2.getPid()); + } + } + private boolean getReturn(String label, String label2) { + String var3 = label; + String var4 = label2; + if (var3 == null) { + if (var4 != null) { return true; } + } else if (!Objects.equals(var3, var4)) { + return true; } + return false; } protected boolean canEqual(Object other) { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 56f7b891..69d59895 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -58,6 +58,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAutolistPage(String tbname, String headId, Map params, List needList) { HashMap var5 = new HashMap<>(); @@ -79,6 +80,26 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var21 = this.onlCgformFieldMapper.queryListBySql(var9.toString()); + log.debug("---Online查询sql 不分页 :>>" + var9.toString()); + putVar6(var5, var8, var21); + } else { + Integer var22 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); + Page> var18 = new Page<>(var22, var20); + log.debug("---Online查询sql:>>" + var9.toString()); + IPage> var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString()); + var5.put(TOTAL, var19.getTotal()); + var5.put(RECORDS, CgformUtil.d(var19.getRecords())); + } + + return var5; + } + + private void appendVar9(Map params, List var7, StringBuilder var9, Object var15) { if (var15 != null) { String var16 = var15.toString(); String var17 = params.get("order").toString(); @@ -91,29 +112,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var21 = this.onlCgformFieldMapper.queryListBySql(var9.toString()); - log.debug("---Online查询sql 不分页 :>>" + var9.toString()); - if (var21 != null && !var21.isEmpty()) { - var5.put(TOTAL, var21.size()); - var5.put(FIELD_LIST, var8); - var5.put(RECORDS, CgformUtil.d(var21)); - } else { - var5.put(TOTAL, 0); - var5.put(FIELD_LIST, var8); - } - } else { - Integer var22 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); - Page> var18 = new Page<>(var22, var20); - log.debug("---Online查询sql:>>" + var9.toString()); - IPage> var19 = this.onlCgformFieldMapper.selectPageBySql(var18, var9.toString()); - var5.put(TOTAL, var19.getTotal()); - var5.put(RECORDS, CgformUtil.d(var19.getRecords())); - } - - return var5; } @Override @@ -137,6 +135,66 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var25 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); + if ("true".equals(params.get("hasQuery"))) { + ArrayList> var19 = new ArrayList<>(); + Iterator> var20 = var25.iterator(); + + var25 = getMaps(tbname, headId, needList, pidField, var19, var20); + } + + log.debug("---Online查询sql 不分页 :>>" + var10.toString()); + putVar6(var6, var9, var25); + } else { + Integer var26 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); + Page> var27 = new Page<>(var26, var24); + log.debug("---Online查询sql:>>" + var10.toString()); + IPage> var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString()); + var6.put(TOTAL, var28.getTotal()); + var6.put(RECORDS, CgformUtil.d(var28.getRecords())); + } + + return var6; + } + + private List> getMaps(String tbname, String headId, List needList, String pidField, ArrayList> var19, Iterator> var20) { + List> var25; + while(true) { + while(var20.hasNext()) { + Map var21 = var20.next(); + String var22 = var21.get(pidField).toString(); + if (var22 != null && !"0".equals(var22)) { + Map var23 = this.a(var22, tbname, headId, needList, pidField); + if (var23 != null && var23.size() > 0 && !var19.contains(var23)) { + var19.add(var23); + } + } else if (!var19.contains(var21)) { + var19.add(var21); + } + } + + var25 = var19; + break; + } + return var25; + } + + private void putVar6(HashMap var6, List var9, List> var25) { + if (var25 != null && !(var25).isEmpty()) { + var6.put(TOTAL, (var25).size()); + var6.put(FIELD_LIST, var9); + var6.put(RECORDS, CgformUtil.d(var25)); + } else { + var6.put(TOTAL, 0); + var6.put(FIELD_LIST, var9); + } + } + + private void setVar10(Map params, List var8, StringBuilder var10, Object var16) { if (var16 != null) { String var17 = var16.toString(); String var18 = params.get("order").toString(); @@ -149,52 +207,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var25 = this.onlCgformFieldMapper.queryListBySql(var10.toString()); - if ("true".equals(params.get("hasQuery"))) { - ArrayList> var19 = new ArrayList<>(); - Iterator var20 = ((List)var25).iterator(); - - while(true) { - while(var20.hasNext()) { - Map var21 = (Map)var20.next(); - String var22 = var21.get(pidField).toString(); - if (var22 != null && !"0".equals(var22)) { - Map var23 = this.a(var22, tbname, headId, needList, pidField); - if (var23 != null && var23.size() > 0 && !var19.contains(var23)) { - var19.add(var23); - } - } else if (!var19.contains(var21)) { - var19.add(var21); - } - } - - var25 = var19; - break; - } - } - - log.debug("---Online查询sql 不分页 :>>" + var10.toString()); - if (var25 != null && !(var25).isEmpty()) { - var6.put(TOTAL, (var25).size()); - var6.put(FIELD_LIST, var9); - var6.put(RECORDS, CgformUtil.d(var25)); - } else { - var6.put(TOTAL, 0); - var6.put(FIELD_LIST, var9); - } - } else { - Integer var26 = params.get(PAGE_NO) == null ? 1 : Integer.parseInt(params.get(PAGE_NO).toString()); - Page> var27 = new Page<>(var26, var24); - log.debug("---Online查询sql:>>" + var10.toString()); - IPage> var28 = this.onlCgformFieldMapper.selectPageBySql(var27, var10.toString()); - var6.put(TOTAL, var28.getTotal()); - var6.put(RECORDS, CgformUtil.d(var28.getRecords())); - } - - return var6; } private Map a(String var1, String var2, String var3, List var4, String var5) { @@ -243,11 +255,11 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var6 = new LambdaQueryWrapper<>(); var6.eq(OnlCgformField::getCgformHeadId, code); List var7 = this.list(var6); - Iterator var8 = var7.iterator(); + Iterator var8 = var7.iterator(); while(true) { while(var8.hasNext()) { - OnlCgformField var9 = (OnlCgformField)var8.next(); + OnlCgformField var9 = var8.next(); if (hasChildField.equals(var9.getDbFieldName()) && var9.getIsShowForm() != 1) { var9.setIsShowForm(1); json.put(hasChildField, "0"); @@ -331,92 +343,117 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var9 = new ArrayList<>(); - if (oConvertUtils.isNotEmpty(head.getSubTableStr())) { - String[] var10 = head.getSubTableStr().split(","); - int var11 = var10.length; - - for(int var12 = 0; var12 < var11; ++var12) { - String var13 = var10[var12]; - OnlCgformHead var14 = this.cgformHeadMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var13)); - if (var14 != null) { - LambdaQueryWrapper fieldQueryWrapper = new LambdaQueryWrapper<>(); - fieldQueryWrapper.eq(OnlCgformField::getCgformHeadId, var14.getId()).eq(OnlCgformField::getMainTable, head.getTableName()); - - List list = this.list(fieldQueryWrapper); - if (list != null && !list.isEmpty()) { - OnlCgformField onlCgformField = list.get(0); - HashMap var18 = new HashMap<>(); - var18.put(var6, onlCgformField.getDbFieldName()); - var18.put(var8, onlCgformField.getMainField()); - var18.put(var5, var13); - var18.put(var7, ""); - var9.add(var18); - } - } - } - - LambdaQueryWrapper headIdQueryWrapper = new LambdaQueryWrapper<>(); - headIdQueryWrapper.eq(OnlCgformField::getCgformHeadId, var3); - List var25 = this.list(headIdQueryWrapper); - String[] var26 = ids.split(","); - String[] var27 = var26; - int var29 = var26.length; - int var31 = 0; - - label52: - while(true) { - if (var31 >= var29) { - Iterator var28 = var9.iterator(); - - while(true) { - if (!var28.hasNext()) { - break label52; - } - - Map var30 = (Map)var28.next(); - this.deleteAutoList((String)var30.get(var5), (String)var30.get(var6), (String)var30.get(var7)); - } - } - - String var32 = var27[var31]; - String var33 = CgformUtil.a(var4, var25, var32); - Map var34 = this.onlCgformFieldMapper.queryFormData(var33); - new ArrayList<>(); - - for (HashMap stringStringHashMap : var9) { - Map var21 = (Map) stringStringHashMap; - Object var22 = var34.get(((String) var21.get(var8)).toLowerCase()); - if (var22 == null) { - var22 = var34.get(((String) var21.get(var8)).toUpperCase()); - } - - if (var22 != null) { - String var23 = (String) var21.get(var7) + String.valueOf(var22) + ","; - var21.put(var7, var23); - } - } - - ++var31; - } - } + getSubTableStr(head, ids); this.deleteAutoListById(head.getTableName(), ids); } } + private void getSubTableStr(OnlCgformHead head, String ids) { + String var3 = head.getId(); + String var4 = head.getTableName(); + ArrayList> var9 = new ArrayList<>(); + if (oConvertUtils.isNotEmpty(head.getSubTableStr())) { + String[] var10 = head.getSubTableStr().split(","); + int var11 = var10.length; + + getVar12(head, var9, var10, var11); + + LambdaQueryWrapper headIdQueryWrapper = new LambdaQueryWrapper<>(); + headIdQueryWrapper.eq(OnlCgformField::getCgformHeadId, var3); + List var25 = this.list(headIdQueryWrapper); + String[] var26 = ids.split(","); + String[] var27 = var26; + int var29 = var26.length; + int var31 = 0; + + getVar31(var4,var9, var25, var27[var31], var31 >= var29, var31); + } + } + + private void getVar31(String var4,ArrayList> var9, List var25, String var321, boolean b, int var31) { + String var5 = "tableName"; + String var6 = "linkField"; + String var7 = "linkValueStr"; + String var8 = "mainField"; + label52: + while(true) { + if (b) { + Iterator> var28 = var9.iterator(); + + while(true) { + if (!var28.hasNext()) { + break label52; + } + + HashMap var30 = var28.next(); + this.deleteAutoList(var30.get(var5), var30.get(var6), var30.get(var7)); + } + } + + String var33 = CgformUtil.a(var4, var25, var321); + Map var34 = this.onlCgformFieldMapper.queryFormData(var33); + new ArrayList<>(); + + getVar9(var7, var8, var9, var34); + + ++var31; + } + } + + private void getVar12(OnlCgformHead head,ArrayList> var9, String[] var10, int var11) { + String var5 = "tableName"; + String var6 = "linkField"; + String var7 = "linkValueStr"; + String var8 = "mainField"; + for(int var12 = 0; var12 < var11; ++var12) { + String var13 = var10[var12]; + OnlCgformHead var14 = this.cgformHeadMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var13)); + if (var14 == null) { + continue; + } + LambdaQueryWrapper fieldQueryWrapper = new LambdaQueryWrapper<>(); + fieldQueryWrapper.eq(OnlCgformField::getCgformHeadId, var14.getId()).eq(OnlCgformField::getMainTable, head.getTableName()); + + List list = this.list(fieldQueryWrapper); + getList(var5, var6, var7, var8, var9, var13, list); + } + } + + private void getList(String var5, String var6, String var7, String var8, ArrayList> var9, String var13, List list) { + if (list != null && !list.isEmpty()) { + OnlCgformField onlCgformField = list.get(0); + HashMap var18 = new HashMap<>(); + var18.put(var6, onlCgformField.getDbFieldName()); + var18.put(var8, onlCgformField.getMainField()); + var18.put(var5, var13); + var18.put(var7, ""); + var9.add(var18); + } + } + + private void getVar9(String var7, String var8, ArrayList> var9, Map var34) { + for (HashMap stringStringHashMap : var9) { + Map var21 = stringStringHashMap; + Object var22 = var34.get((var21.get(var8)).toLowerCase()); + if (var22 == null) { + var22 = var34.get((var21.get(var8)).toUpperCase()); + } + + if (var22 != null) { + String var23 = var21.get(var7) + var22 + ","; + var21.put(var7, var23); + } + } + } + @Override public void deleteAutoListById(String tbname, String ids) { this.deleteAutoList(tbname, "id", ids); @@ -452,12 +489,12 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var3 = this.list(var2); - ArrayList var4 = new ArrayList<>(); + List> var4 = new ArrayList<>(); int var5 = 0; - HashMap var8; - for(Iterator var6 = var3.iterator(); var6.hasNext(); var4.add(var8)) { - OnlCgformField var7 = (OnlCgformField)var6.next(); + HashMap var8; + for(Iterator var6 = var3.iterator(); var6.hasNext(); var4.add(var8)) { + OnlCgformField var7 = var6.next(); var8 = new HashMap<>(); var8.put("label", var7.getDbFieldTxt()); var8.put("field", var7.getDbFieldName()); @@ -503,14 +540,19 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl 2) { - var8.put("hidden", "1"); - } + putVar8(var5, var8); } return var4; } + private void putVar8(int var5, HashMap var8) { + if (var5 > 2) { + var8.put("hidden", "1"); + } + } + + @Override public List queryFormFields(String code, boolean isform) { LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformField::getCgformHeadId, code); @@ -578,11 +620,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAvailableFields(String cgFormId, String tbname, String taskId, boolean isList) { LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); var5.eq(OnlCgformField::getCgformHeadId, cgFormId); - if (isList) { - var5.eq(OnlCgformField::getIsShowList, 1); - } else { - var5.eq(OnlCgformField::getIsShowForm, 1); - } + setVar5(isList, var5); var5.orderByAsc(OnlCgformField::getOrderNum); List var6 = this.list(var5); @@ -618,6 +656,14 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var5) { + if (isList) { + var5.eq(OnlCgformField::getIsShowList, 1); + } else { + var5.eq(OnlCgformField::getIsShowForm, 1); + } + } + @Override public List queryDisabledFields(String tbname) { String var2 = ONLINE + tbname + "%"; @@ -657,20 +703,20 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl queryAvailableFields(String tbname, boolean isList, List List, List needList) { + public List queryAvailableFields(String tbname, boolean isList, List list, List needList) { String var5 = ONLINE + tbname + "%"; LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var7 = var6.getId(); List var8 = this.baseMapper.selectOnlineHideColumns(var7, var5); - return this.a(var8, isList, List, needList); + return this.a(var8, isList, list, needList); } @Override - public List queryAvailableFields(String cgformId, String tbname, boolean isList, List List, List needList) { + public List queryAvailableFields(String cgformId, String tbname, boolean isList, List list, List needList) { LoginUser var6 = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String var7 = var6.getId(); List var8 = this.onlAuthPageService.queryListHideColumn(var7, cgformId); - return this.a(var8, isList, List, needList); + return this.a(var8, isList, list, needList); } private List a(List var1, boolean var2, List var3, List var4) { @@ -680,34 +726,17 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var7 = var3.iterator(); while(true) { while(var7.hasNext()) { - OnlCgformField var8 = (OnlCgformField)var7.next(); + OnlCgformField var8 = var7.next(); String var9 = var8.getDbFieldName(); if (var4 != null && var4.contains(var9)) { var8.setIsQuery(1); var5.add(var8); } else { - if (var2) { - if (var8.getIsShowList() != 1) { - if (oConvertUtils.isNotEmpty(var8.getMainTable()) && oConvertUtils.isNotEmpty(var8.getMainField())) { - var5.add(var8); - } - continue; - } - } else if (var8.getIsShowForm() != 1) { - continue; - } - - if (var6) { - if (this.b(var9, var1)) { - var5.add(var8); - } - } else { - var5.add(var8); - } + getVar2(var1, var2, var5, var6, var8, var9); } } @@ -715,6 +744,27 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var1, boolean var2, ArrayList var5, boolean var6, OnlCgformField var8, String var9) { + if (var2) { + if (var8.getIsShowList() != 1) { + if (oConvertUtils.isNotEmpty(var8.getMainTable()) && oConvertUtils.isNotEmpty(var8.getMainField())) { + var5.add(var8); + } + return; + } + } else if (var8.getIsShowForm() != 1) { + return; + } + + if (var6) { + if (this.b(var9, var1)) { + var5.add(var8); + } + } else { + var5.add(var8); + } + } + private boolean b(String var1, List var2) { boolean var3 = true; @@ -822,8 +872,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl> var6 = this.onlCgformFieldMapper.queryListBySql(var5); Map var9; if (var6 != null && !var6.isEmpty()) { - for(Iterator var7 = var6.iterator(); var7.hasNext(); this.a(var9.get("id").toString(), var2, var3, var4)) { - Map var8 = (Map)var7.next(); + for(Iterator> var7 = var6.iterator(); var7.hasNext(); this.a(var9.get("id").toString(), var2, var3, var4)) { + Map var8 = var7.next(); var9 = CgformUtil.b(var8); if (!var4.toString().contains(var9.get("id").toString())) { var4.append(",").append(var9.get("id")); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java index de8036bb..a4efdeea 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformHeadServiceImpl.java @@ -40,6 +40,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.formula.functions.T; import org.hibernate.HibernateException; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -138,127 +140,146 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var6 = model.getFields(); - List var7 = model.getIndexs(); - ArrayList var8 = new ArrayList<>(); - ArrayList var9 = new ArrayList<>(); - - for (OnlCgformField var11 : var6) { - String var12 = String.valueOf(var11.getId()); - this.a(var11); - if (var12.length() == 32) { - var9.add(var11); - } else { - String var13 = "_pk"; - if (!var13.equals(var12)) { - var11.setId(null); - var11.setCgformHeadId(var2.getId()); - var8.add(var11); - } - } - } - - if (!var8.isEmpty()) { - var4 = "N"; - } - - int var18 = 0; - - Iterator var19; - OnlCgformField var21; - for(var19 = var9.iterator(); var19.hasNext(); this.fieldService.updateById(var21)) { - var21 = (OnlCgformField)var19.next(); - OnlCgformField var23 = this.fieldService.getById(var21.getId()); - boolean var14 = CgformUtil.a(var23, var21); - if (var14) { - var4 = "N"; - } - - if ((var23.getOrderNum() == null ? 0 : var23.getOrderNum()) > var18) { - var18 = var23.getOrderNum(); - } - } - - for(var19 = var8.iterator(); var19.hasNext(); this.fieldService.save(var21)) { - var21 = (OnlCgformField)var19.next(); - if (var21.getOrderNum() == null) { - ++var18; - var21.setOrderNum(var18); - } - } - - List var20 = this.indexService.getCgformIndexsByCgformId(var2.getId()); - ArrayList var22 = new ArrayList<>(); - ArrayList var24 = new ArrayList<>(); - Iterator var25 = var7.iterator(); - - OnlCgformIndex var15; - while(var25.hasNext()) { - var15 = (OnlCgformIndex)var25.next(); - String var16 = String.valueOf(var15.getId()); - if (var16.length() == 32) { - var24.add(var15); - } else { - var15.setId((String)null); - var15.setIsDbSynch("N"); - var15.setDelFlag(CommonConstant.DEL_FLAG_0); - var15.setCgformHeadId(var2.getId()); - var22.add(var15); - } - } - - var25 = var20.iterator(); - - while(var25.hasNext()) { - var15 = (OnlCgformIndex)var25.next(); - final OnlCgformIndex cgformIndexCopy = var15; - boolean var26 = var7.stream().anyMatch(var1 -> cgformIndexCopy.getId().equals(var1.getId())); - if (!var26) { - var15.setDelFlag(CommonConstant.DEL_FLAG_1); - var24.add(var15); - var4 = "N"; - } - } - - if (!var22.isEmpty()) { - var4 = "N"; - this.indexService.saveBatch(var22); - } - - for(var25 = var24.iterator(); var25.hasNext(); this.indexService.updateById(var15)) { - var15 = (OnlCgformIndex)var25.next(); - OnlCgformIndex var27 = this.indexService.getById(var15.getId()); - boolean var17 = CgformUtil.a(var27, var15); - if (var17) { - var4 = "N"; - var15.setIsDbSynch("N"); - } - } - - if (!model.getDeleteFieldIds().isEmpty()) { - var4 = "N"; - this.fieldService.removeByIds(model.getDeleteFieldIds()); - } - - var2.setIsDbSynch(var4); - super.updateById(var2); - this.a(var2, var6); - this.b(var2, var6); + getIsDbSynch(model, var2, var3); return Result.OK("全部修改成功"); } } + private void getIsDbSynch(OnlCgformModel model, OnlCgformHead var2, OnlCgformHead var3) { + String var4 = var3.getIsDbSynch(); + var4 = getVar4(var4, CgformUtil.a(var3, var2)); + + Integer var5 = var3.getTableVersion(); + if (var5 == null) { + var5 = 1; + } + + var2.setTableVersion(var5 + 1); + List var6 = model.getFields(); + List var7 = model.getIndexs(); + ArrayList var8 = new ArrayList<>(); + ArrayList var9 = new ArrayList<>(); + + forOnlCgformField(var2, var6, var8, var9); + + var4 = getVar4(var4, !var8.isEmpty()); + + int var18 = 0; + + Iterator var19; + OnlCgformField var21; + for(var19 = var9.iterator(); var19.hasNext(); this.fieldService.updateById(var21)) { + var21 = var19.next(); + OnlCgformField var23 = this.fieldService.getById(var21.getId()); + boolean var14 = CgformUtil.a(var23, var21); + var4 = getVar4(var4, var14); + + var18 = getVar18(var18, var23); + } + + for(var19 = var8.iterator(); var19.hasNext(); this.fieldService.save(var21)) { + var21 = var19.next(); + var18 = getVar21(var18, var21); + } + + List var20 = this.indexService.getCgformIndexsByCgformId(var2.getId()); + ArrayList var22 = new ArrayList<>(); + ArrayList var24 = new ArrayList<>(); + Iterator var25 = var7.iterator(); + + OnlCgformIndex var15; + while(var25.hasNext()) { + var15 = var25.next(); + String var16 = String.valueOf(var15.getId()); + if (var16.length() == 32) { + var24.add(var15); + } else { + var15.setId(null); + var15.setIsDbSynch("N"); + var15.setDelFlag(CommonConstant.DEL_FLAG_0); + var15.setCgformHeadId(var2.getId()); + var22.add(var15); + } + } + + var25 = var20.iterator(); + + while(var25.hasNext()) { + var15 = var25.next(); + final OnlCgformIndex cgformIndexCopy = var15; + boolean var26 = var7.stream().anyMatch(var1 -> cgformIndexCopy.getId().equals(var1.getId())); + if (!var26) { + var15.setDelFlag(CommonConstant.DEL_FLAG_1); + var24.add(var15); + var4 = "N"; + } + } + + if (!var22.isEmpty()) { + var4 = "N"; + this.indexService.saveBatch(var22); + } + + for(var25 = var24.iterator(); var25.hasNext(); this.indexService.updateById(var15)) { + var15 = var25.next(); + OnlCgformIndex var27 = this.indexService.getById(var15.getId()); + boolean var17 = CgformUtil.a(var27, var15); + if (var17) { + var4 = "N"; + var15.setIsDbSynch("N"); + } + } + + if (!model.getDeleteFieldIds().isEmpty()) { + var4 = "N"; + this.fieldService.removeByIds(model.getDeleteFieldIds()); + } + + var2.setIsDbSynch(var4); + super.updateById(var2); + this.a(var2, var6); + this.b(var2, var6); + } + + private int getVar21(int var18, OnlCgformField var21) { + if (var21.getOrderNum() == null) { + ++var18; + var21.setOrderNum(var18); + } + return var18; + } + + private int getVar18(int var18, OnlCgformField var23) { + if ((var23.getOrderNum() == null ? 0 : var23.getOrderNum()) > var18) { + var18 = var23.getOrderNum(); + } + return var18; + } + + private String getVar4(String var4, boolean var14) { + if (var14) { + var4 = "N"; + } + return var4; + } + + private void forOnlCgformField(OnlCgformHead var2, List var6, ArrayList var8, ArrayList var9) { + for (OnlCgformField var11 : var6) { + String var12 = String.valueOf(var11.getId()); + this.a(var11); + if (var12.length() == 32) { + var9.add(var11); + } else { + String var13 = "_pk"; + if (!var13.equals(var12)) { + var11.setId(null); + var11.setCgformHeadId(var2.getId()); + var8.add(var11); + } + } + } + } + @Override public void doDbSynch(String code, String synMethod) throws HibernateException, IOException, TemplateException, SQLException, DBException { OnlCgformHead var3 = this.getById(code); @@ -277,60 +298,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var12 = var11.b(var7); - - for (String var14 : var12) { - if (!oConvertUtils.isEmpty(var14) && !oConvertUtils.isEmpty(var14.trim())) { - this.baseMapper.executeDDL(var14); - } - } - - List var21 = this.indexService.list(new LambdaQueryWrapper().eq(OnlCgformIndex::getCgformHeadId, code)); - Iterator var22 = var21.iterator(); - - label58: - while(true) { - OnlCgformIndex var15; - do { - if (!var22.hasNext()) { - break label58; - } - - var15 = (OnlCgformIndex)var22.next(); - } while(!"N".equals(var15.getIsDbSynch()) && !CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())); - - String var16 = var11.b(var15.getIndexName(), var4); - if (this.indexService.isExistIndex(var16)) { - String var17 = var11.a(var15.getIndexName(), var4); - - try { - log.info("删除索引 executeDDL:" + var17); - this.baseMapper.executeDDL(var17); - if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) { - this.indexService.removeById(var15.getId()); - } - } catch (Exception var19) { - log.error("删除表【" + var4 + "】索引(" + var15.getIndexName() + ")失败!", var19); - } - } else if (CommonConstant.DEL_FLAG_1.equals(var15.getDelFlag())) { - this.indexService.removeById(var15.getId()); - } - } - } else { - DbTableProcess.a(var7); - } - } else if ("force".equals(synMethod)) { - DbTableHandleI var20 = DbTableUtil.getTableHandle(); - String var9 = var20.dropTableSQL(var4); - this.baseMapper.executeDDL(var9); - DbTableProcess.a(var7); - } + getSynMethod(code, synMethod, var4, var7); this.indexService.createIndex(code, DbTableUtil.getDatabaseType(), var4); var3.setIsDbSynch("Y"); @@ -342,6 +310,61 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var12 = var11.b(var7); + + for (String var14 : var12) { + if (!oConvertUtils.isEmpty(var14) && !oConvertUtils.isEmpty(var14.trim())) { + this.baseMapper.executeDDL(var14); + } + } + + List var21 = this.indexService.list(new LambdaQueryWrapper().eq(OnlCgformIndex::getCgformHeadId, code)); + for (OnlCgformIndex onlCgformIndex : var21) { + getOnlCgformIndex(var4, var11, onlCgformIndex); + } + } else { + DbTableProcess.a(var7); + } + } + + private void getOnlCgformIndex(String var4, DbTableProcess var11, OnlCgformIndex onlCgformIndex) { + if(!"N".equals(onlCgformIndex.getIsDbSynch()) && !CommonConstant.DEL_FLAG_1.equals(onlCgformIndex.getDelFlag())){ + String var16 = var11.b(onlCgformIndex.getIndexName(), var4); + if (this.indexService.isExistIndex(var16)) { + String var17 = var11.a(onlCgformIndex.getIndexName(), var4); + + try { + log.info("删除索引 executeDDL:" + var17); + this.baseMapper.executeDDL(var17); + if (CommonConstant.DEL_FLAG_1.equals(onlCgformIndex.getDelFlag())) { + this.indexService.removeById(onlCgformIndex.getId()); + } + } catch (Exception var19) { + log.error("删除表【" + var4 + "】索引(" + onlCgformIndex.getIndexName() + ")失败!", var19); + } + } else if (CommonConstant.DEL_FLAG_1.equals(onlCgformIndex.getDelFlag())) { + this.indexService.removeById(onlCgformIndex.getId()); + } + } + } + @Override public void deleteRecordAndTable(String id) throws DBException, SQLException { OnlCgformHead var2 = this.getById(id); @@ -503,116 +526,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl originalColumnsList = DbReadTableUtil.listOriginalColumns(tbname); - for(int i = 0; i < originalColumnsList.size(); ++i) { - ColumnVo columnVo = originalColumnsList.get(i); - log.info(" columnt : " + columnVo.toString()); - String fieldDbName = columnVo.getFieldDbName(); - OnlCgformField onlCgformField = new OnlCgformField(); - onlCgformField.setCgformHeadId(cgformHeadId); - onlCgformField.setDbFieldNameOld(columnVo.getFieldDbName().toLowerCase()); - onlCgformField.setDbFieldName(columnVo.getFieldDbName().toLowerCase()); - if (oConvertUtils.isNotEmpty(columnVo.getFiledComment())) { - onlCgformField.setDbFieldTxt(columnVo.getFiledComment()); - } else { - onlCgformField.setDbFieldTxt(columnVo.getFieldName()); - } - - onlCgformField.setDbIsKey(0); - onlCgformField.setIsShowForm(1); - onlCgformField.setIsQuery(0); - onlCgformField.setFieldMustInput("0"); - onlCgformField.setIsShowList(1); - onlCgformField.setOrderNum(i + 1); - onlCgformField.setQueryMode("single"); - onlCgformField.setDbLength(oConvertUtils.getInt(columnVo.getPrecision())); - onlCgformField.setFieldLength(120); - onlCgformField.setDbPointLength(oConvertUtils.getInt(columnVo.getScale())); - onlCgformField.setFieldShowType("text"); - onlCgformField.setDbIsNull("Y".equals(columnVo.getNullable()) ? 1 : 0); - onlCgformField.setIsReadOnly(0); - if ("id".equalsIgnoreCase(fieldDbName)) { - String[] var10 = new String[]{INTEGER, "java.lang.Long"}; - String var11 = columnVo.getFieldType(); - if (Arrays.asList(var10).contains(var11)) { - var2.setIdType("NATIVE"); - } else { - var2.setIdType("UUID"); - } - - onlCgformField.setDbIsKey(1); - onlCgformField.setIsShowForm(0); - onlCgformField.setIsShowList(0); - onlCgformField.setIsReadOnly(1); - } - - if ("create_by".equalsIgnoreCase(fieldDbName) || "create_time".equalsIgnoreCase(fieldDbName) || "update_by".equalsIgnoreCase(fieldDbName) || "update_time".equalsIgnoreCase(fieldDbName) || "sys_org_code".equalsIgnoreCase(fieldDbName)) { - onlCgformField.setIsShowForm(0); - onlCgformField.setIsShowList(0); - } - - if (INTEGER.equalsIgnoreCase(columnVo.getFieldType())) { - onlCgformField.setDbType("int"); - } else if ("java.lang.Long".equalsIgnoreCase(columnVo.getFieldType())) { - onlCgformField.setDbType("int"); - } else if ("java.util.Date".equalsIgnoreCase(columnVo.getFieldType())) { - onlCgformField.setDbType("Date"); - onlCgformField.setFieldShowType("date"); - } else if (!"java.lang.Double".equalsIgnoreCase(columnVo.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(columnVo.getFieldType())) { - if (!"java.math.BigDecimal".equalsIgnoreCase(columnVo.getFieldType()) && !"BigDecimal".equalsIgnoreCase(columnVo.getFieldType())) { - if (!"byte[]".equalsIgnoreCase(columnVo.getFieldType()) && !columnVo.getFieldType().contains("blob")) { - if (!"java.lang.Object".equals(columnVo.getFieldType()) || !"text".equalsIgnoreCase(columnVo.getFieldDbType()) && !"ntext".equalsIgnoreCase(columnVo.getFieldDbType())) { - if ("java.lang.Object".equals(columnVo.getFieldType()) && "image".equalsIgnoreCase(columnVo.getFieldDbType())) { - onlCgformField.setDbType("Blob"); - } else { - onlCgformField.setDbType("string"); - } - } else { - onlCgformField.setDbType("Text"); - onlCgformField.setFieldShowType("textarea"); - } - } else { - onlCgformField.setDbType("Blob"); - columnVo.setCharmaxLength((String)null); - } - } else { - onlCgformField.setDbType("BigDecimal"); - } - } else { - onlCgformField.setDbType("double"); - } - - if (oConvertUtils.isEmpty(columnVo.getPrecision()) && oConvertUtils.isNotEmpty(columnVo.getCharmaxLength())) { - if (Long.parseLong(columnVo.getCharmaxLength()) >= 3000L) { - onlCgformField.setDbType("Text"); - onlCgformField.setFieldShowType("textarea"); - - setDbLength(columnVo, onlCgformField); - } else { - onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength())); - } - } else { - if (oConvertUtils.isNotEmpty(columnVo.getPrecision())) { - onlCgformField.setDbLength(Integer.valueOf(columnVo.getPrecision())); - } else if (onlCgformField.getDbType().equals("int")) { - onlCgformField.setDbLength(10); - } - - if (oConvertUtils.isNotEmpty(columnVo.getScale())) { - onlCgformField.setDbPointLength(Integer.valueOf(columnVo.getScale())); - } - } - - if (oConvertUtils.getInt(columnVo.getPrecision()) == -1 && oConvertUtils.getInt(columnVo.getScale()) == 0) { - onlCgformField.setDbType("Text"); - } - - if ("Blob".equals(onlCgformField.getDbType()) || "Text".equals(onlCgformField.getDbType()) || "Date".equals(onlCgformField.getDbType())) { - onlCgformField.setDbLength(0); - onlCgformField.setDbPointLength(0); - } - - var4.add(onlCgformField); - } + getColumnVo(var2, cgformHeadId, var4, originalColumnsList); } catch (Exception var13) { log.error(var13.getMessage(), var13); } @@ -625,6 +539,143 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var4, List originalColumnsList) { + for(int i = 0; i < originalColumnsList.size(); ++i) { + ColumnVo columnVo = originalColumnsList.get(i); + log.info(" columnt : " + columnVo.toString()); + String fieldDbName = columnVo.getFieldDbName(); + OnlCgformField onlCgformField = new OnlCgformField(); + onlCgformField.setCgformHeadId(cgformHeadId); + onlCgformField.setDbFieldNameOld(columnVo.getFieldDbName().toLowerCase()); + onlCgformField.setDbFieldName(columnVo.getFieldDbName().toLowerCase()); + setDbFieldTxt(columnVo, onlCgformField); + + onlCgformField.setDbIsKey(0); + onlCgformField.setIsShowForm(1); + onlCgformField.setIsQuery(0); + onlCgformField.setFieldMustInput("0"); + onlCgformField.setIsShowList(1); + onlCgformField.setOrderNum(i + 1); + onlCgformField.setQueryMode("single"); + onlCgformField.setDbLength(oConvertUtils.getInt(columnVo.getPrecision())); + onlCgformField.setFieldLength(120); + onlCgformField.setDbPointLength(oConvertUtils.getInt(columnVo.getScale())); + onlCgformField.setFieldShowType("text"); + onlCgformField.setDbIsNull("Y".equals(columnVo.getNullable()) ? 1 : 0); + onlCgformField.setIsReadOnly(0); + if ("id".equalsIgnoreCase(fieldDbName)) { + String[] var10 = new String[]{INTEGER, "java.lang.Long"}; + String var11 = columnVo.getFieldType(); + if (Arrays.asList(var10).contains(var11)) { + var2.setIdType("NATIVE"); + } else { + var2.setIdType("UUID"); + } + + onlCgformField.setDbIsKey(1); + onlCgformField.setIsShowForm(0); + onlCgformField.setIsShowList(0); + onlCgformField.setIsReadOnly(1); + } + + if ("create_by".equalsIgnoreCase(fieldDbName) || "create_time".equalsIgnoreCase(fieldDbName) || "update_by".equalsIgnoreCase(fieldDbName) || "update_time".equalsIgnoreCase(fieldDbName) || "sys_org_code".equalsIgnoreCase(fieldDbName)) { + onlCgformField.setIsShowForm(0); + onlCgformField.setIsShowList(0); + } + + getInteger(columnVo, onlCgformField); + + getOnlCgformField(columnVo, onlCgformField); + + setDbType(columnVo, onlCgformField); + + if ("Blob".equals(onlCgformField.getDbType()) || "Text".equals(onlCgformField.getDbType()) || "Date".equals(onlCgformField.getDbType())) { + onlCgformField.setDbLength(0); + onlCgformField.setDbPointLength(0); + } + + var4.add(onlCgformField); + } + } + + private void setDbType(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (oConvertUtils.getInt(columnVo.getPrecision()) == -1 && oConvertUtils.getInt(columnVo.getScale()) == 0) { + onlCgformField.setDbType("Text"); + } + } + + private void setDbFieldTxt(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (oConvertUtils.isNotEmpty(columnVo.getFiledComment())) { + onlCgformField.setDbFieldTxt(columnVo.getFiledComment()); + } else { + onlCgformField.setDbFieldTxt(columnVo.getFieldName()); + } + } + + private void getOnlCgformField(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (oConvertUtils.isEmpty(columnVo.getPrecision()) && oConvertUtils.isNotEmpty(columnVo.getCharmaxLength())) { + if (Long.parseLong(columnVo.getCharmaxLength()) >= 3000L) { + onlCgformField.setDbType("Text"); + onlCgformField.setFieldShowType("textarea"); + + setDbLength(columnVo, onlCgformField); + } else { + onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength())); + } + } else { + if (oConvertUtils.isNotEmpty(columnVo.getPrecision())) { + onlCgformField.setDbLength(Integer.valueOf(columnVo.getPrecision())); + } else if (onlCgformField.getDbType().equals("int")) { + onlCgformField.setDbLength(10); + } + + if (oConvertUtils.isNotEmpty(columnVo.getScale())) { + onlCgformField.setDbPointLength(Integer.valueOf(columnVo.getScale())); + } + } + } + + private void getInteger(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (INTEGER.equalsIgnoreCase(columnVo.getFieldType())) { + onlCgformField.setDbType("int"); + } else if ("java.lang.Long".equalsIgnoreCase(columnVo.getFieldType())) { + onlCgformField.setDbType("int"); + } else if ("java.util.Date".equalsIgnoreCase(columnVo.getFieldType())) { + onlCgformField.setDbType("Date"); + onlCgformField.setFieldShowType("date"); + } else if (!"java.lang.Double".equalsIgnoreCase(columnVo.getFieldType()) && !"java.lang.Float".equalsIgnoreCase(columnVo.getFieldType())) { + getFieldType(columnVo, onlCgformField); + } else { + onlCgformField.setDbType("double"); + } + } + + private void getFieldType(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (!"java.math.BigDecimal".equalsIgnoreCase(columnVo.getFieldType()) && !"BigDecimal".equalsIgnoreCase(columnVo.getFieldType())) { + if (!"byte[]".equalsIgnoreCase(columnVo.getFieldType()) && !columnVo.getFieldType().contains("blob")) { + setOnlCgformField(columnVo, onlCgformField); + } else { + onlCgformField.setDbType("Blob"); + columnVo.setCharmaxLength(null); + } + } else { + onlCgformField.setDbType("BigDecimal"); + } + } + + private void setOnlCgformField(ColumnVo columnVo, OnlCgformField onlCgformField) { + if (!"java.lang.Object".equals(columnVo.getFieldType()) || !"text".equalsIgnoreCase(columnVo.getFieldDbType()) && !"ntext".equalsIgnoreCase(columnVo.getFieldDbType())) { + if ("java.lang.Object".equals(columnVo.getFieldType()) && "image".equalsIgnoreCase(columnVo.getFieldDbType())) { + onlCgformField.setDbType("Blob"); + } else { + onlCgformField.setDbType("string"); + } + } else { + onlCgformField.setDbType("Text"); + onlCgformField.setFieldShowType("textarea"); + } + } + private void setDbLength(ColumnVo columnVo, OnlCgformField onlCgformField) { try { onlCgformField.setDbLength(Integer.valueOf(columnVo.getCharmaxLength())); @@ -636,66 +687,80 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { if (var1.getTableType() == 3) { var1 = this.baseMapper.selectById(var1.getId()); - - for(int var3 = 0; var3 < var2.size(); ++var3) { - OnlCgformField var4 = var2.get(var3); - String var5 = var4.getMainTable(); - if (!oConvertUtils.isEmpty(var5)) { - OnlCgformHead var6 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var5)); - if (var6 != null) { - String var7 = var6.getSubTableStr(); - if (oConvertUtils.isEmpty(var7)) { - var7 = var1.getTableName(); - } else if (!var7.contains(var1.getTableName())) { - ArrayList var8 = new ArrayList<>(Arrays.asList(var7.split(","))); - - for(int var9 = 0; var9 < var8.size(); ++var9) { - String var10 = var8.get(var9); - OnlCgformHead var11 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var10)); - if (var11 != null && var1.getTabOrderNum() < oConvertUtils.getInt(var11.getTabOrderNum(), 0)) { - var8.add(var9, var1.getTableName()); - break; - } - } - - if (!var8.contains(var1.getTableName())) { - var8.add(var1.getTableName()); - } - - var7 = String.join(",", var8); - } - - var6.setSubTableStr(var7); - this.baseMapper.updateById(var6); - break; - } - } - } + forVar2(var1, var2); } else { List var12 = this.baseMapper.selectList(new LambdaQueryWrapper().like(OnlCgformHead::getSubTableStr, var1.getTableName())); if (var12 != null && !var12.isEmpty()) { - - for (Object o : var12) { - OnlCgformHead var14 = (OnlCgformHead) o; - String var15 = var14.getSubTableStr(); - if (var14.getSubTableStr().equals(var1.getTableName())) { - var15 = ""; - } else if (var14.getSubTableStr().startsWith(var1.getTableName() + ",")) { - var15 = var15.replace(var1.getTableName() + ",", ""); - } else if (var14.getSubTableStr().endsWith("," + var1.getTableName())) { - var15 = var15.replace("," + var1.getTableName(), ""); - } else if (var14.getSubTableStr().contains("," + var1.getTableName() + ",")) { - var15 = var15.replace("," + var1.getTableName() + ",", ","); - } - - var14.setSubTableStr(var15); - (this.baseMapper).updateById(var14); - } + forOnlCgformHead(var1, var12); } } } + private void forOnlCgformHead(OnlCgformHead var1, List var12) { + for (OnlCgformHead o : var12) { + OnlCgformHead var14 = o; + String var15 = var14.getSubTableStr(); + if (var14.getSubTableStr().equals(var1.getTableName())) { + var15 = ""; + } else if (var14.getSubTableStr().startsWith(var1.getTableName() + ",")) { + var15 = var15.replace(var1.getTableName() + ",", ""); + } else if (var14.getSubTableStr().endsWith("," + var1.getTableName())) { + var15 = var15.replace("," + var1.getTableName(), ""); + } else if (var14.getSubTableStr().contains("," + var1.getTableName() + ",")) { + var15 = var15.replace("," + var1.getTableName() + ",", ","); + } + + var14.setSubTableStr(var15); + (this.baseMapper).updateById(var14); + } + } + + private void forVar2(OnlCgformHead var1, List var2) { + for(int var3 = 0; var3 < var2.size(); ++var3) { + OnlCgformField var4 = var2.get(var3); + String var5 = var4.getMainTable(); + if (!oConvertUtils.isEmpty(var5)) { + OnlCgformHead var6 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var5)); + if (var6 != null) { + String var7 = var6.getSubTableStr(); + if (oConvertUtils.isEmpty(var7)) { + var7 = var1.getTableName(); + } else if (!var7.contains(var1.getTableName())) { + ArrayList var8 = new ArrayList<>(Arrays.asList(var7.split(","))); + + addVar8(var1, var8); + + getTableName(var1, var8); + + var7 = String.join(",", var8); + } + + var6.setSubTableStr(var7); + this.baseMapper.updateById(var6); + break; + } + } + } + } + + private void getTableName(OnlCgformHead var1, ArrayList var8) { + if (!var8.contains(var1.getTableName())) { + var8.add(var1.getTableName()); + } + } + + private void addVar8(OnlCgformHead var1, ArrayList var8) { + for(int var9 = 0; var9 < var8.size(); ++var9) { + String var10 = var8.get(var9); + OnlCgformHead var11 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var10)); + if (var11 != null && var1.getTabOrderNum() < oConvertUtils.getInt(var11.getTabOrderNum(), 0)) { + var8.add(var9, var1.getTableName()); + break; + } + } + } + @Override @Transactional( rollbackFor = {Exception.class} @@ -708,51 +773,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var12)); - if (var14 != null) { - List var15 = this.fieldService.list((new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); - String var16 = ""; - String var17 = null; - - for (Object o : var15) { - OnlCgformField var19 = (OnlCgformField) o; - if (!oConvertUtils.isEmpty(var19.getMainField())) { - var16 = var19.getDbFieldName(); - String var20 = var19.getMainField(); - if (json.get(var20.toLowerCase()) != null) { - var17 = json.getString(var20.toLowerCase()); - } - - if (json.get(var20.toUpperCase()) != null) { - var17 = json.getString(var20.toUpperCase()); - } - } - } - - for(int var27 = 0; var27 < var13.size(); ++var27) { - JSONObject var28 = var13.getJSONObject(var27); - if (var17 != null) { - var28.put(var16, var17); - } - - this.fieldService.saveFormData(var15, var12, var28); - } - } - } - } - } - } + getVar4(json, var4); if ("Y".equals(var4.getIsTree())) { this.fieldService.saveTreeFormData(code, var6, json, var4.getTreeIdField(), var4.getTreeParentIdField()); @@ -788,9 +809,66 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl()).eq(OnlCgformHead::getTableName, var12)); + if (var14 != null) { + List var15 = this.fieldService.list((new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var14.getId())); + String var16 = ""; + String var17 = null; + + for (OnlCgformField o : var15) { + OnlCgformField var19 = o; + if (!oConvertUtils.isEmpty(var19.getMainField())) { + var16 = var19.getDbFieldName(); + String var20 = var19.getMainField(); + var17 = getVar17(json, var17, var20); + } + } + + for(int var27 = 0; var27 < var13.size(); ++var27) { + JSONObject var28 = var13.getJSONObject(var27); + if (var17 != null) { + var28.put(var16, var17); + } + + this.fieldService.saveFormData(var15, var12, var28); + } + } + } + + private String getVar17(JSONObject json, String var17, String var20) { + if (json.get(var20.toLowerCase()) != null) { + var17 = json.getString(var20.toLowerCase()); + } + + if (json.get(var20.toUpperCase()) != null) { + var17 = json.getString(var20.toUpperCase()); + } + return var17; + } + @Override public Map querySubFormData(String table, String mainId) throws DBException { - new HashMap(); + new HashMap<>(); OnlCgformHead var4 = this.getOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); if (var4 == null) { throw new DBException(DB_SUB_ID + table + "]不存在"); @@ -798,12 +876,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.fieldService.queryFormFields(var4.getId(), false); String var6 = null; - for (OnlCgformField var8 : var5) { - if (oConvertUtils.isNotEmpty(var8.getMainField())) { - var6 = var8.getDbFieldName(); - break; - } - } + var6 = getVar6(var5, var6); List> var9 = this.fieldService.querySubFormData(var5, table, var6, mainId); if (var9 != null && var9.isEmpty()) { @@ -820,6 +893,16 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5, String var6) { + for (OnlCgformField var8 : var5) { + if (oConvertUtils.isNotEmpty(var8.getMainField())) { + var6 = var8.getDbFieldName(); + break; + } + } + return var6; + } + @Override public List> queryManySubFormData(String table, String mainId) throws DBException { OnlCgformHead var3 = this.getOne((new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, table)); @@ -830,11 +913,11 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var8 = var4.iterator(); OnlCgformField var9; while(var8.hasNext()) { - var9 = (OnlCgformField)var8.next(); + var9 = var8.next(); if (oConvertUtils.isNotEmpty(var9.getMainField())) { var5 = var9.getDbFieldName(); var6 = var9.getMainTable(); @@ -853,21 +936,25 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl(); - } - ArrayList> var13 = new ArrayList(var12.size()); - - for (Map stringObjectMap : var12) { - Map var15 = stringObjectMap; - var13.add(CgformUtil.b(var15)); - } - - return var13; + return getMaps(var12); } } } + @NotNull + private ArrayList> getMaps(List> var12) { + if(CollectionUtils.isEmpty(var12)){ + var12 = new ArrayList<>(); + } + ArrayList> var13 = new ArrayList<>(var12.size()); + + for (Map stringObjectMap : var12) { + Map var15 = stringObjectMap; + var13.add(CgformUtil.b(var15)); + } + return var13; + } + @Override public Map queryManyFormData(String code, String id) throws DBException { OnlCgformHead var3 = this.getById(code); @@ -883,34 +970,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var11)); - if (var12 != null) { - List var13 = this.fieldService.queryFormFields(var12.getId(), false); - String var14 = ""; - String var15 = null; - - for (OnlCgformField var17 : var13) { - if (!oConvertUtils.isEmpty(var17.getMainField())) { - var14 = var17.getDbFieldName(); - String var18 = var17.getMainField(); - if (null == var5.get(var18)) { - var15 = var5.get(var18.toUpperCase()).toString(); - } else { - var15 = var5.get(var18).toString(); - } - } - } - - List> var19 = this.fieldService.querySubFormData(var13, var11, var14, var15); - if (var19 != null && !var19.isEmpty()) { - var5.put(var11, CgformUtil.d(var19)); - } else { - var5.put(var11, new String[0]); - } - } - } + forVar10(var5, var8, var9); } } @@ -918,6 +978,43 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5, String[] var8, int var9) { + for(int var10 = 0; var10 < var9; ++var10) { + String var11 = var8[var10]; + OnlCgformHead var12 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var11)); + if (var12 != null) { + List var13 = this.fieldService.queryFormFields(var12.getId(), false); + String var14 = ""; + String var15 = null; + + for (OnlCgformField var17 : var13) { + if (!oConvertUtils.isEmpty(var17.getMainField())) { + var14 = var17.getDbFieldName(); + String var18 = var17.getMainField(); + var15 = getVar15(var5, var18); + } + } + + List> var19 = this.fieldService.querySubFormData(var13, var11, var14, var15); + if (var19 != null && !var19.isEmpty()) { + var5.put(var11, CgformUtil.d(var19)); + } else { + var5.put(var11, new String[0]); + } + } + } + } + + private String getVar15(Map var5, String var18) { + String var15; + if (null == var5.get(var18)) { + var15 = var5.get(var18.toUpperCase()).toString(); + } else { + var15 = var5.get(var18).toString(); + } + return var15; + } + @Override @Transactional( rollbackFor = {Exception.class} @@ -937,51 +1034,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var11)); - if (var12 != null) { - List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); - String var14 = ""; - String var15 = null; - - for (OnlCgformField var17 : var13) { - if (!oConvertUtils.isEmpty(var17.getMainField())) { - var14 = var17.getDbFieldName(); - String var18 = var17.getMainField(); - if (json.get(var18.toLowerCase()) != null) { - var15 = json.getString(var18.toLowerCase()); - } - - if (json.get(var18.toUpperCase()) != null) { - var15 = json.getString(var18.toUpperCase()); - } - } - } - - if (!oConvertUtils.isEmpty(var15)) { - this.fieldService.deleteAutoList(var11, var14, var15); - JSONArray var19 = json.getJSONArray(var11); - if (var19 != null && !var19.isEmpty()) { - for(int var20 = 0; var20 < var19.size(); ++var20) { - JSONObject var21 = var19.getJSONObject(var20); - if (var15 != null) { - var21.put(var14, var15); - } - - this.fieldService.saveFormData(var13, var11, var21); - } - } - } - } - } - } + getVar6(json, var3); } this.executeEnhanceJava(var4, "end", var3, json); @@ -990,6 +1043,62 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var11)); + if (var12 != null) { + getOnlCgformField(json, var11, var12); + } + } + } + } + + private void getOnlCgformField(JSONObject json, String var11, OnlCgformHead var12) { + List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); + String var14 = ""; + String var15 = null; + + for (OnlCgformField var17 : var13) { + if (!oConvertUtils.isEmpty(var17.getMainField())) { + var14 = var17.getDbFieldName(); + String var18 = var17.getMainField(); + if (json.get(var18.toLowerCase()) != null) { + var15 = json.getString(var18.toLowerCase()); + } + + if (json.get(var18.toUpperCase()) != null) { + var15 = json.getString(var18.toUpperCase()); + } + } + } + + if (!oConvertUtils.isEmpty(var15)) { + this.fieldService.deleteAutoList(var11, var14, var15); + JSONArray var19 = json.getJSONArray(var11); + if (var19 != null && !var19.isEmpty()) { + getVar20(var11, var13, var14, var15, var19); + } + } + } + + private void getVar20(String var11, List var13, String var14, String var15, JSONArray var19) { + for (int var20 = 0; var20 < var19.size(); ++var20) { + JSONObject var21 = var19.getJSONObject(var20); + if (var15 != null) { + var21.put(var14, var15); + } + + this.fieldService.saveFormData(var13, var11, var21); + } + } + @Override public int executeEnhanceJava(String buttonCode, String eventType, OnlCgformHead head, JSONObject json) throws BusinessException { LambdaQueryWrapper var5 = new LambdaQueryWrapper<>(); @@ -1164,41 +1273,51 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var9)); - if (var10 != null) { - List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); - new ArrayList<>(); - List var12; - if (oConvertUtils.isNotEmpty(head.getTaskId())) { - var12 = this.fieldService.queryDisabledFields(var10.getTableName(), head.getTaskId()); - } else { - var12 = this.onlAuthPageService.queryFormDisabledCode(var10.getId()); - } - - JSONObject var13 = new JSONObject(); - if (1 == var10.getRelationType()) { - var13 = CgformUtil.a(var11, var12, null); - } else { - var13.put("columns", CgformUtil.a(var11, var12)); - } - - var13.put("relationType", var10.getRelationType()); - var13.put("view", "tab"); - var13.put("order", var10.getTabOrderNum()); - var13.put("formTemplate", var10.getFormTemplate()); - var13.put("describe", var10.getTableTxt()); - var13.put("key", var10.getTableName()); - var14.getJSONObject("properties").put(var10.getTableName(), var13); - } - } + forVar7(head, var14, var6, var7); } } return var14; } + private void forVar7(OnlCgformHead head, JSONObject var14, String[] var6, int var7) { + for(int var8 = 0; var8 < var7; ++var8) { + String var9 = var6[var8]; + OnlCgformHead var10 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); + if (var10 != null) { + List var11 = this.fieldService.queryAvailableFields(var10.getId(), var10.getTableName(), head.getTaskId(), false); + new ArrayList<>(); + List var12; + if (oConvertUtils.isNotEmpty(head.getTaskId())) { + var12 = this.fieldService.queryDisabledFields(var10.getTableName(), head.getTaskId()); + } else { + var12 = this.onlAuthPageService.queryFormDisabledCode(var10.getId()); + } + + JSONObject var13 = getVar13(var10, var11, var12); + + var13.put("relationType", var10.getRelationType()); + var13.put("view", "tab"); + var13.put("order", var10.getTabOrderNum()); + var13.put("formTemplate", var10.getFormTemplate()); + var13.put("describe", var10.getTableTxt()); + var13.put("key", var10.getTableName()); + var14.getJSONObject("properties").put(var10.getTableName(), var13); + } + } + } + + @NotNull + private JSONObject getVar13(OnlCgformHead var10, List var11, List var12) { + JSONObject var13 = new JSONObject(); + if (1 == var10.getRelationType()) { + var13 = CgformUtil.a(var11, var12, null); + } else { + var13.put("columns", CgformUtil.a(var11, var12)); + } + return var13; + } + @Override public List generateCode(OnlGenerateModel model) throws Exception { TableVo tableVo = new TableVo(); @@ -1285,7 +1404,7 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var5 = this.fieldService.list(var4); OnlCgformField var6 = null; - Iterator var7 = var5.iterator(); + Iterator var7 = var5.iterator(); while(true) { OnlCgformField var8; @@ -1295,60 +1414,10 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl= 0) { - var9.setDictTable(var8.getDictTable().split("where")[0].trim()); - } else { - var9.setDictTable(var8.getDictTable()); - } - - var9.setDictText(var8.getDictText()); - var9.setFieldDbName(var8.getDbFieldName()); - var9.setFieldName(oConvertUtils.camelName(var8.getDbFieldName())); - var9.setFiledComment(var8.getDbFieldTxt()); - var9.setFieldDbType(var8.getDbType()); - var9.setFieldType(this.a(var8.getDbType())); - var9.setClassType(var8.getFieldShowType()); - var9.setClassType_row(var8.getFieldShowType()); - if (var8.getDbIsNull() != 0 && !"*".equals(var8.getFieldValidType()) && !"1".equals(var8.getFieldMustInput())) { - var9.setNullable("Y"); - } else { - var9.setNullable("N"); - } - - if ("switch".equals(var8.getFieldShowType())) { - var9.setDictField(var8.getFieldExtendJson()); - } - - var9.setSort("1".equals(var8.getSortFlag()) ? "Y" : "N"); - var9.setReadonly(Integer.valueOf(1).equals(var8.getIsReadOnly()) ? "Y" : "N"); - if (oConvertUtils.isNotEmpty(var8.getFieldDefaultValue()) && !var8.getFieldDefaultValue().trim().startsWith("${") && !var8.getFieldDefaultValue().trim().startsWith("#{") && !var8.getFieldDefaultValue().trim().startsWith("{{")) { - var9.setDefaultVal(var8.getFieldDefaultValue()); - } - - if (("file".equals(var8.getFieldShowType()) || "image".equals(var8.getFieldShowType())) && oConvertUtils.isNotEmpty(var8.getFieldExtendJson())) { - JSONObject var10 = JSON.parseObject(var8.getFieldExtendJson()); - if (oConvertUtils.isNotEmpty(var10.getString("uploadnum"))) { - var9.setUploadnum(var10.getString("uploadnum")); - } - } + var9 = getColumnVo(var8); var3.add(var9); } while(var8.getIsShowForm() != 1 && var8.getIsShowList() != 1); @@ -1357,6 +1426,88 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl= 0) { + var9.setDictTable(var8.getDictTable().split("where")[0].trim()); + } else { + var9.setDictTable(var8.getDictTable()); + } + } + + private OnlCgformField getVar6(OnlCgformField var6, OnlCgformField var8) { + if (oConvertUtils.isNotEmpty(var8.getMainTable())) { + var6 = var8; + } + return var6; + } + private String a(String var1) { var1 = var1.toLowerCase(); if (var1.indexOf("int") >= 0) { @@ -1377,101 +1528,129 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl().eq(OnlCgformHead::getTableName, var9)); - if (var12 != null) { - List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); - String var14 = ""; - String var15 = null; - - for (OnlCgformField var17 : var13) { - if (!oConvertUtils.isEmpty(var17.getMainField())) { - var14 = var17.getDbFieldName(); - String var18 = var17.getMainField(); - var15 = json.getString(var18); - } - } - - for(int var19 = 0; var19 < var11.size(); ++var19) { - JSONObject var20 = var11.getJSONObject(var19); - if (var15 != null) { - var20.put(var14, var15); - } - - this.fieldService.executeInsertSQL(CgformUtil.c(var9, var13, var20)); - } - } - } - } - } - } + getSubTableStr(json, var3); } this.fieldService.saveFormData(var3.getId(), tbname, json, true); } } + private void getSubTableStr(JSONObject json, OnlCgformHead var3) throws UnsupportedEncodingException { + String var4 = var3.getSubTableStr(); + if (var4 != null) { + String[] var5 = var4.split(","); + String[] var6 = var5; + int var7 = var5.length; + + for(int var8 = 0; var8 < var7; ++var8) { + String var9 = var6[var8]; + String var10 = json.getString("sub-table-design_" + var9); + getVar10(json, var9, var10); + } + } + } + + private void getVar10(JSONObject json, String var9, String var10) throws UnsupportedEncodingException { + if (!oConvertUtils.isEmpty(var10)) { + JSONArray var11 = JSON.parseArray(URLDecoder.decode(var10, "UTF-8")); + if (var11 != null && !var11.isEmpty()) { + OnlCgformHead var12 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); + getVar12(json, var9, var11, var12); + } + } + } + + private void getVar12(JSONObject json, String var9, JSONArray var11, OnlCgformHead var12) { + if (var12 != null) { + List var13 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var12.getId())); + String var14 = ""; + String var15 = null; + + for (OnlCgformField var17 : var13) { + if (!oConvertUtils.isEmpty(var17.getMainField())) { + var14 = var17.getDbFieldName(); + String var18 = var17.getMainField(); + var15 = json.getString(var18); + } + } + + for(int var19 = 0; var19 < var11.size(); ++var19) { + JSONObject var20 = var11.getJSONObject(var19); + if (var15 != null) { + var20.put(var14, var15); + } + + this.fieldService.executeInsertSQL(CgformUtil.c(var9, var13, var20)); + } + } + } + @Override public void editCrazyFormData(String tbname, JSONObject json) throws DBException, UnsupportedEncodingException { OnlCgformHead var3 = this.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, tbname)); if (var3 == null) { throw new DBException("数据库主表[" + tbname + "]不存在"); } else { - if (var3.getTableType() == 2) { - String var4 = var3.getSubTableStr(); - String[] var5 = var4.split(","); - String[] var6 = var5; - int var7 = var5.length; + getTableType(json, var3); - for(int var8 = 0; var8 < var7; ++var8) { - String var9 = var6[var8]; - OnlCgformHead var10 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); - if (var10 != null) { - List var11 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var10.getId())); - String var12 = ""; - String var13 = null; + this.fieldService.editFormData(var3.getId(), tbname, json, true); + } + } - for (OnlCgformField var15 : var11) { - if (!oConvertUtils.isEmpty(var15.getMainField())) { - var12 = var15.getDbFieldName(); - String var16 = var15.getMainField(); - var13 = json.getString(var16); - } - } + private void getTableType(JSONObject json, OnlCgformHead var3) throws UnsupportedEncodingException { + if (var3.getTableType() == 2) { + String var4 = var3.getSubTableStr(); + String[] var5 = var4.split(","); + String[] var6 = var5; + int var7 = var5.length; - if (!oConvertUtils.isEmpty(var13)) { - this.fieldService.deleteAutoList(var9, var12, var13); - String var18 = json.getString("sub-table-design_" + var9); - if (!oConvertUtils.isEmpty(var18)) { - JSONArray var19 = JSON.parseArray(URLDecoder.decode(var18, "UTF-8")); - if (var19 != null && !var19.isEmpty()) { - for(int var20 = 0; var20 < var19.size(); ++var20) { - JSONObject var17 = var19.getJSONObject(var20); - if (var13 != null) { - var17.put(var12, var13); - } + forVar8(json, var6, var7); + } + } - this.fieldService.executeInsertSQL(CgformUtil.c(var9, var11, var17)); - } - } - } - } + private void forVar8(JSONObject json, String[] var6, int var7) throws UnsupportedEncodingException { + for(int var8 = 0; var8 < var7; ++var8) { + String var9 = var6[var8]; + OnlCgformHead var10 = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var9)); + if (var10 != null) { + List var11 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var10.getId())); + String var12 = ""; + String var13 = null; + + for (OnlCgformField var15 : var11) { + if (!oConvertUtils.isEmpty(var15.getMainField())) { + var12 = var15.getDbFieldName(); + String var16 = var15.getMainField(); + var13 = json.getString(var16); + } + } + + getVar13(json, var9, var11, var12, var13); + } + } + } + + private void getVar13(JSONObject json, String var9, List var11, String var12, String var13) throws UnsupportedEncodingException { + if (!oConvertUtils.isEmpty(var13)) { + this.fieldService.deleteAutoList(var9, var12, var13); + String var18 = json.getString("sub-table-design_" + var9); + if (!oConvertUtils.isEmpty(var18)) { + JSONArray var19 = JSON.parseArray(URLDecoder.decode(var18, "UTF-8")); + if (var19 != null && !var19.isEmpty()) { + for(int var20 = 0; var20 < var19.size(); ++var20) { + JSONObject var17 = var19.getJSONObject(var20); + putVar17(var12, var13, var17); + + this.fieldService.executeInsertSQL(CgformUtil.c(var9, var11, var17)); } } } + } + } - this.fieldService.editFormData(var3.getId(), tbname, json, true); + private void putVar17(String var12, String var13, JSONObject var17) { + if (var13 != null) { + var17.put(var12, var13); } } @@ -1591,120 +1770,139 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { List var3 = this.list(new LambdaQueryWrapper().eq(OnlCgformHead::getPhysicId, var1.getId())); if (var3 != null && !var3.isEmpty()) { - Iterator var4 = var3.iterator(); + Iterator var4 = var3.iterator(); + getVar4(var2, var4); + } + } - while(true) { - List var6; - String var13; - ArrayList var19; - Iterator var22; - label108: - do { - while(var4.hasNext()) { - OnlCgformHead var5 = (OnlCgformHead)var4.next(); - var6 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var5.getId())); - OnlCgformField var9; - if (var6 != null && !var6.isEmpty()) { - HashMap var15 = new HashMap<>(); + private void getVar4(List var2, Iterator var4) { + while(true) { + List var6; + ArrayList var19; + label108: + do { + while(var4.hasNext()) { + OnlCgformHead var5 = var4.next(); + var6 = this.fieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var5.getId())); + if (var6 != null && !var6.isEmpty()) { + HashMap var15 = new HashMap<>(); - for (Object value : var6) { - var9 = (OnlCgformField) value; - var15.put(var9.getDbFieldName(), 1); - } + forVar6(var6, var15); - HashMap var17 = new HashMap<>(); + HashMap var17 = new HashMap<>(); - for (OnlCgformField var10 : var2) { - var17.put(var10.getDbFieldName(), 1); - } + forVar10(var2, var17); - var19 = new ArrayList<>(); - ArrayList var20 = new ArrayList<>(); + var19 = new ArrayList<>(); + ArrayList var20 = new ArrayList<>(); - for (Object o : var17.keySet()) { - String var12 = (String) o; - if (var15.get(var12) == null) { - var20.add(var12); - } else { - var19.add(var12); - } - } + forVar17(var19, var15, var17, var20); - ArrayList var21 = new ArrayList<>(); - var22 = var15.keySet().iterator(); + ArrayList var21 = new ArrayList<>(); - while(var22.hasNext()) { - var13 = (String)var22.next(); - if (var17.get(var13) == null) { - var21.add(var13); - } - } + forVar15(var15, var17, var21); - OnlCgformField var23; - if (!var21.isEmpty()) { - var22 = var6.iterator(); + getVar23(var6, var21); - while(var22.hasNext()) { - var23 = (OnlCgformField)var22.next(); - if (var21.contains(var23.getDbFieldName())) { - this.fieldService.removeById(var23.getId()); - } - } - } - - if (!var20.isEmpty()) { - var22 = var2.iterator(); - - while(var22.hasNext()) { - var23 = (OnlCgformField)var22.next(); - if (var20.contains(var23.getDbFieldName())) { - OnlCgformField var14 = new OnlCgformField(); - var14.setCgformHeadId(var5.getId()); - this.a(var23, var14); - this.fieldService.save(var14); - } - } - } - continue label108; - } - - for (OnlCgformField var8 : var2) { - var9 = new OnlCgformField(); - var9.setCgformHeadId(var5.getId()); - this.a(var8, var9); - this.fieldService.save(var9); - } + getVar20(var2, var5, var20); + continue label108; } - return; - } while(var19.isEmpty()); + forVar8(var2, var5); + } - var22 = var19.iterator(); + return; + } while(var19.isEmpty()); - while(var22.hasNext()) { - var13 = (String)var22.next(); - this.b(var13, var2, var6); + forVar19(var2, var6, var19); + } + } + + private void forVar10(List var2, HashMap var17) { + for (OnlCgformField var10 : var2) { + var17.put(var10.getDbFieldName(), 1); + } + } + + private void forVar6(List var6, HashMap var15) { + OnlCgformField var9; + for (OnlCgformField value : var6) { + var9 = value; + var15.put(var9.getDbFieldName(), 1); + } + } + + private void forVar15(HashMap var15, HashMap var17, ArrayList var21) { + String var13; + for (String s : var15.keySet()) { + var13 = s; + if (var17.get(var13) == null) { + var21.add(var13); + } + } + } + + private void forVar17(ArrayList var19, HashMap var15, HashMap var17, ArrayList var20) { + for (String o : var17.keySet()) { + String var12 = o; + if (var15.get(var12) == null) { + var20.add(var12); + } else { + var19.add(var12); + } + } + } + + private void getVar23(List var6, ArrayList var21) { + OnlCgformField var23; + if (!var21.isEmpty()) { + + for (OnlCgformField onlCgformField : var6) { + var23 = onlCgformField; + if (var21.contains(var23.getDbFieldName())) { + this.fieldService.removeById(var23.getId()); } } } } + private void getVar20(List var2, OnlCgformHead var5, ArrayList var20) { + OnlCgformField var23; + if (!var20.isEmpty()) { + for (OnlCgformField onlCgformField : var2) { + var23 = onlCgformField; + if (var20.contains(var23.getDbFieldName())) { + OnlCgformField var14 = new OnlCgformField(); + var14.setCgformHeadId(var5.getId()); + this.a(var23, var14); + this.fieldService.save(var14); + } + } + } + } + + private void forVar8(List var2, OnlCgformHead var5) { + OnlCgformField var9; + for (OnlCgformField var8 : var2) { + var9 = new OnlCgformField(); + var9.setCgformHeadId(var5.getId()); + this.a(var8, var9); + this.fieldService.save(var9); + } + } + + private void forVar19(List var2, List var6, ArrayList var19) { + String var13; + for (String s : var19) { + var13 = s; + this.b(var13, var2, var6); + } + } + private void b(String var1, List var2, List var3) { - OnlCgformField var4 = null; + OnlCgformField var4 = getOnlCgformField(var1, var2); - for (OnlCgformField var6 : var2) { - if (var1.equals(var6.getDbFieldName())) { - var4 = var6; - } - } - - OnlCgformField var8 = null; - - for (OnlCgformField var7 : var3) { - if (var1.equals(var7.getDbFieldName())) { - var8 = var7; - } - } + OnlCgformField var8 = getOnlCgformField(var1, var3); if (var4 != null && var8 != null) { boolean var10 = false; @@ -1735,6 +1933,18 @@ public class OnlCgformHeadServiceImpl extends ServiceImpl var2) { + OnlCgformField var4 = null; + + for (OnlCgformField var6 : var2) { + if (var1.equals(var6.getDbFieldName())) { + var4 = var6; + } + } + return var4; + } + private void a(OnlCgformField var1, OnlCgformField var2) { var2.setDbDefaultVal(var1.getDbDefaultVal()); var2.setDbFieldName(var1.getDbFieldName()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java index 0354de03..bb43adb8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineBaseAPIServiceImpl.java @@ -2,8 +2,6 @@ package com.jero.generater.modules.online.cgform.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import java.util.Iterator; -import java.util.List; import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; @@ -13,6 +11,8 @@ import com.jero.generater.modules.online.cgform.service.IOnlineBaseAPI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service("onlineBaseAPI") public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { @Autowired @@ -20,6 +20,7 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { @Autowired private OnlCgformFieldMapper onlCgformFieldMapper; + @Override public String getOnlineErpCode(String code, String tableType) { if ("3".equals(tableType)) { String var3 = code.substring(1); @@ -29,12 +30,7 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { if (var6 != null && !var6.isEmpty()) { String var7 = null; - for (OnlCgformField var9 : var6) { - if (oConvertUtils.isNotEmpty(var9.getMainTable())) { - var7 = var9.getMainTable(); - break; - } - } + var7 = getString(var6, var7); LambdaQueryWrapper var10 = new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var7); OnlCgformHead var11 = this.onlCgformHeadMapper.selectOne(var10); @@ -47,4 +43,14 @@ public class OnlineBaseAPIServiceImpl implements IOnlineBaseAPI { return code; } + + private String getString(List var6, String var7) { + for (OnlCgformField var9 : var6) { + if (oConvertUtils.isNotEmpty(var9.getMainTable())) { + var7 = var9.getMainTable(); + break; + } + } + return var7; + } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java index 379ca0e7..dc2f4203 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlineServiceImpl.java @@ -27,7 +27,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; @@ -46,50 +45,32 @@ public class OnlineServiceImpl implements IOnlineService { // do other } + @Override public OnlComplexModel queryOnlineConfig(OnlCgformHead head) { String var2 = head.getId(); List var3 = this.a(var2); List var4 = this.onlAuthPageService.queryHideCode(var2, true); ArrayList var5 = new ArrayList<>(); - HashMap var6 = new HashMap<>(); - ArrayList var7 = new ArrayList<>(); + HashMap> var6 = new HashMap<>(); + ArrayList var7 = new ArrayList<>(); ArrayList var8 = new ArrayList<>(); ArrayList var9 = new ArrayList<>(); - Iterator var10 = var3.iterator(); String var14; - while(var10.hasNext()) { - OnlCgformField var11 = (OnlCgformField)var10.next(); + for (OnlCgformField onlCgformField : var3) { + OnlCgformField var11 = onlCgformField; String var12 = var11.getDbFieldName(); String var13 = var11.getMainTable(); var14 = var11.getMainField(); - if (oConvertUtils.isNotEmpty(var14) && oConvertUtils.isNotEmpty(var13)) { - OnlForeignKey var15 = new OnlForeignKey(var12, var14); - var8.add(var15); - } + getVar8(var8, var14, var12, var13); if (1 == var11.getIsShowList() && !"id".equals(var12) && !var4.contains(var12) && !var9.contains(var12)) { OnlColumn var28 = new OnlColumn(var11.getDbFieldTxt(), var12); String var16 = var11.getDictField(); String var17 = var11.getFieldShowType(); - if (oConvertUtils.isNotEmpty(var16) && !"popup".equals(var17)) { - Object var18 = new ArrayList<>(); - if (oConvertUtils.isNotEmpty(var11.getDictTable())) { - var18 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var11.getDictText(), var16); - } else if (oConvertUtils.isNotEmpty(var11.getDictField())) { - var18 = this.sysBaseAPI.queryDictItemsByCode(var16); - } + getVar18(var6, var11, var12, var28, var16, var17); - var6.put(var12, var18); - var28.setCustomRender(var12); - } - - List var29; - if ("switch".equals(var17)) { - var29 = CgformUtil.a(var11); - var6.put(var12, var29); - var28.setCustomRender(var12); - } + getVar29(var6, var11, var12, var28, var17); List var20; String var31; @@ -104,70 +85,22 @@ public class OnlineServiceImpl implements IOnlineService { this.a(var3, var9, var5, var12, var21); } - if ("sel_tree".equals(var17)) { - String[] var33 = var11.getDictText().split(","); - List var30 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var33[2], var33[0]); - var6.put(var12, var30); - var28.setCustomRender(var12); - } + getVar17(var6, var11, var12, var28, var17); - if ("cat_tree".equals(var17)) { - var31 = var11.getDictText(); - if (oConvertUtils.isEmpty(var31)) { - String var32 = CgformUtil.e(var11.getDictField()); - var20 = this.sysBaseAPI.queryFilterTableDictInfo("SYS_CATEGORY", "NAME", "ID", var32); - var6.put(var12, var20); - var28.setCustomRender(var12); - } else { - var28.setCustomRender("_replace_text_" + var31); - } - } + getVar28(var6, var11, var12, var28, var17); - if ("sel_depart".equals(var17)) { - var29 = this.sysBaseAPI.queryAllDepartBackDictModel(); - var6.put(var12, var29); - var28.setCustomRender(var12); - } + getVar28(var6, var12, var28, var17); - if ("sel_user".equals(var11.getFieldShowType())) { - var29 = this.sysBaseAPI.queryTableDictItemsByCode("SYS_USER", "REALNAME", "USERNAME"); - var6.put(var12, var29); - var28.setCustomRender(var12); - } + getVar28(var6, var11, var12, var28); - if (var17.contains("file")) { - var28.setScopedSlots(new ScopedSlots("fileSlot")); - } else if (var17.contains("image")) { - var28.setScopedSlots(new ScopedSlots("imgSlot")); - } else if (var17.contains("editor")) { - var28.setScopedSlots(new ScopedSlots("htmlSlot")); - } else if (var17.equals("date")) { - var28.setScopedSlots(new ScopedSlots("dateSlot")); - } else if (var17.equals("pca")) { - var28.setScopedSlots(new ScopedSlots("pcaSlot")); - } + getVar28(var28, var17); - if (StringUtils.isNotBlank(var11.getFieldHref())) { - var31 = "fieldHref_" + var12; - var28.setHrefSlotName(var31); - var7.add(new HrefSlots(var31, var11.getFieldHref())); - } + getVar28(var7, var11, var12, var28); - if ("1".equals(var11.getSortFlag())) { - var28.setSorter(true); - } - String showLength = "showLength"; - var31 = var11.getFieldExtendJson(); - if (oConvertUtils.isNotEmpty(var31) && var31.contains(showLength)) { - JSONObject var34 = JSON.parseObject(var31); - if (var34 != null && var34.get(showLength) != null) { - var28.setShowLength(oConvertUtils.getInt(var34.get(showLength))); - } - } + getVar28(var11, var28); + setVar28(var11, var28); - if (!"link_down".equals(var17)) { - var5.add(var28); - } + getVar5(var5, var28, var17); } } @@ -211,6 +144,126 @@ public class OnlineServiceImpl implements IOnlineService { return var22; } + private void getVar17(HashMap> var6, OnlCgformField var11, String var12, OnlColumn var28, String var17) { + if ("sel_tree".equals(var17)) { + String[] var33 = var11.getDictText().split(","); + List var30 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var33[2], var33[0]); + var6.put(var12, var30); + var28.setCustomRender(var12); + } + } + + private void getVar29(HashMap> var6, OnlCgformField var11, String var12, OnlColumn var28, String var17) { + List var29; + if ("switch".equals(var17)) { + var29 = CgformUtil.a(var11); + var6.put(var12, var29); + var28.setCustomRender(var12); + } + } + + private void getVar28(HashMap> var6, OnlCgformField var11, String var12, OnlColumn var28, String var17) { + String var31; + List var20; + if ("cat_tree".equals(var17)) { + var31 = var11.getDictText(); + if (oConvertUtils.isEmpty(var31)) { + String var32 = CgformUtil.e(var11.getDictField()); + var20 = this.sysBaseAPI.queryFilterTableDictInfo("SYS_CATEGORY", "NAME", "ID", var32); + var6.put(var12, var20); + var28.setCustomRender(var12); + } else { + var28.setCustomRender("_replace_text_" + var31); + } + } + } + + private void getVar28(HashMap> var6, OnlCgformField var11, String var12, OnlColumn var28) { + List var29; + if ("sel_user".equals(var11.getFieldShowType())) { + var29 = this.sysBaseAPI.queryTableDictItemsByCode("SYS_USER", "REALNAME", "USERNAME"); + var6.put(var12, var29); + var28.setCustomRender(var12); + } + } + + private void getVar28(HashMap> var6, String var12, OnlColumn var28, String var17) { + List var29; + if ("sel_depart".equals(var17)) { + var29 = this.sysBaseAPI.queryAllDepartBackDictModel(); + var6.put(var12, var29); + var28.setCustomRender(var12); + } + } + + private void getVar5(ArrayList var5, OnlColumn var28, String var17) { + if (!"link_down".equals(var17)) { + var5.add(var28); + } + } + + private void setVar28(OnlCgformField var11, OnlColumn var28) { + String var31; + String showLength = "showLength"; + var31 = var11.getFieldExtendJson(); + if (oConvertUtils.isNotEmpty(var31) && var31.contains(showLength)) { + JSONObject var34 = JSON.parseObject(var31); + if (var34 != null && var34.get(showLength) != null) { + var28.setShowLength(oConvertUtils.getInt(var34.get(showLength))); + } + } + } + + private void getVar28(ArrayList var7, OnlCgformField var11, String var12, OnlColumn var28) { + String var31; + if (StringUtils.isNotBlank(var11.getFieldHref())) { + var31 = "fieldHref_" + var12; + var28.setHrefSlotName(var31); + var7.add(new HrefSlots(var31, var11.getFieldHref())); + } + } + + private void getVar28(OnlCgformField var11, OnlColumn var28) { + if ("1".equals(var11.getSortFlag())) { + var28.setSorter(true); + } + } + + private void getVar28(OnlColumn var28, String var17) { + if (var17.contains("file")) { + var28.setScopedSlots(new ScopedSlots("fileSlot")); + } else if (var17.contains("image")) { + var28.setScopedSlots(new ScopedSlots("imgSlot")); + } else if (var17.contains("editor")) { + var28.setScopedSlots(new ScopedSlots("htmlSlot")); + } else if (var17.equals("date")) { + var28.setScopedSlots(new ScopedSlots("dateSlot")); + } else if (var17.equals("pca")) { + var28.setScopedSlots(new ScopedSlots("pcaSlot")); + } + } + + private void getVar18(HashMap> var6, OnlCgformField var11, String var12, OnlColumn var28, String var16, String var17) { + if (oConvertUtils.isNotEmpty(var16) && !"popup".equals(var17)) { + List var18 = new ArrayList<>(); + if (oConvertUtils.isNotEmpty(var11.getDictTable())) { + var18 = this.sysBaseAPI.queryTableDictItemsByCode(var11.getDictTable(), var11.getDictText(), var16); + } else if (oConvertUtils.isNotEmpty(var11.getDictField())) { + var18 = this.sysBaseAPI.queryDictItemsByCode(var16); + } + + var6.put(var12, var18); + var28.setCustomRender(var12); + } + } + + private void getVar8(ArrayList var8, String var14, String var12, String var13) { + if (oConvertUtils.isNotEmpty(var14) && oConvertUtils.isNotEmpty(var13)) { + OnlForeignKey var15 = new OnlForeignKey(var12, var14); + var8.add(var15); + } + } + private void a(List var1, List var2, List var3, String var4, String var5) { if (oConvertUtils.isNotEmpty(var5)) { String[] var6 = var5.split(","); @@ -235,6 +288,7 @@ public class OnlineServiceImpl implements IOnlineService { } + @Override public JSONObject queryOnlineFormObj(OnlCgformHead head, OnlCgformEnhanceJs onlCgformEnhanceJs) { JSONObject var3 = new JSONObject(); String var4 = head.getId(); @@ -272,11 +326,13 @@ public class OnlineServiceImpl implements IOnlineService { return var3; } + @Override public JSONObject queryOnlineFormObj(OnlCgformHead head) { OnlCgformEnhanceJs var2 = this.onlCgformHeadService.queryEnhanceJs(head.getId(), "form"); return this.queryOnlineFormObj(head, var2); } + @Override public List queryFormValidButton(String headId) { List var2 = this.onlCgformHeadService.queryButtonList(headId, false); List var3 = null; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java index 735734fa..f407ff53 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/util/OnlineDbHandler.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import java.math.BigDecimal; import java.util.Map; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import org.jetbrains.annotations.NotNull; public class OnlineDbHandler { public static final String INT = "int"; @@ -46,30 +47,39 @@ public class OnlineDbHandler { var3.put(var5, var2.getString(var5) != null ? var2.getString(var5).getBytes() : null); return "#{" + var5 + ",jdbcType=BLOB}"; } else if (DATE.equals(var4)) { - String var7 = var2.getString(var5); - if ("ORACLE".equals(var0)) { - if ("date".equals(var6)) { - var3.put(var5, var7.length() > 10 ? var7.substring(0, 10) : var7); - return "to_date(#{" + var5 + "},'yyyy-MM-dd')"; - } else { - var3.put(var5, var7.length() == 10 ? var2.getString(var5) + " 00:00:00" : var7); - return "to_date(#{" + var5 + "},'yyyy-MM-dd HH24:mi:ss')"; - } - } else if ("POSTGRESQL".equals(var0)) { - if ("date".equals(var6)) { - var3.put(var5, var7.length() > 10 ? var7.substring(0, 10) : var7); - return "CAST(#{" + var5 + "} as TIMESTAMP)"; - } else { - var3.put(var5, var7.length() == 10 ? var2.getString(var5) + " 00:00:00" : var7); - return "CAST(#{" + var5 + "} as TIMESTAMP)"; - } - } else { - var3.put(var5, var2.getString(var5)); - return "#{" + var5 + "}"; - } + return getString(var0, var2, var3, var5, var6); } else { var3.put(var5, var2.getString(var5)); return "#{" + var5 + ",jdbcType=VARCHAR}"; } } + + @NotNull + private static String getString(String var0, JSONObject var2, Map var3, String var5, String var6) { + String var7 = var2.getString(var5); + if ("ORACLE".equals(var0)) { + if ("date".equals(var6)) { + putVar3(var3, var5, var7, var7.length() > 10, var7.substring(0, 10)); + return "to_date(#{" + var5 + "},'yyyy-MM-dd')"; + } else { + putVar3(var3, var5, var7, var7.length() == 10, var2.getString(var5) + " 00:00:00"); + return "to_date(#{" + var5 + "},'yyyy-MM-dd HH24:mi:ss')"; + } + } else if ("POSTGRESQL".equals(var0)) { + if ("date".equals(var6)) { + putVar3(var3, var5, var7, var7.length() > 10, var7.substring(0, 10)); + return "CAST(#{" + var5 + "} as TIMESTAMP)"; + } else { + putVar3(var3, var5, var7, var7.length() == 10, var2.getString(var5) + " 00:00:00"); + return "CAST(#{" + var5 + "} as TIMESTAMP)"; + } + } else { + var3.put(var5, var2.getString(var5)); + return "#{" + var5 + "}"; + } + } + + private static void putVar3(Map var3, String var5, String var7, boolean b, String substring) { + var3.put(var5, b ? substring : var7); + } } diff --git a/jero-web/src/components/jero/JTable.vue b/jero-web/src/components/jero/JTable.vue index caa10e05..8085b562 100644 --- a/jero-web/src/components/jero/JTable.vue +++ b/jero-web/src/components/jero/JTable.vue @@ -10,9 +10,12 @@ v-bind="$attrs" v-on="$listeners"> - @@ -99,6 +102,7 @@ export default { }, data () { return { + // settingVisible: false, // 设置表格 settingColumns: [ { title: '列名', dataIndex: 'title', align: 'center', ellipsis: true, width: 150 }, @@ -116,17 +120,6 @@ export default { selfScroll: {} } }, - computed: { - slots () { - const slots = [] - for (const column of this.columns) { - if (column.scopedSlots && column.scopedSlots.customRender) { - slots.push(column.scopedSlots.customRender) - } - } - return slots - } - }, watch: { // 配置列改变，将配置转换成配置表格数据 settingColumnsObj: { @@ -145,7 +138,7 @@ export default { return } dataSource.push({ - title: col.title, // 用于显示的字段 + title: col.title || col.columnTitle, // 用于显示的字段 key: tempKey, // 用于存储的字段 hide: this.settingColumnsObj.hide.includes(tempKey), // 是否隐藏 freeze: this.settingColumnsObj.freeze.includes(tempKey), // 是否冻结 @@ -154,24 +147,89 @@ export default { }) }) this.settingDataSource = dataSource - this.setResultColumns() + // 自定义列配置修改后，更新表格字段 + this.setResultColumns(this.columns) } } }, methods: { + // 将父组件的columns进行处理：增加设置列按钮 + setResultColumns (columns) { + // 深度克隆，防止直接修改父组件数据 + columns = cloneDeep(columns) + // 设置按钮插槽配置 + const settingOption = { + filterDropdown: 'settingDropdown', + filterIcon: 'settingIcon' + } + let findActionIndex = columns.findIndex(col => col && (getKey(col) === actionKey)) + // 将设置按钮放到表格右上角，如果有操作栏就固定到右侧（操作栏固定右侧，没有的话就最后一列） + if (findActionIndex === -1) { + findActionIndex = columns.length - 1 + } + if (columns[findActionIndex].scopedSlots instanceof Object) { + Object.assign(columns[findActionIndex].scopedSlots, settingOption) + } else { + columns[findActionIndex].scopedSlots = settingOption + } + // 自定义设置弹框（尝试解决表格刷新丢失弹框的问题）此方法会出现两个弹框 + // columns[findActionIndex].filterDropdownVisible = this.settingVisible + // columns[findActionIndex].onFilterDropdownVisibleChange = (visible) => { + // this.settingVisible = visible + // } + + // 最后过滤掉需要隐藏的字段,按定位进行排序 + const startArr = [] // 冻结左侧的列 + const midArr = [] // 没有冻结的列 + const endArr = [] // 冻结右侧的列(只能是action，暂时不能自定义固定右侧) + columns.forEach(col => { + const key = getKey(col) + const fixed = this.settingColumnsObj.freeze.includes(key) + col.hide = this.settingColumnsObj.hide.includes(key) + col.fixed = key === actionKey ? 'right' : fixed + // 如果是字符串就转换成数字（因为实现拖拽，单位只能是px） + col.width = col.width && parseInt(col.width + '') + // 如果没有最小宽度就获取统一设置的最小宽度 + col.minWidth = (col.minWidth && parseInt(col.minWidth + '')) || this.columnMinWidth + if (!col.hide) { + // 如果没有宽度就取minWidth（不添加原数据的width属性，这里只对需要固定的minWidth生效） + const width = col.width || col.minWidth + switch (col.fixed) { + case true: + case 'left': + startArr.push({ ...col, width }) + break + case 'right': + endArr.push({ ...col, width }) + break + default: + midArr.push(col) + } + } + }) + // 更新父组件的数据，将排序后的进行渲染 + this.$emit('update:columns', columns) + // 按冻结顺序排序 + this.resultColumns = [...startArr.sort((a, b) => { + const freezeArr = this.settingColumnsObj.freeze + return freezeArr.indexOf(getKey(a)) - freezeArr.indexOf(getKey(b)) + }), ...midArr, ...endArr] + return this.resultColumns + }, // 初始化表格拖拽 - initDrag (tbCols) { + initDrag (columns) { + columns = cloneDeep(columns) // 没有边框就不能拖拽 if (!this.bordered) { return } // 如果没有任何列开启拖拽就不需要拖拽 - if (!tbCols.some(col => col.resizable)) { + if (!columns.some(col => col.resizable)) { return } // 第一步：列宽映射 const draggingMap = {} - tbCols.forEach((col) => { + columns.forEach((col) => { draggingMap[col.dataIndex || col.key] = col.width }) const draggingState = Vue.observable(draggingMap) @@ -194,14 +252,14 @@ export default { if (key === 'selection-column') { col = {} } else { - col = this.columns.find(col => getKey(col) === key) + col = columns.find(col => getKey(col) === key) } // 没有开启拖拽 或 没有宽度 或 有定位，都不能拖拽（防止布局异常，至少有一列不设width并且不能有fixed） if (!col.resizable || !col.width || !!col.fixed) { return {children} } // 开始拖拽监听 - const onDrag = (x) => { + const onDragging = (x) => { const beforeWidth = col.width const scroll = cloneDeep(this.scroll) || {} draggingState[key] = 0 @@ -219,11 +277,17 @@ export default { } else { this.selfScroll = scroll } + // 修改列宽后，更新表格字段 + this.setResultColumns(columns) } // 停止拖拽监听 const onDragstop = () => { draggingState[key] = thDom.getBoundingClientRect().width } + // 控制最小拖拽宽度 + const onDrag = (x) => { + return x >= (col.minWidth || this.columnMinWidth) + } return ( ) } }, - /** - * 将父组件的columns进行处理：增加设置列按钮 - */ - setResultColumns () { - // 深度克隆，防止直接修改父组件数据 - const columns = cloneDeep(this.columns) - // 设置按钮插槽配置 - const settingOption = { - filterDropdown: 'settingDropdown', - filterIcon: 'settingIcon' - } - let findActionIndex = columns.findIndex(col => col && (getKey(col) === actionKey)) - // 将设置按钮放到表格右上角，如果有操作栏就固定到右侧（操作栏固定右侧，没有的话就最后一列） - if (findActionIndex === -1) { - findActionIndex = columns.length - 1 - } - if (columns[findActionIndex].scopedSlots instanceof Object) { - Object.assign(columns[findActionIndex].scopedSlots, settingOption) - } else { - columns[findActionIndex].scopedSlots = settingOption - } - // 最后过滤掉需要隐藏的字段,按定位进行排序 - const startArr = [] // 冻结左侧的列 - const midArr = [] // 没有冻结的列 - const endArr = [] // 冻结右侧的列(只能是action，暂时不能自定义固定右侧) - columns.forEach(col => { - const key = getKey(col) - const fixed = this.settingColumnsObj.freeze.includes(key) - col.hide = this.settingColumnsObj.hide.includes(key) - col.fixed = key === actionKey ? 'right' : fixed - // 如果是字符串就转换成数字（因为实现拖拽，单位只能是px） - col.width = parseInt(col.width + '') - // 如果没有最小宽度就获取统一设置的最小宽度 - col.minWidth = parseInt(col.minWidth + '') || this.columnMinWidth - if (!col.hide) { - // 如果没有宽度就取minWidth（不添加原数据的width属性，这里只对需要固定的minWidth生效） - const width = col.width || col.minWidth - switch (col.fixed) { - case true: - case 'left': - startArr.push({ ...col, width }) - break - case 'right': - endArr.push({ ...col, width }) - break - default: - midArr.push(col) - } - } - }) - // 更新父组件的数据，将排序后的进行渲染 - this.$emit('update:columns', columns) - this.resultColumns = [...startArr, ...midArr, ...endArr] - }, /** * 配置表中复选框改变状态的事件 * @param text 修改前的状态 @@ -322,15 +333,13 @@ export default { } this.saveSetting() /** - * 弹框消失问题 冻结列会导致dom结构改变而从局部更新丢失弹框 - * 情况1：原本显示没有冻结列，新增第一个冻结列 - * 情况2：原本有且只剩一个冻结列，取消最后一个冻结列 + * 弹框消失问题 冻结列出现和消失会导致dom结构改变而从更新结构丢失弹框 * 解决方案，刷新前获取dom，刷新后再次获取，如果获取不一致就触发点击事件点开弹框 */ const beforeIsFixed = !!this.$refs.table.$el.querySelector('.ant-table-fixed-left') this.$nextTick(() => { const afterIsFixed = !!this.$refs.table.$el.querySelector('.ant-table-fixed-left') - // console.log(beforeIsFixed, afterIsFixed) + // console.log(beforeIsFixed !== afterIsFixed) if (beforeIsFixed !== afterIsFixed) { this.$refs.settingBtn.$el.click() } diff --git a/jero-web/src/components/jero/README_JTable.md b/jero-web/src/components/jero/README_JTable.md index e713a372..0b24e523 100644 --- a/jero-web/src/components/jero/README_JTable.md +++ b/jero-web/src/components/jero/README_JTable.md @@ -52,7 +52,7 @@ 在[示例](#示例)中，设定了一个 `ref="table"` 的属性，那么在vue中就可以使用`this.$refs.table`获取到该表格的实例，并调取其中的方法。 假如我要调取`resteColumns`方法，就可以这么写：`this.$refs.table.resteColumns()` -### columns和scroll为什么要使用`.sync` +### `columns`和`scroll`为什么要使用`.sync` 保证父组件和子组件数据同步 @@ -60,35 +60,68 @@ `scroll`拖拽后会把最新的总宽度同步 -### 对原ATable的使用有哪些限制 +### 对原`a-table`的使用有哪些限制 - 操作列的`dataIndex`或`key`必须为`action` - - 带有设置的列不能使用`scopedSlots.filterIcon` 和 `scopedSlots.filterDropdown` + - 带有设置的列不能使用`scopedSlots.filterIcon` 和 `scopedSlots.filterDropdown`(没有操作列时，设置在最后一列) - `scroll.x`和`width`必须是数字，不支持百分比 + - 使用作用域插槽，需要使用解构赋值，里面有三个参数`{text, record, index}`，可参考[示例](#示例)写法 + +### 拖拽后没有设置宽度的列会被缩小 + + - 设置scroll.x配置一个默认宽度即可 + +### 出现空白列 + + - 设置至少一列没有width（没有width不能被拖拽） + - 建议没有`width`的列不能手动控制隐藏和冻结，使用`disabledHide`和`disabledFreeze`或者`hideSettingColumn` + +### `resizable`没有效果 + + - 需要设置`resizable: true`，要有`width`，且不能有`fixed` + +### 自定义列的弹框会消失 + + - 因为冻结列的出现或消失会刷新表格结构导致弹框丢失 + - 设置一个冻结列始终存在，不可被手动控制隐藏和取消冻结即可 ### 注意事项 + - `table-key`该属性为全局每个表的唯一属性，建议使用路由+命名的方式，如[示例](#示例)中设置 - 固定头和列（ant-design-vue自带的问题） ：若列头与内容不对齐或出现列重复，请指定固定列的宽度 width。如果指定 width 不生效或出现白色垂直空隙，请尝试建议留一列不设宽度以适应弹性布局，或者检查是否有超长连续字段破坏布局。 建议指定 scroll.x 为大于表格宽度的固定值。注意，且非固定列宽度之和不要超过 `scroll.x`。 - - `table-key`该属性为全局每个表的唯一属性，建议使用路由+命名的方式，如[示例](#示例)中设置 ## 示例 ```vue @@ -108,7 +145,6 @@ import JTable from '@comp/jero/JTable' export default { name: 'Demo', components: { JTable }, - data () { const columns = [ { @@ -126,7 +162,7 @@ export default { fixed: true, title: '#', ellipsis: true, - dataIndex: 'key', + dataIndex: 'key' }, { resizable: true, @@ -134,6 +170,20 @@ export default { dataIndex: 'date', width: 200 }, + { + // 标题使用插槽使用这个代替title（用于设置里显示列名） + columnTitle: 'Name', + dataIndex: 'name', + key: 'name', + slots: { title: 'customTitle' }, + scopedSlots: { customRender: 'name' } + }, + { + title: 'Tags', + key: 'tags', + dataIndex: 'tags', + scopedSlots: { customRender: 'tags' } + }, { resizable: true, // 可拖拽属性 title: 'Amount', @@ -148,9 +198,13 @@ export default { }, { title: 'Note', - dataIndex: 'note' + dataIndex: 'note', // 保留一列自适应 // width: 100 + // 建议：没有宽度的列至少一列禁止自定义（解决冻结或隐藏列导致出现空列） + // disabledHide: true, + // disabledFreeze: true, + hideSettingColumn: true }, { title: 'Action', @@ -163,6 +217,8 @@ export default { const dataSource = [ { key: 0, + name: 'John Brown', + tags: ['nice', 'developer'], date: '2018-02-11', amount: 120, type: 'income', @@ -170,6 +226,8 @@ export default { }, { key: 1, + name: 'Jim Green', + tags: ['loser'], date: '2018-03-11', amount: 243, type: 'income', @@ -177,6 +235,8 @@ export default { }, { key: 2, + name: 'Joe Black', + tags: ['cool', 'teacher'], date: '2018-04-11', amount: 98, type: 'income', @@ -184,7 +244,7 @@ export default { } ] return { - scroll: { x: 1000 }, + scroll: { x: 1400 }, columns: columns, dataSource: dataSource, selectedRowKeys: [] @@ -192,7 +252,7 @@ export default { }, methods: { // 还原表格初始配置 - resetTable() { + resetTable () { this.$refs.table.resteColumns() }, // 清除当前表格缓存 diff --git a/jero-web/src/views/demo/list/JTableList.vue b/jero-web/src/views/demo/list/JTableList.vue index 7fd16644..affd8ebc 100644 --- a/jero-web/src/views/demo/list/JTableList.vue +++ b/jero-web/src/views/demo/list/JTableList.vue @@ -8,12 +8,24 @@ + + {{ text }} + Name + + + {{ tag.toUpperCase() }} + + Delete + + @@ -61,6 +77,20 @@ export default { dataIndex: 'date', width: 200 }, + { + // 标题使用插槽使用这个代替title（用于设置里显示列名） + columnTitle: 'Name', + dataIndex: 'name', + key: 'name', + slots: { title: 'customTitle' }, + scopedSlots: { customRender: 'name' } + }, + { + title: 'Tags', + key: 'tags', + dataIndex: 'tags', + scopedSlots: { customRender: 'tags' } + }, { resizable: true, // 可拖拽属性 title: 'Amount', @@ -75,9 +105,13 @@ export default { }, { title: 'Note', - dataIndex: 'note' + dataIndex: 'note', // 保留一列自适应 // width: 100 + // 建议：没有宽度的列至少一列禁止自定义（解决冻结或隐藏列导致出现空列） + // disabledHide: true, + // disabledFreeze: true, + hideSettingColumn: true }, { title: 'Action', @@ -90,6 +124,8 @@ export default { const dataSource = [ { key: 0, + name: 'John Brown', + tags: ['nice', 'developer'], date: '2018-02-11', amount: 120, type: 'income', @@ -97,6 +133,8 @@ export default { }, { key: 1, + name: 'Jim Green', + tags: ['loser'], date: '2018-03-11', amount: 243, type: 'income', @@ -104,6 +142,8 @@ export default { }, { key: 2, + name: 'Joe Black', + tags: ['cool', 'teacher'], date: '2018-04-11', amount: 98, type: 'income',