【fix sonar】OnlCgformApiController文件

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java

@@ -4,50 +4,30 @@ package com.jero.generater.modules.online.cgform.controller;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Lists;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-
-import com.jero.common.exception.JeroBootException;
-import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
-import org.apache.poi.ss.usermodel.Workbook;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.aspect.annotation.OnlineAuth;
 import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.constant.enums.ModuleType;
+import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.util.BrowserUtils;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.TokenUtils;
 import com.jero.common.util.oConvertUtils;
-import com.jero.generater.modules.online.cgform.link.LinkDown;
+import com.jero.generater.modules.online.auth.service.IOnlAuthPageService;
 import com.jero.generater.modules.online.cgform.converter.ConvertUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformHead;
+import com.jero.generater.modules.online.cgform.link.LinkDown;
 import com.jero.generater.modules.online.cgform.model.OnlCgformModel;
+import com.jero.generater.modules.online.cgform.model.OnlComplexModel;
 import com.jero.generater.modules.online.cgform.model.OnlGenerateModel;
 import com.jero.generater.modules.online.cgform.model.TreeModel;
-import com.jero.generater.modules.online.cgform.model.OnlComplexModel;
-import com.jero.generater.modules.online.cgform.model.TreeSelectColumn;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService;
 import com.jero.generater.modules.online.cgform.service.IOnlCgformSqlService;
@@ -56,32 +36,40 @@ import com.jero.generater.modules.online.cgform.util.CgFormExcelHandler;
 import com.jero.generater.modules.online.cgform.util.CgformUtil;
 import com.jero.generater.modules.online.cgform.util.EnhanceJsUtil;
 import com.jero.generater.modules.online.cgform.util.GenerateCodeFileToZip;
-import com.jero.generater.modules.online.config.util.DbTableUtil;
 import com.jero.generater.modules.online.config.exception.BusinessException;
-import com.jero.generater.modules.online.config.exception.DBException;
+import com.jero.generater.modules.online.config.util.DbTableUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer;
-import org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIncrementer;
+import org.springframework.jdbc.support.incrementer.PostgresSequenceMaxValueIncrementer;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 @RestController("onlCgformApiController")
 @RequestMapping({"/online/cgform/api"})
 @Slf4j
