From 054eb6beacf2c8f55b371119866dfc8a6e87b903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 20 Mar 2023 18:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91OnlCgformHeadServi?= =?UTF-8?q?ceImpl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OnlCgformHeadServiceImpl.java | 1654 ++++++++++------- 1 file changed, 932 insertions(+), 722 deletions(-) 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());