boman-report 2

boman-report/src/main/java/com/boman/report/BomanReportApplication.java

@@ -1,35 +0,0 @@
-package com.boman.report;
-
-import com.boman.common.security.annotation.EnableCustomConfig;
-import com.boman.common.security.annotation.EnableRyFeignClients;
-import com.boman.common.swagger.annotation.EnableCustomSwagger2;
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * web-core
- *
- * @author shiqian
- */
-@EnableCustomConfig
-@EnableCustomSwagger2
-@EnableRyFeignClients
-@SpringCloudApplication
-@ComponentScan(value = {"com.boman", "org.jeecg.modules.jmreport"})
-public class BomanReportApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(BomanReportApplication.class, args);
-        System.out.println();
-        System.out.println();
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println("---------------------------------------------- boman-report 模块启动成功----------------------------------------------");
-        System.out.println();
-        System.out.println();
-    }
-}

boman-report/src/main/java/com/boman/report/control/JimuController.java

@@ -1,51 +0,0 @@
-package com.boman.report.control;
-
-import com.boman.domain.dto.AjaxResult;
-import com.boman.domain.dto.ClockOnDto;
-import org.jeecg.modules.jmreport.common.util.oConvertUtils;
-import org.jeecg.modules.jmreport.common.vo.Result;
-import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.boman.common.core.utils.obj.ObjectUtils.*;
-
-/**
- * @author shiqian
- * @date 2021年08月16日 14:54
- **/
-@RequestMapping("jmreport/")
-@RestController
-public class JimuController {
-
-    private static final Logger a = LoggerFactory.getLogger(JimuController.class);
-
-    @Autowired
-    private JmReportTokenClient jimuTokenClient;
-    @Autowired
-    private IJmReportDbService reportDbService;
-
-    @PostMapping({"/executeSelectApiBoman"})
-    public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam("api") String paramString1, @RequestParam("method") String paramString2) {
-        String str1 = paramHttpServletRequest.getParameter("token");
-        String str2 = paramHttpServletRequest.getParameter("apiConvert");
-        String str3 = paramHttpServletRequest.getParameter("paramArray");
-        if (oConvertUtils.isEmpty(str1)) {
-            str1 = this.jimuTokenClient.getToken();
-        }
-        a.info("api= " + paramString1 + ", method= " + paramString2 + ", token= " + str1);
-        Map<String, Object> map = this.reportDbService.executeSelectApi(paramString1, paramString2, str1, str2, str3);
-        List<Map> list = this.reportDbService.parseData(map);
-        return Result.OK(list);
-    }
-
-
-}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/a.java

@@ -1,8 +1,14 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
 package org.jeecg.modules.jmreport.desreport.a;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -14,6 +20,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -21,6 +28,7 @@ import java.util.Scanner;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.jeecg.modules.jmreport.api.data.IDataSetFactory;
 import org.jeecg.modules.jmreport.common.annotation.JimuLoginRequired;
@@ -36,10 +44,10 @@ import org.jeecg.modules.jmreport.config.JmReportBaseConfig;
 import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
 import org.jeecg.modules.jmreport.config.oss.JmReportUploadConfig;
 import org.jeecg.modules.jmreport.desreport.entity.JimuReport;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportDataSource;
 import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
 import org.jeecg.modules.jmreport.desreport.entity.JmReportDbField;
 import org.jeecg.modules.jmreport.desreport.entity.JmReportDbParam;
-import org.jeecg.modules.jmreport.desreport.model.JmPage;
 import org.jeecg.modules.jmreport.desreport.model.QueryVO;
 import org.jeecg.modules.jmreport.desreport.render.utils.FreeMarkerUtils;
 import org.jeecg.modules.jmreport.desreport.service.IJimuReportService;
@@ -50,6 +58,8 @@ import org.jeecg.modules.jmreport.desreport.service.IJmReportDbSourceService;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportExportExcel;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportExportPdf;
 import org.jeecg.modules.jmreport.desreport.service.IJmReportMapService;