@@ -140,7 +128,7 @@ public class OnlCgformApiController {
     @OnlineAuth("getColumns")
     @GetMapping({"/getColumns/{code}"})
     public Result<OnlComplexModel> a(@PathVariable("code") String var1) {
-        Result var2 = new Result<>();
+        Result<OnlComplexModel> var2 = new Result<>();
         OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
         if (var3 == null) {
             return Result.error(EN_IS_NULL);
@@ -163,7 +151,7 @@ public class OnlCgformApiController {
     @OnlineAuth("getData")
     @GetMapping({"/getData/{code}"})
     public Result<Map<String, Object>> a(@PathVariable("code") String var1, HttpServletRequest var2) {
-        Result var3 = new Result<>();
+        Result<Map<String, Object>> var3 = new Result<>();
         OnlCgformHead var4 = this.onlCgformHeadService.getById(var1);
         if (var4 == null) {
             return Result.error(EN_IS_NULL);
@@ -191,13 +179,13 @@ public class OnlCgformApiController {
     )
     @OnlineAuth("getFormItem")
     @GetMapping({"/getFormItem/{code}"})
-    public Result<T> b(@PathVariable("code") String var1, HttpServletRequest var2) {
+    public Result<JSONObject> b(@PathVariable("code") String var1, HttpServletRequest var2) {
         OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
         if (var3 == null) {
             Result.error("表不存在");
         }
 
-        Result var4 = new Result<>();
+        Result<JSONObject> var4 = new Result<>();
         OnlCgformEnhanceJs var5 = this.onlCgformHeadService.queryEnhanceJs(var1, "form");
         JSONObject var6 = this.onlineService.queryOnlineFormObj(var3, var5);
         if (!Objects.isNull(var3)) {
@@ -212,6 +200,24 @@ public class OnlCgformApiController {
                 String[] var10 = var8.split(",");
                 int var11 = var10.length;
 
+                forVar12(var9, var10, var11);
+
+                getVar9(var5, var7, var9);
+            }
+
+            if (var5 != null && oConvertUtils.isNotEmpty(var5.getCgJs())) {
+                var6.put("enhanceJs", EnhanceJsUtil.a(var5.getCgJs()));
+            }
+        }
+
+        var4.setResult(var6);
+        if (!Objects.isNull(var3)) {
+            var4.setOnlTable(var3.getTableName());
+        }
+        return var4;
+    }
+
+    private void forVar12(ArrayList<OnlCgformHead> var9, String[] var10, int var11) {
         for (int var12 = 0; var12 < var11; ++var12) {
             String var13 = var10[var12];
             OnlCgformHead var14 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var13));
@@ -219,7 +225,9 @@ public class OnlCgformApiController {
                 var9.add(var14);
             }
         }
+    }
 
+    private void getVar9(OnlCgformEnhanceJs var5, JSONObject var7, ArrayList<OnlCgformHead> var9) {
         if (!var9.isEmpty()) {
             Collections.sort(var9, (var122, var21) -> {
                 Integer var31 = var122.getTabOrderNum();
@@ -259,26 +267,14 @@ public class OnlCgformApiController {
         }
     }
 
-            if (var5 != null && oConvertUtils.isNotEmpty(var5.getCgJs())) {
-                var6.put("enhanceJs", EnhanceJsUtil.a(var5.getCgJs()));
-            }
-        }
-
-        var4.setResult(var6);
-        if(!Objects.isNull(var3)){
-            var4.setOnlTable(var3.getTableName());
-        }
-        return var4;
-    }
-
     @AutoLog(
             operateType = 1,
             value = "online根据表名加载表单",
             module = ModuleType.ONLINE
     )
     @GetMapping({"/getFormItemBytbname/{table}"})
-    public Result<T> a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) {
+    public Result<JSONObject> a(@PathVariable("table") String var1, @RequestParam(name = "taskId", required = false) String var2) {
-        Result var3 = new Result<>();
+        Result<JSONObject> var3 = new Result<>();
         LambdaQueryWrapper<OnlCgformHead> var4 = new LambdaQueryWrapper<>();
         var4.eq(OnlCgformHead::getTableName, var1);
         OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4);
@@ -314,7 +310,7 @@ public class OnlCgformApiController {
             value = "online表单数据查询"
     )
     @GetMapping({"/form/{code}/{id}"})
-    public Result b(@PathVariable("code") String var1, @PathVariable("id") String var2) {
+    public Result<Map<String, Object>> b(@PathVariable("code") String var1, @PathVariable("id") String var2) {
         try {
             Map<String, Object> var3 = this.onlCgformHeadService.queryManyFormData(var1, var2);
             return Result.OK(CgformUtil.b(var3));
@@ -325,7 +321,7 @@ public class OnlCgformApiController {
     }
 
     @GetMapping({"/subform/{table}/{mainId}"})
-    public Result c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
+    public Result<Map<String, Object>> c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
         try {
             Map<String, Object> var3 = this.onlCgformHeadService.querySubFormData(var1, var2);
             return Result.OK(CgformUtil.b(var3));
@@ -336,7 +332,7 @@ public class OnlCgformApiController {
     }
 
     @GetMapping({"/subform/list/{table}/{mainId}"})
-    public Result d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
+    public Result<List<Map<String, Object>>> d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) {
         try {
             return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2));
         } catch (Exception var4) {
@@ -351,7 +347,7 @@ public class OnlCgformApiController {
             module = ModuleType.ONLINE
     )
     @GetMapping({"/form/table_name/{tableName}/{dataId}"})
-    public Result e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) {
+    public Result<Map<String, Object>> e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) {
         try {
             LambdaQueryWrapper<OnlCgformHead> var3 = new LambdaQueryWrapper<>();
             var3.eq(OnlCgformHead::getTableName, var1);
@@ -359,7 +355,7 @@ public class OnlCgformApiController {
             if (var4 == null) {
                 throw new JeroBootException("OnlCgform tableName: " + var1 + " 不存在！");
             } else {
-                Result var5 = this.b(var4.getId(), var2);
+                Result<Map<String, Object>> var5 = this.b(var4.getId(), var2);
                 var5.setOnlTable(var1);
                 return var5;
             }
@@ -377,7 +373,7 @@ public class OnlCgformApiController {
     @OnlineAuth("form")
     @PostMapping({"/form/{code}"})
     public Result<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) {
-        Result var4 = new Result<>();
+        Result<String> var4 = new Result<>();
 
         try {
             String var5 = CgformUtil.a();
@@ -403,10 +399,10 @@ public class OnlCgformApiController {
     )
     @OnlineAuth("form")
     @PostMapping({"/form/update/{code}"})
-    public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2) {
+    public Result<String> a(@PathVariable("code") String var1, @RequestBody JSONObject var2) {
         try {
             String var3 = this.onlCgformHeadService.editManyFormData(var1, var2);
-            Result var4 = Result.OK("操作成功!");
+            Result<String> var4 = Result.OK("操作成功!");
             var4.setOnlTable(var3);
             return var4;
         } catch (Exception var5) {
@@ -422,19 +418,32 @@ public class OnlCgformApiController {
     )
     @OnlineAuth("form")
     @PostMapping({"/form/{code}/{id}"})
-    public Result f(@PathVariable("code") String var1, @PathVariable("id") String var2) {
+    public Result<String> f(@PathVariable("code") String var1, @PathVariable("id") String var2) {
         OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
         if (var3 == null) {
             return Result.error(EN_IS_NULL);
         } else {
             try {
+                getVar4(var1, var2, var3);
+            } catch (Exception var12) {
+                log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var12.getMessage(), var12);
+                return Result.error("删除失败");
+            }
+
+            Result<String> var13 = Result.OK("删除成功!");
+            var13.setOnlTable(var3.getTableName());
+            return var13;
+        }
+    }
+
+    private void getVar4(@PathVariable("code") String var1, @PathVariable("id") String var2, OnlCgformHead var3) throws BusinessException {
         String var4 = "";
         if ("Y".equals(var3.getIsTree())) {
             var2 = this.onlCgformFieldService.queryTreeChildIds(var3, var2);
             var4 = this.onlCgformFieldService.queryTreePids(var3, var2);
         }
 
-                if (var2.indexOf(",") >= 0) {
+        if (var2.contains(",")) {
             String var5;
             if (var3.getTableType() == 2) {
                 this.onlCgformFieldService.deleteAutoListMainAndSub(var3, var2);
@@ -462,15 +471,6 @@ public class OnlCgformApiController {
         if (oConvertUtils.isNotEmpty(var3.getIsDesForm()) && "1".equals(var3.getIsDesForm())) {
             this.onlCgformFieldService.deleteAutoList("design_form_data", "online_form_data_id", var2);
         }
-            } catch (Exception var12) {
-                log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var12.getMessage(), var12);
-                return Result.error("删除失败");
-            }
-
-            Result var13 = Result.OK("删除成功!");
-            var13.setOnlTable(var3.getTableName());
-            return var13;
-        }
     }
 
     @AutoLog(
@@ -479,7 +479,7 @@ public class OnlCgformApiController {
             module = ModuleType.ONLINE
     )
     @PostMapping({"/formByCode/{code}/{id}"})
-    public Result g(@PathVariable("code") String var1, @PathVariable("id") String var2) {
+    public Result<String> g(@PathVariable("code") String var1, @PathVariable("id") String var2) {
         OnlCgformHead var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var1));
         if (var3 == null) {
             return Result.error(EN_IS_NULL);
@@ -496,7 +496,7 @@ public class OnlCgformApiController {
                 return Result.error("删除失败");
             }
 
-            Result var6 = Result.OK("删除成功!");
+            Result<String> var6 = Result.OK("删除成功!");
             var6.setOnlTable(var3.getTableName());
             return var6;
         }
@@ -504,7 +504,7 @@ public class OnlCgformApiController {
 
     @OnlineAuth("getQueryInfo")
     @GetMapping({"/getQueryInfo/{code}"})
-    public Result b(@PathVariable("code") String var1) {
+    public Result<List<Map<String, String>>> b(@PathVariable("code") String var1) {
         try {
             List<Map<String, String>> var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1);
             return Result.OK(var2);
@@ -515,7 +515,7 @@ public class OnlCgformApiController {
     }
 
     @PostMapping({"/doDbSynch/{code}/{synMethod}"})
-    public Result h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) {
+    public Result<T> h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) {
         try {
             long var3 = System.currentTimeMillis();
             this.onlCgformHeadService.doDbSynch(var1, var2);
@@ -536,17 +536,17 @@ public class OnlCgformApiController {
         if (var4 != null) {
             String var5 = var4.getTableTxt();
             String var6 = var2.getParameter("paramsStr");
-            Object var7 = new HashMap<>();
+            Map<String, Object> var7 = new HashMap<>();
             if (oConvertUtils.isNotEmpty(var6)) {
                 var7 = JSON.parseObject(var6, Map.class);
             }
 
-            ((Map)var7).put("pageSize", -521);
+            var7.put("pageSize", -521);
-            Map<String, Object> var9 = this.onlCgformFieldService.queryAutolistPage(var4.getTableName(), var4.getId(), (Map)var7, (List)null);
+            Map<String, Object> var9 = this.onlCgformFieldService.queryAutolistPage(var4.getTableName(), var4.getId(), var7, null);
             List<OnlCgformField> fieldList = (List) var9.get("fieldList");
             List<Map<String, Object>> records = (List) var9.get("records");
-            List var12 = new ArrayList<>();
+            List<Map<String, Object>> var12 = new ArrayList<>();
-            String var13 = ((Map)var7).get("selections") == null ? null : ((Map)var7).get("selections").toString();
+            String var13 = var7.get("selections") == null ? null : var7.get("selections").toString();
 
             if (var13 != null && !StringUtils.isEmpty(var13)) {
                 final List<String> var14 = Arrays.asList(var13.split(","));
@@ -566,24 +566,17 @@ public class OnlCgformApiController {
                 log.error("导出java增强处理出错", var31.getMessage());
             }
 
-            List<ExcelExportEntity> var14 = this.a(fieldList, "id");
+            List<ExcelExportEntity> var14 = getExcelExportEntities(var4, var7, fieldList, var12);
-            if (var4.getTableType() == 2 && oConvertUtils.isEmpty(((Map)var7).get("exportSingleOnly"))) {
-                String var15 = var4.getSubTableStr();
-                if (oConvertUtils.isNotEmpty(var15)) {
-                    String[] var16 = var15.split(",");
-                    String[] var17 = var16;
-                    int var18 = var16.length;
-
-                    for(int var19 = 0; var19 < var18; ++var19) {
-                        String var20 = var17[var19];
-                        this.a(var20, (Map)var7, var12, var14);
-                    }
-                }
-            }
 
             Workbook var33 = ExcelExportUtil.exportExcel(new ExportParams(null, var5), var14, var12);
             ServletOutputStream var34 = null;
 
+            getVar3(var2, var3, var4, var33, var34);
+
+        }
+    }
+
+    private void getVar3(HttpServletRequest var2, HttpServletResponse var3, OnlCgformHead var4, Workbook var33, ServletOutputStream var34) {
         try {
             var3.setContentType("application/x-msdownload;charset=utf-8");
             String var35 = BrowserUtils.checkBrowse(var2);
@@ -610,15 +603,32 @@ public class OnlCgformApiController {
             }
 
         }
-
     }
+
+    @NotNull
+    private List<ExcelExportEntity> getExcelExportEntities(OnlCgformHead var4, Map<String, Object> var7, List<OnlCgformField> fieldList, List<Map<String, Object>> var12) {
+        List<ExcelExportEntity> var14 = this.a(fieldList, "id");
+        if (var4.getTableType() == 2 && oConvertUtils.isEmpty(var7.get("exportSingleOnly"))) {
+            String var15 = var4.getSubTableStr();
+            if (oConvertUtils.isNotEmpty(var15)) {
+                String[] var16 = var15.split(",");
+                String[] var17 = var16;
+                int var18 = var16.length;
+
+                for (int var19 = 0; var19 < var18; ++var19) {
+                    String var20 = var17[var19];
+                    this.a(var20, var7, var12, var14);
+                }
+            }
+        }
+        return var14;
     }
 
     @OnlineAuth("importXls")
     @PostMapping({"/importXls/{code}"})
-    public Result b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) {
+    public Result<T> b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) {
         long var4 = System.currentTimeMillis();
-        Result var6 = new Result<>();
+        Result<T> var6 = new Result<>();
         String var7 = "";
 
         try {
@@ -632,22 +642,7 @@ public class OnlCgformApiController {
             List<OnlCgformField> var10 = this.onlCgformFieldService.list(var9);
             String var11 = var2.getParameter("isSingleTableImport");
             List<String> var12 = CgformUtil.e(var10);
-            if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) {
+            getVar11(var8, var11, var12);
-                String[] var13 = var8.getSubTableStr().split(",");
-                int var14 = var13.length;
-
-                for(int var15 = 0; var15 < var14; ++var15) {
-                    String var16 = var13[var15];
-                    OnlCgformHead var17 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var16));
-                    if (var17 != null) {
-                        List<OnlCgformField> var18 = this.onlCgformFieldService.list(new LambdaQueryWrapper<OnlCgformField>().eq(OnlCgformField::getCgformHeadId, var17.getId()));
-                        List<String> var19 = CgformUtil.b(var18, var17.getTableTxt());
-                        if (!var19.isEmpty()) {
-                            var12.addAll(var19);
-                        }
-                    }
-                }
-            }
 
             JSONObject var47 = null;
             String var48 = var2.getParameter("foreignKeys");
@@ -659,57 +654,21 @@ public class OnlCgformApiController {
             Map<String, MultipartFile> var50 = var49.getFileMap();
             DataSource var51 = SpringContextUtils.getApplicationContext().getBean(DataSource.class);
             String var52 = DbTableUtil.a(var51);
-            Iterator var53 = var50.entrySet().iterator();
+            Iterator<Entry<String, MultipartFile>> var53 = var50.entrySet().iterator();
 
             while (true) {
                 while (var53.hasNext()) {
-                    Entry var20 = (Entry)var53.next();
+                    Entry<String, MultipartFile> var20 = var53.next();
-                    MultipartFile var21 = (MultipartFile)var20.getValue();
+                    MultipartFile var21 = var20.getValue();
                     ImportParams var22 = new ImportParams();
                     var22.setImageList(var12);
                     var22.setDataHanlder(new CgFormExcelHandler(var10, this.upLoadPath, this.uploadType));
-                    List var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, var22);
+                    List<Map<String, Object>> var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, var22);
                     if (var23 != null) {
                         Object var24 = "";
-                        ArrayList var25 = new ArrayList<>();
+                        ArrayList<Map<String, Object>> var25 = new ArrayList<>();
 
-                        Map var27;
+                        forVar27(var8, var47, var51, var52, var23, var24, var25);
-                        for(Iterator var26 = var23.iterator(); var26.hasNext(); var27.put("$mainTable$id", var24)) {
-                            var27 = (Map)var26.next();
-                            boolean var28 = false;
-                            Set var29 = var27.keySet();
-                            HashMap var30 = new HashMap<>();
-                            Iterator var31 = var29.iterator();
-
-                            String var32;
-                            while(var31.hasNext()) {
-                                var32 = (String)var31.next();
-                                if (!var32.contains("$subTable$")) {
-                                    if (var32.contains(MAIN_TABLE) && oConvertUtils.isNotEmpty(var27.get(var32).toString())) {
-                                        var28 = true;
-                                        var24 = this.a(var8, var51, var52);
-                                    }
-
-                                    var30.put(var32.replace(MAIN_TABLE, ""), var27.get(var32));
-                                }
-                            }
-
-                            if (var28) {
-                                var30.put("id", var24);
-                                var25.add(var30);
-                                var24 = var30.get("id");
-                            }
-
-                            if (var47 != null) {
-                                var31 = var47.keySet().iterator();
-
-                                while(var31.hasNext()) {
-                                    var32 = (String)var31.next();
-                                    log.info(var32 + "=" + var47.getString(var32));
-                                    var30.put(var32, var47.getString(var32));
-                                }
-                            }
-                        }
 
                         if (var25.isEmpty()) {
                             var6.setSuccess(false);
@@ -718,56 +677,8 @@ public class OnlCgformApiController {
                         }
 
                         this.onlCgformSqlService.saveBatchOnlineTable(var8, var10, var25);
-                        if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) {
+                        getVar11(var8, var11, var51, var52, var23);
-                            String[] var54 = var8.getSubTableStr().split(",");
-                            int var55 = var54.length;
 
-                            for(int var56 = 0; var56 < var55; ++var56) {
-                                String var57 = var54[var56];
-                                OnlCgformHead var58 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var57));
-                                if (var58 != null) {
-                                    LambdaQueryWrapper<OnlCgformField> var59 = new LambdaQueryWrapper<>();
-                                    var59.eq(OnlCgformField::getCgformHeadId, var58.getId());
-                                    List<OnlCgformField> var60 = this.onlCgformFieldService.list(var59);
-                                    ArrayList var33 = new ArrayList<>();
-                                    String var34 = var58.getTableTxt();
-
-                                    for (Object value : var23) {
-                                        Map var36 = (Map) value;
-                                        boolean var37 = false;
-                                        HashMap var38 = new HashMap<>();
-
-                                        for (Object o : var60) {
-                                            OnlCgformField var40 = (OnlCgformField) o;
-                                            String var41 = var40.getMainTable();
-                                            String var42 = var40.getMainField();
-                                            boolean var43 = var8.getTableName().equals(var41) && oConvertUtils.isNotEmpty(var42);
-                                            String var44 = var34 + "_" + var40.getDbFieldTxt();
-                                            if (var43) {
-                                                var38.put(var40.getDbFieldName(), var36.get(MAIN_TABLE + var42));
-                                            }
-
-                                            Object var45 = var36.get("$subTable$" + var44);
-                                            if (null != var45 && oConvertUtils.isNotEmpty(var45.toString())) {
-                                                var37 = true;
-                                                var38.put(var40.getDbFieldName(), var45);
-                                            }
-                                        }
-
-                                        if (var37) {
-                                            var38.put("id", this.a(var58, var51, var52));
-                                            var33.add(var38);
-                                        }
-                                    }
-
-                                    if (!var33.isEmpty()) {
-                                        this.onlCgformSqlService.saveBatchOnlineTable(var58, var60, var33);
-                                    }
-                                }
-                            }
-                        }
-
-                        var7 = "文件导入成功！";
                     } else {
                         var7 = "识别模版数据错误";
                         log.error(var7);
@@ -788,12 +699,136 @@ public class OnlCgformApiController {
         return var6;
     }
 
+    private void getVar11(OnlCgformHead var8, String var11, DataSource var51, String var52, List<Map<String, Object>> var23) throws BusinessException {
+        if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) {
+            String[] var54 = var8.getSubTableStr().split(",");
+            int var55 = var54.length;
+
+            forVar56(var8, var51, var52, var23, var54, var55);
+        }
+    }
+
+    private void forVar27(OnlCgformHead var8, JSONObject var47, DataSource var51, String var52, List<Map<String, Object>> var23, Object var24, ArrayList<Map<String, Object>> var25) {
+        Map<String, Object> var27;
+        for (Iterator<Map<String, Object>> var26 = var23.iterator(); var26.hasNext(); var27.put("$mainTable$id", var24)) {
+            var27 = var26.next();
+            boolean var28 = false;
+            Set<String> var29 = var27.keySet();
+            HashMap<String, Object> var30 = new HashMap<>();
+            Iterator<String> var31 = var29.iterator();
+
+            String var32;
+            while (var31.hasNext()) {
+                var32 = var31.next();
+                if (!var32.contains("$subTable$")) {
+                    if (var32.contains(MAIN_TABLE) && oConvertUtils.isNotEmpty(var27.get(var32).toString())) {
+                        var28 = true;
+                        var24 = this.a(var8, var51, var52);
+                    }
+
+                    var30.put(var32.replace(MAIN_TABLE, ""), var27.get(var32));
+                }
+            }
+
+            if (var28) {
+                var30.put("id", var24);
+                var25.add(var30);
+                var24 = var30.get("id");
+            }
+
+            getVar47(var47, var30);
+        }
+    }
+
+    private void getVar47(JSONObject var47, HashMap<String, Object> var30) {
+        Iterator<String> var31;
+        String var32;
+        if (var47 != null) {
+            var31 = var47.keySet().iterator();
+
+            while (var31.hasNext()) {
+                var32 = var31.next();
+                log.info(var32 + "=" + var47.getString(var32));
+                var30.put(var32, var47.getString(var32));
+            }
+        }
+    }
+
+    private void forVar56(OnlCgformHead var8, DataSource var51, String var52, List<Map<String, Object>> var23, String[] var54, int var55) throws BusinessException {
+        for (int var56 = 0; var56 < var55; ++var56) {
+            String var57 = var54[var56];
+            OnlCgformHead var58 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var57));
+            if (var58 != null) {
+                LambdaQueryWrapper<OnlCgformField> var59 = new LambdaQueryWrapper<>();
+                var59.eq(OnlCgformField::getCgformHeadId, var58.getId());
+                List<OnlCgformField> var60 = this.onlCgformFieldService.list(var59);
+                ArrayList<Map<String, Object>> var33 = new ArrayList<>();
+                String var34 = var58.getTableTxt();
+
+                for (Map<String, Object> value : var23) {
+                    Map<String, Object> var36 = value;
+                    boolean var37 = false;
+                    HashMap<String, Object> var38 = new HashMap<>();
+
+                    var37 = isVar37(var8, var60, var34, var36, var37, var38);
+
+                    if (var37) {
+                        var38.put("id", this.a(var58, var51, var52));
+                        var33.add(var38);
+                    }
+                }
+
+                if (!var33.isEmpty()) {
+                    this.onlCgformSqlService.saveBatchOnlineTable(var58, var60, var33);
+                }
+            }
+        }
+    }
+
+    private boolean isVar37(OnlCgformHead var8, List<OnlCgformField> var60, String var34, Map<String, Object> var36, boolean var37, HashMap<String, Object> var38) {
+        for (OnlCgformField o : var60) {
+            OnlCgformField var40 = o;
+            String var41 = var40.getMainTable();
+            String var42 = var40.getMainField();
+            boolean var43 = var8.getTableName().equals(var41) && oConvertUtils.isNotEmpty(var42);
+            String var44 = var34 + "_" + var40.getDbFieldTxt();
+            if (var43) {
+                var38.put(var40.getDbFieldName(), var36.get(MAIN_TABLE + var42));
+            }
+
+            Object var45 = var36.get("$subTable$" + var44);
+            if (null != var45 && oConvertUtils.isNotEmpty(var45.toString())) {
+                var37 = true;
+                var38.put(var40.getDbFieldName(), var45);
+            }
+        }
+        return var37;
+    }
+
+    private void getVar11(OnlCgformHead var8, String var11, List<String> var12) {
+        if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) {
+            String[] var13 = var8.getSubTableStr().split(",");
+            int var14 = var13.length;
+
+            for (int var15 = 0; var15 < var14; ++var15) {
+                String var16 = var13[var15];
+                OnlCgformHead var17 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var16));
+                if (var17 != null) {
+                    List<OnlCgformField> var18 = this.onlCgformFieldService.list(new LambdaQueryWrapper<OnlCgformField>().eq(OnlCgformField::getCgformHeadId, var17.getId()));
+                    List<String> var19 = CgformUtil.b(var18, var17.getTableTxt());
+                    if (!var19.isEmpty()) {
+                        var12.addAll(var19);
+                    }
+                }
+            }
+        }
+    }
+
     @PostMapping({"/doButton"})
     public Result<T> a(@RequestBody JSONObject var1) {
         String var2 = var1.getString("formId");
         String var3 = var1.getString("dataId");
         String var4 = var1.getString("buttonCode");
-        JSONObject var5 = var1.getJSONObject("uiFormData");
 
         try {
             this.onlCgformHeadService.executeCustomerButton(var4, var2, var3);
@@ -812,48 +847,10 @@ public class OnlCgformApiController {
         if (oConvertUtils.isNotEmpty(var5) && "UUID".equalsIgnoreCase(var5)) {
             var4 = CgformUtil.a();
         } else {
-            PostgreSQLSequenceMaxValueIncrementer var7;
-            OracleSequenceMaxValueIncrementer var13;
             if (oConvertUtils.isNotEmpty(var5) && "NATIVE".equalsIgnoreCase(var5)) {
-                if (oConvertUtils.isNotEmpty(var3) && "oracle".equalsIgnoreCase(var3)) {
+                var4 = getObject(var2, var3, var4, "HIBERNATE_SEQUENCE");
-                    var13 = new OracleSequenceMaxValueIncrementer(var2, "HIBERNATE_SEQUENCE");
-
-                    try {
-                        var4 = var13.nextLongValue();
-                    } catch (Exception var12) {
-                        log.error(var12.getMessage(), var12);
-                    }
-                } else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
-                    var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, "HIBERNATE_SEQUENCE");
-
-                    try {
-                        var4 = var7.nextLongValue();
-                    } catch (Exception var11) {
-                        log.error(var11.getMessage(), var11);
-                    }
-                } else {
-                    var4 = null;
-                }
             } else if (oConvertUtils.isNotEmpty(var5) && "SEQUENCE".equalsIgnoreCase(var5)) {
-                if (oConvertUtils.isNotEmpty(var3) && "oracle".equalsIgnoreCase(var3)) {
+                var4 = getObject(var2, var3, var4, var6);
-                    var13 = new OracleSequenceMaxValueIncrementer(var2, var6);
-
-                    try {
-                        var4 = var13.nextLongValue();
-                    } catch (Exception var10) {
-                        log.error(var10.getMessage(), var10);
-                    }
-                } else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
-                    var7 = new PostgreSQLSequenceMaxValueIncrementer(var2, var6);
-
-                    try {
-                        var4 = var7.nextLongValue();
-                    } catch (Exception var9) {
-                        log.error(var9.getMessage(), var9);
-                    }
-                } else {
-                    var4 = null;
-                }
             } else {
                 var4 = CgformUtil.a();
             }
@@ -862,8 +859,29 @@ public class OnlCgformApiController {
         return var4;
     }
 
-    private void a(Map var1, List<OnlCgformField> var2) {
+    private Object getObject(DataSource var2, String var3, Object var4, String hibernateSequence) {
-        Iterator var3 = var2.iterator();
+        if (oConvertUtils.isNotEmpty(var3) && "oracle".equalsIgnoreCase(var3)) {
+            OracleSequenceMaxValueIncrementer var13 = new OracleSequenceMaxValueIncrementer(var2, hibernateSequence);
+
+            try {
+                var4 = var13.nextLongValue();
+            } catch (Exception var12) {
+                log.error(var12.getMessage(), var12);
+            }
+        } else if (oConvertUtils.isNotEmpty(var3) && "postgres".equalsIgnoreCase(var3)) {
+            PostgresSequenceMaxValueIncrementer var7 = new PostgresSequenceMaxValueIncrementer(var2, hibernateSequence);
+
+            try {
+                var4 = var7.nextLongValue();
+            } catch (Exception var11) {
+                log.error(var11.getMessage(), var11);
+            }
+        }
+        return var4;
+    }
+
+    private void a(Map<String, String> var1, List<OnlCgformField> var2) {
+        Iterator<OnlCgformField> var3 = var2.iterator();
 
         while (true) {
             OnlCgformField var4;
@@ -876,7 +894,7 @@ public class OnlCgformApiController {
                         return;
                     }
 
-                    var4 = (OnlCgformField)var3.next();
+                    var4 = var3.next();
                     var5 = var4.getDictTable();
                     var6 = var4.getDictField();
                     var7 = var4.getDictText();
@@ -891,12 +909,15 @@ public class OnlCgformApiController {
                 var8 = this.sysBaseAPI.queryTableDictItemsByCode(var5, var7, var6);
             }
 
-            for (Object o : var8) {
+            getVar1(var1, var4, var9, var8);
-                DictModel var11 = (DictModel) o;
-                if (var9.equals(var11.getText())) {
-                    var1.put(var4.getDbFieldName(), var11.getValue());
         }
     }
+
+    private void getVar1(Map<String, String> var1, OnlCgformField var4, String var9, List<DictModel> var8) {
+        for (DictModel o : var8) {
+            if (var9.equals(o.getText())) {
+                var1.put(var4.getDbFieldName(), o.getValue());
+            }
         }
     }
 
@@ -907,6 +928,16 @@ public class OnlCgformApiController {
             if ((null == var2 || !var2.equals(var1.get(var4).getDbFieldName())) && var1.get(var4).getIsShowList() == 1) {
                 String var5 = var1.get(var4).getDbFieldName();
                 ExcelExportEntity var6 = new ExcelExportEntity(var1.get(var4).getDbFieldTxt(), var5);
+                getImage(var1, var4, var6);
+
+                var3.add(var6);
+            }
+        }
+
+        return var3;
+    }
+
+    private void getImage(List<OnlCgformField> var1, int var4, ExcelExportEntity var6) {
         if ("image".equals(var1.get(var4).getFieldShowType())) {
             var6.setType(2);
             var6.setExportImageType(3);
@@ -928,12 +959,6 @@ public class OnlCgformApiController {
 
             var6.setWidth(var7);
         }
-
-                var3.add(var6);
-            }
-        }
-
-        return var3;
     }
 
     private void a(String var1, Map<String, Object> var2, List<Map<String, Object>> var3, List<ExcelExportEntity> var4) {
@@ -961,7 +986,7 @@ public class OnlCgformApiController {
             var2.put(var9, (var3.get(var15)).get(var8));
             String var12 = CgformUtil.a(var5.getTableName(), var7, var2);
             log.info("-----------动态列表查询子表sql》》" + var12);
-            List var13 = this.onlCgformHeadService.queryListData(var12);
+            List<Map<String, Object>> var13 = this.onlCgformHeadService.queryListData(var12);
             ConvertUtil.a(1, var13, var7);
             (var3.get(var15)).put(var1, CgformUtil.d(var13));
         }
@@ -969,7 +994,7 @@ public class OnlCgformApiController {
     }
 
     @GetMapping({"/checkOnlyTable"})
-    public Result i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) {
+    public Result<Integer> i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) {
         OnlCgformHead var3;
         if (oConvertUtils.isEmpty(var2)) {
             if (Boolean.TRUE.equals(DbTableUtil.a(var1))) {
@@ -982,21 +1007,23 @@ public class OnlCgformApiController {
             }
         } else {
             var3 = this.onlCgformHeadService.getById(var2);
-            if (!var1.equals(var3.getTableName()) && DbTableUtil.a(var1)) {
+            if (!var1.equals(var3.getTableName()) && Boolean.TRUE.equals(DbTableUtil.a(var1))) {
                 return Result.OK(-1);
             }
         }
 
         return Result.OK(1);
     }
+
     /**
      * 生成代码
-     * @date 2021/4/6 11:41
+     *
      * @param jsonObject 参数
      * @return com.jero.common.api.vo.Result
+     * @date 2021/4/6 11:41
      */
     @PostMapping({"/codeGenerate"})
-    public Result codeGenerate(@RequestBody JSONObject jsonObject) {
+    public Result<List<String>> codeGenerate(@RequestBody JSONObject jsonObject) {
         OnlGenerateModel onlGenerateModel = JSON.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class);
         List<String> list;
 
@@ -1016,7 +1043,7 @@ public class OnlCgformApiController {
 
     @GetMapping({"/downGenerateCode"})
     public void a(@RequestParam("fileList") List<String> var1, HttpServletRequest var2, HttpServletResponse var3) {
-        List<String> var4 = var1.stream().filter((var0) -> !var0.contains("src/main/java") && !var0.contains("src%5Cmain%5Cjava")).collect(Collectors.toList());
+        List<String> var4 = var1.stream().filter(var0 -> !var0.contains("src/main/java") && !var0.contains("src%5Cmain%5Cjava")).collect(Collectors.toList());
         if (var4.isEmpty()) {
             String var5 = "生成代码_" + System.currentTimeMillis() + ".zip";
             final String var6 = "/opt/temp/codegenerate/" + var5;
@@ -1029,14 +1056,12 @@ public class OnlCgformApiController {
                 try (FileInputStream var9 = new FileInputStream(var7);
                      BufferedInputStream var10 = new BufferedInputStream(var9);
                      ServletOutputStream var11 = var3.getOutputStream();) {
-                    for(int var12 = var10.read(var8); var12 != -1; var12 = var10.read(var8)) {
+                     getVar11(var8, var10, var11);
-                        var11.write(var8, 0, var12);
-                    }
                 } catch (Exception var25) {
                     var25.printStackTrace();
                 } finally {
-                    class NamelessClass_1 extends Thread {
+                    class NamelessClass1 extends Thread {
-                        NamelessClass_1() {
+                        NamelessClass1() {
                         }
 
                         @Override
@@ -1050,7 +1075,7 @@ public class OnlCgformApiController {
                             }
                         }
                     }
-                    (new NamelessClass_1()).start();
+                    (new NamelessClass1()).start();
                 }
             }
         } else {
@@ -1058,6 +1083,12 @@ public class OnlCgformApiController {
         }
     }
 
+    private void getVar11(byte[] var8, BufferedInputStream var10, ServletOutputStream var11) throws IOException {
+        for (int var12 = var10.read(var8); var12 != -1; var12 = var10.read(var8)) {
+            var11.write(var8, 0, var12);
+        }
+    }
+
     @AutoLog(
             operateType = 1,
             value = "online列表数据查询",
@@ -1099,13 +1130,13 @@ public class OnlCgformApiController {
     }
 
     private void a(OnlCgformHead var1, Map<String, Object> var2) throws BusinessException {
-        List var3 = (List)var2.get("records");
+        List<Map<String, Object>> var3 = (List) var2.get("records");
         this.onlCgformHeadService.executeEnhanceList(var1, "query", var3);
     }
 
     @PostMapping({"/crazyForm/{name}"})
-    public Result b(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
+    public Result<String> b(@PathVariable("name") String var1, @RequestBody JSONObject var2) {
-        Result var3 = new Result<>();
+        Result<String> var3 = new Result<>();
         try {
             String var4 = CgformUtil.a();
             var2.put("id", var4);
@@ -1157,13 +1188,7 @@ public class OnlCgformApiController {
                     String[] var8 = var6.split(",");
                     int var9 = var8.length;
 
-                    for(int var10 = 0; var10 < var9; ++var10) {
+                    getVar7(var7, var8, var9);
-                        String var11 = var8[var10];
-                        OnlCgformHead var12 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var11));
-                        if (var12 != null) {
-                            var7.add(this.onlineService.queryOnlineConfig(var12));
-                        }
-                    }
 
                     if (!var7.isEmpty()) {
                         var4.put("subList", var7);
@@ -1178,19 +1203,29 @@ public class OnlCgformApiController {
         }
     }
 
+    private void getVar7(ArrayList<OnlComplexModel> var7, String[] var8, int var9) {
+        for (int var10 = 0; var10 < var9; ++var10) {
+            String var11 = var8[var10];
+            OnlCgformHead var12 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper<OnlCgformHead>().eq(OnlCgformHead::getTableName, var11));
+            if (var12 != null) {
+                var7.add(this.onlineService.queryOnlineConfig(var12));
+            }
+        }
+    }
+
     @AutoLog(
             operateType = 1,
             value = "online表单加载",
             module = ModuleType.ONLINE
     )
     @GetMapping({"/getErpFormItem/{code}"})
-    public Result<T> e(@PathVariable("code") String var1, HttpServletRequest var2) {
+    public Result<JSONObject> e(@PathVariable("code") String var1) {
         OnlCgformHead var3 = this.onlCgformHeadService.getById(var1);
         if (var3 == null) {
             return Result.error("表不存在");
         }
 
-        Result var4 = new Result<>();
+        Result<JSONObject> var4 = new Result<>();
         JSONObject var5 = this.onlineService.queryOnlineFormObj(var3);
         var4.setResult(var5);
         var4.setOnlTable(var3.getTableName());