diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceExportDemo.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceExportDemo.java index 55b5dc3c..c9ac6652 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceExportDemo.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/enhance/demo/CgformEnhanceExportDemo.java @@ -1,20 +1,21 @@ package com.jero.generater.modules.online.cgform.enhance.demo; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.SysCategoryModel; import com.jero.common.util.oConvertUtils; import com.jero.generater.modules.online.cgform.enhance.CgformEnhanceJavaListInter; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; -import com.jero.generater.modules.online.config.exception.BusinessException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + @Component("cgformEnhanceExportDemo") public class CgformEnhanceExportDemo implements CgformEnhanceJavaListInter { @Autowired @@ -23,35 +24,38 @@ public class CgformEnhanceExportDemo implements CgformEnhanceJavaListInter { IOnlCgformFieldService onlCgformFieldService; public CgformEnhanceExportDemo() { + // do other } - public void execute(String tableName, List> data) throws BusinessException { + @Override + public void execute(String tableName, List> data) { List var3 = this.sysBaseAPI.queryAllDSysCategory(); - Iterator var4 = data.iterator(); - + Iterator> var4 = data.iterator(); + String selSearch = "sel_search"; while(var4.hasNext()) { - Map var5 = (Map)var4.next(); + Map var5 = var4.next(); String var6 = oConvertUtils.getString(var5.get("fen_tree")); if (!oConvertUtils.isEmpty(var6)) { - List var7 = var3.stream().filter((var1) -> { - return var1.getId().equals(var6); - }).collect(Collectors.toList()); - if (var7 != null && var7.size() != 0) { - var5.put("fen_tree", ((SysCategoryModel)var7.get(0)).getName()); - } - - String var8 = oConvertUtils.getString(var5.get("sel_search")); - if (!oConvertUtils.isEmpty(var8)) { - OnlCgformField var9 = this.onlCgformFieldService.queryFormFieldByTableNameAndField(tableName, "sel_search"); - if (var9 != null && !oConvertUtils.isEmpty(var9.getDictTable())) { - List var10 = this.sysBaseAPI.queryTableDictByKeys(var9.getDictTable(), var9.getDictText(), var9.getDictField(), new String[]{var8}); - if (var10 != null && var10.size() > 0) { - var5.put("sel_search", var10.get(0)); - } - } + List var7 = var3.stream().filter(var1 -> Objects.equals(var1.getId(),var6)).collect(Collectors.toList()); + if (!var7.isEmpty()) { + var5.put("fen_tree", var7.get(0).getName()); } + putVar5(tableName, selSearch, var5); } } } + + private void putVar5(String tableName, String selSearch, Map var5) { + String var8 = oConvertUtils.getString(var5.get(selSearch)); + if (!oConvertUtils.isEmpty(var8)) { + OnlCgformField var9 = this.onlCgformFieldService.queryFormFieldByTableNameAndField(tableName, selSearch); + if (var9 != null && !oConvertUtils.isEmpty(var9.getDictTable())) { + List var10 = this.sysBaseAPI.queryTableDictByKeys(var9.getDictTable(), var9.getDictText(), var9.getDictField(), new String[]{var8}); + if (var10 != null && !var10.isEmpty()) { + var5.put(selSearch, var10.get(0)); + } + } + } + } }