+import org.jeecg.modules.jmreport.desreport.util.d;
+import org.jeecg.modules.jmreport.desreport.util.e;
 import org.jeecg.modules.jmreport.dyndb.vo.JmreportDynamicDataSourceVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,981 +87,1127 @@ import org.springframework.web.servlet.HandlerMapping;
 @RequestMapping({"/jmreport"})
 public class a {
     private static final Logger a = LoggerFactory.getLogger(a.class);
-
     @Value("classpath:static/jmreport/json/excel.virtual.json")
     private Resource virtualJson;
-
     @Autowired
     private IJimuReportService jmReportDesignService;
-
     @Autowired
     private IJmReportDbService reportDbService;
-
     @Autowired
     private IJmReportDbParamService jmReportDbParamService;
-
     @Autowired
     private IJmReportDbFieldService jmReportDbFieldService;
-
     @Autowired
     private IJmReportDbSourceService jmReportDbSourceService;
-
     @Autowired
     private IJmReportMapService jmReportMapService;
-
     @Autowired
     private IJmReportExportExcel exportExcel;
-
     @Autowired
     private JmReportTokenClient jimuTokenClient;
-
     @Autowired
     private JmReportUploadConfig jimuReportUploadConfig;
-
     @Autowired
     private JmReportBaseConfig jmBaseConfig;
-
     @Autowired
     private IJmReportExportPdf jmReportExportPdf;
 
+    public a() {
+    }
+
     @RequestMapping({"/demo"})
-    public void a(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws Exception {
-        a.debug(" --- --- ");
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/demo.ftl");
+    public void a(HttpServletRequest var1, HttpServletResponse var2) throws Exception {
+        a.debug(" --- 进入报表设计器demo --- ");
+        HashMap var3 = new HashMap();
+        this.a((HttpServletRequest) var1, (HttpServletResponse) var2, (Map) var3, (String) "jmreport/desreport/demo.ftl");
     }
 
     @RequestMapping({"/list"})
-    public void b(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws Exception {
-        a.debug(" --- --- ");
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/list.ftl");
+    public void b(HttpServletRequest var1, HttpServletResponse var2) throws Exception {
+        a.debug(" --- 进入报表设计器列表展示 --- ");
+        HashMap var3 = new HashMap();
+        this.a((HttpServletRequest) var1, (HttpServletResponse) var2, (Map) var3, (String) "jmreport/desreport/list.ftl");
     }
 
     @PostMapping({"/excelCreate"})
     @JimuLoginRequired
-    public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestBody JimuReport paramJimuReport) {
-        a.debug("============EXCEL);
+    public Result<?> a(HttpServletRequest var1, @RequestBody JimuReport var2) {
+        a.debug("============EXCEL模板创建/编辑==========");
+
         try {
-            String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-            paramJimuReport.setCreateBy(str);
-            paramJimuReport = this.jmReportDesignService.excelCreate(paramJimuReport);
-        } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
-            return Result.error(exception.getMessage());
+            String var3 = this.jimuTokenClient.getUsername(var1);
+            var2.setCreateBy(var3);
+            var2 = this.jmReportDesignService.excelCreate(var2);
+        } catch (Exception var4) {
+            a.error(var4.getMessage(), var4);
+            return Result.error(var4.getMessage());
         }
-        return Result.OK(paramJimuReport);
+
+        return Result.OK(var2);
     }
 
     @PostMapping({"/excelQueryName"})
     @JimuLoginRequired
-    public Result<?> b(HttpServletRequest paramHttpServletRequest, @RequestBody JimuReport paramJimuReport) {
-        boolean bool = this.jmReportDesignService.excelQueryName(paramJimuReport);
-        if (bool)
-            return Result.OK();
-        return Result.FAIL(", Boolean.valueOf(bool));
+    public Result<?> b(HttpServletRequest var1, @RequestBody JimuReport var2) {
+        boolean var3 = this.jmReportDesignService.excelQueryName(var2);
+        return var3 ? Result.OK() : Result.FAIL("您输入的报表名字已经存在，换一个吧！", var3);
     }
 
     @GetMapping({"/excelQuery"})
     @JimuLoginRequired
-    public Result<?> a(@RequestParam(name = "reportType", required = false) String paramString1, @RequestParam(name = "name") String paramString2, @RequestParam(name = "pageNo", defaultValue = "1") Integer paramInteger1, @RequestParam(name = "pageSize", defaultValue = "10") Integer paramInteger2, HttpServletRequest paramHttpServletRequest) {
-        a.debug("============EXCEL);
-        return this.jmReportDesignService.excelQuery(paramString1, paramString2, paramHttpServletRequest, paramInteger1, paramInteger2);
+    public Result<?> a(@RequestParam(name = "reportType", required = false) String var1, @RequestParam(name = "name") String var2, @RequestParam(name = "pageNo", defaultValue = "1") Integer var3, @RequestParam(name = "pageSize", defaultValue = "10") Integer var4, HttpServletRequest var5) {
+        a.debug("============EXCEL模板查询==========");
+        return this.jmReportDesignService.excelQuery(var1, var2, var5, var3, var4);
     }
 
     @GetMapping({"/excelQueryByTemplate"})
-    public Result<?> b(@RequestParam(name = "reportType", required = false) String paramString1, @RequestParam(name = "name") String paramString2, @RequestParam(name = "pageNo", defaultValue = "1") Integer paramInteger1, @RequestParam(name = "pageSize", defaultValue = "10") Integer paramInteger2, HttpServletRequest paramHttpServletRequest) {
-        return this.jmReportDesignService.excelQueryByTemplate(paramString1, paramString2, paramHttpServletRequest, paramInteger1, paramInteger2);
+    public Result<?> b(@RequestParam(name = "reportType", required = false) String var1, @RequestParam(name = "name") String var2, @RequestParam(name = "pageNo", defaultValue = "1") Integer var3, @RequestParam(name = "pageSize", defaultValue = "10") Integer var4, HttpServletRequest var5) {
+        return this.jmReportDesignService.excelQueryByTemplate(var1, var2, var5, var3, var4);
     }
 
     @GetMapping({"/userinfo"})
     @JimuLoginRequired
-    public Result<?> a(HttpServletRequest paramHttpServletRequest) {
-        Result result = Result.OK();
-        String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-        result.setMessage(str);
-        return Result.OK(result);
+    public Result<?> a(HttpServletRequest var1) {
+        Result var2 = Result.OK();
+        String var3 = this.jimuTokenClient.getUsername(var1);
+        var2.setMessage(var3);
+        return Result.OK(var2);
     }
 
-    public void c(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws Exception {
-        a.debug(" --- --- ");
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/index.ftl");
+    public void c(HttpServletRequest var1, HttpServletResponse var2) throws Exception {
+        a.debug(" --- 进入报表设计器 --- ");
+        HashMap var3 = new HashMap();
+        this.a((HttpServletRequest) var1, (HttpServletResponse) var2, (Map) var3, (String) "jmreport/desreport/index.ftl");
     }
 
     @RequestMapping({"/index/{id}"})
-    public void a(@PathVariable("id") String paramString, HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws Exception {
-        a.debug(" --- --- ");
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        if (oConvertUtils.isNotEmpty(paramString))
-            hashMap.put("id", paramString);
-        hashMap.put("mode", this.jmBaseConfig.getMode());
-        String str = "jmreport/desreport/index.ftl";
-        a.info("" + this.jmBaseConfig.getSaas() + " ," + this.jimuTokenClient.getToken());
-        if (this.jmBaseConfig.getSaas().booleanValue() && oConvertUtils.isNotEmpty(this.jimuTokenClient.getToken())) {
-            String str1 = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-            JimuReport jimuReport = this.jmReportDesignService.getById(paramString);
-            if (jimuReport != null && !str1.equals(jimuReport.getCreateBy()))
-                str = "jmreport/desreport/authority.ftl";
+    public void a(@PathVariable("id") String var1, HttpServletRequest var2, HttpServletResponse var3) throws Exception {
+        a.debug(" --- 进入报表设计器 --- ");
+        HashMap var4 = new HashMap();
+        if (oConvertUtils.isNotEmpty(var1)) {
+            var4.put("id", var1);
+        }
+
+        var4.put("mode", this.jmBaseConfig.getMode());
+        String var5 = "jmreport/desreport/index.ftl";
+        a.info("进入设计器页面，saas: " + this.jmBaseConfig.getSaas() + " ,登录Token: " + this.jimuTokenClient.getToken());
+        if (this.jmBaseConfig.getSaas() && oConvertUtils.isNotEmpty(this.jimuTokenClient.getToken())) {
+            String var6 = this.jimuTokenClient.getUsername(var2);
+            JimuReport var7 = this.jmReportDesignService.getById(var1);
+            if (var7 != null && !var6.equals(var7.getCreateBy())) {
+                var5 = "jmreport/desreport/authority.ftl";
+            }
         }
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, str);
+
+        this.a((HttpServletRequest) var2, (HttpServletResponse) var3, (Map) var4, (String) var5);
     }
 
     @RequestMapping({"/view/{id}"})
-    public void b(@PathVariable("id") String paramString, HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws Exception {
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        if (oConvertUtils.isNotEmpty(paramString))
-            hashMap.put("id", paramString);
-        hashMap.put("shareView", "0");
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/view.ftl");
+    public void b(@PathVariable("id") String var1, HttpServletRequest var2, HttpServletResponse var3) throws Exception {
+        HashMap var4 = new HashMap();
+        if (oConvertUtils.isNotEmpty(var1)) {
+            var4.put("id", var1);
+        }
+
+        var4.put("shareView", "0");
+        this.a((HttpServletRequest) var2, (HttpServletResponse) var3, (Map) var4, (String) "jmreport/desreport/view.ftl");
     }
 
     @RequestMapping({"/shareView/{id}"})
-    public void a(@PathVariable("id") String paramString, HttpServletResponse paramHttpServletResponse, HttpServletRequest paramHttpServletRequest) throws Exception {
-        HashMap<Object, Object> hashMap = new HashMap<>();
-        if (oConvertUtils.isNotEmpty(paramString))
-            hashMap.put("id", paramString);
-        hashMap.put("shareView", "1");
-        a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/view.ftl");
+    public void a(@PathVariable("id") String var1, HttpServletResponse var2, HttpServletRequest var3) throws Exception {
+        HashMap var4 = new HashMap();
+        if (oConvertUtils.isNotEmpty(var1)) {
+            var4.put("id", var1);
+        }
+
+        var4.put("shareView", "1");
+        this.a((HttpServletRequest) var3, (HttpServletResponse) var2, (Map) var4, (String) "jmreport/desreport/view.ftl");
     }
 
     @PostMapping({"/addViewCount/{id}"})
-    public Result<?> a(@PathVariable("id") String paramString) {
-        Integer integer = Integer.valueOf(this.jmReportDesignService.updateViewCount(paramString));
-        boolean bool = false;
-        if (integer.intValue() > 0)
-            bool = true;
-        return Result.OK("", Boolean.valueOf(bool));
+    public Result<?> a(@PathVariable("id") String var1) {
+        Integer var2 = this.jmReportDesignService.updateViewCount(var1);
+        boolean var3 = false;
+        if (var2 > 0) {
+            var3 = true;
+        }
+
+        return Result.OK("", var3);
     }
 
     @GetMapping({"/checkParam/{id}"})
-    public Result<List<JmReportDbParam>> b(@PathVariable(name = "id") String paramString) {
-        Result<List<JmReportDbParam>> result = new Result();
-        List list = this.jmReportDesignService.queryReportParam(paramString);
-        if (list == null || list.size() == 0) {
-            result.setSuccess(false);
+    public Result<List<JmReportDbParam>> b(@PathVariable(name = "id") String var1) {
+        Result var2 = new Result();
+        List var3 = this.jmReportDesignService.queryReportParam(var1);
+        if (var3 != null && var3.size() != 0) {
+            var2.setSuccess(true);
+            var2.setResult(var3);
         } else {
-            result.setSuccess(true);
-            result.setResult(list);
+            var2.setSuccess(false);
         }
-        return result;
+
+        return var2;
     }
 
     @RequestMapping({"/show"})
-    public Result<?> a(@RequestParam(name = "id") String paramString, HttpServletRequest paramHttpServletRequest) {
-        String str = paramHttpServletRequest.getParameter("params");
+    public Result<?> a(@RequestParam(name = "id") String var1, HttpServletRequest var2) {
+        String var3 = var2.getParameter("params");
+
         try {
-            return this.jmReportDesignService.show(paramString, str);
-        } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
-            return Result.error(exception.getMessage());
+            return this.jmReportDesignService.show(var1, var3);
+        } catch (Exception var5) {
+            a.error(var5.getMessage(), var5);
+            return Result.error(var5.getMessage());
         }
     }
 
     @PostMapping({"/save"})
     @JimuLoginRequired
-    public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestBody JSONObject paramJSONObject) {
+    public Result<?> a(HttpServletRequest var1, @RequestBody JSONObject var2) {
         try {
-            JimuReport jimuReport = this.jmReportDesignService.saveReport(paramJSONObject, paramHttpServletRequest);
-            return Result.OK(jimuReport);
-        } catch (Exception exception) {
-            a.error(exception.getMessage(), exception);
-            return Result.error(");
+            JimuReport var3 = this.jmReportDesignService.saveReport(var2, var1);
+            return Result.OK(var3);
+        } catch (Exception var4) {
+            a.error(var4.getMessage(), var4);
+            return Result.error("保存失败！");
         }
     }
 
     @GetMapping({"/get/{id}"})
     @JimuLoginRequired
-    public Result<?> a(HttpServletRequest paramHttpServletRequest, @PathVariable("id") String paramString) {
-        a.debug("============EXCEL JSON);
-                JimuReport jimuReport = this.jmReportDesignService.getById(paramString);
-        return Result.OK(jimuReport);
+    public Result<?> a(HttpServletRequest var1, @PathVariable("id") String var2) {
+        a.debug("============EXCEL JSON数据查询==========");
+        JimuReport var3 = this.jmReportDesignService.getById(var2);
+        return Result.OK(var3);
     }
 
     @GetMapping({"/mockPieData"})
     public Result<?> a() {
-        a.debug("============);
-                ArrayList<HashMap<Object, Object>> arrayList = new ArrayList();
-        String[] arrayOfString = { "IE", "Safari", "Firefox", "Opera", "Chrome" };
-        Random random = new Random();
-        for (String str : arrayOfString) {
-            HashMap<Object, Object> hashMap = new HashMap<>();
-            hashMap.put("name", str);
-            hashMap.put("value", Integer.valueOf(random.nextInt(1901) + 100));
-            arrayList.add(hashMap);
+        a.debug("============模拟图表数据==========");
+        ArrayList var1 = new ArrayList();
+        String[] var2 = new String[]{"IE", "Safari", "Firefox", "Opera", "Chrome"};
+        Random var3 = new Random();
+        String[] var4 = var2;
+        int var5 = var2.length;
+
+        for (int var6 = 0; var6 < var5; ++var6) {
+            String var7 = var4[var6];
+            HashMap var8 = new HashMap();
+            var8.put("name", var7);
+            var8.put("value", var3.nextInt(1901) + 100);
+            var1.add(var8);
         }
-        return Result.OK(arrayList);
+
+        return Result.OK(var1);
     }
 
     @GetMapping({"/mockChartData"})
     public Result<?> b() {
-        a.debug("============);
-                ArrayList<HashMap<Object, Object>> arrayList = new ArrayList();
-        String[] arrayOfString = { ", ", ", ", "};
-                Random random = new Random();
-        for (String str : arrayOfString) {
-            HashMap<Object, Object> hashMap = new HashMap<>();
-            hashMap.put("name", str);
-            ArrayList<Integer> arrayList1 = new ArrayList();
-            for (byte b = 0; b < 7; b++)
-                arrayList1.add(Integer.valueOf(random.nextInt(1901) + 100));
-            hashMap.put("data", arrayList1);
-            arrayList.add(hashMap);
+        a.debug("============模拟图表数据2==========");
+        ArrayList var1 = new ArrayList();
+        String[] var2 = new String[]{"邮件营销", "联盟广告", "视频广告", "直接访问", "搜索引擎"};
+        Random var3 = new Random();
+        String[] var4 = var2;
+        int var5 = var2.length;
+
+        for (int var6 = 0; var6 < var5; ++var6) {
+            String var7 = var4[var6];
+            HashMap var8 = new HashMap();
+            var8.put("name", var7);
+            ArrayList var9 = new ArrayList();
+
+            for (int var10 = 0; var10 < 7; ++var10) {
+                var9.add(var3.nextInt(1901) + 100);
+            }
+
+            var8.put("data", var9);
+            var1.add(var8);
         }
-        return Result.OK(arrayList);
-  }
 
-        @PostMapping({"/upload"})
-        public Result<?> d(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) {
-            Result<?> result = new Result();
-            try {
-                MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest)paramHttpServletRequest;
-                MultipartFile multipartFile = multipartHttpServletRequest.getFile("file");
-                String str1 = paramHttpServletRequest.getParameter("bizType");
-                if (oConvertUtils.isEmpty(str1))
-                    str1 = this.jimuReportUploadConfig.getUploadType();
-                String str2 = "";
-                a.debug(" " + str1);
-                if ("alioss".equals(str1)) {
-                    a.debug(" alioss");
-                    str2 = OssBootUtil.upload(multipartFile, "designreport/images");
-                } else if ("minio".equals(str1)) {
-                    a.debug(" minio");
-                    str2 = MinioUtil.upload(multipartFile, "designreport/images");
-                } else if ("local".equals(str1)) {
-                    a.debug("local");
-                    str2 = a(multipartFile, "excel_online");
-                }
-                a.debug(", str2);
-                        result.setMessage(str2);
-                result.setSuccess(true);
-            } catch (Exception exception) {
-                result.setSuccess(false);
-                result.setMessage("");
-                a.error(exception.getMessage(), exception);
+        return Result.OK(var1);
+    }
+
+    @PostMapping({"/upload"})
+    public Result<?> d(HttpServletRequest var1, HttpServletResponse var2) {
+        Result var3 = new Result();
+
+        try {
+            MultipartHttpServletRequest var4 = (MultipartHttpServletRequest) var1;
+            MultipartFile var5 = var4.getFile("file");
+            String var6 = var1.getParameter("bizType");
+            if (oConvertUtils.isEmpty(var6)) {
+                var6 = this.jimuReportUploadConfig.getUploadType();
             }
-            return result;
-        }
 
-        @CrossOrigin
-        @GetMapping({"/img/**"})
-        public void e(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) {
-            String str = e(paramHttpServletRequest);
-            BufferedInputStream bufferedInputStream = null;
-            ServletOutputStream servletOutputStream = null;
-            try {
-                str = str.replace("..", "");
-                if (str.endsWith(","))
-                    str = str.substring(0, str.length() - 1);
-                paramHttpServletResponse.setContentType("image/jpeg;charset=utf-8");
-                String str1 = this.jimuReportUploadConfig.getPath().getUpload();
-                String str2 = str1 + File.separator + str;
-                bufferedInputStream = new BufferedInputStream(new FileInputStream(str2));
-                servletOutputStream = paramHttpServletResponse.getOutputStream();
-                byte[] arrayOfByte = new byte[1024];
-                int i;
-                while ((i = bufferedInputStream.read(arrayOfByte)) > 0)
-                    servletOutputStream.write(arrayOfByte, 0, i);
-                paramHttpServletResponse.flushBuffer();
-            } catch (IOException iOException) {
-                a.error("+ iOException.getMessage(), iOException);
-            } finally {
-                if (bufferedInputStream != null)
-                    try {
-                        bufferedInputStream.close();
-                    } catch (IOException iOException) {
-                        a.error(iOException.getMessage(), iOException);
-                    }
-                if (servletOutputStream != null)
-                    try {
-                        servletOutputStream.close();
-                    } catch (IOException iOException) {
-                        a.error(iOException.getMessage(), iOException);
-                    }
+            String var7 = "";
+            a.debug("文件上传开始------------------------------uploadType  " + var6);
+            if ("alioss".equals(var6)) {
+                a.debug("进入OSS方法----->CommonConstant.UPLOAD_TYPE_OSS  alioss");
+                var7 = OssBootUtil.upload(var5, "designreport/images");
+            } else if ("minio".equals(var6)) {
+                a.debug("进入MINIO方法----->CommonConstant.UPLOAD_TYPE_MINIO  minio");
+                var7 = MinioUtil.upload(var5, "designreport/images");
+            } else if ("local".equals(var6)) {
+                a.debug("进入LOCAL方法----->CommonConstant.UPLOAD_TYPE_LOCAL local");
+                var7 = this.a(var5, "excel_online");
             }
+
+            a.debug("文件上传结束------------------------------返回url", var7);
+            var3.setMessage(var7);
+            var3.setSuccess(true);
+        } catch (Exception var8) {
+            var3.setSuccess(false);
+            var3.setMessage("");
+            a.error(var8.getMessage(), var8);
         }
 
-        private String a(File paramFile) {
-            Scanner scanner = null;
-            StringBuilder stringBuilder = new StringBuilder();
-            try {
-                scanner = new Scanner(paramFile, "utf-8");
-                while (scanner.hasNextLine())
-                    stringBuilder.append(scanner.nextLine());
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            } finally {
-                if (scanner != null)
-                    scanner.close();
+        return var3;
+    }
+
+    @CrossOrigin
+    @GetMapping({"/img/**"})
+    public void e(HttpServletRequest var1, HttpServletResponse var2) {
+        String var3 = e(var1);
+        BufferedInputStream var4 = null;
+        ServletOutputStream var5 = null;
+
+        try {
+            var3 = var3.replace("..", "");
+            if (var3.endsWith(",")) {
+                var3 = var3.substring(0, var3.length() - 1);
+            }
+
+            var2.setContentType("image/jpeg;charset=utf-8");
+            String var6 = this.jimuReportUploadConfig.getPath().getUpload();
+            String var7 = var6 + File.separator + var3;
+            var4 = new BufferedInputStream(new FileInputStream(var7));
+            var5 = var2.getOutputStream();
+            byte[] var8 = new byte[1024];
+
+            int var9;
+            while ((var9 = var4.read(var8)) > 0) {
+                var5.write(var8, 0, var9);
+            }
+
+            var2.flushBuffer();
+        } catch (IOException var22) {
+            a.error("预览图片失败" + var22.getMessage(), var22);
+        } finally {
+            if (var4 != null) {
+                try {
+                    var4.close();
+                } catch (IOException var21) {
+                    a.error(var21.getMessage(), var21);
+                }
+            }
+
+            if (var5 != null) {
+                try {
+                    var5.close();
+                } catch (IOException var20) {
+                    a.error(var20.getMessage(), var20);
+                }
             }
-            return stringBuilder.toString();
+
         }
 
-        private void a(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse, Map<String, String> paramMap, String paramString) throws Exception {
-            try {
-                paramMap.put("base", paramHttpServletRequest.getContextPath());
-                paramMap.put("baseURL", d.a(paramHttpServletRequest));
-                a.info("freemarker customPrePath: {}", oConvertUtils.getString(paramHttpServletRequest.getAttribute("customPrePath"), ""));
-                paramMap.put("customPrePath", oConvertUtils.getString(paramHttpServletRequest.getAttribute("customPrePath"), ""));
-                paramMap.put("reportConfig", JSON.toJSONString(this.jmBaseConfig));
-            } catch (Exception exception) {
-                exception.printStackTrace();
-                paramMap.put("message", exception.getMessage());
+    }
+
+    private String a(File var1) {
+        Scanner var2 = null;
+        StringBuilder var3 = new StringBuilder();
+
+        try {
+            var2 = new Scanner(var1, "utf-8");
+
+            while (var2.hasNextLine()) {
+                var3.append(var2.nextLine());
             }
-            ViewFreemarker.view(paramHttpServletRequest, paramHttpServletResponse, paramString, paramMap);
+        } catch (Exception var8) {
+            var8.printStackTrace();
+        } finally {
+            if (var2 != null) {
+                var2.close();
+            }
+
         }
 
-        private static String e(HttpServletRequest paramHttpServletRequest) {
-            String str1 = (String)paramHttpServletRequest.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
-            String str2 = (String)paramHttpServletRequest.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
-            return (new AntPathMatcher()).extractPathWithinPattern(str2, str1);
+        return var3.toString();
+    }
+
+    private void a(HttpServletRequest var1, HttpServletResponse var2, Map var3, String var4) throws Exception {
+        try {
+            var3.put("base", var1.getContextPath());
+            var3.put("baseURL", d.a(var1));
+            a.info("freemarker customPrePath: {}", oConvertUtils.getString(var1.getAttribute("customPrePath"), ""));
+            var3.put("customPrePath", oConvertUtils.getString(var1.getAttribute("customPrePath"), ""));
+            var3.put("reportConfig", JSON.toJSONString(this.jmBaseConfig));
+        } catch (Exception var6) {
+            var6.printStackTrace();
+            var3.put("message", var6.getMessage());
         }
 
-        @PostMapping({"/loadTable"})
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam("dbSource") String paramString, @RequestParam(name = "pageNo", defaultValue = "1") Integer paramInteger1, @RequestParam(name = "pageSize", defaultValue = "50") Integer paramInteger2) {
-            a.debug("============);
-            if (oConvertUtils.isNotEmpty(paramString)) {
-                JmreportDynamicDataSourceVo jmreportDynamicDataSourceVo = this.jmReportDbSourceService.getByDbKey(paramString);
-                if (jmreportDynamicDataSourceVo == null)
-                    return Result.error(");
+        ViewFreemarker.view(var1, var2, var4, var3);
+    }
+
+    private static String e(HttpServletRequest var0) {
+        String var1 = (String) var0.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+        String var2 = (String) var0.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
+        return (new AntPathMatcher()).extractPathWithinPattern(var2, var1);
+    }
+
+    @PostMapping({"/loadTable"})
+    public Result<?> a(HttpServletRequest var1, @RequestParam("dbSource") String var2, @RequestParam(name = "pageNo", defaultValue = "1") Integer var3, @RequestParam(name = "pageSize", defaultValue = "50") Integer var4) {
+        a.debug("============加载表信息loadTable()==========");
+        if (oConvertUtils.isNotEmpty(var2)) {
+            JmreportDynamicDataSourceVo var5 = this.jmReportDbSourceService.getByDbKey(var2);
+            if (var5 == null) {
+                return Result.error("数据源不存在");
             }
-            List list = this.reportDbService.loadDataSourceTable(paramString);
-            Map map = e.a(list, paramInteger1, paramInteger2);
-            return Result.OK(map);
         }
 
-        @PostMapping({"/loadTableData"})
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam(value = "dbSource", required = false) String paramString1, @RequestParam(value = "tableName", required = false) String paramString2, @RequestParam(value = "pageNo", required = false) Integer paramInteger1, @RequestParam(value = "pageSize", required = false) Integer paramInteger2, @RequestParam(value = "sql", required = false) String paramString3, @RequestParam("paramArray") String paramString4) {
-            a.debug("============);
-            if (oConvertUtils.isEmpty(paramString1) && this.jmBaseConfig.getSaas().booleanValue())
-                return Result.error(1001, ");
-            if (oConvertUtils.isNotEmpty(paramString1)) {
-                JmreportDynamicDataSourceVo jmreportDynamicDataSourceVo = this.jmReportDbSourceService.getByDbKey(paramString1);
-                if (jmreportDynamicDataSourceVo == null)
-                    return Result.error(");
+        List var7 = this.reportDbService.loadDataSourceTable(var2);
+        Map var6 = e.a(var7, var3, var4);
+        return Result.OK(var6);
+    }
+
+    @PostMapping({"/loadTableData"})
+    public Result<?> a(HttpServletRequest var1, @RequestParam(value = "dbSource", required = false) String var2, @RequestParam(value = "tableName", required = false) String var3, @RequestParam(value = "pageNo", required = false) Integer var4, @RequestParam(value = "pageSize", required = false) Integer var5, @RequestParam(value = "sql", required = false) String var6, @RequestParam("paramArray") String var7) {
+        a.debug("============加载表数据信息loadTableData()==========");
+        if (oConvertUtils.isEmpty(var2) && this.jmBaseConfig.getSaas()) {
+            return Result.error(1001, "数据源不允许为空，请选择数据源！");
+        } else {
+            JmreportDynamicDataSourceVo var8;
+            if (oConvertUtils.isNotEmpty(var2)) {
+                var8 = this.jmReportDbSourceService.getByDbKey(var2);
+                if (var8 == null) {
+                    return Result.error("数据源不存在");
+                }
             }
-            Map map = null;
+
+            var8 = null;
+
+            Map var11;
             try {
-                map = this.reportDbService.loadTableData(paramString1, paramString2, paramInteger1, paramInteger2, paramString3, paramString4);
-            } catch (Exception exception) {
-                exception.printStackTrace();
-                return Result.error("SQL{}" + exception.getMessage());
+                var11 = this.reportDbService.loadTableData(var2, var3, var4, var5, var6, var7);
+            } catch (Exception var10) {
+                var10.printStackTrace();
+                return Result.error("SQL执行失败，{}" + var10.getMessage());
             }
-            return Result.OK(map);
+
+            return Result.OK(var11);
         }
+    }
 
-        @PostMapping({"/queryFieldBySql"})
-        public Result<?> a(@RequestBody JSONObject paramJSONObject) {
-            a.debug("============);
-                    String str1 = paramJSONObject.getString("sql");
-            String str2 = paramJSONObject.getString("dbSource");
-            Object object = paramJSONObject.get("paramArray");
-            String str3 = paramJSONObject.getString("type");
-            Integer integer = Integer.valueOf(0);
-            JmreportDynamicDataSourceVo jmreportDynamicDataSourceVo = null;
-            if (oConvertUtils.isEmpty(str2) && this.jmBaseConfig.getSaas().booleanValue())
-                return Result.error(1001, ");
-            if (oConvertUtils.isNotEmpty(str2)) {
-                jmreportDynamicDataSourceVo = this.jmReportDbSourceService.getByDbKey(str2);
-                integer = jmreportDynamicDataSourceVo.getConnectTimes();
-                if (integer != null && integer.intValue() > 5)
-                    return Result.error(");
-                if (jmreportDynamicDataSourceVo == null)
-                    return Result.error(");
-            }
-            try {
-                Map map = this.reportDbService.parseReportSql(str1, str2, object, str3);
-                if (map.get("message") != null)
-                    return Result.OK(map);
-                return Result.OK(", map);
-            } catch (Exception exception) {
-                if (exception instanceof JimuReportException) {
-                    JimuReportException jimuReportException = (JimuReportException)exception;
-                    return Result.error(jimuReportException.getExceptionCode(), jimuReportException.getMessage());
+    @PostMapping({"/queryFieldBySql"})
+    public Result<?> a(@RequestBody JSONObject var1) {
+        a.debug("============解析sql==========");
+        String var2 = var1.getString("sql");
+        String var3 = var1.getString("dbSource");
+        Object var4 = var1.get("paramArray");
+        String var5 = var1.getString("type");
+        Integer var6 = 0;
+        JmreportDynamicDataSourceVo var7 = null;
+        if (oConvertUtils.isEmpty(var3) && this.jmBaseConfig.getSaas()) {
+            return Result.error(1001, "数据源不允许为空，请选择数据源！");
+        } else {
+            if (oConvertUtils.isNotEmpty(var3)) {
+                var7 = this.jmReportDbSourceService.getByDbKey(var3);
+                var6 = var7.getConnectTimes();
+                if (var6 != null && var6 > 5) {
+                    return Result.error("数据源配置不正确,请修改!");
+                }
+
+                if (var7 == null) {
+                    return Result.error("数据源不存在");
                 }
-                return Result.error(exception.getMessage());
             }
-        }
 
-        @PostMapping({"/queryFieldByBean"})
-        public Result<?> b(@RequestBody JSONObject paramJSONObject) {
-            a.debug("============);
-                    String str1 = paramJSONObject.getString("javaType");
-            String str2 = paramJSONObject.getString("javaValue");
-            Boolean bool = paramJSONObject.getBoolean("isPage");
-            JSONObject jSONObject = paramJSONObject.getJSONObject("param");
-            Map map = d.a(jSONObject);
             try {
-                Object object = d.c(str1, str2);
-                if (object != null && object instanceof IDataSetFactory) {
-                    IDataSetFactory iDataSetFactory = (IDataSetFactory)object;
-                    List list = d.a(iDataSetFactory, map, bool);
-                    if (list == null || list.size() == 0)
-                        return Result.error(");
-                    return Result.OK(", list);
+                Map var8 = this.reportDbService.parseReportSql(var2, var3, var4, var5);
+                return var8.get("message") != null ? Result.OK(var8) : Result.OK("解析成功", var8);
+            } catch (Exception var10) {
+                if (var10 instanceof JimuReportException) {
+                    JimuReportException var9 = (JimuReportException) var10;
+                    return Result.error(var9.getExceptionCode(), var9.getMessage());
+                } else {
+                    return Result.error(var10.getMessage());
                 }
-                return Result.error("javabean);
-            } catch (Exception exception) {
-                return Result.error(exception.getMessage());
             }
         }
+    }
 
-        @PostMapping({"/executeSelectApi"})
-        @JimuLoginRequired
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam("api") String paramString1, @RequestParam("method") String paramString2) {
-            String str1 = paramHttpServletRequest.getParameter("token");
-            String str2 = paramHttpServletRequest.getParameter("apiConvert");
-            String str3 = paramHttpServletRequest.getParameter("paramArray");
-            if (oConvertUtils.isEmpty(str1))
-                str1 = this.jimuTokenClient.getToken();
-            a.info("api= " + paramString1 + ", method= " + paramString2 + ", token= " + str1);
-            Map map = this.reportDbService.executeSelectApi(paramString1, paramString2, str1, str2, str3);
-            List list = this.reportDbService.parseData(map);
-            return Result.OK(list);
-        }
+    @PostMapping({"/queryFieldByBean"})
+    public Result<?> b(@RequestBody JSONObject var1) {
+        a.debug("============解析javabean==========");
+        String var2 = var1.getString("javaType");
+        String var3 = var1.getString("javaValue");
+        Boolean var4 = var1.getBoolean("isPage");
+        JSONObject var5 = var1.getJSONObject("param");
+        Map var6 = d.a(var5);
 
-        @PostMapping({"/saveDb"})
-        @JimuLoginRequired
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestBody JmReportDb paramJmReportDb) {
-            a.debug("============saveDb==========");
-            try {
-                String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-                paramJmReportDb.setCreateBy(str);
-                Date date = new Date();
-                paramJmReportDb.setCreateTime(date);
-                paramJmReportDb.setUpdateTime(date);
-                paramJmReportDb = this.reportDbService.saveDb(paramJmReportDb);
-            } catch (Exception exception) {
-                a.error(exception.getMessage(), exception);
-                return Result.error(exception.getMessage());
+        try {
+            Object var7 = d.c(var2, var3);
+            if (var7 != null && var7 instanceof IDataSetFactory) {
+                IDataSetFactory var8 = (IDataSetFactory) var7;
+                List var9 = d.a(var8, var6, var4);
+                return var9 != null && var9.size() != 0 ? Result.OK("解析成功", var9) : Result.error("解析成功但是无数据!");
+            } else {
+                return Result.error("javabean数据集需要实现接口IDataSetFactory");
             }
-            return Result.OK(paramJmReportDb);
+        } catch (Exception var10) {
+            return Result.error(var10.getMessage());
         }
+    }
 
-        @GetMapping({"/field/tree/{reportId}"})
-        @JimuLoginRequired
-        public Result<?> b(HttpServletRequest paramHttpServletRequest, @PathVariable("reportId") String paramString) {
-            a.debug("============fieldTree==========");
-            List list = new ArrayList();
-            try {
-                list = this.reportDbService.fieldTree(paramString);
-            } catch (Exception exception) {
-                exception.printStackTrace();
-            }
-            return Result.OK(list);
+    @PostMapping({"/executeSelectApi"})
+    @JimuLoginRequired
+    public Result<?> a(HttpServletRequest var1, @RequestParam("api") String var2, @RequestParam("method") String var3) {
+        String var4 = var1.getParameter("token");
+        String var5 = var1.getParameter("apiConvert");
+        String var6 = var1.getParameter("paramArray");
+        if (oConvertUtils.isEmpty(var4)) {
+            var4 = this.jimuTokenClient.getToken();
         }
 
-        @GetMapping({"/queryIsPage/{reportId}"})
-        @JimuLoginRequired
-        public Result<?> c(HttpServletRequest paramHttpServletRequest, @PathVariable("reportId") String paramString) {
-            boolean bool = this.reportDbService.queryIsPage(paramString);
-            return Result.OK(Boolean.valueOf(bool));
+        a.info("报表executeSelectApi:: api= " + var2 + ", method= " + var3 + ", token= " + var4);
+        Map var7 = this.reportDbService.executeSelectApi(var2, var3, var4, var5, var6);
+        List var8 = this.reportDbService.parseData(var7);
+        return Result.OK(var8);
+    }
+
+    @PostMapping({"/saveDb"})
+    @JimuLoginRequired
+    public Result<?> a(HttpServletRequest var1, @RequestBody JmReportDb var2) {
+        a.debug("============saveDb==========");
+
+        try {
+            String var3 = this.jimuTokenClient.getUsername(var1);
+            var2.setCreateBy(var3);
+            Date var4 = new Date();
+            var2.setCreateTime(var4);
+            var2.setUpdateTime(var4);
+            var2 = this.reportDbService.saveDb(var2);
+        } catch (Exception var5) {
+            a.error(var5.getMessage(), var5);
+            return Result.error(var5.getMessage());
         }
 
-        @GetMapping({"loadDbData/{dbId}"})
-        @JimuLoginRequired
-        public Result<?> d(HttpServletRequest paramHttpServletRequest, @PathVariable("dbId") String paramString) {
-            a.debug("============loadDbData==========");
-            Map map = this.reportDbService.loadDbData(paramString);
-            return Result.OK(map);
+        return Result.OK(var2);
+    }
+
+    @GetMapping({"/field/tree/{reportId}"})
+    @JimuLoginRequired
+    public Result<?> b(HttpServletRequest var1, @PathVariable("reportId") String var2) {
+        a.debug("============fieldTree==========");
+        Object var3 = new ArrayList();
+
+        try {
+            var3 = this.reportDbService.fieldTree(var2);
+        } catch (Exception var5) {
+            var5.printStackTrace();
         }
 
-        @GetMapping({"initDataSource"})
-        @JimuLoginRequired
-        public Result<?> b(HttpServletRequest paramHttpServletRequest) {
-            a.debug("============initDataSource==========");
-            String str = "";
-            if (this.jmBaseConfig.getSaas().booleanValue())
-                str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-            List list = this.reportDbService.initDataSource(str);
-            return Result.OK(list);
+        return Result.OK(var3);
+    }
+
+    @GetMapping({"/queryIsPage/{reportId}"})
+    @JimuLoginRequired
+    public Result<?> c(HttpServletRequest var1, @PathVariable("reportId") String var2) {
+        boolean var3 = this.reportDbService.queryIsPage(var2);
+        return Result.OK(var3);
+    }
+
+    @GetMapping({"loadDbData/{dbId}"})
+    @JimuLoginRequired
+    public Result<?> d(HttpServletRequest var1, @PathVariable("dbId") String var2) {
+        a.debug("============loadDbData==========");
+        Map var3 = this.reportDbService.loadDbData(var2);
+        return Result.OK(var3);
+    }
+
+    @GetMapping({"initDataSource"})
+    @JimuLoginRequired
+    public Result<?> b(HttpServletRequest var1) {
+        a.debug("============initDataSource==========");
+        String var2 = "";
+        if (this.jmBaseConfig.getSaas()) {
+            var2 = this.jimuTokenClient.getUsername(var1);
         }
 
-        @GetMapping({"/delDbData/{dbId}"})
-        @JimuLoginRequired
-        public Result<?> e(HttpServletRequest paramHttpServletRequest, @PathVariable("dbId") String paramString) {
-            a.debug("============delDbData==========");
-            this.reportDbService.delDbData(paramString);
-            return Result.OK();
+        List var3 = this.reportDbService.initDataSource(var2);
+        return Result.OK(var3);
+    }
+
+    @GetMapping({"/delDbData/{dbId}"})
+    @JimuLoginRequired
+    public Result<?> e(HttpServletRequest var1, @PathVariable("dbId") String var2) {
+        a.debug("============delDbData==========");
+        this.reportDbService.delDbData(var2);
+        return Result.OK();
+    }
+
+    @PostMapping({"/deleteParamByIds"})
+    @JimuLoginRequired
+    public Result<?> b(HttpServletRequest var1, @RequestBody JSONObject var2) {
+        a.debug("============deleteParamByIds==========");
+        JSONArray var3 = var2.getJSONArray("selectIds");
+        String var4 = var2.getString("id");
+        String var5 = var2.getString("dbDynSql");
+        this.jmReportDbParamService.deleteParamByIdsAndUpdateDbSql(var3, var4, var5);
+        return Result.OK();
+    }
+
+    @DeleteMapping({"/deleteFieldByIds"})
+    @JimuLoginRequired
+    public Result<?> f(HttpServletRequest var1, @RequestBody String var2) {
+        a.debug("============deleParams==========");
+        this.jmReportDbFieldService.deleteByIds(var2);
+        return Result.OK();
+    }
+
+    @DeleteMapping({"/delete"})
+    @ResponseBody
+    @JimuLoginRequired
+    public Result<?> g(HttpServletRequest var1, @RequestParam(name = "id", required = true) String var2) {
+        JimuReport var3 = new JimuReport();
+        var3.setId(var2);
+        var3.setDelFlag(1);
+        this.jmReportDesignService.updateById(var3);
+        return Result.OK("删除成功!", true);
+    }
+
+    @GetMapping({"/reportCopy"})
+    @ResponseBody
+    @JimuLoginRequired
+    public Result<?> h(HttpServletRequest var1, @RequestParam(name = "id", required = true) String var2) {
+        try {
+            String var3 = this.jimuTokenClient.getUsername(var1);
+            JimuReport var4 = new JimuReport();
+            var4.setCreateBy(var3);
+            Date var5 = new Date();
+            var4.setCreateTime(var5);
+            var4.setUpdateTime(var5);
+            var4.setId(var2);
+            this.jmReportDesignService.reportCopy(var4);
+        } catch (Exception var6) {
+            var6.printStackTrace();
+            return Result.error(403, "您没有权限");
         }
 
-        @PostMapping({"/deleteParamByIds"})
-        @JimuLoginRequired
-        public Result<?> b(HttpServletRequest paramHttpServletRequest, @RequestBody JSONObject paramJSONObject) {
-            a.debug("============deleteParamByIds==========");
-            JSONArray jSONArray = paramJSONObject.getJSONArray("selectIds");
-            String str1 = paramJSONObject.getString("id");
-            String str2 = paramJSONObject.getString("dbDynSql");
-            this.jmReportDbParamService.deleteParamByIdsAndUpdateDbSql(jSONArray, str1, str2);
-            return Result.OK();
+        return Result.OK("复制成功!", true);
+    }
+
+    @GetMapping({"/setTemplate"})
+    @ResponseBody
+    @JimuLoginRequired
+    public Result<?> a(HttpServletRequest var1, @RequestParam(name = "id", required = true) String var2, @RequestParam(name = "template", required = true) Integer var3) {
+        JimuReport var4 = new JimuReport();
+        var4.setId(var2);
+        var4.setTemplate(var3);
+        Integer var5 = this.jmReportDesignService.updateById(var4);
+        boolean var6 = false;
+        if (var5 > 0) {
+            var6 = true;
         }
 
-        @DeleteMapping({"/deleteFieldByIds"})
-        @JimuLoginRequired
-        public Result<?> f(HttpServletRequest paramHttpServletRequest, @RequestBody String paramString) {
-            a.debug("============deleParams==========");
-            this.jmReportDbFieldService.deleteByIds(paramString);
-            return Result.OK();
+        return Result.OK("设置成功!", var6);
+    }
+
+    @PostMapping({"/importExcel"})
+    @ResponseBody
+    @JimuLoginRequired
+    public Result<Object> a(HttpServletRequest var1, @RequestParam("file") MultipartFile var2) throws IOException {
+        Result var3 = new Result();
+        Map var4 = this.jmReportDesignService.importExcel(var2);
+        if (var4.size() > 0 && !var4.isEmpty()) {
+            var3.setResult(var4);
+            var3.setSuccess(true);
+        } else {
+            var3.setSuccess(false);
         }
 
-        @DeleteMapping({"/delete"})
-        @ResponseBody
-        @JimuLoginRequired
-        public Result<?> g(HttpServletRequest paramHttpServletRequest, @RequestParam(name = "id", required = true) String paramString) {
-            JimuReport jimuReport = new JimuReport();
-            jimuReport.setId(paramString);
-            jimuReport.setDelFlag(Integer.valueOf(1));
-            this.jmReportDesignService.updateById(jimuReport);
-            return Result.OK(", Boolean.valueOf(true));
+        return var3;
+    }
+
+    @PostMapping({"/exportAllExcel"})
+    @ResponseBody
+    public Result<Object> a(HttpServletRequest var1, HttpServletResponse var2, @RequestBody JSONObject var3) throws IOException {
+        HashMap var4 = new HashMap(var1.getParameterMap());
+        boolean var5 = var4.containsKey("token");
+        if (var5) {
+            var4.remove("token");
         }
 
-        @GetMapping({"/reportCopy"})
-        @ResponseBody
-        @JimuLoginRequired
-        public Result<?> h(HttpServletRequest paramHttpServletRequest, @RequestParam(name = "id", required = true) String paramString) {
+        String var6 = var3.getString("excelConfigId");
+        JSONObject var7 = var3.getJSONObject("queryParam");
+        long var8 = System.currentTimeMillis();
+        JSONArray var10 = var3.getJSONArray("base64Arry");
+        Map var11 = this.exportExcel.exportExcel(var6, var7, var10);
+        File var12 = new File(var11.get("name").toString());
+        ServletOutputStream var13 = var2.getOutputStream();
+        SXSSFWorkbook var14 = (SXSSFWorkbook) var11.get("workbook");
+        ByteArrayOutputStream var15 = new ByteArrayOutputStream();
+        HashMap var16 = new HashMap();
+
+        try {
+            var14.write(var15);
+            String var17 = Base64Utils.encodeToString(var15.toByteArray());
+            var16.put("file", var17);
+            var16.put("success", true);
+            var16.put("name", var12.getName());
+        } catch (IOException var26) {
+            var26.printStackTrace();
+            var16.put("error", var26.getMessage());
+        } finally {
             try {
-                String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-                JimuReport jimuReport = new JimuReport();
-                jimuReport.setCreateBy(str);
-                Date date = new Date();
-                jimuReport.setCreateTime(date);
-                jimuReport.setUpdateTime(date);
-                jimuReport.setId(paramString);
-                this.jmReportDesignService.reportCopy(jimuReport);
-            } catch (Exception exception) {
-                exception.printStackTrace();
-                return Result.error(403, ");
+                var15.close();
+            } catch (IOException var25) {
+                var25.printStackTrace();
             }
-            return Result.OK(", Boolean.valueOf(true));
-        }
 
-        @GetMapping({"/setTemplate"})
-        @ResponseBody
-        @JimuLoginRequired
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam(name = "id", required = true) String paramString, @RequestParam(name = "template", required = true) Integer paramInteger) {
-            JimuReport jimuReport = new JimuReport();
-            jimuReport.setId(paramString);
-            jimuReport.setTemplate(paramInteger);
-            Integer integer = this.jmReportDesignService.updateById(jimuReport);
-            boolean bool = false;
-            if (integer.intValue() > 0)
-                bool = true;
-            return Result.OK(", Boolean.valueOf(bool));
         }
 
-        @PostMapping({"/importExcel"})
-        @ResponseBody
-        @JimuLoginRequired
-        public Result<Object> a(HttpServletRequest paramHttpServletRequest, @RequestParam("file") MultipartFile paramMultipartFile) throws IOException {
-            Result<Object> result = new Result();
-            Map map = this.jmReportDesignService.importExcel(paramMultipartFile);
-            if (map.size() > 0 && !map.isEmpty()) {
-                result.setResult(map);
-                result.setSuccess(true);
+        long var28 = System.currentTimeMillis();
+        a.info("导出excel数据运行时间：" + (var28 - var8) + "ms");
+        return Result.OK(var16);
+    }
+
+    @RequestMapping({"/print"})
+    public void a(HttpServletResponse var1, HttpServletRequest var2) throws Exception {
+        HashMap var3 = new HashMap();
+        this.a((HttpServletRequest) var2, (HttpServletResponse) var1, (Map) var3, (String) "jmreport/desreport/print.ftl");
+    }
+
+    @PostMapping({"/putFile"})
+    @ResponseBody
+    @JimuLoginRequired
+    public Result<JimuReport> i(HttpServletRequest var1, @RequestParam String var2) {
+        Result var3 = new Result();
+
+        try {
+            MultipartHttpServletRequest var4 = (MultipartHttpServletRequest) var1;
+            MultipartFile var5 = var4.getFile("file");
+            String var6 = "";
+            String var7 = this.jimuReportUploadConfig.getUploadType();
+            if ("alioss".equals(var7)) {
+                var6 = OssBootUtil.upload(var5, "designreport/images");
+            } else if ("minio".equals(var7)) {
+                var6 = MinioUtil.upload(var5, "designreport/images");
             } else {
-                result.setSuccess(false);
+                var6 = this.a(var5, "excel_online");
             }
-            return result;
-        }
 
-        @PostMapping({"/exportAllExcel"})
-        @ResponseBody
-        public Result<Object> a(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse, @RequestBody JSONObject paramJSONObject) throws IOException {
-            HashMap<Object, Object> hashMap1 = new HashMap<>(paramHttpServletRequest.getParameterMap());
-            boolean bool = hashMap1.containsKey("token");
-            if (bool)
-                hashMap1.remove("token");
-            String str = paramJSONObject.getString("excelConfigId");
-            JSONObject jSONObject = paramJSONObject.getJSONObject("queryParam");
-            long l1 = System.currentTimeMillis();
-            JSONArray jSONArray = paramJSONObject.getJSONArray("base64Arry");
-            Map map = this.exportExcel.exportExcel(str, jSONObject, (List)jSONArray);
-            File file = new File(map.get("name").toString());
-            ServletOutputStream servletOutputStream = paramHttpServletResponse.getOutputStream();
-            SXSSFWorkbook sXSSFWorkbook = (SXSSFWorkbook)map.get("workbook");
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            HashMap<Object, Object> hashMap2 = new HashMap<>();
-            try {
-                sXSSFWorkbook.write(byteArrayOutputStream);
-                String str1 = Base64Utils.encodeToString(byteArrayOutputStream.toByteArray());
-                hashMap2.put("file", str1);
-                hashMap2.put("success", Boolean.valueOf(true));
-                hashMap2.put("name", file.getName());
-            } catch (IOException iOException) {
-                iOException.printStackTrace();
-                hashMap2.put("error", iOException.getMessage());
-            } finally {
-                try {
-                    byteArrayOutputStream.close();
-                } catch (IOException iOException) {
-                    iOException.printStackTrace();
-                }
+            JimuReport var8 = new JimuReport();
+            if (oConvertUtils.isNotEmpty(var6) && oConvertUtils.isNotEmpty(var2)) {
+                var8.setId(var2);
+                var8.setThumb(var6);
+                this.jmReportDesignService.updateById(var8);
+                var3.setMessage("封面图上传成功!");
+                var3.setResult(var8);
             }
-            long l2 = System.currentTimeMillis();
-            a.info("+ (l2 - l1) + "ms");
-            return Result.OK(hashMap2);
+        } catch (Exception var9) {
+            var3.setSuccess(false);
+            var3.setMessage("");
+            a.error(var9.getMessage(), var9);
         }
 
-        @RequestMapping({"/print"})
-        public void a(HttpServletResponse paramHttpServletResponse, HttpServletRequest paramHttpServletRequest) throws Exception {
-            HashMap<Object, Object> hashMap = new HashMap<>();
-            a(paramHttpServletRequest, paramHttpServletResponse, hashMap, "jmreport/desreport/print.ftl");
-        }
+        return var3;
+    }
 
-        @PostMapping({"/putFile"})
-        @ResponseBody
-        @JimuLoginRequired
-        public Result<JimuReport> i(HttpServletRequest paramHttpServletRequest, @RequestParam String paramString) {
-            Result<JimuReport> result = new Result();
-            try {
-                MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest)paramHttpServletRequest;
-                MultipartFile multipartFile = multipartHttpServletRequest.getFile("file");
-                String str1 = "";
-                String str2 = this.jimuReportUploadConfig.getUploadType();
-                if ("alioss".equals(str2)) {
-                    str1 = OssBootUtil.upload(multipartFile, "designreport/images");
-                } else if ("minio".equals(str2)) {
-                    str1 = MinioUtil.upload(multipartFile, "designreport/images");
-                } else {
-                    str1 = a(multipartFile, "excel_online");
-                }
-                JimuReport jimuReport = new JimuReport();
-                if (oConvertUtils.isNotEmpty(str1) && oConvertUtils.isNotEmpty(paramString)) {
-                    jimuReport.setId(paramString);
-                    jimuReport.setThumb(str1);
-                    this.jmReportDesignService.updateById(jimuReport);
-                    result.setMessage(");
-                            result.setResult(jimuReport);
-                }
-            } catch (Exception exception) {
-                result.setSuccess(false);
-                result.setMessage("");
-                a.error(exception.getMessage(), exception);
+    @GetMapping({"/download/image"})
+    @ResponseBody
+    public Result<Object> f(HttpServletRequest var1, HttpServletResponse var2) throws IOException {
+        String var3 = var1.getParameter("imageUrl");
+        Result var4 = new Result();
+        if (oConvertUtils.isEmpty(var3)) {
+            var4.setSuccess(false);
+            return var4;
+        } else {
+            if (!var3.contains("http")) {
+                var4.setSuccess(true);
+                var4.setResult(var3);
             }
-            return result;
-        }
 
-        @GetMapping({"/download/image"})
-        @ResponseBody
-        public Result<Object> f(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse) throws IOException {
-            String str1 = paramHttpServletRequest.getParameter("imageUrl");
-            Result<Object> result = new Result();
-            if (oConvertUtils.isEmpty(str1)) {
-                result.setSuccess(false);
-                return result;
+            String var5 = File.separator + "designreport" + File.separator + "images" + File.separator;
+            String var6 = var3.substring(var3.lastIndexOf("/") + 1);
+            String var7 = this.jimuReportUploadConfig.getPath().getUpload();
+            File var8 = new File(var7 + var5);
+            if (!var8.exists()) {
+                var8.mkdirs();
             }
-            if (!str1.contains("http")) {
-                result.setSuccess(true);
-                result.setResult(str1);
+
+            a.debug("----imageUrl------" + var3);
+            a.debug("----fileName------" + var6);
+            a.debug("----downFilePath------" + var7 + var5 + var6);
+            File var9 = new File(var7 + var5 + var6);
+            if (!var9.exists()) {
+                d.a(var3, var9);
             }
-            String str2 = File.separator + "designreport" + File.separator + "images" + File.separator;
-            String str3 = str1.substring(str1.lastIndexOf("/") + 1);
-            String str4 = this.jimuReportUploadConfig.getPath().getUpload();
-            File file1 = new File(str4 + str2);
-            if (!file1.exists())
-                file1.mkdirs();
-            a.debug("----imageUrl------" + str1);
-            a.debug("----fileName------" + str3);
-            a.debug("----downFilePath------" + str4 + str2 + str3);
-            File file2 = new File(str4 + str2 + str3);
-            if (!file2.exists())
-                d.a(str1, file2);
-            result.setSuccess(true);
-            result.setResult(str2 + str3);
-            return result;
+
+            var4.setSuccess(true);
+            var4.setResult(var5 + var6);
+            return var4;
         }
+    }
 
-        private String a(MultipartFile paramMultipartFile, String paramString) {
-            try {
-                String str1 = this.jimuReportUploadConfig.getPath().getUpload();
-                a.info(" --- local upload path : " + str1 + " --- ");
-                String str2 = null;
-                File file1 = new File(str1 + File.separator + paramString + File.separator);
-                if (!file1.exists())
-                    file1.mkdirs();
-                String str3 = paramMultipartFile.getOriginalFilename();
-                str3 = CommonUtils.getFileName(str3);
-                if (str3.indexOf(".") != -1) {
-                    str2 = str3.substring(0, str3.lastIndexOf(".")) + "_" + System.currentTimeMillis() + str3.substring(str3.indexOf("."));
-                } else {
-                    str2 = str3 + "_" + System.currentTimeMillis();
-                }
-                String str4 = file1.getPath() + File.separator + str2;
-                File file2 = new File(str4);
-                FileCopyUtils.copy(paramMultipartFile.getBytes(), file2);
-                String str5 = null;
-                if (oConvertUtils.isNotEmpty(paramString)) {
-                    str5 = paramString + File.separator + str2;
-                } else {
-                    str5 = str2;
-                }
-                if (str5.contains("\\"))
-                    str5 = str5.replace("\\", "/");
-                return str5;
-            } catch (IOException iOException) {
-                a.error(iOException.getMessage(), iOException);
-                return "";
+    private String a(MultipartFile var1, String var2) {
+        try {
+            String var3 = this.jimuReportUploadConfig.getPath().getUpload();
+            a.info(" --- local upload path : " + var3 + " --- ");
+            String var4 = null;
+            File var5 = new File(var3 + File.separator + var2 + File.separator);
+            if (!var5.exists()) {
+                var5.mkdirs();
             }
-        }
 
-        @PostMapping({"/addDataSource"})
-        @JimuLoginRequired
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestBody JmReportDataSource paramJmReportDataSource) {
-            return this.reportDbService.addDataSource(paramJmReportDataSource, paramHttpServletRequest);
-        }
+            String var6 = var1.getOriginalFilename();
+            var6 = CommonUtils.getFileName(var6);
+            if (var6.indexOf(".") != -1) {
+                var4 = var6.substring(0, var6.lastIndexOf(".")) + "_" + System.currentTimeMillis() + var6.substring(var6.indexOf("."));
+            } else {
+                var4 = var6 + "_" + System.currentTimeMillis();
+            }
 
-        @PostMapping({"/querySourceCode"})
-        @JimuLoginRequired
-        public Result<?> b(HttpServletRequest paramHttpServletRequest, @RequestBody JmReportDataSource paramJmReportDataSource) {
-            boolean bool = this.reportDbService.querySourceCode(paramJmReportDataSource);
-            return Result.OK(Boolean.valueOf(bool));
-        }
+            String var7 = var5.getPath() + File.separator + var4;
+            File var8 = new File(var7);
+            FileCopyUtils.copy(var1.getBytes(), var8);
+            String var9 = null;
+            if (oConvertUtils.isNotEmpty(var2)) {
+                var9 = var2 + File.separator + var4;
+            } else {
+                var9 = var4;
+            }
 
-        @PostMapping({"/delDataSource"})
-        @JimuLoginRequired
-        public Result<?> c(HttpServletRequest paramHttpServletRequest, @RequestBody JmReportDataSource paramJmReportDataSource) {
-            this.reportDbService.delDataSource(paramJmReportDataSource);
-            return Result.OK(", Boolean.valueOf(true));
+            if (var9.contains("\\")) {
+                var9 = var9.replace("\\", "/");
+            }
+
+            return var9;
+        } catch (IOException var10) {
+            a.error(var10.getMessage(), var10);
+            return "";
         }
+    }
+
+    @PostMapping({"/addDataSource"})
+    @JimuLoginRequired
+    public Result<?> a(HttpServletRequest var1, @RequestBody JmReportDataSource var2) {
+        return this.reportDbService.addDataSource(var2, var1);
+    }
 
-        @PostMapping({"/testConnection"})
-        public Result a(@RequestBody JmreportDynamicDataSourceVo paramJmreportDynamicDataSourceVo) {
-            Connection connection = null;
+    @PostMapping({"/querySourceCode"})
+    @JimuLoginRequired
+    public Result<?> b(HttpServletRequest var1, @RequestBody JmReportDataSource var2) {
+        boolean var3 = this.reportDbService.querySourceCode(var2);
+        return Result.OK(var3);
+    }
+
+    @PostMapping({"/delDataSource"})
+    @JimuLoginRequired
+    public Result<?> c(HttpServletRequest var1, @RequestBody JmReportDataSource var2) {
+        this.reportDbService.delDataSource(var2);
+        return Result.OK("删除成功", true);
+    }
+
+    @PostMapping({"/testConnection"})
+    public Result a(@RequestBody JmreportDynamicDataSourceVo var1) {
+        Connection var2 = null;
+
+        Result var3;
+        try {
+            Result var4;
             try {
-                Class.forName(paramJmreportDynamicDataSourceVo.getDbDriver());
+                Class.forName(var1.getDbDriver());
                 DriverManager.setLoginTimeout(10);
-                connection = DriverManager.getConnection(paramJmreportDynamicDataSourceVo.getDbUrl(), paramJmreportDynamicDataSourceVo.getDbUsername(), paramJmreportDynamicDataSourceVo.getDbPassword());
-                if (connection != null)
-                    return Result.OK(", Boolean.valueOf(true));
-                return Result.OK(", Boolean.valueOf(true));
-            } catch (ClassNotFoundException classNotFoundException) {
-                a.error(classNotFoundException.toString());
-                return Result.error(");
-            } catch (Exception exception) {
-                a.error(exception.toString());
-                return Result.error("+ exception.getMessage());
-            } finally {
-                try {
-                    if (connection != null && !connection.isClosed())
-                        connection.close();
-                } catch (SQLException sQLException) {
-                    a.error(sQLException.toString());
+                var2 = DriverManager.getConnection(var1.getDbUrl(), var1.getDbUsername(), var1.getDbPassword());
+                if (var2 != null) {
+                    var3 = Result.OK("数据库连接成功", true);
+                    return var3;
+                }
+
+                var3 = Result.OK("数据库连接失败：错误未知", true);
+            } catch (ClassNotFoundException var17) {
+                a.error(var17.toString());
+                var4 = Result.error("数据库连接失败：驱动类不存在");
+                return var4;
+            } catch (Exception var18) {
+                a.error(var18.toString());
+                var4 = Result.error("数据库连接失败：" + var18.getMessage());
+                return var4;
+            }
+        } finally {
+            try {
+                if (var2 != null && !var2.isClosed()) {
+                    var2.close();
                 }
+            } catch (SQLException var16) {
+                a.error(var16.toString());
             }
+
         }
 
-        @RequestMapping({"/qurestApi"})
-        public Result<?> b(@RequestParam(name = "apiSelectId") String paramString, HttpServletRequest paramHttpServletRequest) {
-            String str1 = "";
-            JmReportDb jmReportDb = this.reportDbService.getById(paramString);
-            if (jmReportDb == null)
-                return Result.ok("");
-            String str2 = paramHttpServletRequest.getParameter("token");
-            if (oConvertUtils.isEmpty(str2))
-                str2 = paramHttpServletRequest.getHeader("token");
-            String str3 = jmReportDb.getApiUrl();
-            Map map = this.jimuTokenClient.getUserInfo(str2);
-            str3 = d.a(str3, map, this.jmBaseConfig.getApiBasePath());
-            List list = this.jmReportDbParamService.list(jmReportDb.getId());
-            if ("1".equals(jmReportDb.getDbType())) {
-                HashMap<Object, Object> hashMap = new HashMap<>();
-                for (JmReportDbParam jmReportDbParam : list) {
-                    if (str3.indexOf(jmReportDbParam.getParamName()) > 0)
-                        hashMap.put(jmReportDbParam.getParamName(), jmReportDbParam.getParamValue());
+        return var3;
+    }
+
+    @RequestMapping({"/qurestApi"})
+    public Result<?> b(@RequestParam(name = "apiSelectId") String var1, HttpServletRequest var2) {
+        String var3 = "";
+        JmReportDb var4 = this.reportDbService.getById(var1);
+        if (var4 == null) {
+            return Result.ok("");
+        } else {
+            String var5 = var2.getParameter("token");
+            if (oConvertUtils.isEmpty(var5)) {
+                var5 = var2.getHeader("token");
+            }
+
+            String var6 = var4.getApiUrl();
+            Map var7 = this.jimuTokenClient.getUserInfo(var5);
+            var6 = d.a(var6, var7, this.jmBaseConfig.getApiBasePath());
+            List var8 = this.jmReportDbParamService.list(var4.getId());
+            HashMap var9;
+            Iterator var10;
+            JmReportDbParam var11;
+            if ("1".equals(var4.getDbType())) {
+                var9 = new HashMap();
+                var10 = var8.iterator();
+
+                while (var10.hasNext()) {
+                    var11 = (JmReportDbParam) var10.next();
+                    if (var6.indexOf(var11.getParamName()) > 0) {
+                        var9.put(var11.getParamName(), var11.getParamValue());
+                    }
                 }
-                String str = FreeMarkerUtils.a(str3, hashMap);
-                str = str.replace("'", "");
-                if ("0".equals(jmReportDb.getApiMethod())) {
-                    str1 = d.b(str, str2);
+
+                String var15 = FreeMarkerUtils.a(var6, var9);
+                var15 = var15.replace("'", "");
+                if ("0".equals(var4.getApiMethod())) {
+                    var3 = d.b(var15, var5);
                 } else {
-                    str1 = d.a(str, str2, null);
+                    var3 = d.a(var15, var5, (JSONObject) null);
                 }
-                JSONObject jSONObject = JSONObject.parseObject(str1);
-                return Result.OK(jSONObject);
-            }
-            if ("3".equals(jmReportDb.getDbType())) {
-                JSONObject jSONObject = JSONObject.parseObject(jmReportDb.getJsonData());
-                return Result.OK(jSONObject);
-            }
-            if ("2".equals(jmReportDb.getDbType())) {
-                HashMap<Object, Object> hashMap = new HashMap<>();
-                for (JmReportDbParam jmReportDbParam : list)
-                    hashMap.put(jmReportDbParam.getParamName(), jmReportDbParam.getParamValue());
-                JSONObject jSONObject = JSONObject.parseObject(jmReportDb.getJsonData());
-                IDataSetFactory iDataSetFactory = d.d(jmReportDb.getJavaType(), jmReportDb.getJavaValue());
-                if ("1".equals(jmReportDb.getIsPage())) {
-                    JmPage jmPage = iDataSetFactory.createPageData(hashMap);
-                    return Result.OK(jSONObject);
+
+                JSONObject var17 = JSONObject.parseObject(var3);
+                return Result.OK(var17);
+            } else if ("3".equals(var4.getDbType())) {
+                JSONObject var13 = JSONObject.parseObject(var4.getJsonData());
+                return Result.OK(var13);
+            } else if (!"2".equals(var4.getDbType())) {
+                return null;
+            } else {
+                var9 = new HashMap();
+                var10 = var8.iterator();
+
+                while (var10.hasNext()) {
+                    var11 = (JmReportDbParam) var10.next();
+                    var9.put(var11.getParamName(), var11.getParamValue());
+                }
+
+                JSONObject var14 = JSONObject.parseObject(var4.getJsonData());
+                IDataSetFactory var16 = d.d(var4.getJavaType(), var4.getJavaValue());
+                if ("1".equals(var4.getIsPage())) {
+                    var16.createPageData(var9);
+                    return Result.OK(var14);
+                } else {
+                    List var12 = var16.createData(var9);
+                    return Result.OK(var12);
                 }
-                List list1 = iDataSetFactory.createData(hashMap);
-                return Result.OK(list1);
             }
-            return null;
         }
+    }
 
-        @RequestMapping({"/qurestSql"})
-        public Result<?> c(@RequestParam(name = "apiSelectId") String paramString, HttpServletRequest paramHttpServletRequest) {
-            JmReportDb jmReportDb = this.reportDbService.getById(paramString);
-            List list = this.reportDbService.qurestechSql(jmReportDb);
-            this.jmReportDesignService.replaceDbCode(paramString, list);
-            return Result.OK(d.b(list));
-        }
+    @RequestMapping({"/qurestSql"})
+    public Result<?> c(@RequestParam(name = "apiSelectId") String var1, HttpServletRequest var2) {
+        JmReportDb var3 = this.reportDbService.getById(var1);
+        List var4 = this.reportDbService.qurestechSql(var3);
+        this.jmReportDesignService.replaceDbCode(var1, var4);
+        return Result.OK(d.b(var4));
+    }
 
-        @GetMapping({"/dataCodeExist"})
-        public Result<Boolean> a(@RequestParam(name = "reportId") String paramString1, @RequestParam(name = "code") String paramString2) {
-            int i = this.reportDbService.getCount(paramString1, paramString2);
-            return Result.OK(Boolean.valueOf((i > 0)));
-        }
+    @GetMapping({"/dataCodeExist"})
+    public Result<Boolean> a(@RequestParam(name = "reportId") String var1, @RequestParam(name = "code") String var2) {
+        int var3 = this.reportDbService.getCount(var1, var2);
+        return Result.OK(var3 > 0);
+    }
 
-        @GetMapping({"/getQueryInfo"})
-        public Result<List<QueryVO>> a(@RequestParam(name = "reportId") String paramString1, HttpServletRequest paramHttpServletRequest, @RequestParam("param") String paramString2) {
-            String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-            if (!this.jmBaseConfig.getSaas().booleanValue())
-                str = "";
-            List list = this.jmReportDesignService.getReportQueryInfo(paramString1, str, paramString2);
-            return Result.OK(list);
+    @GetMapping({"/getQueryInfo"})
+    public Result<List<QueryVO>> a(@RequestParam(name = "reportId") String var1, HttpServletRequest var2, @RequestParam("param") String var3) {
+        String var4 = this.jimuTokenClient.getUsername(var2);
+        if (!this.jmBaseConfig.getSaas()) {
+            var4 = "";
         }
 
-        @RequestMapping({"/addChart"})
-        @JimuLoginRequired
-        public Result<?> d(@RequestParam(name = "chartType") String paramString, HttpServletRequest paramHttpServletRequest) {
-            JSONObject jSONObject = this.jmReportDesignService.addChart(paramString);
-            return Result.OK(jSONObject);
-        }
+        List var5 = this.jmReportDesignService.getReportQueryInfo(var1, var4, var3);
+        return Result.OK(var5);
+    }
 
-        @PostMapping({"/queryTableName"})
-        public Result<?> a(HttpServletRequest paramHttpServletRequest, @RequestParam("dbSource") String paramString1, @RequestParam("tableName") String paramString2, @RequestParam(name = "pageNo", defaultValue = "1") Integer paramInteger1, @RequestParam(name = "pageSize", defaultValue = "50") Integer paramInteger2) {
-            List list = this.reportDbService.queryTableName(paramString1, paramString2);
-            Map map = e.a(list, paramInteger1, paramInteger2);
-            return Result.OK(map);
-        }
+    @RequestMapping({"/addChart"})
+    @JimuLoginRequired
+    public Result<?> d(@RequestParam(name = "chartType") String var1, HttpServletRequest var2) {
+        JSONObject var3 = this.jmReportDesignService.addChart(var1);
+        return Result.OK(var3);
+    }
 
-        @GetMapping({"/getReportByUser"})
-        public Result<List<JimuReport>> j(HttpServletRequest paramHttpServletRequest, @RequestParam(name = "reportId") String paramString) {
-            Result<List<JimuReport>> result = new Result();
-            String str = this.jimuTokenClient.getUsername(paramHttpServletRequest);
-            List list = this.jmReportDesignService.getReportByUser(str, paramString);
-            result.setSuccess(true);
-            result.setResult(list);
-            return result;
-        }
+    @PostMapping({"/queryTableName"})
+    public Result<?> a(HttpServletRequest var1, @RequestParam("dbSource") String var2, @RequestParam("tableName") String var3, @RequestParam(name = "pageNo", defaultValue = "1") Integer var4, @RequestParam(name = "pageSize", defaultValue = "50") Integer var5) {
+        List var6 = this.reportDbService.queryTableName(var2, var3);
+        Map var7 = e.a(var6, var4, var5);
+        return Result.OK(var7);
+    }
+
+    @GetMapping({"/getReportByUser"})
+    public Result<List<JimuReport>> j(HttpServletRequest var1, @RequestParam(name = "reportId") String var2) {
+        Result var3 = new Result();
+        String var4 = this.jimuTokenClient.getUsername(var1);
+        List var5 = this.jmReportDesignService.getReportByUser(var4, var2);
+        var3.setSuccess(true);
+        var3.setResult(var5);
+        return var3;
+    }
+
+    @GetMapping({"/getReportChars"})
+    public Result<List<JSONObject>> b(@RequestParam(name = "reportId") String var1, @RequestParam(name = "charId", required = false) String var2) {
+        ArrayList var3 = new ArrayList();
+        JimuReport var4 = this.jmReportDesignService.getById(var1);
+        if (var4 != null) {
+            String var5 = var4.getJsonStr();
+            JSONObject var6 = JSONObject.parseObject(var5);
+            Object var7 = var6.get("chartList");
+            if (null != var7) {
+                JSONArray var8 = JSONArray.parseArray(var7.toString());
+
+                for (int var9 = 0; var9 < var8.size(); ++var9) {
+                    JSONObject var10 = new JSONObject();
+                    Object var11 = var8.getJSONObject(var9).get("layer_id");
+                    Object var12 = var8.getJSONObject(var9).get("config");
+                    JSONObject var13 = JSONObject.parseObject(var12.toString());
+                    JSONObject var14 = var13.getJSONObject("title");
+                    Object var15 = var14.get("text");
+                    if (null != var15 && null != var11) {
+                        if (oConvertUtils.isNotEmpty(var2) && !var2.equals(var11)) {
+                            var10.put("id", var11);
+                            var10.put("name", var15);
+                            var3.add(var10);
+                        }
 
-        @GetMapping({"/getReportChars"})
-        public Result<List<JSONObject>> b(@RequestParam(name = "reportId") String paramString1, @RequestParam(name = "charId", required = false) String paramString2) {
-            ArrayList<JSONObject> arrayList = new ArrayList();
-            JimuReport jimuReport = this.jmReportDesignService.getById(paramString1);
-            if (jimuReport != null) {
-                String str = jimuReport.getJsonStr();
-                JSONObject jSONObject = JSONObject.parseObject(str);
-                Object object = jSONObject.get("chartList");
-                if (null != object) {
-                    JSONArray jSONArray = JSONArray.parseArray(object.toString());
-                    for (byte b = 0; b < jSONArray.size(); b++) {
-                        JSONObject jSONObject1 = new JSONObject();
-                        Object object1 = jSONArray.getJSONObject(b).get("layer_id");
-                        Object object2 = jSONArray.getJSONObject(b).get("config");
-                        JSONObject jSONObject2 = JSONObject.parseObject(object2.toString());
-                        JSONObject jSONObject3 = jSONObject2.getJSONObject("title");
-                        Object object3 = jSONObject3.get("text");
-                        if (null != object3 && null != object1) {
-                            if (oConvertUtils.isNotEmpty(paramString2) && !paramString2.equals(object1)) {
-                                jSONObject1.put("id", object1);
-                                jSONObject1.put("name", object3);
-                                arrayList.add(jSONObject1);
-                            }
-                            if (oConvertUtils.isEmpty(paramString2)) {
-                                jSONObject1.put("id", object1);
-                                jSONObject1.put("name", object3);
-                                arrayList.add(jSONObject1);
-                            }
+                        if (oConvertUtils.isEmpty(var2)) {
+                            var10.put("id", var11);
+                            var10.put("name", var15);
+                            var3.add(var10);
                         }
                     }
                 }
             }
-            return Result.OK(arrayList);
         }
 
-        @GetMapping({"/getCharData"})
-        public Result<JSONObject> a(@RequestParam(name = "reportId") String paramString1, @RequestParam(name = "charId") String paramString2, @RequestParam(name = "params") String paramString3, HttpServletRequest paramHttpServletRequest) {
-            String str = paramHttpServletRequest.getParameter("X-Access-Token");
-            JSONObject jSONObject = this.jmReportDesignService.getCharData(paramString1, paramString2, paramString3, str);
-            return Result.OK(jSONObject);
-        }
+        return Result.OK(var3);
+    }
 
-        @GetMapping({"/verificationToken"})
-        public void c(HttpServletRequest paramHttpServletRequest) {
-            this.jimuTokenClient.verifyToken(paramHttpServletRequest);
-        }
+    @GetMapping({"/getCharData"})
+    public Result<JSONObject> a(@RequestParam(name = "reportId") String var1, @RequestParam(name = "charId") String var2, @RequestParam(name = "params") String var3, HttpServletRequest var4) {
+        String var5 = var4.getParameter("X-Access-Token");
+        JSONObject var6 = this.jmReportDesignService.getCharData(var1, var2, var3, var5);
+        return Result.OK(var6);
+    }
+
+    @GetMapping({"/verificationToken"})
+    public void c(HttpServletRequest var1) {
+        this.jimuTokenClient.verifyToken(var1);
+    }
 
-        @PostMapping({"/exportPdf"})
-        public Result<Object> b(HttpServletRequest paramHttpServletRequest, HttpServletResponse paramHttpServletResponse, @RequestBody JSONObject paramJSONObject) {
-            HashMap<Object, Object> hashMap = new HashMap<>(paramHttpServletRequest.getParameterMap());
-            boolean bool = hashMap.containsKey("token");
-            if (bool)
-                hashMap.remove("token");
-            String str1 = paramJSONObject.getString("excelConfigId");
-            JSONObject jSONObject = paramJSONObject.getJSONObject("queryParam");
-            jSONObject.put("printAll", Boolean.valueOf(true));
-            Result result = this.jmReportDesignService.show(str1, jSONObject.toJSONString());
-            JimuReport jimuReport = (JimuReport)result.getResult();
-            String str2 = paramHttpServletRequest.getParameter("dpi");
-            float f = 96.0F;
-            if (oConvertUtils.isNotEmpty(str2))
-                f = Float.parseFloat(str2);
-            JSONArray jSONArray = paramJSONObject.getJSONArray("base64Arry");
-            Map map = this.jmReportExportPdf.exportPdf(jimuReport, jSONArray, f);
-            return Result.OK(map);
+    @PostMapping({"/exportPdf"})
+    public Result<Object> b(HttpServletRequest var1, HttpServletResponse var2, @RequestBody JSONObject var3) {
+        HashMap var4 = new HashMap(var1.getParameterMap());
+        boolean var5 = var4.containsKey("token");
+        if (var5) {
+            var4.remove("token");
         }
 
-        @GetMapping({"/getLinkageChartInfo"})
-        public Result<Object> d(HttpServletRequest paramHttpServletRequest) {
-            String str1 = paramHttpServletRequest.getParameter("reportId");
-            String str2 = paramHttpServletRequest.getParameter("dbCode");
-            String str3 = paramHttpServletRequest.getParameter("linkageDbCode");
-            List list1 = this.jmReportDbParamService.queryParamByDbcode(str1, str3);
-            List list2 = this.jmReportDbFieldService.queryFieldsByDbcode(str1, str2);
-            HashMap<Object, Object> hashMap = new HashMap<>();
-            hashMap.put("paramList", list1);
-            hashMap.put("fieldList", list2);
-            return Result.OK(hashMap);
+        String var6 = var3.getString("excelConfigId");
+        JSONObject var7 = var3.getJSONObject("queryParam");
+        var7.put("printAll", true);
+        Result var8 = this.jmReportDesignService.show(var6, var7.toJSONString());
+        JimuReport var9 = (JimuReport) var8.getResult();
+        String var10 = var1.getParameter("dpi");
+        float var11 = 96.0F;
+        if (oConvertUtils.isNotEmpty(var10)) {
+            var11 = Float.parseFloat(var10);
         }
 
-        @GetMapping({"/getListReportDb"})
-        public Result<Map<String, Object>> c(@RequestParam(name = "reportId") String paramString) {
-            HashMap<Object, Object> hashMap1 = new HashMap<>();
-            List list = this.reportDbService.getListReportDb(paramString);
-            HashMap<Object, Object> hashMap2 = new HashMap<>();
-            HashMap<Object, Object> hashMap3 = new HashMap<>();
-            for (JmReportDb jmReportDb : list) {
-                List list1 = this.jmReportDbParamService.list(jmReportDb.getId());
-                hashMap3.put(jmReportDb.getDbCode(), list1);
-            }
-            hashMap1.put("reportDbParam", hashMap3);
-            return Result.OK(hashMap1);
+        JSONArray var12 = var3.getJSONArray("base64Arry");
+        Map var13 = this.jmReportExportPdf.exportPdf(var9, var12, var11);
+        return Result.OK(var13);
+    }
+
+    @GetMapping({"/getLinkageChartInfo"})
+    public Result<Object> d(HttpServletRequest var1) {
+        String var2 = var1.getParameter("reportId");
+        String var3 = var1.getParameter("dbCode");
+        String var4 = var1.getParameter("linkageDbCode");
+        List var5 = this.jmReportDbParamService.queryParamByDbcode(var2, var4);
+        List var6 = this.jmReportDbFieldService.queryFieldsByDbcode(var2, var3);
+        HashMap var7 = new HashMap();
+        var7.put("paramList", var5);
+        var7.put("fieldList", var6);
+        return Result.OK(var7);
+    }
+
+    @GetMapping({"/getListReportDb"})
+    public Result<Map<String, Object>> c(@RequestParam(name = "reportId") String var1) {
+        HashMap var2 = new HashMap();
+        List var3 = this.reportDbService.getListReportDb(var1);
+        new HashMap();
+        HashMap var5 = new HashMap();
+        Iterator var6 = var3.iterator();
+
+        while (var6.hasNext()) {
+            JmReportDb var7 = (JmReportDb) var6.next();
+            List var8 = this.jmReportDbParamService.list(var7.getId());
+            var5.put(var7.getDbCode(), var8);
         }
 
-        @GetMapping({"/dictCodeSearch"})
-        public Result<List<JmDictModel>> a(@RequestParam(name = "key") String paramString1, @RequestParam(name = "text") String paramString2, @RequestParam(name = "reportId") String paramString3) {
-            Result<List<JmDictModel>> result = new Result();
-            List list = this.reportDbService.getListReportDb(paramString3);
-            String str = this.jimuTokenClient.getUsername();
-            if (oConvertUtils.isEmpty(paramString1))
-                return null;
-            String[] arrayOfString = paramString1.split("__");
-            for (JmReportDb jmReportDb : list) {
-                if (arrayOfString.length == 2 && arrayOfString[0].equals(jmReportDb.getDbCode())) {
-                    List list1 = this.jmReportDbFieldService.getByDbId(jmReportDb.getId());
-                    for (JmReportDbField jmReportDbField : list1) {
-                        if (jmReportDbField.getFieldName().equals(arrayOfString[1])) {
-                            JSONObject jSONObject = new JSONObject();
-                            List list2 = this.jmReportDesignService.queryQueryDictList(jmReportDb, jmReportDbField, str, paramString2, null);
-                            result.setResult(list2);
-                            result.setSuccess(true);
-                            return result;
+        var2.put("reportDbParam", var5);
+        return Result.OK(var2);
+    }
+
+    @GetMapping({"/dictCodeSearch"})
+    public Result<List<JmDictModel>> a(@RequestParam(name = "key") String var1, @RequestParam(name = "text") String var2, @RequestParam(name = "reportId") String var3) {
+        Result var4 = new Result();
+        List var5 = this.reportDbService.getListReportDb(var3);
+        String var6 = this.jimuTokenClient.getUsername();
+        if (oConvertUtils.isEmpty(var1)) {
+            return null;
+        } else {
+            String[] var7 = var1.split("__");
+            Iterator var8 = var5.iterator();
+
+            while (true) {
+                JmReportDb var9;
+                do {
+                    do {
+                        if (!var8.hasNext()) {
+                            return null;
                         }
+
+                        var9 = (JmReportDb) var8.next();
+                    } while (var7.length != 2);
+                } while (!var7[0].equals(var9.getDbCode()));
+
+                List var10 = this.jmReportDbFieldService.getByDbId(var9.getId());
+                Iterator var11 = var10.iterator();
+
+                while (var11.hasNext()) {
+                    JmReportDbField var12 = (JmReportDbField) var11.next();
+                    if (var12.getFieldName().equals(var7[1])) {
+                        new JSONObject();
+                        List var14 = this.jmReportDesignService.queryQueryDictList(var9, var12, var6, var2, (String) null);
+                        var4.setResult(var14);
+                        var4.setSuccess(true);
+                        return var4;
                     }
                 }
             }
-            return null;
         }
     }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/b.java

@@ -0,0 +1,190 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
+import org.jeecg.modules.jmreport.common.constant.CommonConstant;
+import org.jeecg.modules.jmreport.common.util.oConvertUtils;
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.config.JmReportBaseConfig;
+import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
+import org.jeecg.modules.jmreport.desreport.entity.JimuReportDict;
+import org.jeecg.modules.jmreport.desreport.model.JmPage;
+import org.jeecg.modules.jmreport.desreport.service.IJimuReportDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
+@RestController("jimuReportDictController")
+@RequestMapping({"/jmreport/dict"})
+public class b {
+    @Autowired
+    private IJimuReportDictService dictService;
+    @Autowired
+    private JmReportTokenClient jimuTokenClient;
+    @Autowired
+    private JmReportBaseConfig jmBaseConfig;
+
+    public b() {
+    }
+
+    @GetMapping({"/list"})
+    public Result<JmPage<JimuReportDict>> a(JimuReportDict var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
+        Result var5 = new Result();
+        String var6 = this.jimuTokenClient.getUsername(var4);
+        if (this.jmBaseConfig.getSaas()) {
+            var1.setCreateBy(var6);
+        }
+
+        var1.setDelFlag(CommonConstant.DEL_FLAG_0);
+        JmPage var7 = this.dictService.queryPageList(var1, var2, var3);
+        var5.setSuccess(true);
+        var5.setResult(var7);
+        return var5;
+    }
+
+    @PostMapping({"/add"})
+    public Result<JimuReportDict> a(@RequestBody JimuReportDict var1, HttpServletRequest var2) {
+        Result var3 = new Result();
+        String var4 = this.jimuTokenClient.getUsername(var2);
+        Integer var5 = this.dictService.getDictCount(var1.getDictCode());
+        if (var5 > 0) {
+            var3.setSuccess(false);
+            var3.setMessage("字典编码已存在！");
+            return var3;
+        } else {
+            var1.setCreateTime(new Date());
+            var1.setDelFlag(CommonConstant.DEL_FLAG_0);
+            var1.setCreateBy(var4);
+            this.dictService.save(var1);
+            var3.setSuccess(true);
+            var3.success("保存成功！");
+            return var3;
+        }
+    }
+
+    @PostMapping({"/edit"})
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDict> a(@RequestBody JimuReportDict var1) {
+        Result var2 = new Result();
+        JimuReportDict var3 = this.dictService.getById(var1.getId());
+        Integer var4 = this.dictService.getEditDictCount(var1.getDictCode(), var1.getId());
+        if (var4 > 0) {
+            var2.setSuccess(false);
+            var2.setMessage("字典编码已存在！");
+            return var2;
+        } else {
+            if (var3 == null) {
+                var2.error500("未找到对应实体");
+            } else {
+                var1.setUpdateTime(new Date());
+                int var5 = this.dictService.updateById(var1);
+                if (var5 > 0) {
+                    var2.success("编辑成功!");
+                }
+            }
+
+            return var2;
+        }
+    }
+
+    @DeleteMapping({"/delete"})
+    public Result<JimuReportDict> a(@RequestParam(name = "id") String var1) {
+        Result var2 = new Result();
+        int var3 = this.dictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1, var1);
+        if (var3 > 0) {
+            var2.success("删除成功!");
+        } else {
+            var2.error500("删除失败!");
+        }
+
+        return var2;
+    }
+
+    @DeleteMapping({"/thoroughDelete"})
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<?> b(@RequestParam(name = "id") String var1) {
+        try {
+            this.dictService.deleteOneDictPhysically(var1);
+            return Result.ok("删除成功!");
+        } catch (Exception var3) {
+            var3.printStackTrace();
+            return Result.error("删除失败!");
+        }
+    }
+
+    @DeleteMapping({"/deleteBatch"})
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDict> c(@RequestParam(name = "ids") String var1) {
+        Result var2 = new Result();
+        if (oConvertUtils.isEmpty(var1)) {
+            var2.error500("参数不识别！");
+        } else {
+            this.dictService.updateDelFlagByIds(var1);
+            var2.success("删除成功!");
+        }
+
+        return var2;
+    }
+
+    @GetMapping({"/refleshCache"})
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<String> a(HttpServletRequest var1) {
+        new Result();
+        this.jimuTokenClient.getUsername(var1);
+        return Result.OK("刷新缓存成功!");
+    }
+
+    @GetMapping({"/deleteList"})
+    public Result<List<JimuReportDict>> b(HttpServletRequest var1) {
+        String var2 = this.jimuTokenClient.getUsername(var1);
+        Result var3 = new Result();
+        if (!this.jmBaseConfig.getSaas()) {
+            var2 = "";
+        }
+
+        List var4 = this.dictService.queryDeleteList(var2);
+        var3.setSuccess(true);
+        var3.setResult(var4);
+        return var3;
+    }
+
+    @PostMapping({"/back"})
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<?> b(@RequestBody JimuReportDict var1) {
+        try {
+            this.dictService.updateDictDelFlag(CommonConstant.DEL_FLAG_0, var1.getId());
+            return Result.ok("取回成功!");
+        } catch (Exception var3) {
+            var3.printStackTrace();
+            return Result.error("操作失败!");
+        }
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/c.java

@@ -0,0 +1,159 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import java.util.Arrays;
+import java.util.Date;
+import javax.servlet.http.HttpServletRequest;
+
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
+import org.jeecg.modules.jmreport.desreport.entity.JimuReportDictItem;
+import org.jeecg.modules.jmreport.desreport.model.JmPage;
+import org.jeecg.modules.jmreport.desreport.service.IJimuReportDictItemService;
+import org.jeecg.modules.jmreport.desreport.service.IJimuReportDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("jimuReportDictItemController")
+@RequestMapping({"/jmreport/dictItem"})
+public class c {
+    @Autowired
+    private IJimuReportDictItemService dictItemService;
+    @Autowired
+    private JmReportTokenClient jimuTokenClient;
+    @Autowired
+    private IJimuReportDictService dictService;
+
+    public c() {
+    }
+
+    @RequestMapping(
+            value = {"/list"},
+            method = {RequestMethod.GET}
+    )
+    public Result<JmPage<JimuReportDictItem>> a(JimuReportDictItem var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) {
+        Result var5 = new Result();
+        JmPage var6 = this.dictItemService.queryPageList(var1, var2, var3);
+        var5.setSuccess(true);
+        var5.setResult(var6);
+        return var5;
+    }
+
+    @RequestMapping(
+            value = {"/add"},
+            method = {RequestMethod.POST}
+    )
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDictItem> a(@RequestBody JimuReportDictItem var1, HttpServletRequest var2) {
+        Result var3 = new Result();
+        Boolean var4 = this.a(var1);
+        if (!var4) {
+            var3.setSuccess(false);
+            var3.setMessage("数据值已重复");
+            return var3;
+        } else {
+            try {
+                var1.setCreateTime(new Date());
+                this.dictItemService.save(var1);
+                var3.success("保存成功！");
+            } catch (Exception var6) {
+                var3.error500("操作失败");
+            }
+
+            return var3;
+        }
+    }
+
+    @RequestMapping(
+            value = {"/edit"},
+            method = {RequestMethod.POST}
+    )
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDictItem> b(@RequestBody JimuReportDictItem var1, HttpServletRequest var2) {
+        Result var3 = new Result();
+        Boolean var4 = this.a(var1);
+        if (!var4) {
+            var3.setSuccess(false);
+            var3.setMessage("数据值已重复");
+            return var3;
+        } else {
+            JimuReportDictItem var5 = this.dictItemService.getById(var1.getId());
+            if (var5 == null) {
+                var3.error500("未找到对应实体");
+            } else {
+                var1.setUpdateTime(new Date());
+                int var6 = this.dictItemService.updateById(var1);
+                if (var6 > 0) {
+                    var3.success("编辑成功!");
+                }
+            }
+
+            return var3;
+        }
+    }
+
+    @RequestMapping(
+            value = {"/delete"},
+            method = {RequestMethod.DELETE}
+    )
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDictItem> a(@RequestParam(name = "id") String var1, HttpServletRequest var2) {
+        Result var3 = new Result();
+        JimuReportDictItem var4 = this.dictItemService.getById(var1);
+        String var5 = var4.getDictId();
+        if (var4 == null) {
+            var3.error500("未找到对应实体");
+        } else {
+            Integer var6 = this.dictItemService.removeById(var1);
+            if (var6 > 0) {
+                var3.success("删除成功!");
+            }
+        }
+
+        return var3;
+    }
+
+    @RequestMapping(
+            value = {"/deleteBatch"},
+            method = {RequestMethod.DELETE}
+    )
+    @CacheEvict(
+            value = {"jmreport:cache:dict", "jmreport:cache:dictTxt"},
+            allEntries = true
+    )
+    public Result<JimuReportDictItem> a(@RequestParam(name = "ids") String var1) {
+        Result var2 = new Result();
+        if (var1 != null && !"".equals(var1.trim())) {
+            this.dictItemService.removeByIds(Arrays.asList(var1.split(",")));
+            var2.success("删除成功!");
+        } else {
+            var2.error500("参数不识别！");
+        }
+
+        return var2;
+    }
+
+    public Boolean a(JimuReportDictItem var1) {
+        boolean var2 = false;
+        int var3 = this.dictItemService.count(var1);
+        return var3 == 0 ? true : false;
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/d.java

@@ -0,0 +1,59 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import java.util.List;
+
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.desreport.entity.JimuReportLink;
+import org.jeecg.modules.jmreport.desreport.service.IJimuReportLinkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
+@RestController("jimuReportLinkController")
+@RequestMapping({"/jmreport/link"})
+public class d {
+    private static final Logger a = LoggerFactory.getLogger(d.class);
+    @Autowired
+    private IJimuReportLinkService reportLinkService;
+
+    public d() {
+    }
+
+    @PostMapping({"/saveAndEdit"})
+    public Result<String> a(@RequestBody JimuReportLink var1) {
+        Result var2 = new Result();
+        String var3 = this.reportLinkService.saveAndEdit(var1);
+        var2.setSuccess(true);
+        var2.setResult(var3);
+        return var2;
+    }
+
+    @PostMapping({"/delete"})
+    public Result<?> b(@RequestBody JimuReportLink var1) {
+        this.reportLinkService.removeById(var1.getId());
+        return Result.OK("删除成功!");
+    }
+
+    @GetMapping({"/queryByIds"})
+    public Result<?> a(@RequestParam(name = "ids", required = true) String var1) {
+        List var2 = this.reportLinkService.queryByIds(var1);
+        return Result.OK(var2);
+    }
+
+    @GetMapping({"/getLinkData"})
+    public Result<?> a(@RequestParam(name = "linkType") String var1, @RequestParam(name = "reportId") String var2) {
+        List var3 = this.reportLinkService.getLinkData(var1, var2);
+        return Result.OK(var3);
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/e.java

@@ -0,0 +1,92 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import java.util.Date;
+import javax.servlet.http.HttpServletRequest;
+
+import org.jeecg.modules.jmreport.common.constant.CommonConstant;
+import org.jeecg.modules.jmreport.common.util.oConvertUtils;
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.config.client.JmReportTokenClient;
+import org.jeecg.modules.jmreport.desreport.entity.JmReportMap;
+import org.jeecg.modules.jmreport.desreport.model.JmPage;
+import org.jeecg.modules.jmreport.desreport.service.IJmReportMapService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
+@RestController("jimuReportMapController")
+@RequestMapping({"/jmreport/map"})
+public class e {
+    private static final Logger a = LoggerFactory.getLogger(e.class);
+    @Autowired
+    private IJmReportMapService jmReportMapService;
+    @Autowired
+    private JmReportTokenClient jimuTokenClient;
+
+    public e() {
+    }
+
+    @GetMapping({"/mapList"})
+    public Result<?> a(HttpServletRequest var1, @RequestParam(name = "label", required = false) String var2, @RequestParam(name = "name", required = false) String var3, @RequestParam(name = "current", defaultValue = "1") Integer var4, @RequestParam(name = "size", defaultValue = "10") Integer var5) {
+        String var6 = this.jimuTokenClient.getUsername(var1);
+        a.debug("============地图列表查询==========");
+        JmReportMap var7 = new JmReportMap();
+        var7.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+        var7.setCreateBy(var6);
+        if (oConvertUtils.isNotEmpty(var2)) {
+            var7.setLabel(var2);
+        }
+
+        if (oConvertUtils.isNotEmpty(var3)) {
+            var7.setName(var3);
+        }
+
+        JmPage var8 = this.jmReportMapService.queryPageList(var7, var4, var5);
+        return Result.OK(var8);
+    }
+
+    @PostMapping({"/addMapData"})
+    public Result<?> a(HttpServletRequest var1, @RequestBody JmReportMap var2) {
+        try {
+            String var3 = this.jimuTokenClient.getUsername(var1);
+            var2.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+            var2.setCreateBy(var3);
+            var2.setCreateTime(new Date());
+            var2.setUpdateTime(new Date());
+            this.jmReportMapService.saveMapSource(var2);
+        } catch (Exception var4) {
+            return Result.error(403, "操作失败");
+        }
+
+        return Result.OK("添加成功！", true);
+    }
+
+    @PostMapping({"/delMapSource"})
+    public Result<?> b(HttpServletRequest var1, @RequestBody JmReportMap var2) {
+        this.jmReportMapService.removeById(var2.getId());
+        return Result.OK("删除成功！", true);
+    }
+
+    @PostMapping({"/queryMapByCode"})
+    public Result<?> c(HttpServletRequest var1, @RequestBody JmReportMap var2) {
+        String var3 = this.jimuTokenClient.getUsername(var1);
+        a.debug("============地图信息查询==========");
+        var2.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+        String var4 = var2.getReportId();
+        var2.setCreateBy(var3);
+        String var5 = this.jimuTokenClient.getToken(var1);
+        JmReportMap var6 = this.jmReportMapService.queryMapByCode(var2, var5);
+        return Result.OK(var6);
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/f.java

@@ -0,0 +1,60 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import org.jeecg.modules.jmreport.common.vo.Result;
+import org.jeecg.modules.jmreport.desreport.entity.JimuReportShare;
+import org.jeecg.modules.jmreport.desreport.service.IJimuReportShareService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
+
+@RestController("jimuReportShareController")
+@RequestMapping({"/jmreport/share"})
+public class f {
+    private static final Logger a = LoggerFactory.getLogger(f.class);
+    @Autowired
+    private IJimuReportShareService jurisdictionService;
+
+    public f() {
+    }
+
+    @GetMapping({"/queryJurisdiction"})
+    public Result<JimuReportShare> a(@RequestParam(name = "reportId") String var1) {
+        Result var2 = new Result();
+        JimuReportShare var3 = this.jurisdictionService.selectJurisdiction(var1);
+        if (null != var3) {
+            var3 = this.jurisdictionService.compareToDate(var3);
+        }
+
+        var2.setSuccess(true);
+        var2.setResult(var3);
+        return var2;
+    }
+
+    @PostMapping({"/addAndEdit"})
+    public Result<?> a(@RequestBody JimuReportShare var1) {
+        try {
+            JimuReportShare var2 = this.jurisdictionService.addAndEdit(var1);
+            return Result.OK(var2);
+        } catch (Exception var3) {
+            a.error(var3.getMessage(), var3);
+            return Result.error("保存失败！");
+        }
+    }
+
+    @GetMapping({"/verification"})
+    public Result<String> a(@RequestParam(name = "reportId") String var1, @RequestParam(name = "lock", required = false) String var2) {
+        String var3 = this.jurisdictionService.passwordVerification(var1, var2);
+        return Result.OK(var3);
+    }
+}

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/g.java

@@ -0,0 +1,154 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package org.jeecg.modules.jmreport.desreport.a;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jeecg.modules.jmreport.common.util.oConvertUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("jimuReportTestController")
+@RequestMapping({"/jmreport/test"})
+public class g {
+    public g() {
+    }
+
+    @GetMapping({"/getUserMsg"})
+    public JSONObject a(@RequestParam(name = "cname", required = false) String var1, @RequestParam(name = "did", required = false) String var2, @RequestParam(name = "riqi", required = false) String var3, @RequestParam(name = "riqi_begin", required = false) String var4, @RequestParam(name = "riqi_end", required = false) String var5) throws ParseException {
+        JSONObject var6 = new JSONObject();
+        ArrayList var7 = new ArrayList();
+        String var8 = "";
+        if (oConvertUtils.isNotEmpty(var3)) {
+            SimpleDateFormat var9 = new SimpleDateFormat("yyyy-MM-dd");
+            Date var10 = var9.parse(var3);
+            SimpleDateFormat var11 = new SimpleDateFormat("yyyy年MM月dd日");
+            var8 = var11.format(var10);
+        }
+
+        for (int var15 = 0; var15 < 30; ++var15) {
+            JSONObject var17 = new JSONObject();
+            var17.put("id", "2020" + var15);
+            var17.put("cname", "牛奶" + var15);
+            var17.put("cnum", "每箱12瓶");
+            var17.put("cprice", "56");
+            var17.put("ctotal", 125 + var15 + "箱");
+            var17.put("tp", "7000");
+            var17.put("dtotal", "1256箱");
+            var17.put("ztotal", "589箱");
+            if (var15 < 15) {
+                var17.put("riqi", "2022年10月21日");
+                var17.put("id", "1");
+                var17.put("dId", "1");
+            } else if (var15 > 15 && var15 < 25) {
+                var17.put("riqi", "2022年10月22日");
+                var17.put("id", "2");
+                var17.put("dId", "2");
+            } else {
+                var17.put("riqi", "2022年10月23日");
+                var17.put("id", "2");
+                var17.put("dId", "2");
+            }
+
+            var7.add(var17);
+        }
+
+        ArrayList var16 = new ArrayList();
+        Iterator var18 = var7.iterator();
+
+        while (true) {
+            while (var18.hasNext()) {
+                JSONObject var19 = (JSONObject) var18.next();
+                String var12 = var19.getString("cname");
+                String var13 = var19.getString("riqi");
+                String var14 = var19.getString("id");
+                if (oConvertUtils.isNotEmpty(var1) && oConvertUtils.isNotEmpty(var8) && oConvertUtils.isNotEmpty(var2)) {
+                    if (var1.equals(var12) && var8.equals(var13) && var2.equals(var14)) {
+                        var16.add(var19);
+                    }
+                } else if (oConvertUtils.isNotEmpty(var1)) {
+                    if (var1.equals(var12)) {
+                        var16.add(var19);
+                    }
+                } else if (oConvertUtils.isNotEmpty(var8)) {
+                    if (var8.equals(var13)) {
+                        var16.add(var19);
+                    }
+                } else if (oConvertUtils.isNotEmpty(var2) && var2.equals(var14)) {
+                    var16.add(var19);
+                }
+            }
+
+            if (!oConvertUtils.isNotEmpty(var3) && !oConvertUtils.isNotEmpty(var1) && !oConvertUtils.isNotEmpty(var2)) {
+                var6.put("data", var7);
+            } else {
+                var6.put("data", var16);
+            }
+
+            return var6;
+        }
+    }
+
+    @GetMapping({"/getOrder"})
+    public JSONObject a(@RequestParam(value = "id", required = false) String var1) {
+        ArrayList var2 = new ArrayList();
+        JSONObject var3 = new JSONObject();
+        JSONObject var4;
+        if (oConvertUtils.isEmpty(var1) || "1".equals(var1)) {
+            var4 = new JSONObject();
+            var4.put("id", "1");
+            var4.put("dOrderDate", "2021年3月18日");
+            var4.put("dGoodsDate", "2021年3月19日");
+            var4.put("dGoodsCode", "17612057");
+            var4.put("dName", "张三");
+            var4.put("dAddress", "北京市海淀区");
+            var4.put("dArrivalDate", "2021年3月21日");
+            var2.add(var4);
+        }
+
+        if (oConvertUtils.isEmpty(var1) || "2".equals(var1)) {
+            var4 = new JSONObject();
+            var4.put("id", "2");
+            var4.put("dOrderDate", "2021年4月20日");
+            var4.put("dGoodsDate", "2021年4月21日");
+            var4.put("dGoodsCode", "17612057");
+            var4.put("dName", "李四");
+            var4.put("dAddress", "北京市朝阳区");
+            var4.put("dArrivalDate", "2021年4月23日");
+            var2.add(var4);
+        }
+
+        var3.put("data", var2);
+        return var3;
+    }
+
+    @GetMapping({"/getDictSex"})
+    public List<Object> b(@RequestParam(name = "dictCode") String var1) {
+        ArrayList var2 = new ArrayList();
+        if (var1.equals("sex")) {
+            HashMap var3 = new HashMap();
+            var3.put("text", "男");
+            var3.put("value", "1");
+            var2.add(var3);
+            HashMap var4 = new HashMap();
+            var4.put("text", "女");
+            var4.put("value", "2");
+            var2.add(var4);
+        }
+
+        return var2;
+    }
+}

boman-report/src/main/resources/templates/jmreport/desreport/index.ftl

@@ -483,8 +483,8 @@
                                                 <Dropdown-menu slot="list">
                                                     <Dropdown-item name="sqlInfo" class="rightFontSize">SQL数据集</Dropdown-item>
                                                     <Dropdown-item name="apiInfo" class="rightFontSize">API数据集</Dropdown-item>
-                                                    <Dropdown-item name="javabean" class="rightFontSize">JavaBean数据集</Dropdown-item>
-                                                    <Dropdown-item name="jsonInfo" class="rightFontSize">JSON数据集</Dropdown-item>
+<#--                                                    <Dropdown-item name="javabean" class="rightFontSize">JavaBean数据集</Dropdown-item>-->
+<#--                                                    <Dropdown-item name="jsonInfo" class="rightFontSize">JSON数据集</Dropdown-item>-->
                                                 </Dropdown-menu>
                                             </Dropdown>
                                         </div>