原始jm

boman-report/src/main/java/org/jeecg/modules/jmreport/BomanReportApplication.java → boman-report/src/main/java/com/boman/report/BomanReportApplication.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.jmreport;
+package com.boman.report;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

boman-report/src/main/java/com/boman/report/conf/DruidConfig.java

@@ -1,26 +0,0 @@
-package com.boman.report.conf;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.sql.DataSource;
-
-/**
- * @author shiqian
- * @date 2021年08月31日 10:17
- **/
-
-@Configuration
-public class DruidConfig {
-
-    @ConfigurationProperties(prefix = "spring.datasource")
-    @Bean
-    public DataSource druid() {
-        return new DruidDataSource();
-    }
-
-
-}
-

boman-report/src/main/java/com/boman/report/constant/IgnoreTable.java

@@ -1,46 +0,0 @@
-package com.boman.report.constant;
-
-import com.google.common.collect.Sets;
-import org.springframework.beans.factory.annotation.Configurable;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author shiqian
- * @date 2021年08月27日 16:24
- **/
-@Configurable
-@RefreshScope
-@Component
-public class IgnoreTable {
-
-    @Value("${report.tableNames}")
-    private String ignoreTableNames;
-
-
-
-    public String getIgnoreTableNames() {
-        return ignoreTableNames;
-    }
-
-    public void setIgnoreTableNames(String ignoreTableNames) {
-        this.ignoreTableNames = ignoreTableNames;
-    }
-
-    public Set<String> getSet() {
-        if (null != ignoreTableNames && ignoreTableNames.length() != 0) {
-            String[] split = ignoreTableNames.split(",");
-            HashSet<String> tableNameSet = Sets.newHashSet();
-            Collections.addAll(tableNameSet, split);
-            return tableNameSet;
-        }
-
-        return null;
-    }
-
-}

boman-report/src/main/java/com/boman/report/controller/ImportController.java

@@ -1,34 +0,0 @@
-//package com.boman.report.controller;
-//
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.dto.ImportDto;
-//import com.boman.report.service.IImportServcie;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-///**
-// * 报表导入
-// */
-//@RestController
-//@RequestMapping("/cs/file")
-//public class ImportController {
-//
-//    @Autowired
-//    private IImportServcie importServcie;
-//
-//    /**
-//     * 功能描述: 导入接口
-//     *
-//     * @param importDto     tableName
-//     * @return void
-//     */
-//    @PostMapping("/import")
-//    public AjaxResult importData(@RequestBody ImportDto importDto) {
-//        try {
-//            return importServcie.importData(importDto.getFile(), importDto.getPersonnelId(), importDto.getTableName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return AjaxResult.error("失败");
-//    }
-//}

boman-report/src/main/java/com/boman/report/controller/StatisticReportController.java

@@ -1,70 +0,0 @@
-//package com.boman.report.controller;
-//
-//import com.boman.common.core.web.controller.BaseController;
-//import com.boman.common.core.web.page.TableDataInfo;
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.report.service.StatisticReportService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.repository.query.Param;
-//import org.springframework.web.bind.annotation.*;
-//import com.boman.domain.entity.StatisticReport;
-//
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping("/statistic/report")
-//public class StatisticReportController extends BaseController {
-//
-//    @Autowired
-//    private StatisticReportService statisticReportService;
-//    @Autowired
-//    private StatisticReportService reportService;
-//
-//    /**
-//     * 获取报表id集合
-//     *
-//     * @return
-//     */
-//    @GetMapping("/datas")
-//    public AjaxResult datas(@Param("reportName") String reportName) {
-//        return AjaxResult.success(reportService.datas(reportName));
-//    }
-//
-//    /**
-//     * 列表
-//     * @return
-//     */
-//    @PostMapping("/list")
-//    public TableDataInfo list(@RequestBody StatisticReport report) {
-//        startPage();
-//        List<StatisticReport> list = reportService.selectList(report);
-//        return getDataTable(list);
-//    }
-//
-//    @PostMapping("/saveOrUpdate")
-//    public AjaxResult saveOrUpdate(@RequestBody StatisticReport report) {
-//        return reportService.saveOrUpdate(report);
-//    }
-//
-//
-//    /**
-//     * 获取报表详情
-//     * @param id
-//     * @return
-//     */
-//    @GetMapping(value = "/reportInfo/{id}")
-//    public AjaxResult getReportInfo(@PathVariable Long id)
-//    {
-//        return statisticReportService.getReportInfo(id);
-//    }
-//
-//    /**
-//     * 获取报表详情
-//     * @param id
-//     * @return
-//     */
-//    @GetMapping(value = "/detail/{id}")
-//    public AjaxResult getDetailById(@PathVariable Long id) {
-//        return AjaxResult.success(statisticReportService.getDetailById(id));
-//    }
-//}

boman-report/src/main/java/com/boman/report/controller/StatisticReportPersonnelController.java

@@ -1,30 +0,0 @@
-//package com.boman.report.controller;
-//
-//import com.boman.common.core.web.controller.BaseController;
-//import com.boman.common.core.web.page.TableDataInfo;
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//import com.boman.report.service.StatisticReportPersonnelService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping("/statistic/reportPersonnel")
-//public class StatisticReportPersonnelController extends BaseController {
-//
-//    @Autowired
-//    private StatisticReportPersonnelService service;
-//
-//    /**
-//     * 列表
-//     * @return
-//     */
-//    @RequestMapping("/list")
-//    public TableDataInfo list(@RequestBody StatisticReportPersonnel personnel) {
-//        startPage();
-//        List<StatisticReportPersonnel> list = service.selectList(personnel);
-//        return getDataTable(list);
-//    }
-//
-//}

boman-report/src/main/java/com/boman/report/controller/TableController.java

@@ -1,22 +0,0 @@
-package com.boman.report.controller;
-
-import com.boman.domain.GenTable;
-import com.boman.report.service.ITableService;
-import org.jeecg.modules.jmreport.common.vo.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/jmreport/table")
-public class TableController{
-
-    @Autowired
-    private ITableService tableService;
-
-    @PostMapping("/list")
-    public Result<List<GenTable>> genList(@RequestBody GenTable genTable) {
-        return Result.OK(tableService.selectList(genTable));
-    }
-}

boman-report/src/main/java/com/boman/report/domain/GenTable.java

@@ -1,617 +0,0 @@
-package com.boman.report.domain;
-
-import com.boman.domain.BaseEntity;
-
-import java.util.List;
-
-/**
- * 业务表 gen_table
- * 
- * @author ruoyi
- */
-public class GenTable extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 编号 */
-    private Long id;
-    /**
-     * 前端传来提示修改的状态 1:修改gen_table  2:修改gen_table_column
-     */
-    private String updateType;
-
-    /** 表名称 */
-//    @NotBlank(message = "表名称不能为空")
-    private String tableName;
-
-    /** 表描述 */
-//    @NotBlank(message = "表描述不能为空")
-    private String tableComment;
-
-    /** 关联父表的表名 */
-    private String subTableName;
-
-    /** 本表关联父表的外键名 */
-    private String subTableFkName;
-
-    /** 实体类名称(首字母大写) */
-    //@NotBlank(message = "实体类名称不能为空")
-    private String className;
-
-    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
-    private String tplCategory;
-
-    /** 生成包路径 */
-    //@NotBlank(message = "生成包路径不能为空")
-    private String packageName;
-
-    /** 生成模块名 */
-    //@NotBlank(message = "生成模块名不能为空")
-    private String moduleName;
-
-    /** 生成业务名 */
-    //@NotBlank(message = "生成业务名不能为空")
-    private String businessName;
-
-    /** 生成功能名 */
-    //@NotBlank(message = "生成功能名不能为空")
-    private String functionName;
-
-    /** 生成作者 */
-    //@NotBlank(message = "作者不能为空")
-    private String functionAuthor;
-
-    /** 生成代码方式（0zip压缩包 1自定义路径） */
-    private String genType;
-
-    /** 生成路径（不填默认项目路径） */
-    private String genPath;
-
-    /** 主键信息 */
-    private GenTableColumn pkColumn;
-
-    /** 子表信息 */
-    private GenTable subTable;
-
-    /** 表列信息 */
-//    @Valid
-    private List<GenTableColumn> columns;
-
-    /** 主表关联的附表信息（附表包含字段信息） */
-//    @Valid
-    private List<GenTable> relationList;
-
-    /** 其它生成选项 */
-    private String options;
-
-    /**
-     * 是否菜单
-     */
-    private String isMenu;
-
-    /**
-     * 菜单权限(AMDQSUE)
-     */
-//    @NotBlank(message = "菜单权限不能为空")
-    private String menuRole;
-
-    /**
-     * 输入字段
-     */
-    private Long akColumn;
-    private String akColumnName;
-
-    /**
-     * 输出字段
-     */
-    private Long dkColumn;
-    private String dkColumnName;
-
-    /**
-     * 新增触发器
-     */
-    private String triggerCreate;
-
-    /**
-     * 检索触发器
-     */
-    private String triggerRetrieve;
-
-    /**
-     * 修改触发器
-     */
-    private String triggerUpdate;
-
-    /**
-     * 删除触发器
-     */
-    private String triggerDelete;
-
-    /**
-     * 提交触发器
-     */
-    private String triggerSubmit;
-
-    /**
-     * 实际数据库名称
-     */
-    private String realTableName;
-
-    /**
-     * 过滤条件
-     */
-    private String filterConditions;
-
-    /**
-     * 扩展属性
-     */
-    private String extendedAttributes;
-
-
-    /** 树编码字段 */
-    private String treeCode;
-
-    /** 树父编码字段 */
-    private String treeParentCode;
-
-    /** 树名称字段 */
-    private String treeName;
-
-    /** 上级菜单ID字段 */
-    private String parentMenuId;
-
-    /** 上级菜单名称字段 */
-    private String parentMenuName;
-
-
-    /**
-     * 对应表主键
-     */
-    private Long tablePrimaryKey;
-
-    /**
-     * 主键名称
-     */
-    private String tablePrimaryKeyName;
-
-    /**
-     * 此表中的字段是否含有blob的列, true含
-     */
-    private Boolean isContainsBlob;
-
-    /**
-     * 列宽
-     */
-    private Integer tableColumn;
-
-
-    public Integer getTableColumn() {
-        return tableColumn;
-    }
-
-    public void setTableColumn(Integer tableColumn) {
-        this.tableColumn = tableColumn;
-    }
-
-    public String getUpdateType() {
-        return updateType;
-    }
-
-    public void setUpdateType(String updateType) {
-        this.updateType = updateType;
-    }
-
-    public String getAkColumnName() {
-        return akColumnName;
-    }
-
-    public void setAkColumnName(String akColumnName) {
-        this.akColumnName = akColumnName;
-    }
-
-    public String getDkColumnName() {
-        return dkColumnName;
-    }
-
-    public void setDkColumnName(String dkColumnName) {
-        this.dkColumnName = dkColumnName;
-    }
-
-    public String getTablePrimaryKeyName() {
-        return tablePrimaryKeyName;
-    }
-
-    public void setTablePrimaryKeyName(String tablePrimaryKeyName) {
-        this.tablePrimaryKeyName = tablePrimaryKeyName;
-    }
-
-    public Long getTablePrimaryKey() {
-        return tablePrimaryKey;
-    }
-
-    public void setTablePrimaryKey(Long tablePrimaryKey) {
-        this.tablePrimaryKey = tablePrimaryKey;
-    }
-
-    public String getRealTableName() {
-        return realTableName;
-    }
-
-    public void setRealTableName(String realTableName) {
-        this.realTableName = realTableName;
-    }
-
-    public String getFilterConditions() {
-        return filterConditions;
-    }
-
-    public void setFilterConditions(String filterConditions) {
-        this.filterConditions = filterConditions;
-    }
-
-    public String getExtendedAttributes() {
-        return extendedAttributes;
-    }
-
-    public void setExtendedAttributes(String extendedAttributes) {
-        this.extendedAttributes = extendedAttributes;
-    }
-
-    public String getTriggerCreate() {
-        return triggerCreate;
-    }
-
-    public void setTriggerCreate(String triggerCreate) {
-        this.triggerCreate = triggerCreate;
-    }
-
-    public String getTriggerRetrieve() {
-        return triggerRetrieve;
-    }
-
-    public void setTriggerRetrieve(String triggerRetrieve) {
-        this.triggerRetrieve = triggerRetrieve;
-    }
-
-    public String getTriggerUpdate() {
-        return triggerUpdate;
-    }
-
-    public void setTriggerUpdate(String triggerUpdate) {
-        this.triggerUpdate = triggerUpdate;
-    }
-
-    public String getTriggerDelete() {
-        return triggerDelete;
-    }
-
-    public void setTriggerDelete(String triggerDelete) {
-        this.triggerDelete = triggerDelete;
-    }
-
-    public String getTriggerSubmit() {
-        return triggerSubmit;
-    }
-
-    public void setTriggerSubmit(String triggerSubmit) {
-        this.triggerSubmit = triggerSubmit;
-    }
-
-    public Long getAkColumn() {
-        return akColumn;
-    }
-
-    public void setAkColumn(Long akColumn) {
-        this.akColumn = akColumn;
-    }
-
-    public Long getDkColumn() {
-        return dkColumn;
-    }
-
-    public void setDkColumn(Long dkColumn) {
-        this.dkColumn = dkColumn;
-    }
-
-    public String getIsMenu() {
-        return isMenu;
-    }
-
-    public void setIsMenu(String isMenu) {
-        this.isMenu = isMenu;
-    }
-
-    public String getMenuRole() {
-        return menuRole;
-    }
-
-    public void setMenuRole(String menuRole) {
-        this.menuRole = menuRole;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTableName()
-    {
-        return tableName;
-    }
-
-    public void setTableName(String tableName)
-    {
-        this.tableName = tableName;
-    }
-
-    public String getTableComment()
-    {
-        return tableComment;
-    }
-
-    public void setTableComment(String tableComment)
-    {
-        this.tableComment = tableComment;
-    }
-
-    public String getSubTableName()
-    {
-        return subTableName;
-    }
-
-    public void setSubTableName(String subTableName)
-    {
-        this.subTableName = subTableName;
-    }
-
-    public String getSubTableFkName()
-    {
-        return subTableFkName;
-    }
-
-    public void setSubTableFkName(String subTableFkName)
-    {
-        this.subTableFkName = subTableFkName;
-    }
-
-    public String getClassName()
-    {
-        return className;
-    }
-
-    public void setClassName(String className)
-    {
-        this.className = className;
-    }
-
-    public String getTplCategory()
-    {
-        return tplCategory;
-    }
-
-    public void setTplCategory(String tplCategory)
-    {
-        this.tplCategory = tplCategory;
-    }
-
-    public String getPackageName()
-    {
-        return packageName;
-    }
-
-    public void setPackageName(String packageName)
-    {
-        this.packageName = packageName;
-    }
-
-    public String getModuleName()
-    {
-        return moduleName;
-    }
-
-    public void setModuleName(String moduleName)
-    {
-        this.moduleName = moduleName;
-    }
-
-    public String getBusinessName()
-    {
-        return businessName;
-    }
-
-    public void setBusinessName(String businessName)
-    {
-        this.businessName = businessName;
-    }
-
-    public String getFunctionName()
-    {
-        return functionName;
-    }
-
-    public void setFunctionName(String functionName)
-    {
-        this.functionName = functionName;
-    }
-
-    public String getFunctionAuthor()
-    {
-        return functionAuthor;
-    }
-
-    public void setFunctionAuthor(String functionAuthor)
-    {
-        this.functionAuthor = functionAuthor;
-    }
-
-    public String getGenType()
-    {
-        return genType;
-    }
-
-    public void setGenType(String genType)
-    {
-        this.genType = genType;
-    }
-
-    public String getGenPath()
-    {
-        return genPath;
-    }
-
-    public void setGenPath(String genPath)
-    {
-        this.genPath = genPath;
-    }
-
-    public GenTableColumn getPkColumn()
-    {
-        return pkColumn;
-    }
-
-    public void setPkColumn(GenTableColumn pkColumn)
-    {
-        this.pkColumn = pkColumn;
-    }
-
-    public GenTable getSubTable()
-    {
-        return subTable;
-    }
-
-    public void setSubTable(GenTable subTable)
-    {
-        this.subTable = subTable;
-    }
-    public List<GenTableColumn> getColumns()
-    {
-        return columns;
-    }
-
-    public void setColumns(List<GenTableColumn> columns)
-    {
-        this.columns = columns;
-    }
-
-    public String getOptions()
-    {
-        return options;
-    }
-
-    public void setOptions(String options)
-    {
-        this.options = options;
-    }
-
-    public String getTreeCode()
-    {
-        return treeCode;
-    }
-
-    public void setTreeCode(String treeCode)
-    {
-        this.treeCode = treeCode;
-    }
-
-    public String getTreeParentCode()
-    {
-        return treeParentCode;
-    }
-
-    public void setTreeParentCode(String treeParentCode)
-    {
-        this.treeParentCode = treeParentCode;
-    }
-
-    public String getTreeName()
-    {
-        return treeName;
-    }
-
-    public void setTreeName(String treeName)
-    {
-        this.treeName = treeName;
-    }
-
-    public String getParentMenuId()
-    {
-        return parentMenuId;
-    }
-
-    public void setParentMenuId(String parentMenuId)
-    {
-        this.parentMenuId = parentMenuId;
-    }
-
-    public String getParentMenuName()
-    {
-        return parentMenuName;
-    }
-
-    public void setParentMenuName(String parentMenuName)
-    {
-        this.parentMenuName = parentMenuName;
-    }
-
-//    public boolean isSub()
-//    {
-//        return isSub(this.tplCategory);
-//    }
-//
-//    public static boolean isSub(String tplCategory)
-//    {
-//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
-//    }
-//    public boolean isTree()
-//    {
-//        return isTree(this.tplCategory);
-//    }
-//
-//    public static boolean isTree(String tplCategory)
-//    {
-//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
-//    }
-//
-//    public boolean isCrud()
-//    {
-//        return isCrud(this.tplCategory);
-//    }
-
-//    public static boolean isCrud(String tplCategory)
-//    {
-//        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
-//    }
-
-//    public boolean isSuperColumn(String javaField)
-//    {
-//        return isSuperColumn(this.tplCategory, javaField);
-//    }
-
-//    public static boolean isSuperColumn(String tplCategory, String javaField)
-//    {
-//        if (isTree(tplCategory))
-//        {
-//            return StringUtils.equalsAnyIgnoreCase(javaField, ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
-//        }
-//        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
-//    }
-
-    public List<GenTable> getRelationList() {
-        return relationList;
-    }
-
-    public void setRelationList(List<GenTable> relationList) {
-        this.relationList = relationList;
-    }
-
-    public Boolean getIsContainsBlob() {
-        return isContainsBlob;
-    }
-
-    public void setIsContainsBlob(Boolean isContainsBlob) {
-        this.isContainsBlob = isContainsBlob;
-    }
-}

boman-report/src/main/java/com/boman/report/domain/GenTableColumn.java

@@ -1,679 +0,0 @@
-package com.boman.report.domain;
-
-import com.boman.domain.BaseEntity;
-import com.boman.domain.SysDictData;
-import com.boman.domain.SysFile;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 代码生成业务字段表 gen_table_column
- *
- * @author ruoyi
- */
-public class GenTableColumn extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 是查询字段 */
-    public static final String IS_QUERY = "1";
-
-    /** 主键 */
-    public static final String IS_PK = "1";
-
-    /** 必填 */
-    public static final String IS_REQUIRED = "1";
-
-    /** 编号 */
-    private Long id;
-
-    /** 归属表编号 */
-    private Long tableId;
-
-    /** 归属表名 数据库没有此字段*/
-    private String tableName;
-
-    /** 列名称 */
-    private String columnName;
-
-    /** 列描述 */
-    private String columnComment;
-
-    /** 列类型 */
-    private String columnType;
-
-    /** JAVA类型 */
-    private String javaType;
-
-    /** JAVA字段名 */
-    //@NotBlank(message = "Java属性不能为空")
-    private String javaField;
-
-    /** 是否主键（1是） */
-    private String isPk;
-
-    /** 是否自增（1是） */
-    private String isIncrement;
-
-    /** 是否必填（1是） */
-    private String isRequired;
-
-    /** 是否为插入字段（1是） */
-    private String isInsert;
-
-    /** 是否编辑字段（1是） */
-    private String isEdit;
-
-    /** 是否列表字段（1是） */
-    private String isList;
-
-    /** 是否查询字段（1是） */
-    private String isQuery;
-
-    /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
-    private String queryType;
-
-    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
-    private String htmlType;
-
-    /**
-     * 外键(表明该表哪个字段是外键,取值id)
-     */
-    private Long foreignKey;
-
-    /**
-     * 外键名称(仅仅给前端展示使用)
-     */
-    private String foreignKeyName;
-
-    /** 字典类型 */
-    private String dictType;
-
-    /** 排序 */
-    private Integer sort;
-
-    /** 如果是下拉框，单选，复选框 对应的子节点的值 */
-    private List<SysDictData> sysDictData;
-
-    /** 哪些字段属于这些hr的 */
-    private Long hrParentId;
-    /**
-     * hr名称(仅仅给前端展示使用)
-     */
-    private String hrParentName;
-
-    /** hr的孩子们 */
-    private List<GenTableColumn> hrChildren;
-
-    /**
-     * 字段排序规则
-     */
-    private String mask;
-    /**
-     * 默认值
-     */
-    private String defaultValue;
-
-    /**
-     * 行数
-     */
-    private String numRows;
-    /**
-     * 列数
-     */
-    private String numColumns;
-
-    /**
-     * 字段翻译器
-     */
-    private String fieldTranslator;
-
-    /**
-     * 扩展属性 eg：{"col":["start_time","end_time"],"comp":"end_time-start_time"}
-     */
-    private String extendedAttributes;
-
-    /**
-     *是否输入 Y是
-     */
-    private String isIn;
-
-    /**
-     * 是否显示 Y是
-     */
-    private String isOut;
-
-    /**
-     * 此列对应的值
-     */
-    private Object columnValue;
-
-    /**
-     * 正则表达式
-     */
-    private String regular;
-
-    /**
-     * readonly， 前端回显的时候，判断是否可编辑
-     */
-    private boolean readonly;
-
-    /**
-     * 查询时：{"fkTableName":"外键表的表名", "fkColumnName":"关联外键表的列名", "dkColumnName":"关联表需要展示的字段名"}
-     * 根据列名获取关联表字段的值和名称{"name":"12", "value":"dept_id"}
-     */
-    private Map<String, Object> fkInfo;
-
-    private List<SysFile> annex;
-
-    /**
-     * 前端单对象展示样式
-     */
-    private String cssClass;
-    /**
-     * 表.字段全称
-     */
-    private String tableColumnName;
-    /**
-     * 前端再计算的时候，是否用到该列的扩展属性 extendedAttributes
-     */
-    private Boolean isUseExtend;
-    /**
-     * 单据编号规则表名称
-     */
-    private String seqName;
-
-    public String getSeqName() {
-        return seqName;
-    }
-
-    public void setSeqName(String seqName) {
-        this.seqName = seqName;
-    }
-
-    public Boolean getIsUseExtend() {
-        return isUseExtend;
-    }
-
-    public void setIsUseExtend(Boolean isUseExtend) {
-        this.isUseExtend = isUseExtend;
-    }
-
-    public String getTableColumnName() {
-        return tableColumnName;
-    }
-
-    public void setTableColumnName(String tableColumnName) {
-        this.tableColumnName = tableColumnName;
-    }
-
-    public String getCssClass() {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass) {
-        this.cssClass = cssClass;
-    }
-
-    public List<SysFile> getAnnex() {
-        return annex;
-    }
-
-    public void setAnnex(List<SysFile> annex) {
-        this.annex = annex;
-    }
-
-    public Map<String, Object> getFkInfo() {
-        return fkInfo;
-    }
-
-    public void setFkInfo(Map<String, Object> fkInfo) {
-        this.fkInfo = fkInfo;
-    }
-
-    public String getRegular() {
-        return regular;
-    }
-
-    public void setRegular(String regular) {
-        this.regular = regular;
-    }
-
-    public String getFieldTranslator() {
-        return fieldTranslator;
-    }
-
-    public void setFieldTranslator(String fieldTranslator) {
-        this.fieldTranslator = fieldTranslator;
-    }
-
-    public String getExtendedAttributes() {
-        return extendedAttributes;
-    }
-
-    public void setExtendedAttributes(String extendedAttributes) {
-        this.extendedAttributes = extendedAttributes;
-    }
-
-    public String getIsIn() {
-        return isIn;
-    }
-
-    public void setIsIn(String isIn) {
-        this.isIn = isIn;
-    }
-
-    public String getIsOut() {
-        return isOut;
-    }
-
-    public void setIsOut(String isOut) {
-        this.isOut = isOut;
-    }
-
-    public String getMask() {
-        return mask;
-    }
-
-    public void setMask(String mask) {
-        this.mask = mask;
-    }
-
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public String getNumRows() {
-        return numRows;
-    }
-
-    public void setNumRows(String numRows) {
-        this.numRows = numRows;
-    }
-
-    public String getNumColumns() {
-        return numColumns;
-    }
-
-    public void setNumColumns(String numColumns) {
-        this.numColumns = numColumns;
-    }
-
-    public Long getForeignKey() {
-        return foreignKey;
-    }
-
-    public void setForeignKey(Long foreignKey) {
-        this.foreignKey = foreignKey;
-    }
-
-    public String getForeignKeyName() {
-        return foreignKeyName;
-    }
-
-    public void setForeignKeyName(String foreignKeyName) {
-        this.foreignKeyName = foreignKeyName;
-    }
-
-    public String getHrParentName() {
-        return hrParentName;
-    }
-
-    public void setHrParentName(String hrParentName) {
-        this.hrParentName = hrParentName;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public void setTableId(Long tableId)
-    {
-        this.tableId = tableId;
-    }
-
-    public Long getTableId()
-    {
-        return tableId;
-    }
-
-    public void setColumnName(String columnName)
-    {
-        this.columnName = columnName;
-    }
-
-    public String getColumnName()
-    {
-        return columnName;
-    }
-
-    public void setColumnComment(String columnComment)
-    {
-        this.columnComment = columnComment;
-    }
-
-    public String getColumnComment()
-    {
-        return columnComment;
-    }
-
-    public void setColumnType(String columnType)
-    {
-        this.columnType = columnType;
-    }
-
-    public String getColumnType()
-    {
-        return columnType;
-    }
-
-    public void setJavaType(String javaType)
-    {
-        this.javaType = javaType;
-    }
-
-    public String getJavaType()
-    {
-        return javaType;
-    }
-
-    public void setJavaField(String javaField)
-    {
-        this.javaField = javaField;
-    }
-
-    public String getJavaField()
-    {
-        return javaField;
-    }
-
-//    public String getCapJavaField()
-//    {
-//        return StringUtils.capitalize(javaField);
-//    }
-
-    public void setIsPk(String isPk)
-    {
-        this.isPk = isPk;
-    }
-
-    public String getIsPk()
-    {
-        return isPk;
-    }
-
-//    public boolean isPk()
-//    {
-//        return isPk(this.isPk);
-//    }
-
-//    public boolean isPk(String isPk)
-//    {
-//        return isPk != null && StringUtils.equals("1", isPk);
-//    }
-
-    public String getIsIncrement()
-    {
-        return isIncrement;
-    }
-
-    public void setIsIncrement(String isIncrement)
-    {
-        this.isIncrement = isIncrement;
-    }
-
-//    public boolean isIncrement()
-//    {
-//        return isIncrement(this.isIncrement);
-//    }
-
-//    public boolean isIncrement(String isIncrement)
-//    {
-//        return isIncrement != null && StringUtils.equals("1", isIncrement);
-//    }
-
-    public void setIsRequired(String isRequired)
-    {
-        this.isRequired = isRequired;
-    }
-
-    public String getIsRequired()
-    {
-        return isRequired;
-    }
-
-//    public boolean isRequired()
-//    {
-//        return isRequired(this.isRequired);
-//    }
-
-//    public boolean isRequired(String isRequired)
-//    {
-//        return isRequired != null && StringUtils.equals("1", isRequired);
-//    }
-
-    public void setIsInsert(String isInsert)
-    {
-        this.isInsert = isInsert;
-    }
-
-    public String getIsInsert()
-    {
-        return isInsert;
-    }
-
-//    public boolean isInsert()
-//    {
-//        return isInsert(this.isInsert);
-//    }
-
-//    public boolean isInsert(String isInsert)
-//    {
-//        return isInsert != null && StringUtils.equals("1", isInsert);
-//    }
-
-    public void setIsEdit(String isEdit)
-    {
-        this.isEdit = isEdit;
-    }
-
-    public String getIsEdit()
-    {
-        return isEdit;
-    }
-
-//    public boolean isEdit()
-//    {
-//        return isInsert(this.isEdit);
-//    }
-
-//    public boolean isEdit(String isEdit)
-//    {
-//        return isEdit != null && StringUtils.equals("1", isEdit);
-//    }
-
-    public void setIsList(String isList)
-    {
-        this.isList = isList;
-    }
-
-    public String getIsList()
-    {
-        return isList;
-    }
-
-//    public boolean isList()
-//    {
-//        return isList(this.isList);
-//    }
-//
-//    public boolean isList(String isList)
-//    {
-//        return isList != null && StringUtils.equals("1", isList);
-//    }
-
-    public void setIsQuery(String isQuery)
-    {
-        this.isQuery = isQuery;
-    }
-
-    public String getIsQuery()
-    {
-        return isQuery;
-    }
-
-//    public boolean isQuery()
-//    {
-//        return isQuery(this.isQuery);
-//    }
-
-//    public boolean isQuery(String isQuery)
-//    {
-//        return isQuery != null && StringUtils.equals("1", isQuery);
-//    }
-
-    public void setQueryType(String queryType)
-    {
-        this.queryType = queryType;
-    }
-
-    public String getQueryType()
-    {
-        return queryType;
-    }
-
-    public String getHtmlType()
-    {
-        return htmlType;
-    }
-
-    public void setHtmlType(String htmlType)
-    {
-        this.htmlType = htmlType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setSort(Integer sort)
-    {
-        this.sort = sort;
-    }
-
-    public Integer getSort()
-    {
-        return sort;
-    }
-
-//    public boolean isSuperColumn()
-//    {
-//        return isSuperColumn(this.javaField);
-//    }
-//
-//    public static boolean isSuperColumn(String javaField)
-//    {
-//        return StringUtils.equalsAnyIgnoreCase(javaField,
-//                // BaseEntity
-//                "createBy", "createTime", "updateBy", "updateTime", "remark",
-//                // TreeEntity
-//                "parentName", "parentId", "orderNum", "ancestors");
-//    }
-
-//    public boolean isUsableColumn()
-//    {
-//        return isUsableColumn(javaField);
-//    }
-
-//    public static boolean isUsableColumn(String javaField)
-//    {
-//        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
-//        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
-//    }
-
-//    public String readConverterExp()
-//    {
-//        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
-//        StringBuffer sb = new StringBuffer();
-//        if (StringUtils.isNotEmpty(remarks))
-//        {
-//            for (String value : remarks.split(" "))
-//            {
-//                if (StringUtils.isNotEmpty(value))
-//                {
-//                    Object startStr = value.subSequence(0, 1);
-//                    String endStr = value.substring(1);
-//                    sb.append("").append(startStr).append("=").append(endStr).append(",");
-//                }
-//            }
-//            return sb.deleteCharAt(sb.length() - 1).toString();
-//        }
-//        else
-//        {
-//            return this.columnComment;
-//        }
-//    }
-
-    public List<SysDictData> getSysDictData() {
-        return sysDictData;
-    }
-
-    public void setSysDictData(List<SysDictData> sysDictData) {
-        this.sysDictData = sysDictData;
-    }
-
-    public Long getHrParentId() {
-        return hrParentId;
-    }
-
-    public void setHrParentId(Long hrParentId) {
-        this.hrParentId = hrParentId;
-    }
-
-    public List<GenTableColumn> getHrChildren() {
-        return hrChildren;
-    }
-
-    public void setHrChildren(List<GenTableColumn> hrChildren) {
-        this.hrChildren = hrChildren;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
-    public Object getColumnValue() {
-        return columnValue;
-    }
-
-    public void setColumnValue(Object columnValue) {
-        this.columnValue = columnValue;
-    }
-
-    public boolean isReadonly() {
-        return readonly;
-    }
-
-    public void setReadonly(boolean readonly) {
-        this.readonly = readonly;
-    }
-}

boman-report/src/main/java/com/boman/report/domain/TableDataInfo.java

@@ -1,85 +0,0 @@
-package com.boman.report.domain;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 表格分页数据对象
- * 
- * @author ruoyi
- */
-public class TableDataInfo implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 总记录数 */
-    private long total;
-
-    /** 列表数据 */
-    private List<?> rows;
-
-    /** 消息状态码 */
-    private int code;
-
-    /** 消息内容 */
-    private String msg;
-
-    /**
-     * 表格数据对象
-     */
-    public TableDataInfo()
-    {
-    }
-
-    /**
-     * 分页
-     * 
-     * @param list 列表数据
-     * @param total 总记录数
-     */
-    public TableDataInfo(List<?> list, int total)
-    {
-        this.rows = list;
-        this.total = total;
-    }
-
-    public long getTotal()
-    {
-        return total;
-    }
-
-    public void setTotal(long total)
-    {
-        this.total = total;
-    }
-
-    public List<?> getRows()
-    {
-        return rows;
-    }
-
-    public void setRows(List<?> rows)
-    {
-        this.rows = rows;
-    }
-
-    public int getCode()
-    {
-        return code;
-    }
-
-    public void setCode(int code)
-    {
-        this.code = code;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-}

boman-report/src/main/java/com/boman/report/mapper/GenTableColumnMapper.java

@@ -1,27 +0,0 @@
-package com.boman.report.mapper;
-
-/**
- * @author shiqian
- * @date 2021年08月31日 10:51
- **/
-
-import java.util.List;
-
-import com.boman.domain.GenTableColumn;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 业务字段 数据层
- *
- * @author ruoyi
- */
-public interface GenTableColumnMapper {
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableIdList 业务字段编号List
-     * @return 业务字段集合
-     */
-    List<GenTableColumn> listByTableIdList(@Param("tableIdList") List<Long> tableIdList);
-
-}

boman-report/src/main/java/com/boman/report/mapper/GenTableMapper.java

@@ -1,23 +0,0 @@
-package com.boman.report.mapper;
-
-import com.boman.domain.GenTable;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 业务 数据层
- *
- * @author ruoyi
- */
-public interface GenTableMapper {
-
-    /**
-     * 查询表名称业务信息
-     *
-     * @param tableName 表名称
-     * @return 业务信息
-     */
-    GenTable selectGenTableByName(String tableName);
-
-}

boman-report/src/main/java/com/boman/report/mapper/ImportMapper.java

@@ -1,52 +0,0 @@
-package com.boman.report.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.SelectProvider;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 导入mapper
- */
-public interface ImportMapper {
-
-
-    /**
-     * 功能描述: 根据表名称获取表对应的设计器数据
-     * {@link SqlProvider#reportDesignData(Map)}
-     *
-     * @param tableName tableName
-     * @return com.alibaba.fastjson.JSONObject
-     */
-    @SelectProvider(type = SqlProvider.class, method = "reportDesignData")
-    JSONObject getReportDesignData(@Param("tableName") String tableName);
-
-    /**
-     * 功能描述: 根据sql获取数据
-     *
-     * {@link SqlProvider#getDataByDynamicSql(Map)}
-     *
-     * @param sql
-     * @return List<com.alibaba.fastjson.JSONObject>
-     */
-    @SelectProvider(type = SqlProvider.class, method = "getDataByDynamicSql")
-    List<JSONObject> getDataByDynamicSql(@Param("sql") String sql);
-
-    class SqlProvider {
-        public String reportDesignData(Map<String, Object> params) {
-            String tableName = (String) params.get("tableName");
-            StringBuilder sql = new StringBuilder();
-            sql.append("SELECT rd.db_ch_name as dbChName, r.json_str as jsonStr")
-                    .append(" FROM ").append(" jimu_report r ")
-                    .append(" JOIN jimu_report_db rd ON rd.jimu_report_id = r.id ")
-                    .append(" where rd.db_code = '").append(tableName).append("'");
-            return sql.toString();
-        }
-
-        public String getDataByDynamicSql(Map<String, Object> params) {
-            return (String) params.get("sql");
-        }
-    }
-}

boman-report/src/main/java/com/boman/report/mapper/StatisticReportMapper.java

@@ -1,36 +0,0 @@
-//package com.boman.report.mapper;
-//
-//import com.boman.domain.dto.StatisticReportDto;
-//import com.boman.domain.entity.StatisticReport;
-//import com.boman.domain.entity.StatisticReport;
-//import com.boman.domain.entity.vo.StatisticReportVo;
-//import org.springframework.stereotype.Repository;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:09
-// **/
-//@Repository
-//public interface StatisticReportMapper {
-//
-//    List<StatisticReportDto> selectReportInfo(Map<String, String> params);
-//
-//    List<StatisticReport> selectList(StatisticReport report);
-//
-//    int insert(StatisticReport report);
-//
-//    int update(StatisticReport report);
-//
-//    /**
-//     * 获取表报详情
-//     * @param id
-//     * @return
-//     */
-//    StatisticReportVo getReportInfo(Long id);
-//
-//    StatisticReport getDetailById(Long id);
-//
-//}

boman-report/src/main/java/com/boman/report/mapper/StatisticReportPersonnelMapper.java

@@ -1,25 +0,0 @@
-//package com.boman.report.mapper;
-//
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//import org.springframework.stereotype.Repository;
-//
-//import java.util.List;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:09
-// **/
-//@Repository
-//public interface StatisticReportPersonnelMapper {
-//
-//    int deleteByStatisticIds(Long[] ids);
-//
-//    int insert(StatisticReportPersonnel personnel);
-//
-//    int updateStatus(StatisticReportPersonnel personnel);
-//
-//    List<StatisticReportPersonnel> selectByStatisticId(Long id);
-//
-//    List<StatisticReportPersonnel> selectList(StatisticReportPersonnel personnel);
-//
-//}

boman-report/src/main/java/com/boman/report/mapper/TableMapper.java

@@ -1,62 +0,0 @@
-package com.boman.report.mapper;
-
-import com.boman.domain.GenTable;
-import io.swagger.models.auth.In;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.SelectProvider;
-
-import java.util.List;
-import java.util.Map;
-
-public interface TableMapper {
-
-    /**
-     * 查询表数据
-     * @return 业务集合
-     */
-    @SelectProvider(type = SqlProvider.class, method = "selectList")
-    public List<GenTable> selectList(@Param("tableName") String tableName,
-                                     @Param("tableComment") String tableComment);
-
-    @SelectProvider(type = SqlProvider.class, method = "selectCount")
-    public Integer selectCount(@Param("tableName") String tableName,
-                               @Param("tableComment") String tableComment);
-
-    class SqlProvider {
-
-        public String selectCount(Map<String, Object> params) {
-            String tableName = (String) params.get("tableName");
-            String tableComment = (String) params.get("tableComment");
-
-            StringBuilder sql = new StringBuilder();
-            sql.append("select count(1) from gen_table ").append(" where 1 = 1 ");
-            if(StringUtils.isNotEmpty(tableName)) {
-                sql.append("AND lower(table_name) like lower(concat('%',").append(tableName).append(", '%'))");
-            }
-            if(StringUtils.isNotEmpty(tableComment)) {
-                sql.append("AND lower(table_comment) like lower(concat('%',").append(tableComment).append(", '%'))");
-            }
-            return sql.toString();
-        }
-
-        public String selectList(Map<String, Object> params) {
-            String tableName = (String) params.get("tableName");
-            String tableComment = (String) params.get("tableComment");
-
-            StringBuilder sql = new StringBuilder();
-            sql.append("select table_id, table_name as tableName, table_comment as tableComment, sub_table_name as subTableName, sub_table_fk_name  as subTableFkName, ")
-                    .append("class_name as className, tpl_category as tplCategory, package_name as packageName, module_name as moduleName, business_name as businessName,  ")
-                    .append("function_name, function_author, gen_type, gen_path, options, ")
-                    .append(" create_by, create_time, update_by, update_time, remark  ")
-                    .append(" from gen_table ").append(" where 1 = 1 ");
-            if(StringUtils.isNotEmpty(tableName)) {
-               sql.append("AND lower(table_name) like lower(concat('%',").append("'").append(tableName).append("'").append(", '%'))");
-            }
-            if(StringUtils.isNotEmpty(tableComment)) {
-                sql.append("AND lower(table_comment) like lower(concat('%',").append("'").append(tableComment).append("'").append(", '%'))");
-            }
-            return sql.toString();
-        }
-    }
-}

boman-report/src/main/java/com/boman/report/service/IGenTableColumnService.java

@@ -1,28 +0,0 @@
-package com.boman.report.service;
-
-import com.boman.domain.GenTableColumn;
-
-import java.util.List;
-
-/**
- * @author shiqian
- * @date 2021年08月31日 10:48
- **/
-public interface IGenTableColumnService {
-
-    /**
-     * 功能描述: 根据表名查询改表所有的字段信息
-     *
-     * @param tableName tableName
-     * @return java.util.List<com.boman.domain.GenTableColumn>
-     */
-    List<GenTableColumn> listColumnsByTableName(String tableName);
-
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableIdList 业务字段编号List
-     * @return 业务字段集合
-     */
-    public List<GenTableColumn> listByTableIdList(List<Long> tableIdList);
-}

boman-report/src/main/java/com/boman/report/service/IImportServcie.java

@@ -1,14 +0,0 @@
-//package com.boman.report.service;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.dto.ImportFileDto;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.util.List;
-//
-//public interface IImportServcie {
-//
-//    AjaxResult importData(ImportFileDto fileDto, Long personnelId, String tableName) throws Exception;
-//
-//}

boman-report/src/main/java/com/boman/report/service/ITableService.java

@@ -1,19 +0,0 @@
-package com.boman.report.service;
-
-import com.boman.domain.GenTable;
-
-import java.util.List;
-
-public interface ITableService {
-
-    public Integer selectCount(GenTable genTable);
-
-
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    public List<GenTable> selectList(GenTable genTable);
-}

boman-report/src/main/java/com/boman/report/service/StatisticReportPersonnelService.java

@@ -1,20 +0,0 @@
-//package com.boman.report.service;
-//
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//
-//import java.util.List;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:09
-// **/
-//public interface StatisticReportPersonnelService {
-//
-//    int deleteByStatisticIds(Long[] ids);
-//
-//    int insert(List<StatisticReportPersonnel> personnels);
-//
-//    int updateStatus(StatisticReportPersonnel personnel);
-//
-//    List<StatisticReportPersonnel> selectList(StatisticReportPersonnel personnel);
-//}

boman-report/src/main/java/com/boman/report/service/StatisticReportService.java

@@ -1,39 +0,0 @@
-//package com.boman.report.service;
-//
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.dto.StatisticReportDto;
-//import com.boman.domain.entity.StatisticReport;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-//import com.boman.domain.dto.AjaxResult;
-//
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.entity.StatisticReport;
-//
-//import java.util.List;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:10
-// **/
-//public interface StatisticReportService {
-//
-//    Map<String, Object> datas(String name);
-//
-//    List<StatisticReport> selectList(StatisticReport report);
-//
-//    AjaxResult saveOrUpdate(StatisticReport report);
-//
-//    /**
-//     * 获取表报详情
-//     * @param id
-//     * @return
-//     */
-//    AjaxResult getReportInfo (Long id);
-//
-//    public StatisticReport getDetailById(Long id);
-//
-//}
-//

boman-report/src/main/java/com/boman/report/service/impl/GenTableColumnServiceImpl.java

@@ -1,59 +0,0 @@
-package com.boman.report.service.impl;
-
-import com.boman.domain.GenTable;
-import com.boman.domain.GenTableColumn;
-import com.boman.report.mapper.GenTableColumnMapper;
-import com.boman.report.mapper.GenTableMapper;
-import com.boman.report.service.IGenTableColumnService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author shiqian
- * @date 2021年08月31日 10:48
- **/
-@Service
-public class GenTableColumnServiceImpl implements IGenTableColumnService {
-
-    @Resource
-    private GenTableMapper genTableMapper;
-    @Resource
-    private GenTableColumnMapper genTableColumnMapper;
-
-    /**
-     * 功能描述: 根据表名查询改表所有的字段信息
-     *
-     * @param tableName tableName
-     * @return java.util.List<com.boman.domain.GenTableColumn>
-     */
-    @Override
-    public List<GenTableColumn> listColumnsByTableName(String tableName) {
-        GenTable genTable = genTableMapper.selectGenTableByName(tableName);
-
-        List<GenTableColumn> columns = genTable.getColumns();
-        if (null == columns || columns.size() == 0) {
-            columns = listByTableIdList(Collections.singletonList(genTable.getId()));
-        }
-
-        return columns;
-    }
-
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableIdList 业务字段编号List
-     * @return 业务字段集合
-     */
-    @Override
-    public List<GenTableColumn> listByTableIdList(List<Long> tableIdList) {
-        if (null == tableIdList || tableIdList.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        return genTableColumnMapper.listByTableIdList(tableIdList);
-
-    }
-}

boman-report/src/main/java/com/boman/report/service/impl/ImportServiceImpl.java

@@ -1,199 +0,0 @@
-//package com.boman.report.service.impl;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.boman.common.core.utils.CollectUtils;
-//import com.boman.common.core.utils.StringUtils;
-//import com.boman.common.core.utils.obj.ObjectUtils;
-//import com.boman.common.core.utils.poi.ExcelUtil;
-//import com.boman.common.redis.RedisKey;
-//import com.boman.common.redis.service.RedisService;
-//import com.boman.domain.GenTable;
-//import com.boman.domain.GenTableColumn;
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.dto.ImportExcelDto;
-//import com.boman.domain.dto.ImportFileDto;
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//import com.boman.report.mapper.ImportMapper;
-//import com.boman.report.service.IImportServcie;
-//import com.boman.report.service.StatisticReportPersonnelService;
-//import com.boman.web.core.api.RemoteObjService;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Isolation;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.io.File;
-//import java.io.FileInputStream;
-//import java.util.*;
-//
-///**
-// * 导入服务类
-// */
-//@Service
-//public class ImportServiceImpl implements IImportServcie {
-//
-//    private static final Logger logger = LoggerFactory.getLogger(ImportServiceImpl.class);
-//
-//    private static final String CREATE_BY = "create_by";
-//    private static final String CREATE_TIME = "create_time";
-//    private static final String UPDATE_BY = "update_by";
-//    private static final String UPDATE_TIME = "update_time";
-//
-//    @Autowired
-//    private ImportMapper importMapper;
-//    @Autowired
-//    private RedisService redisService;
-//    @Autowired
-//    private RemoteObjService remoteObjService;
-//    @Autowired
-//    private StatisticReportPersonnelService personnelService;
-//
-//    @Override
-//    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-//    public AjaxResult importData(ImportFileDto fileDto, Long personnelId, String tableName) throws Exception {
-//        Objects.requireNonNull(fileDto, "未上传文件！");
-//        ObjectUtils.requireNonNull(tableName, "表名为空！");
-//        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + tableName);
-//        Map<String, GenTableColumn> columnMap = this.genImportColumn(genTable.getColumns());
-//        List<GenTableColumn> columns = genColumData(tableName, columnMap);
-//        this.genBaseData(columns,  columnMap);
-//        ExcelUtil<JSONObject> util = new ExcelUtil<>(JSONObject.class);
-//
-//        String realPath = getFileRealPath(fileDto);
-//        File file = new File(realPath);
-//        List<JSONObject> list = util.importCommonExcel("", new FileInputStream(file), columns);
-//        ImportExcelDto dto = new ImportExcelDto();
-//        dto.setDataList(list);
-//        dto.setTableName(tableName);
-//
-//        try {
-//            remoteObjService.importCommonData(dto);
-//        }catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        // 上传成功后需要修改上报人的状态
-//        StatisticReportPersonnel personnel = new StatisticReportPersonnel();
-//        personnel.setId(personnelId);
-//        personnel.setStatus("2");
-//
-//        JSONObject json = (JSONObject) JSONObject.toJSON(fileDto);
-//
-//        personnel.setUploadFile(JSON.toJSONString(CollectUtils.newArrayList(json)));
-//        personnelService.updateStatus(personnel);
-//        return AjaxResult.success();
-//    }
-//
-//    /**
-//     * 将列组装成map，方便判断，无需多次循环
-//     *
-//     * @param allColumns
-//     * @return
-//     */
-//    private Map<String, GenTableColumn> genImportColumn(List<GenTableColumn> allColumns) {
-//        Map<String, GenTableColumn> columnMap = new HashMap<>();
-//        for (GenTableColumn column : allColumns) {
-//            String columnName = column.getColumnName();
-//            columnMap.put(columnName, column);
-//        }
-//        return columnMap;
-//    }
-//
-//    /**
-//     * 根据报表设计中的表格字段获取gentable中的数据，用于导出
-//     *
-//     * 数据格式："rows":{
-//     * 	"0":{
-//     * 		"cells":{
-//         * 		"0":{
-//         * 			"text":"#{urge_read_message.message_title}",
-//         * 			"style":2
-//         *                },
-//         * 		"1":{
-//         * 			"text":"#{urge_read_message.send_user_id}",
-//         * 			"style":2
-//         *        },
-//         * 		"2":{
-//         * 			"text":"#{urge_read_message.receive_user_name}",
-//         * 			"style":2
-//         *        },
-//         * 		"3":{
-//         * 			"style":2,
-//         * 			"text":"#{urge_read_message.is_del}"
-//         *        }* 	},
-//         * 	"len":100
-//     * },
-//     * @param tableName
-//     * @param columnMap 列map集合
-//     * @return
-//     */
-//    private List<GenTableColumn> genColumData(String tableName, Map<String, GenTableColumn> columnMap) {
-//        List<GenTableColumn> columns = new ArrayList<>();
-//        // 根据名获取报表设计相关数据
-//        JSONObject designObject = importMapper.getReportDesignData(tableName);
-//        if(designObject == null) {
-//            AjaxResult.error("数据表没有设计报表模板！请先设计报表模板！");
-//        }
-//        String jsonStr = designObject.getString("jsonStr");
-//        if(StringUtils.isEmpty(jsonStr)) {
-//            AjaxResult.error("报表模板没有相关设计数据，请确认是否设计好报表模板！");
-//        }
-//        JSONObject rowDatas = JSONObject.parseObject(jsonStr).getJSONObject("rows");
-//        int maxKey = rowDatas.size() - 1;
-//        Iterator<String> rowIterator = rowDatas.keySet().iterator();
-//        int count  = 0;
-//        while (rowIterator.hasNext()) {
-//            count ++;
-//            String key = rowIterator.next();
-//            if(count == maxKey) {
-//                JSONObject cells = JSONObject.parseObject(rowDatas.getString(key));
-//                Iterator<String> cellIterator = cells.keySet().iterator();
-//                while (cellIterator.hasNext()) {
-//                    String cellKey = cellIterator.next();
-//                    JSONObject feildJson = cells.getJSONObject(cellKey);
-//                    Iterator<String> feildIterator = feildJson.keySet().iterator();
-//                    while (feildIterator.hasNext()) {
-//                        String feildName = "";
-//                        String textStr = feildJson.getString(feildIterator.next());
-//                        if(StringUtils.isNotEmpty(textStr)) {
-//                            JSONObject textJson = JSONObject.parseObject(textStr);
-//                            String text = textJson.getString("text");
-//                            // 获取数据
-//                            if(StringUtils.isNotEmpty(text)) {
-//                                String realText = text.replace("#{", "").replace("}", "");
-//                                feildName = realText.substring(tableName.length() + 1, realText.length());
-//                                if(columnMap.containsKey(feildName)) {
-//                                    columns.add(columnMap.get(feildName));
-//                                }
-//                            }
-//                        }
-//                    }
-//                }
-//                break;
-//            }
-//        }
-//        return columns;
-//    }
-//
-//    /**
-//     * 基础字段填充
-//     *
-//     * @param columns
-//     * @param columnMap
-//     */
-//    private void genBaseData(List<GenTableColumn> columns, Map<String, GenTableColumn> columnMap) {
-//        columns.add(columnMap.get(CREATE_BY));
-//        columns.add(columnMap.get(CREATE_TIME));
-//        columns.add(columnMap.get(UPDATE_BY));
-//        columns.add(columnMap.get(UPDATE_TIME));
-//    }
-//
-//    private String getFileRealPath(ImportFileDto dto) {
-//        return dto.getAbsolutePath();
-//    }
-//}

boman-report/src/main/java/com/boman/report/service/impl/StatisticReportPersonnelImpl.java

@@ -1,66 +0,0 @@
-//package com.boman.report.service.impl;
-//
-//import com.boman.common.core.utils.SecurityUtils;
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//import com.boman.report.mapper.StatisticReportPersonnelMapper;
-//import com.boman.report.service.StatisticReportPersonnelService;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Isolation;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.sql.Timestamp;
-//import java.util.List;
-//
-//import static com.boman.common.core.utils.obj.ObjectUtils.*;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:11
-// **/
-//@Service
-//public class StatisticReportPersonnelImpl implements StatisticReportPersonnelService {
-//
-//    private static final Logger LOGGER = LoggerFactory.getLogger(StatisticReportPersonnelImpl.class);
-//
-//    @Autowired
-//    private StatisticReportPersonnelMapper personnelMapper;
-//
-//    @Override
-//    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-//    public int deleteByStatisticIds(Long[] ids) {
-//        return personnelMapper.deleteByStatisticIds(ids);
-//    }
-//
-//    @Override
-//    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-//    public int insert(List<StatisticReportPersonnel> personnels) {
-//        if(isEmpty(personnels)) {
-//            return 0;
-//        }
-//
-//        for(StatisticReportPersonnel personnel : personnels) {
-//            Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-//            personnel.setCreateTime(timestamp);
-//            personnel.setUpdateTime(timestamp);
-//            personnelMapper.insert(personnel);
-//        }
-//        return personnels.size();
-//    }
-//
-//    @Override
-//    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-//    public int updateStatus(StatisticReportPersonnel personnel) {
-//        return personnelMapper.updateStatus(personnel);
-//    }
-//
-//    @Override
-//    public List<StatisticReportPersonnel> selectList(StatisticReportPersonnel personnel) {
-//        personnel.setUserName(SecurityUtils.getUsername());
-//        return personnelMapper.selectList(personnel);
-//    }
-//
-//
-//}

boman-report/src/main/java/com/boman/report/service/impl/StatisticReportServiceImpl.java

@@ -1,198 +0,0 @@
-//package com.boman.report.service.impl;
-//
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.TypeReference;
-//import com.boman.common.core.utils.CollectUtils;
-//import com.boman.common.core.utils.StringUtils;
-//import com.boman.domain.SysFile;
-//import com.boman.domain.dto.AjaxResult;
-//import com.boman.domain.dto.StatisticReportDto;
-//import com.boman.domain.entity.StatisticReport;
-//import com.boman.domain.entity.StatisticReportPersonnel;
-//import com.boman.domain.entity.vo.StatisticReportVo;
-//import com.boman.report.mapper.StatisticReportMapper;
-//import com.boman.report.mapper.StatisticReportPersonnelMapper;
-//import com.boman.report.service.StatisticReportService;
-//import com.boman.common.core.utils.SecurityUtils;
-//import com.boman.report.service.StatisticReportPersonnelService;
-//import org.apache.commons.lang3.SerializationUtils;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Isolation;
-//import org.springframework.transaction.annotation.Transactional;
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-///**
-// * @author shiqian
-// * @date 2021年08月24日 11:10
-// **/
-//@Service
-//public class StatisticReportServiceImpl implements StatisticReportService {
-//
-//    private static final Logger LOGGER = LoggerFactory.getLogger(ImportServiceImpl.class);
-//
-//
-//    public static final String INSERT =  "insert";
-//
-//    public static final String UPDATE =  "update";
-//
-//
-//    @Autowired
-//    private StatisticReportPersonnelService personnelService;
-//
-//    @Autowired
-//    private StatisticReportMapper statisticReportMapper;
-//
-//    @Autowired
-//    private StatisticReportPersonnelMapper statisticReportPersonnelMapper;
-//    /**
-//     * 获取表报详情
-//     * @param id
-//     * @return
-//     */
-//    @Override
-//    public AjaxResult getReportInfo(Long id) {
-//        StatisticReportVo reportInfo = statisticReportMapper.getReportInfo(id);
-//        //获取参与人员信息
-//        List<StatisticReportPersonnel> statisticReportPersonnels = statisticReportPersonnelMapper.selectByStatisticId(id);
-//        if (statisticReportPersonnels != null && statisticReportPersonnels.size() > 0){
-//            Map<String, List<String>> personnelMap = statisticReportPersonnels.stream().collect(Collectors.groupingBy(StatisticReportPersonnel::getDeptName, Collectors.mapping(StatisticReportPersonnel::getUserName, Collectors.toList())));
-//            Map<String, List<String>> filledOutMap = statisticReportPersonnels.stream().filter(e -> "1".equals(e.getStatus())).collect(Collectors.groupingBy(StatisticReportPersonnel::getDeptName, Collectors.mapping(StatisticReportPersonnel::getUserName, Collectors.toList())));
-//            Map<String, List<StatisticReportPersonnel>> filledInMap = statisticReportPersonnels.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.groupingBy(StatisticReportPersonnel::getDeptName));
-//            //参与人员
-//            List<Map<String,Object>> personnelList = new ArrayList<>();
-//            //已填报
-//            List<Map<String,Object>> filledInList = new ArrayList<>();
-//            //未填报
-//            List<Map<String,Object>> filledOutList = new ArrayList<>();
-//            if (personnelMap != null && personnelMap.size() > 0){
-//                personnelMap.forEach((key, value) -> {
-//                    Map<String,Object> map = new HashMap<>();
-//                    map.put("deptName",key);
-//                    map.put("userNameList",value);
-//                    personnelList.add(map);
-//                });
-//            }
-//            if (filledOutMap != null && filledOutMap.size() > 0){
-//                filledOutMap.forEach((key, value) -> {
-//                    Map<String,Object> map= new HashMap<>();
-//                    map.put("deptName",key);
-//                    map.put("userNameList",value);
-//                    filledOutList.add(map);
-//                });
-//            }
-//            if (filledInMap != null && filledInMap.size() > 0){
-//                Set<String> strings = filledInMap.keySet();
-//                for (String deptName : strings) {
-//                    List<StatisticReportPersonnel> statisticReportPersonnelList = filledInMap.get(deptName);
-//                    if (statisticReportPersonnelList != null && statisticReportPersonnelList.size() > 0){
-//                        for (StatisticReportPersonnel statisticReportPersonnel : statisticReportPersonnelList) {
-//                            Map<String,Object> map = new HashMap<>();
-//                            map.put("deptName",deptName);
-//                            map.put("userNameList",statisticReportPersonnel.getUserName());
-//                            String uploadFile = statisticReportPersonnel.getUploadFile();
-//                            //[{"name":"1627634606200.pdf","url":"http://192.168.101.11:9300/statics/2021/07/30/1627634606200.pdf","status":"success","uid":1627634606225}]
-//                            List<SysFile> sysFileList = JSON.parseObject(uploadFile, new TypeReference<List<SysFile>>() {}.getType());
-//                            List<String> fileName = new ArrayList<>();
-//                            List<String> fileUrl = new ArrayList<>();
-//                            if (sysFileList != null && sysFileList.size() > 0){
-//                                for (SysFile sysFile : sysFileList) {
-//                                    fileName.add(sysFile.getName());
-//                                    fileUrl.add(sysFile.getUrl());
-//                                }
-//                            }
-//                            map.put("fileNameList",fileName);
-//                            map.put("fileUrlList",fileUrl);
-//                            filledInList.add(map);
-//                        }
-//                    }
-//                }
-//            }
-//            reportInfo.setPersonnelList(personnelList);
-//            reportInfo.setFilledInList(filledInList);
-//            reportInfo.setFilledOutList(filledOutList);
-//        }
-//        return AjaxResult.success(reportInfo);
-//    }
-//
-//    @Override
-//    public Map<String, Object> datas(String name) {
-//        Map<String, Object> result = new HashMap<>();
-//        Map<String, String> params = CollectUtils.newHashMap();
-//        if(StringUtils.isNotEmpty(name)) {
-//            params.put("name", name);
-//        }
-//        params.put("userName", SecurityUtils.getUsername());
-//        List<StatisticReportDto> reportDtos = statisticReportMapper.selectReportInfo(params);
-//        result.put("reports", reportDtos);
-//        return result;
-//    }
-//
-//    @Override
-//    public List<StatisticReport> selectList(StatisticReport report) {
-//        report.setCreateBy(SecurityUtils.getUsername());
-//        return statisticReportMapper.selectList(report);
-//    }
-//
-//    @Override
-//    public StatisticReport getDetailById(Long id) {
-//        return statisticReportMapper.getDetailById(id);
-//    }
-//
-//    @Override
-//    @Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-//    public AjaxResult saveOrUpdate(StatisticReport report) {
-//        try {
-//            if (report.getId() != null) { // 修改
-//                genReport(report, UPDATE);
-//                // 先删除所有字表数据
-//                personnelService.deleteByStatisticIds(new Long[]{report.getId()});
-//                // 保存报表数据
-//                statisticReportMapper.update(report);
-//            } else {//新增
-//                genReport(report, INSERT);
-//                statisticReportMapper.insert(report);
-//            }
-//
-//            // 获取人员
-//            genReportPersonal(report);
-//            personnelService.insert(report.getPersonnels());
-//        } catch (Exception e) {
-//            LOGGER.info("新增错误，{}", e.getMessage());
-//            return AjaxResult.error();
-//        }
-//
-//        return AjaxResult.success();
-//    }
-//
-//    private void genReport(StatisticReport report, String type) {
-//        Date now = new Date();
-//        String username = SecurityUtils.getUsername();
-//        if (type.equals(INSERT)) {
-//            report.setCreateBy(username);
-//            report.setCreateTime(now);
-//        }
-//
-//        report.setUpdateBy(username);
-//        report.setUpdateTime(now);
-//    }
-//
-//    private void genReportPersonal(StatisticReport report) {
-//        Long statisticId = report.getId();
-//        String reportName =  report.getReportName();
-//        String userName = SecurityUtils.getUsername();
-//        Date now = new Date();
-//        List<StatisticReportPersonnel> personnels = report.getPersonnels();
-//        for (StatisticReportPersonnel personnel : personnels) {
-//            personnel.setStatisticId(statisticId);
-//            personnel.setReportName(reportName);
-//            personnel.setCreateBy(userName);
-//            personnel.setCreateTime(now);
-//            personnel.setUpdateBy(userName);
-//            personnel.setUpdateTime(now);
-//        }
-//    }
-//}

boman-report/src/main/java/com/boman/report/service/impl/TableServiceImpl.java

@@ -1,45 +0,0 @@
-package com.boman.report.service.impl;
-
-import com.boman.domain.GenTable;
-import com.boman.report.constant.IgnoreTable;
-import com.boman.report.mapper.TableMapper;
-import com.boman.report.service.ITableService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
-
-@Service
-public class TableServiceImpl implements ITableService {
-
-    @Resource
-    private TableMapper mapper;
-    @Resource
-    private IgnoreTable ignoreTable;
-
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    @Override
-    public Integer selectCount(GenTable genTable) {
-        return mapper.selectCount(genTable.getTableName(), genTable.getTableComment());
-    }
-
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    @Override
-    public List<GenTable> selectList(GenTable genTable) {
-        List<GenTable> tables = mapper.selectList(genTable.getTableName(), genTable.getTableComment());
-        final Set<String> set = ignoreTable.getSet();
-        tables.removeIf(next -> set.contains(next.getTableName()));
-        return tables;
-    }
-}

boman-report/src/main/java/org/jeecg/modules/jmreport/common/vo/Result.java

@@ -1,258 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by FernFlower decompiler)
-//
-
-package org.jeecg.modules.jmreport.common.vo;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.io.Serializable;
-import org.jeecg.modules.jmreport.common.constant.CommonConstant;
-
-public class Result<T> implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private boolean success = true;
-    private String message = "";
-    private Integer code = 0;
-    private T result;
-    private long timestamp = System.currentTimeMillis();
-    @JsonIgnore
-    private String onlTable;
-
-    public Result() {
-    }
-
-    public Result<T> success(String message) {
-        this.message = message;
-        this.code = CommonConstant.SC_OK_200;
-        this.success = true;
-        return this;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static Result<Object> ok() {
-        Result var0 = new Result();
-        var0.setSuccess(true);
-        var0.setCode(CommonConstant.SC_OK_200);
-        var0.setMessage("成功");
-        return var0;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static Result<Object> ok(String msg) {
-        Result var1 = new Result();
-        var1.setSuccess(true);
-        var1.setCode(CommonConstant.SC_OK_200);
-        var1.setMessage(msg);
-        return var1;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static Result<Object> ok(Object data) {
-        Result var1 = new Result();
-        var1.setSuccess(true);
-        var1.setCode(CommonConstant.SC_OK_200);
-        var1.setResult(data);
-        return var1;
-    }
-
-    public static <T> Result<T> OK() {
-        Result var0 = new Result();
-        var0.setSuccess(true);
-        var0.setCode(CommonConstant.SC_OK_200);
-        return var0;
-    }
-
-    public static <T> Result<T> OK(T data) {
-        Result var1 = new Result();
-        var1.setSuccess(true);
-        var1.setCode(CommonConstant.SC_OK_200);
-        var1.setResult(data);
-        return var1;
-    }
-
-    public static <T> Result<T> OK(String msg, T data) {
-        Result var2 = new Result();
-        var2.setSuccess(true);
-        var2.setCode(CommonConstant.SC_OK_200);
-        var2.setMessage(msg);
-        var2.setResult(data);
-        return var2;
-    }
-
-    public static <T> Result<T> FAIL(String msg, T data) {
-        Result var2 = new Result();
-        var2.setSuccess(false);
-        var2.setCode(CommonConstant.SC_OK_200);
-        var2.setMessage(msg);
-        var2.setResult(data);
-        return var2;
-    }
-
-    public static Result<Object> error(String msg) {
-        return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
-    }
-
-    public static Result<Object> error(int code, String msg) {
-        Result var2 = new Result();
-        var2.setCode(code);
-        var2.setMessage(msg);
-        var2.setSuccess(false);
-        return var2;
-    }
-
-    public Result<T> error500(String message) {
-        this.message = message;
-        this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
-        this.success = false;
-        return this;
-    }
-
-    public static Result<Object> noauth(String msg) {
-        return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
-    }
-
-    public boolean isSuccess() {
-        return this.success;
-    }
-
-    public String getMessage() {
-        return this.message;
-    }
-
-    public Integer getCode() {
-        return this.code;
-    }
-
-    public T getResult() {
-        return this.result;
-    }
-
-    public long getTimestamp() {
-        return this.timestamp;
-    }
-
-    public String getOnlTable() {
-        return this.onlTable;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public void setResult(T result) {
-        this.result = result;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    @JsonIgnore
-    public void setOnlTable(String onlTable) {
-        this.onlTable = onlTable;
-    }
-
-    public boolean equals(Object o) {
-        if (o == this) {
-            return true;
-        } else if (!(o instanceof Result)) {
-            return false;
-        } else {
-            Result var2 = (Result)o;
-            if (!var2.canEqual(this)) {
-                return false;
-            } else if (this.isSuccess() != var2.isSuccess()) {
-                return false;
-            } else if (this.getTimestamp() != var2.getTimestamp()) {
-                return false;
-            } else {
-                label64: {
-                    Integer var3 = this.getCode();
-                    Integer var4 = var2.getCode();
-                    if (var3 == null) {
-                        if (var4 == null) {
-                            break label64;
-                        }
-                    } else if (var3.equals(var4)) {
-                        break label64;
-                    }
-
-                    return false;
-                }
-
-                label57: {
-                    String var5 = this.getMessage();
-                    String var6 = var2.getMessage();
-                    if (var5 == null) {
-                        if (var6 == null) {
-                            break label57;
-                        }
-                    } else if (var5.equals(var6)) {
-                        break label57;
-                    }
-
-                    return false;
-                }
-
-                Object var7 = this.getResult();
-                Object var8 = var2.getResult();
-                if (var7 == null) {
-                    if (var8 != null) {
-                        return false;
-                    }
-                } else if (!var7.equals(var8)) {
-                    return false;
-                }
-
-                String var9 = this.getOnlTable();
-                String var10 = var2.getOnlTable();
-                if (var9 == null) {
-                    if (var10 != null) {
-                        return false;
-                    }
-                } else if (!var9.equals(var10)) {
-                    return false;
-                }
-
-                return true;
-            }
-        }
-    }
-
-    protected boolean canEqual(Object other) {
-        return other instanceof Result;
-    }
-
-    public int hashCode() {
-        boolean var1 = true;
-        byte var2 = 1;
-        int var9 = var2 * 59 + (this.isSuccess() ? 79 : 97);
-        long var3 = this.getTimestamp();
-        var9 = var9 * 59 + (int)(var3 >>> 32 ^ var3);
-        Integer var5 = this.getCode();
-        var9 = var9 * 59 + (var5 == null ? 43 : var5.hashCode());
-        String var6 = this.getMessage();
-        var9 = var9 * 59 + (var6 == null ? 43 : var6.hashCode());
-        Object var7 = this.getResult();
-        var9 = var9 * 59 + (var7 == null ? 43 : var7.hashCode());
-        String var8 = this.getOnlTable();
-        var9 = var9 * 59 + (var8 == null ? 43 : var8.hashCode());
-        return var9;
-    }
-
-    public String toString() {
-        return "Result(success=" + this.isSuccess() + ", message=" + this.getMessage() + ", code=" + this.getCode() + ", result=" + this.getResult() + ", timestamp=" + this.getTimestamp() + ", onlTable=" + this.getOnlTable() + ")";
-    }
-}

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

@@ -1,1262 +0,0 @@
-//
-// 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;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-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;
-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.ColumnCovertService;
-//import org.jeecg.modules.jmreport.common.ExportExcelService;
-import org.jeecg.modules.jmreport.common.annotation.JimuLoginRequired;
-import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
-import org.jeecg.modules.jmreport.common.util.CommonUtils;
-import org.jeecg.modules.jmreport.common.util.MinioUtil;
-import org.jeecg.modules.jmreport.common.util.OssBootUtil;
-import org.jeecg.modules.jmreport.common.util.ViewFreemarker;
-import org.jeecg.modules.jmreport.common.util.oConvertUtils;
-import org.jeecg.modules.jmreport.common.vo.JmDictModel;
-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.config.oss.JmReportUploadConfig;
-import org.jeecg.modules.jmreport.desreport.a.service.a.IJmReportDbService;
-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.QueryVO;
-import org.jeecg.modules.jmreport.desreport.render.utils.FreeMarkerUtils;
-import org.jeecg.modules.jmreport.desreport.service.IJimuReportService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbFieldService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbParamService;
-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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.Base64Utils;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.HandlerMapping;
-
-@RestController
-@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 ExportExcelService exportExcelService;
-    @Autowired
-    private JmReportTokenClient jimuTokenClient;
-    @Autowired
-    private JmReportUploadConfig jimuReportUploadConfig;
-    @Autowired
-    private JmReportBaseConfig jmBaseConfig;
-    @Autowired
-    private IJmReportExportPdf jmReportExportPdf;
-
-    public a() {
-    }
-
-    @RequestMapping({"/demo"})
-    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 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 var1, @RequestBody JimuReport var2) {
-        a.debug("============EXCEL模板创建/编辑==========");
-
-        try {
-            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(var2);
-    }
-
-    @PostMapping({"/excelQueryName"})
-    @JimuLoginRequired
-    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 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 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 var1) {
-        Result var2 = Result.OK();
-        String var3 = this.jimuTokenClient.getUsername(var1);
-        var2.setMessage(var3);
-        return Result.OK(var2);
-    }
-
-    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 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";
-            }
-        }
-
-        this.a((HttpServletRequest) var2, (HttpServletResponse) var3, (Map) var4, (String) var5);
-    }
-
-    @RequestMapping({"/view/{id}"})
-    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 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 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 var1) {
-        Result var2 = new Result();
-        List var3 = this.jmReportDesignService.queryReportParam(var1);
-        if (var3 != null && var3.size() != 0) {
-            var2.setSuccess(true);
-            var2.setResult(var3);
-        } else {
-            var2.setSuccess(false);
-        }
-
-        return var2;
-    }
-
-    @RequestMapping({"/show"})
-    public Result<?> a(@RequestParam(name = "id") String var1, HttpServletRequest var2) {
-        String var3 = var2.getParameter("params");
-
-        try {
-            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 var1, @RequestBody JSONObject var2) {
-        try {
-            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 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 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(var1);
-    }
-
-    @GetMapping({"/mockChartData"})
-    public Result<?> b() {
-        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(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();
-            }
-
-            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);
-        }
-
-        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);
-                }
-            }
-
-        }
-
-    }
-
-    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());
-            }
-        } catch (Exception var8) {
-            var8.printStackTrace();
-        } finally {
-            if (var2 != null) {
-                var2.close();
-            }
-
-        }
-
-        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());
-        }
-
-        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 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("数据源不存在");
-                }
-            }
-
-            var8 = null;
-
-            Map var11;
-            try {
-                var11 = this.reportDbService.loadTableData(var2, var3, var4, var5, var6, var7);
-            } catch (Exception var10) {
-                var10.printStackTrace();
-                return Result.error("SQL执行失败，{}" + var10.getMessage());
-            }
-
-            return Result.OK(var11);
-        }
-    }
-
-    @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");
-        String tableName = var1.getString("tableName");
-        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("数据源不存在");
-                }
-            }
-
-            try {
-                Map var8 = this.reportDbService.parseReportSql(var2, var3, var4, var5, tableName);
-                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());
-                }
-            }
-        }
-    }
-
-    @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);
-
-        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");
-            }
-        } catch (Exception var10) {
-            return Result.error(var10.getMessage());
-        }
-    }
-
-    @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();
-        }
-
-        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());
-        }
-
-        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();
-        }
-
-        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);
-        }
-
-        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, "您没有权限");
-        }
-
-        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;
-        }
-
-        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);
-        }
-
-        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");
-        }
-
-        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 {
-                var15.close();
-            } catch (IOException var25) {
-                var25.printStackTrace();
-            }
-
-        }
-
-        long var28 = System.currentTimeMillis();
-        a.info("导出excel数据运行时间：" + (var28 - var8) + "ms");
-        return Result.OK(var16);
-    }
-
-    @PostMapping({"/exportEmptyExcel"})
-    @ResponseBody
-    public Result<Object> exportEmptyExcel(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");
-        }
-
-        String var6 = var3.getString("excelConfigId");
-        JSONObject var7 = var3.getJSONObject("queryParam");
-        long var8 = System.currentTimeMillis();
-        JSONArray var10 = var3.getJSONArray("base64Arry");
-//        Map var11 = this.exportExcelService.exportEmptyExcel(var6, var7, var10);
-        Map var11 = null;
-        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 {
-                var15.close();
-            } catch (IOException var25) {
-                var25.printStackTrace();
-            }
-
-        }
-
-        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 {
-                var6 = this.a(var5, "excel_online");
-            }
-
-            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);
-            }
-        } catch (Exception var9) {
-            var3.setSuccess(false);
-            var3.setMessage("");
-            a.error(var9.getMessage(), var9);
-        }
-
-        return var3;
-    }
-
-    @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);
-            }
-
-            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();
-            }
-
-            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);
-            }
-
-            var4.setSuccess(true);
-            var4.setResult(var5 + var6);
-            return var4;
-        }
-    }
-
-    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();
-            }
-
-            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();
-            }
-
-            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;
-            }
-
-            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({"/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(var1.getDbDriver());
-                DriverManager.setLoginTimeout(10);
-                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());
-            }
-
-        }
-
-        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 var15 = FreeMarkerUtils.a(var6, var9);
-                var15 = var15.replace("'", "");
-                if ("0".equals(var4.getApiMethod())) {
-                    var3 = d.b(var15, var5);
-                } else {
-                    var3 = d.a(var15, var5, (JSONObject) null);
-                }
-
-                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);
-                }
-            }
-        }
-    }
-
-    @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 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 var1, HttpServletRequest var2, @RequestParam("param") String var3) {
-        String var4 = this.jimuTokenClient.getUsername(var2);
-        if (!this.jmBaseConfig.getSaas()) {
-            var4 = "";
-        }
-
-        List var5 = this.jmReportDesignService.getReportQueryInfo(var1, var4, var3);
-        return Result.OK(var5);
-    }
-
-    @RequestMapping({"/addChart"})
-    @JimuLoginRequired
-    public Result<?> d(@RequestParam(name = "chartType") String var1, HttpServletRequest var2) {
-        JSONObject var3 = this.jmReportDesignService.addChart(var1);
-        return Result.OK(var3);
-    }
-
-    @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);
-                        }
-
-                        if (oConvertUtils.isEmpty(var2)) {
-                            var10.put("id", var11);
-                            var10.put("name", var15);
-                            var3.add(var10);
-                        }
-                    }
-                }
-            }
-        }
-
-        return Result.OK(var3);
-    }
-
-    @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 var1, HttpServletResponse var2, @RequestBody JSONObject var3) {
-        HashMap var4 = new HashMap(var1.getParameterMap());
-        boolean var5 = var4.containsKey("token");
-        if (var5) {
-            var4.remove("token");
-        }
-
-        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);
-        }
-
-        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);
-        }
-
-        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;
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -1,188 +0,0 @@
-//
-// 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

@@ -1,159 +0,0 @@
-//
-// 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

@@ -1,59 +0,0 @@
-//
-// 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

@@ -1,92 +0,0 @@
-//
-// 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

@@ -1,60 +0,0 @@
-//
-// 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

@@ -1,154 +0,0 @@
-//
-// 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/java/org/jeecg/modules/jmreport/desreport/a/service/ReportDbServiceImpl.java

@@ -1,8 +0,0 @@
-package org.jeecg.modules.jmreport.desreport.a.service;
-
-import org.jeecg.modules.jmreport.desreport.service.a.i;
-import org.springframework.stereotype.Service;
-
-@Service("reportDbService")
-public class ReportDbServiceImpl extends i {
-}

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

@@ -1,63 +0,0 @@
-package org.jeecg.modules.jmreport.desreport.a.service.a;
-
-
-import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
-import org.jeecg.modules.jmreport.common.vo.Result;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDataSource;
-import org.jeecg.modules.jmreport.desreport.entity.JmReportDb;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author shiqian
- * @date 2021年08月18日 15:45
- **/
-public interface IJmReportDbService {
-
-    JmReportDb saveDb(JmReportDb var1);
-
-    List<List<Map>> fieldTree(String var1);
-
-    boolean queryIsPage(String var1);
-
-    Map<String, Object> executeSelectSql(String var1, String var2, Map<String, Object> var3);
-
-    Map<String, Object> executeSelectApi(String var1, String var2, String var3, String var4, String var5);
-
-    Map loadDbData(String var1);
-
-    void delDbData(String var1);
-
-    List<JmReportDataSource> initDataSource(String var1);
-
-    void saveDbSource(JmReportDataSource var1);
-
-    boolean querySourceCode(JmReportDataSource var1);
-
-    void delDataSource(JmReportDataSource var1);
-
-    List<Map<String, Object>> qurestechSql(JmReportDb var1);
-
-    List<Map> parseData(Map<String, Object> var1);
-
-    List<Map<String, Object>> loadDataSourceTable(String var1);
-
-    Map<String, Object> loadTableData(String var1, String var2, Integer var3, Integer var4, String var5, String var6);
-
-    Map<String, Object> parseReportSql(String var1, String var2, Object var3, String var4, String tableName) throws JimuReportException;
-
-    Result addDataSource(JmReportDataSource var1, HttpServletRequest var2);
-
-    List<Map<String, Object>> queryTableName(String var1, String var2);
-
-    void updateById(JmReportDb var1);
-
-    JmReportDb getById(String var1);
-
-    int getCount(String var1, String var2);
-
-    List<JmReportDb> getListReportDb(String var1);
-
-}

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

@@ -1,816 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by FernFlower decompiler)
-//
-
-package org.jeecg.modules.jmreport.desreport.a.service.a;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.parser.Feature;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-
-import java.sql.SQLSyntaxErrorException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-
-import com.boman.domain.GenTableColumn;
-import com.boman.report.service.IGenTableColumnService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.jmreport.common.expetion.JimuReportException;
-import org.jeecg.modules.jmreport.common.util.ApiAssert;
-import org.jeecg.modules.jmreport.common.util.CommonUtils;
-import org.jeecg.modules.jmreport.common.util.DesUtils;
-import org.jeecg.modules.jmreport.common.util.JimuSpringContextUtils;
-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.dao.JimuReportDbDao;
-import org.jeecg.modules.jmreport.desreport.dao.JimuReportDbParamDao;
-import org.jeecg.modules.jmreport.desreport.entity.*;
-import org.jeecg.modules.jmreport.desreport.render.handler.convert.ApiDataConvertAdapter;
-import org.jeecg.modules.jmreport.desreport.render.utils.RegexMatches;
-import org.jeecg.modules.jmreport.desreport.service.IJimuReportService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbFieldService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbParamService;
-import org.jeecg.modules.jmreport.desreport.service.IJmReportDbSourceService;
-import org.jeecg.modules.jmreport.desreport.util.d;
-import org.jeecg.modules.jmreport.desreport.util.j;
-import org.jeecg.modules.jmreport.dyndb.JmreportDataSourceCachePool;
-import org.jeecg.modules.jmreport.dyndb.JmreportDynamicDbUtil;
-import org.jeecg.modules.jmreport.dyndb.util.JmreportSqlUtils;
-import org.jeecg.modules.jmreport.dyndb.vo.JmreportDynamicDataSourceVo;
-import org.jeecgframework.minidao.pojo.MiniDaoPage;
-import org.jeecgframework.minidao.util.MiniDaoUtil;
-import org.jeecgframework.minidao.util.SnowflakeIdWorker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Primary;
-import org.springframework.jdbc.UncategorizedSQLException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.ResourceAccessException;
-
-@Service
-@Primary
-public class JmReportDbService implements IJmReportDbService {
-    private static final Logger a = LoggerFactory.getLogger(JmReportDbService.class);
-    @Autowired
-    private IJmReportDbParamService jmReportParamService;
-    @Autowired
-    private IJmReportDbFieldService reportDbFieldService;
-    @Autowired
-    private IJmReportDbSourceService jmReportDbSourceService;
-    @Autowired
-    private JmreportDynamicDbUtil jmreportDynamicDbUtil;
-    @Autowired
-    private JmReportTokenClient jimuTokenClient;
-    @Autowired
-    private JimuReportDbDao reportDbDao;
-    @Autowired
-    private JimuReportDbParamDao dbParamDao;
-    @Autowired
-    private IJimuReportService jimuReportService;
-    @Autowired(required = false)
-    private ApiDataConvertAdapter apiDataConverAdapter;
-    @Value("${jeecg.jmreport.apiBasePath:}")
-    private String apiBasePath;
-    @Autowired
-    private IGenTableColumnService genTableColumnService;
-
-    @Override
-    @Transactional
-    public JmReportDb saveDb(JmReportDb reportDb) {
-        if ("1".equals(reportDb.getIsPage())) {
-            List<JmReportDb> var2 = this.reportDbDao.selectList(reportDb.getJimuReportId());
-            var2.forEach((var1) -> {
-                var1.setIsPage("0");
-                if (oConvertUtils.isEmpty(var1.getDbSource())) {
-                    var1.setDbSource("");
-                }
-
-                this.a(var1);
-            });
-        }
-
-        String var7;
-        if ("0".equals(reportDb.getDbType())) {
-            var7 = reportDb.getDbSource();
-            if (oConvertUtils.isNotEmpty(var7)) {
-                JmReportDataSource var3 = this.jmReportDbSourceService.getById(var7);
-                if (var3 != null) {
-                    reportDb.setDbSourceType(MiniDaoUtil.getDbType(var3.getDbUrl()));
-                }
-            } else {
-                String var8 = CommonUtils.getDatabaseType();
-                reportDb.setDbSourceType(var8);
-                reportDb.setDbSource("");
-            }
-        }
-
-        this.a(reportDb);
-        var7 = reportDb.getId();
-        this.reportDbFieldService.deleteByReportId(var7);
-        List<JmReportDbField> dbFields = reportDb.getFieldList();
-        if (d.a(dbFields)) {
-            for (JmReportDbField dbField : dbFields) {
-                dbField.setJimuReportDbId(var7);
-            }
-
-            this.reportDbFieldService.saveOrUpdateBatch(dbFields);
-        }
-
-        this.jmReportParamService.deleteByReportId(var7);
-        List<JmReportDbParam> dbParams = reportDb.getParamList();
-        if (d.a(dbParams)) {
-            for (JmReportDbParam reportDbParam : dbParams) {
-                reportDbParam.setJimuReportHeadId(var7);
-                if (reportDbParam.getSearchFlag() == null) {
-                    reportDbParam.setSearchFlag(0);
-                }
-            }
-
-            this.jmReportParamService.saveOrUpdateBatch(dbParams);
-        }
-
-//        JmReportDb db = new JmReportDb();
-//        db.setId(reportDb.getId());
-//        db.setDbCode(reportDb.getDbCode());
-//        db.setDbChName(reportDb.getDbChName());
-        reportDbDao.update(reportDb);
-        return reportDb;
-    }
-
-    @Override
-    public List<List<Map>> fieldTree(String reportId) {
-        ArrayList var2 = new ArrayList();
-        new JmReportDb();
-        List var4 = this.reportDbDao.selectList(reportId);
-        if (d.a(var4)) {
-            Iterator var5 = var4.iterator();
-
-            while (var5.hasNext()) {
-                JmReportDb var6 = (JmReportDb) var5.next();
-                ArrayList var7 = new ArrayList();
-                HashMap var8 = new HashMap();
-                var8.put("dbId", var6.getId());
-                var8.put("expand", true);
-                var8.put("title", var6.getDbChName());
-                var8.put("code", var6.getDbCode());
-                var8.put("type", var6.getDbType());
-                var8.put("isList", var6.getIsList());
-                List var9 = this.reportDbFieldService.getByDbId(var6.getId());
-                ArrayList var10 = new ArrayList();
-                HashMap var13;
-                if (d.a(var9)) {
-                    for (Iterator var11 = var9.iterator(); var11.hasNext(); var10.add(var13)) {
-                        JmReportDbField var12 = (JmReportDbField) var11.next();
-                        var13 = new HashMap();
-                        var13.put("expand", true);
-                        if (var12.getFieldName().equals(var12.getFieldText())) {
-                            var13.put("title", var12.getFieldName());
-                            var13.put("fieldText", var12.getFieldName());
-                        } else {
-                            var13.put("title", var12.getFieldName());
-                            var13.put("fieldText", var12.getFieldText());
-                        }
-                    }
-                }
-
-                var8.put("children", var10);
-                var7.add(var8);
-                var2.add(var7);
-            }
-        }
-
-        return var2;
-    }
-
-    @Override
-    public boolean queryIsPage(String reportId) {
-        int var2 = this.reportDbDao.getCountByReportId(reportId);
-        boolean var3 = false;
-        if (var2 > 0) {
-            var3 = true;
-        }
-
-        return var3;
-    }
-
-    @Override
-    public Map<String, Object> executeSelectSql(String sql, String dbKey, Map<String, Object> params) {
-        List var4 = this.jmReportParamService.list(params.get("jimuReportHeadId").toString());
-        JmReportDbParam var6;
-        String var8;
-        if (var4 != null && var4.size() > 0) {
-            for (Iterator var5 = var4.iterator(); var5.hasNext(); sql = sql.replace("${" + var6.getParamName() + "}", var8)) {
-                var6 = (JmReportDbParam) var5.next();
-                Object var7 = params.get("self_" + var6.getParamName());
-                var8 = "";
-                if (var7 != null) {
-                    var8 = var7.toString();
-                } else if (var7 == null && oConvertUtils.isNotEmpty(var6.getParamValue())) {
-                    var8 = var6.getParamValue();
-                }
-            }
-        }
-
-        HashMap var15 = new HashMap();
-        Integer var16 = oConvertUtils.getInt(params.get("pageSize"), 10);
-        Integer var17 = oConvertUtils.getInt(params.get("pageNo"), 1);
-        var8 = "select * from (" + sql + ") jeecg_rp_temp  where 1=1";
-        Object var9 = params.get("column");
-        if (var9 != null) {
-            var8 = var8 + " order by jeecg_rp_temp." + var9.toString() + " " + params.get("order").toString();
-        }
-
-        a.info("报表查询sql=>\r\n" + var8);
-        if (oConvertUtils.isNotEmpty(dbKey)) {
-            String var10 = JmreportSqlUtils.getCountSql(sql);
-            Map var11 = (Map) this.jmreportDynamicDbUtil.findOne(dbKey, var10, new Object[0]);
-            var15.put("total", var11.get("total"));
-            JmreportDynamicDataSourceVo var12 = JmreportDataSourceCachePool.getCacheDynamicDataSourceModel(dbKey);
-            String var13 = MiniDaoUtil.createPageSql(var12.getDbUrl(), var8, var17, var16);
-            List var14 = this.jmreportDynamicDbUtil.findList(dbKey, var13, new Object[0]);
-            var15.put("records", d.b(var14));
-        } else {
-            MiniDaoPage var18 = this.reportDbDao.selectPageBySql(var8, var17, var16);
-            var15.put("total", var18.getResults());
-            var15.put("records", d.b(var18.getResults()));
-        }
-
-        return var15;
-    }
-
-    public Map<String, Object> executeSelectApi(String api, String method, String token, String apiConvert, String paramArray) {
-        HashMap var6 = new HashMap();
-        if (oConvertUtils.isNotEmpty(paramArray)) {
-            api = this.b(paramArray, api);
-        }
-
-        String var12;
-        if (api.contains("token")) {
-            String var7 = api.substring(api.indexOf("token"), api.length());
-            String[] var8 = var7.split("&");
-            String[] var9 = var8;
-            int var10 = var8.length;
-
-            for (int var11 = 0; var11 < var10; ++var11) {
-                var12 = var9[var11];
-                String[] var13 = var12.split("=");
-                if (var13.length > 1 && var13[0].equals("token")) {
-                    var13[1] = var13[1].replace("'", "").replace("'", "");
-                    var13[1] = var13[1].replaceAll("\"", "");
-                    if (oConvertUtils.isNotEmpty(var13[1])) {
-                        token = var13[1];
-                    }
-                }
-            }
-        }
-
-        JSONObject var16 = this.a(api, method, token);
-        ArrayList var17 = new ArrayList();
-        if (var16 != null && !"".equals(var16)) {
-            Object var18 = null;
-            String var19 = new String();
-            String var14;
-            Object var20;
-            JSONObject var22;
-            if (!var16.containsKey("data")) {
-                if (oConvertUtils.isNotEmpty(apiConvert)) {
-                    var20 = JimuSpringContextUtils.getBean(apiConvert);
-                    if (var20 != null && var20 instanceof ApiDataConvertAdapter) {
-                        var22 = RegexMatches.e(var16.toJSONString());
-                        ApiDataConvertAdapter var24 = (ApiDataConvertAdapter) var20;
-                        var14 = var24.getData(var22);
-                        var19 = String.valueOf(var14);
-                        var18 = JSONObject.parse(var19, new Feature[]{Feature.OrderedField});
-                    }
-                } else if (oConvertUtils.isNotEmpty(this.apiDataConverAdapter)) {
-                    JSONObject var21 = RegexMatches.e(var16.toJSONString());
-                    var12 = this.apiDataConverAdapter.getData(var21);
-                    var19 = String.valueOf(var12);
-                    var18 = JSONObject.parse(var19, new Feature[]{Feature.OrderedField});
-                } else {
-                    var18 = var16;
-                    var19 = String.valueOf(var16);
-                }
-            } else {
-                var20 = var16.get("data");
-                if (null != var20) {
-                    var19 = JSON.toJSONString(var20, new SerializerFeature[]{SerializerFeature.WriteMapNullValue});
-                }
-
-                var18 = JSONObject.parse(var19, new Feature[]{Feature.OrderedField});
-            }
-
-            LinkedHashMap var23 = new LinkedHashMap();
-            if (var18 instanceof JSONObject) {
-                var22 = JSON.parseObject(var19, new Feature[]{Feature.OrderedField});
-                Iterator var26 = var22.keySet().iterator();
-
-                while (var26.hasNext()) {
-                    var14 = (String) var26.next();
-                    var23.put(var14, var22.get(var14));
-                    var17.add(var23);
-                }
-            } else if (var18 instanceof JSONArray) {
-                JSONArray var25 = (JSONArray) JSONArray.parse(var19, new Feature[]{Feature.OrderedField});
-                if (var25.size() > 0) {
-                    JSONObject var27 = var25.getJSONObject(0);
-                    Iterator var28 = var27.keySet().iterator();
-
-                    while (var28.hasNext()) {
-                        String var15 = (String) var28.next();
-                        var23.put(var15, var27.get(var15));
-                        var17.add(var23);
-                    }
-                }
-            }
-        }
-
-        var6.put("records", d.b(var17));
-        return var6;
-    }
-
-    private List<String> a(String var1, String var2) {
-        if (oConvertUtils.isEmpty(var1)) {
-            return null;
-        } else {
-            MiniDaoPage var3 = this.reportDbDao.selectPageBySql(var1, 1, 1);
-            List var4 = var3.getResults();
-            if (var4.size() < 1) {
-                throw new JimuReportException("该报表sql没有数据");
-            } else {
-                Set var5 = ((Map) var4.get(0)).keySet();
-                ArrayList var6 = new ArrayList();
-                Iterator var7 = var5.iterator();
-
-                while (var7.hasNext()) {
-                    String var8 = (String) var7.next();
-                    var6.add(var8.toLowerCase());
-                }
-
-                return var6;
-            }
-        }
-    }
-
-    @Override
-    public Map loadDbData(String dbId) {
-        HashMap var2 = new HashMap();
-        JmReportDb var3 = this.reportDbDao.get(dbId);
-        if (var3 == null) {
-            return var2;
-        } else {
-            List var4 = this.reportDbFieldService.getByDbId(dbId);
-            List var5 = this.jmReportParamService.list(dbId);
-            var2.put("dbId", dbId);
-            var2.put("reportDb", var3);
-            var2.put("fieldList", var4);
-            var2.put("paramList", var5);
-            return var2;
-        }
-    }
-
-    @Override
-    public List<JmReportDataSource> initDataSource(String createBy) {
-        List var2 = this.jmReportDbSourceService.querySourceList(createBy);
-        if (oConvertUtils.isNotEmpty(var2)) {
-            Iterator var3 = var2.iterator();
-
-            while (var3.hasNext()) {
-                JmReportDataSource var4 = (JmReportDataSource) var3.next();
-                String var5 = var4.getDbPassword();
-                if (var5.startsWith("@JimuReport")) {
-                    var4.setDbPassword(DesUtils.encode(var5.replace("@JimuReport", "")));
-                }
-            }
-        }
-
-        return var2;
-    }
-
-    @Override
-    public void saveDbSource(JmReportDataSource sysDataSource) {
-        this.jmReportDbSourceService.saveOrUpdate(sysDataSource);
-    }
-
-    @Override
-    public boolean querySourceCode(JmReportDataSource sysDataSource) {
-        boolean var2 = false;
-        Integer var3 = 0;
-        if (oConvertUtils.isNotEmpty(sysDataSource.getId())) {
-            JmReportDataSource var4 = this.jmReportDbSourceService.selectById(sysDataSource.getId());
-            if (var4.getCode() != null) {
-                if (!var4.getCode().equals(sysDataSource.getCode())) {
-                    var3 = this.jmReportDbSourceService.excelQueryCode(sysDataSource.getCode());
-                    if (var3 == 0) {
-                        var2 = true;
-                    }
-                } else {
-                    var2 = true;
-                }
-            } else {
-                var3 = this.jmReportDbSourceService.excelQueryCode(sysDataSource.getCode());
-                if (var3 == 0) {
-                    var2 = true;
-                }
-            }
-        } else {
-            var3 = this.jmReportDbSourceService.excelQueryCode(sysDataSource.getCode());
-            if (var3 == 0) {
-                var2 = true;
-            }
-        }
-
-        return var2;
-    }
-
-    @Override
-    public void delDataSource(JmReportDataSource sysDataSource) {
-        this.jmReportDbSourceService.removeById(sysDataSource.getId());
-    }
-
-    @Override
-    public List<Map<String, Object>> qurestechSql(JmReportDb jmReportDb) {
-        if (jmReportDb == null) {
-            return null;
-        } else {
-            String var2 = jmReportDb.getDbDynSql();
-            List var3 = this.dbParamDao.list(jmReportDb.getId());
-            JSONObject var4 = new JSONObject();
-            Iterator var5 = var3.iterator();
-
-            while (var5.hasNext()) {
-                JmReportDbParam var6 = (JmReportDbParam) var5.next();
-                if (oConvertUtils.isNotEmpty(var6.getParamValue())) {
-                    var4.put(var6.getParamName(), var6.getParamValue());
-                }
-            }
-
-            String var7 = this.jimuReportService.getBaseSql(jmReportDb, var4);
-            if (oConvertUtils.isEmpty(jmReportDb.getDbSource())) {
-                return this.reportDbDao.selectListBySql(var7);
-            } else {
-                return this.jmreportDynamicDbUtil.findList(jmReportDb.getDbSource(), var7, new Object[0]);
-            }
-        }
-    }
-
-    @Override
-    public List<Map> parseData(Map<String, Object> map) {
-        ArrayList var2 = new ArrayList();
-        ArrayList var3 = (ArrayList) map.get("records");
-        if (var3 != null && var3.size() >= 1) {
-            LinkedHashMap var4 = (LinkedHashMap) var3.get(0);
-            Integer var5 = 1;
-            Iterator var6 = var4.entrySet().iterator();
-
-            while (var6.hasNext()) {
-                Entry var7 = (Entry) var6.next();
-                String var8 = (String) var7.getKey();
-                LinkedHashMap var9 = new LinkedHashMap();
-                var9.put("fieldName", var8);
-                var9.put("fieldText", var8);
-                var9.put("widgetType", "String");
-                var9.put("isShow", true);
-                Integer var10 = var5;
-                var5 = var5 + 1;
-                var9.put("orderNum", var10);
-                var2.add(var9);
-            }
-        }
-
-        return var2;
-    }
-
-    @Override
-    public List<Map<String, Object>> loadDataSourceTable(String dbKey) {
-        List var2 = null;
-        JmreportDynamicDataSourceVo var3 = JmreportDataSourceCachePool.getCacheDynamicDataSourceModel(dbKey);
-        String var4 = MiniDaoUtil.getDbType(var3.getDbUrl());
-        String var5 = JmreportSqlUtils.getAllTableSql(var3.getDbUrl());
-        if (oConvertUtils.isNotEmpty(var5)) {
-            var2 = this.jmreportDynamicDbUtil.findList(dbKey, var5, new Object[0]);
-            Iterator var6;
-            Map var7;
-            if (JmreportSqlUtils.dbTypeIsOracle(var4)) {
-                var6 = var2.iterator();
-
-                while (var6.hasNext()) {
-                    var7 = (Map) var6.next();
-                    var7.put("Comment", var7.get("COMMENTS"));
-                    var7.put("Name", var7.get("NAME"));
-                }
-            } else if (JmreportSqlUtils.dbTypeIsPostgre(var4)) {
-                var6 = var2.iterator();
-
-                while (var6.hasNext()) {
-                    var7 = (Map) var6.next();
-                    var7.put("Comment", var7.get("comment"));
-                    var7.put("Name", var7.get("name"));
-                }
-            }
-        }
-
-        return var2;
-    }
-
-    @Override
-    public Map<String, Object> loadTableData(String dbKey, String tableName, Integer pageNo, Integer pageSize, String sql, String paramArray) {
-        HashMap var7 = new HashMap();
-        if (oConvertUtils.isNotEmpty(paramArray)) {
-            sql = this.a((Object) paramArray, sql);
-        }
-
-        String var8 = this.jimuTokenClient.getToken();
-        if (oConvertUtils.isNotEmpty(var8)) {
-            Map var9 = this.jimuTokenClient.getUserInfo(var8);
-            sql = d.a(sql, var9);
-        }
-
-        a.info("报表查询querySql=>\r\n" + sql);
-        String var15 = d.f(sql);
-        if (StringUtils.isNotBlank(var15)) {
-            List var10 = this.jmreportDynamicDbUtil.executeProcedure(dbKey, var15);
-            var7.put("records", d.b(var10));
-        } else if (oConvertUtils.isNotEmpty(dbKey)) {
-            JmreportDynamicDataSourceVo var13 = JmreportDataSourceCachePool.getCacheDynamicDataSourceModel(dbKey);
-            String var11 = MiniDaoUtil.createPageSql(var13.getDbUrl(), sql, pageNo, pageSize);
-            a.info("报表查询pageSQL=>\r\n" + var11);
-            List var12 = this.jmreportDynamicDbUtil.findList(dbKey, var11, new Object[0]);
-            var7.put("records", d.b(var12));
-        } else {
-            MiniDaoPage var14 = this.reportDbDao.selectPageBySql(sql, pageNo, pageSize);
-            var7.put("total", var14.getResults());
-            var7.put("records", d.b(var14.getResults()));
-        }
-
-        return var7;
-    }
-
-    @Override
-    @Transactional
-    public void delDbData(String dbId) {
-        this.reportDbDao.deleteById(dbId);
-        this.reportDbFieldService.deleteByReportId(dbId);
-        this.jmReportParamService.deleteByReportId(dbId);
-    }
-
-    private JSONObject a(String var1, String var2, String var3) {
-        a.info("报表API 查询sendHttpRequest 原始API=> " + var1);
-        Map var4 = this.jimuTokenClient.getUserInfo(var3);
-        var1 = d.a(var1, var4, this.apiBasePath);
-        a.info("报表API 查询sendHttpRequest 替换后API=> " + var1);
-        a.info("报表API 查询sendHttpRequest Method=> " + var2);
-        if (var1.contains("'")) {
-            var1 = var1.replace("'", "");
-        }
-
-        new String();
-
-        try {
-            String var5;
-            if ("0".equals(var2)) {
-                var5 = d.b(var1, var3);
-            } else {
-                var5 = d.a(var1, var3, (JSONObject) null);
-            }
-
-            a.info("报表API 查询sendHttpRequest result=> " + var5);
-            JSONObject var6 = JSONObject.parseObject(var5, new Feature[]{Feature.OrderedField});
-            return var6;
-        } catch (ResourceAccessException var7) {
-            a.warn("连接超时:" + var7.getMessage());
-            throw new JimuReportException("api连接超时，请重试！");
-        } catch (Exception var8) {
-            var8.printStackTrace();
-            return null;
-        }
-    }
-
-    @Override
-    public Map<String, Object> parseReportSql(String sql, String dbKey, Object paramArray, String type, String tableName) throws JimuReportException {
-        HashMap<String, Object> var5 = new HashMap<>();
-        List<Map<String, Object>> var6 = new ArrayList<>();
-        if (oConvertUtils.isNotEmpty(paramArray)) {
-            sql = this.a(paramArray, sql);
-        }
-
-        List var7 = d.b(sql);
-        sql = d.a(sql, (Map) null);
-        String var8 = d.f(sql);
-        if (StringUtils.isNotBlank(var8)) {
-            var6 = this.jmreportDynamicDbUtil.executeProcedure(dbKey, var8);
-        } else if (oConvertUtils.isEmpty(dbKey)) {
-            try {
-                if (sql.contains("*")) {
-                    MiniDaoPage var9 = this.reportDbDao.selectPageBySql(sql, 1, 1);
-                    var6 = var9.getResults();
-                }
-
-                if (oConvertUtils.isEmpty(var6)) {
-                    var6 = j.a(sql);
-                }
-            } catch (Exception var17) {
-                Throwable var10 = var17.getCause();
-                if ("0".equals(type)) {
-                    a.warn(var17.getMessage());
-                    var5.put("message", "解析失败");
-                    return var5;
-                }
-
-                if (var10 instanceof SQLSyntaxErrorException) {
-                    throw new JimuReportException(var17.getMessage());
-                }
-
-                if (var17 instanceof UncategorizedSQLException) {
-                    throw new JimuReportException("SQL语法错误！");
-                }
-
-                throw new JimuReportException(var17);
-            }
-        } else {
-            JmreportDynamicDataSourceVo var18 = JmreportDataSourceCachePool.getCacheDynamicDataSourceModel(dbKey);
-            String var20 = MiniDaoUtil.createPageSql(var18.getDbUrl(), sql, 1, 1);
-
-            try {
-                if (sql.contains("*")) {
-                    var6 = this.jmreportDynamicDbUtil.findList(dbKey, var20, new Object[0]);
-                }
-
-                if (oConvertUtils.isEmpty(var6)) {
-                    var6 = j.a(sql);
-                }
-            } catch (Exception var16) {
-                if ("0".equals(type)) {
-                    a.warn(var16.getMessage());
-                    var5.put("message", "解析失败");
-                    return var5;
-                }
-
-                if (var16.getMessage().contains("bad SQL grammar")) {
-                    throw new JimuReportException("SQL语法错误！");
-                }
-
-                throw new JimuReportException(var16);
-            }
-        }
-
-
-        if (CollectionUtils.isEmpty(var6)) {
-            return var5;
-        }
-
-        // 查询我们自己的gen_table_column
-        List<GenTableColumn> columns = genTableColumnService.listColumnsByTableName(tableName);
-        if (CollectionUtils.isEmpty(columns)) {
-            return var5;
-        }
-
-        List<LinkedHashMap<String, Object>> var19 = new ArrayList<>();
-        Map<String, Object> limitOne = var6.get(0);
-
-        int cnt = 1;
-        for (Entry<String, Object> entry : limitOne.entrySet()) {
-            String limitOneColumnName = entry.getKey().toLowerCase();
-            for (GenTableColumn column : columns) {
-                if (!column.getColumnName().equals(limitOneColumnName)) {
-                    continue;
-                }
-
-                LinkedHashMap<String, Object> temp = new LinkedHashMap<>();
-                temp.put("fieldName", limitOneColumnName);
-                temp.put("fieldText", column.getColumnComment());
-                temp.put("widgetType", "String");
-                temp.put("orderNum", cnt++);
-                var19.add(temp);
-                break;
-            }
-        }
-
-        var5.put("fieldList", var19);
-        var5.put("paramList", var7);
-        return var5;
-    }
-
-    private String a(Object var1, String var2) {
-        JSONArray var3 = JSONArray.parseArray(String.valueOf(var1));
-        new HashMap();
-
-        for (int var5 = 0; var5 < var3.size(); ++var5) {
-            JSONObject var6 = var3.getJSONObject(var5);
-            Object var7 = var6.get("paramName");
-            Object var8 = var6.get("paramValue");
-            if (oConvertUtils.isNotEmpty(var7) && oConvertUtils.isNotEmpty(var8)) {
-                var2 = var2.replace("${" + var7 + "}", String.valueOf(var8));
-                var2 = var2.replace("'${" + var7 + "}'", String.valueOf(var8));
-            }
-        }
-
-        return var2;
-    }
-
-    private String b(Object var1, String var2) {
-        JSONArray var3 = JSONArray.parseArray(String.valueOf(var1));
-        new HashMap();
-
-        for (int var5 = 0; var5 < var3.size(); ++var5) {
-            JSONObject var6 = var3.getJSONObject(var5);
-            Object var7 = var6.get("paramName");
-            Object var8 = var6.get("paramValue");
-            if (oConvertUtils.isNotEmpty(var7) && oConvertUtils.isNotEmpty(var8)) {
-                var2 = var2.replace("${" + var7 + "}", String.valueOf(var8));
-                var2 = var2.replace("'${" + var7 + "}'", String.valueOf(var8));
-            }
-        }
-
-        return var2;
-    }
-
-    public Result addDataSource(JmReportDataSource dataSource, HttpServletRequest request) {
-        String var3 = this.jimuTokenClient.getUsername(request);
-        ApiAssert.isNotEmpty("未实现JmReportTokenServiceI", var3);
-        String var4 = DesUtils.decode(dataSource.getDbPassword());
-        dataSource.setDbPassword("@JimuReport" + var4);
-        dataSource.setCreateBy(var3);
-        dataSource.setCreateTime(new Date());
-        dataSource.setConnectTimes(0);
-        this.saveDbSource(dataSource);
-        JmreportDataSourceCachePool.deleteCacheDataSource(dataSource.getId());
-        return Result.OK("操作成功！", true);
-    }
-
-    public List<Map<String, Object>> queryTableName(String key, String tableName) {
-        ArrayList var3 = new ArrayList();
-        List var4 = this.loadDataSourceTable(key);
-        if (oConvertUtils.isEmpty(tableName)) {
-            return var4;
-        } else {
-            Pattern var5 = Pattern.compile(tableName.toLowerCase());
-            Iterator var6 = var4.iterator();
-
-            while (var6.hasNext()) {
-                Map var7 = (Map) var6.next();
-                Object var8 = new HashMap();
-                String var9 = String.valueOf(var7.get("Name"));
-                Matcher var10 = var5.matcher(var9.toLowerCase());
-                if (var10.find()) {
-                    var8 = var7;
-                    var7.put("Name", var7.get("Name"));
-                }
-
-                if (((Map) var8).size() > 0 && null != var8) {
-                    var3.add(var8);
-                }
-            }
-
-            return var3;
-        }
-    }
-
-    @Override
-    public void updateById(JmReportDb reportDb) {
-        this.reportDbDao.update(reportDb);
-    }
-
-    @Override
-    public JmReportDb getById(String apiSelectId) {
-        return this.reportDbDao.get(apiSelectId);
-    }
-
-    @Override
-    public int getCount(String reportId, String code) {
-        return this.reportDbDao.getCount(reportId, code);
-    }
-
-    @Override
-    public List<JmReportDb> getListReportDb(String reportId) {
-        return this.reportDbDao.selectList(reportId);
-    }
-
-    public void a(JmReportDb var1) {
-        if (oConvertUtils.isNotEmpty(var1.getId())) {
-            this.reportDbDao.update(var1);
-        } else {
-            var1.setId(String.valueOf(SnowflakeIdWorker.generateId()));
-            this.reportDbDao.insert(var1);
-        }
-
-    }
-}

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

@@ -1,8 +0,0 @@
-package org.jeecg.modules.jmreport.desreport.a.service.a;
-
-import org.jeecg.modules.jmreport.desreport.service.a.i;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ReportDbServiceImpl extends i {
-}

boman-report/src/main/resources/mapper/GenTableColumnMapper.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.boman.report.mapper.GenTableColumnMapper">
-    
-    <resultMap type="com.boman.report.domain.GenTableColumn" id="GenTableColumnResult">
-        <result property="id"       column="id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="foreignKey"     column="foreign_key"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-        <result property="hrParentId"     column="hr_parent_id"    />
-        <result property="mask"     column="mask"    />
-        <result property="defaultValue"     column="default_value"    />
-        <result property="numRows"     column="num_rows"    />
-        <result property="numColumns"     column="num_columns"    />
-        <result property="fieldTranslator"     column="field_translator"    />
-        <result property="extendedAttributes"     column="extended_attributes"    />
-        <result property="isIn"     column="is_in"    />
-        <result property="isOut"     column="is_out"    />
-        <result property="regular"     column="regular"    />
-        <result property="tableColumnName"     column="table_column_name"    />
-        <result property="seqName"     column="seq_name"    />
-    </resultMap>
-	
-	<sql id="selectGenTableColumnVo">
-        select id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns, field_translator, extended_attributes, is_in, is_out, regular, table_column_name, seq_name from gen_table_column
-    </sql>
-
-    <select id="listByTableIdList" parameterType="list" resultMap="GenTableColumnResult">
-        <include refid="selectGenTableColumnVo"/>
-        where table_id in
-        <foreach collection="tableIdList" open="(" close=")" separator="," item="tableId">
-            #{tableId}
-        </foreach>
-        order by sort
-    </select>
-</mapper>

boman-report/src/main/resources/mapper/GenTableMapper.xml

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.boman.report.mapper.GenTableMapper">
-
-	<resultMap type="com.boman.report.domain.GenTable" id="GenTableResult">
-	    <id     property="id"        column="id"          />
-		<result property="tableName"      column="table_name"        />
-		<result property="tableComment"   column="table_comment"     />
-		<result property="subTableName"   column="sub_table_name"    />
-		<result property="subTableFkName" column="sub_table_fk_name" />
-		<result property="className"      column="class_name"        />
-		<result property="tplCategory"    column="tpl_category"      />
-		<result property="packageName"    column="package_name"      />
-		<result property="moduleName"     column="module_name"       />
-		<result property="businessName"   column="business_name"     />
-		<result property="functionName"   column="function_name"     />
-		<result property="functionAuthor" column="function_author"   />
-		<result property="genType"        column="gen_type"          />
-		<result property="genPath"        column="gen_path"          />
-		<result property="options"        column="options"           />
-		<result property="createBy"       column="create_by"         />
-		<result property="createTime"     column="create_time"       />
-		<result property="updateBy"       column="update_by"         />
-		<result property="updateTime"     column="update_time"       />
-		<result property="remark"         column="remark"            />
-		<result property="isMenu"         column="is_menu"            />
-		<result property="menuRole"         column="menu_role"            />
-		<result property="akColumn"         column="ak_column"            />
-		<result property="dkColumn"         column="dk_column"            />
-		<result property="triggerCreate"         column="trigger_create"            />
-		<result property="triggerRetrieve"         column="trigger_retrieve"            />
-		<result property="triggerUpdate"         column="trigger_update"            />
-		<result property="triggerDelete"         column="trigger_delete"            />
-		<result property="triggerSubmit"         column="trigger_submit"            />
-		<result property="realTableName"         column="real_table_name"            />
-		<result property="filterConditions"         column="filter_conditions"            />
-		<result property="extendedAttributes"         column="extended_attributes"            />
-		<result property="tablePrimaryKey"         column="table_primary_key"            />
-		<result property="tableColumn"         column="table_column"            />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
-	
-	<resultMap type="com.boman.report.domain.GenTableColumn" id="GenTableColumnResult">
-        <id     property="id"       column="c_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-	
-	<sql id="selectGenTableVo">
-        select id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
-         create_by, create_time, update_by, update_time, remark, is_menu, menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, trigger_update, trigger_delete, trigger_submit, real_table_name, filter_conditions, extended_attributes, table_primary_key, table_column from gen_table
-    </sql>
-
-	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-		SELECT t.id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key, t.table_column,
-			   c.id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-				 LEFT JOIN gen_table_column c ON t.id = c.table_id
-		where t.table_name = #{tableName} order by c.sort
-	</select>
-
-</mapper>

boman-report/src/main/resources/mapper/StatisticReportMapper.xml

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.boman.report.mapper.StatisticReportMapper">
-
-    <resultMap type="com.boman.domain.entity.StatisticReport" id="StatisticReportResult">
-        <id property="id" column="id"/>
-        <result property="reportName" column="report_name"/>
-        <result property="reportId" column="report_id"/>
-        <result property="templateName" column="template_name"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="reportStatus" column="report_status"/>
-        <result property="status" column="status"/>
-        <result property="repUploadFile" column="rep_upload_file"/>
-        <result property="remark" column="remark"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isDel" column="is_del"/>
-        <collection  property="personnels"   javaType="java.util.List" resultMap="StatisticReportPersonnelResult" />
-    </resultMap>
-
-    <resultMap type="com.boman.domain.entity.StatisticReportPersonnel" id="StatisticReportPersonnelResult">
-        <id property="id" column="psersonnel_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-    </resultMap>
-
-    <resultMap type="com.boman.domain.entity.vo.StatisticReportVo" id="StatisticReportVoResult">
-        <id property="id" column="id"/>
-        <result property="reportName" column="report_name"/>
-        <result property="reportId" column="report_id"/>
-        <result property="templateName" column="template_name"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="reportStatus" column="report_status"/>
-        <result property="status" column="status"/>
-        <result property="repUploadFile" column="rep_upload_file"/>
-        <result property="remark" column="remark"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isDel" column="is_del"/>
-    </resultMap>
-
-
-
-    <sql id="selectStatisticReportVo">
-        select id, report_name, report_id, template_name, start_time, end_time, report_status, status, rep_upload_file, remark, create_by, create_time, update_by, update_time, is_del
-        from statistic_report
-    </sql>
-
-    <select id="getReportInfo" parameterType="Long" resultMap="StatisticReportVoResult">
-        <include refid="selectStatisticReportVo"/>
-        where id = #{id} and is_del = "N"
-    </select>
-    <resultMap type="com.boman.domain.dto.StatisticReportDto" id="ReportDtoResult">
-        <id property="id" column="id"/>
-        <result property="name" column="name"/>
-    </resultMap>
-
-    <sql id="selectReportVo">
-        select * from statistic_report
-    </sql>
-
-    <select id="getDetailById" parameterType="Long" resultMap="StatisticReportResult">
-        select t.*, p.id as psersonnel_id, p.dept_id, p.dept_name, p.user_id, p.user_name
-        from statistic_report t left join statistic_report_personnel p on t.id = p.statistic_id
-        where t.id = #{id}
-    </select>
-
-    <select id="selectList" parameterType="com.boman.domain.entity.StatisticReport" resultMap="StatisticReportResult">
-        <include refid="selectReportVo"/>
-        <where>
-            is_del = 'N'
-            <if test="id != null and id != ''">
-                AND id = #{id}
-            </if>
-            <if test="createBy != null and createBy != ''">
-                AND create_by = #{createBy}
-            </if>
-            <if test="reportName != null and reportName != ''">
-                AND lower(report_name) like lower(concat('%', #{reportName}, '%'))
-            </if>
-            <if test="sTime != null and sTime != ''">
-                AND start_time &gt;= #{sTime}
-            </if>
-            <if test="eTime != null and eTime != ''">
-                AND end_time &lt;= #{eTime}
-            </if>
-            <if test="status != null and status != ''">
-                AND status = #{status}
-            </if>
-        </where>
-        order by create_time DESC
-    </select>
-
-    <insert id="insert" parameterType="com.boman.domain.entity.StatisticReport" useGeneratedKeys="true" keyProperty="id">
-        insert into statistic_report
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="reportName != null and reportName != ''">report_name,</if>
-            <if test="reportId != null">report_id,</if>
-            <if test="templateName != null">template_name,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="reportStatus != null">report_status,</if>
-            <if test="status != null">status,</if>
-            <if test="repUploadFile != null and repUploadFile != ''">rep_upload_file,</if>
-            <if test="remark != null">remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="reportName != null and reportName != ''">#{reportName},</if>
-            <if test="reportId != null">#{reportId},</if>
-            <if test="templateName != null">#{templateName},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="reportStatus != null">#{reportStatus},</if>
-            <if test="status != null">#{status},</if>
-            <if test="repUploadFile != null and repUploadFile != ''">#{repUploadFile},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="isDel != null">#{isDel},</if>
-        </trim>
-    </insert>
-
-    <update id="update" parameterType="com.boman.domain.entity.StatisticReport">
-        update statistic_report
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="reportName != null and reportName != ''">report_name = #{reportName},</if>
-            <if test="reportId != null">report_id = #{reportId},</if>
-            <if test="templateName != null">template_name = #{templateName},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime == null">end_time = #{endTime},</if>
-            <if test="reportStatus != null">report_status = #{reportStatus},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="repUploadFile != null">rep_upload_file = #{repUploadFile},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="isDel != null">is_del = #{isDel},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <select id="selectReportInfo" resultMap="ReportDtoResult" parameterType="java.util.Map">
-        select id, name from  jimu_report where
-             create_by = #{userName}
-            <if test="name != null and name != ''">
-                AND lower(name) like lower(concat('%', #{name}, '%'))
-            </if>
-            order by create_by desc
-    </select>
-</mapper>

boman-report/src/main/resources/mapper/StatisticReportPersonnelMapper.xml

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.boman.report.mapper.StatisticReportPersonnelMapper">
-
-    <resultMap type="com.boman.domain.entity.StatisticReportPersonnel" id="StatisticReportPersonnelResult">
-        <id property="id" column="id"/>
-        <result property="reportName" column="report_name"/>
-        <result property="statisticId" column="statistic_id"/>
-        <result property="deptId" column="dept_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="status" column="status"/>
-        <result property="uploadFile" column="upload_file"/>
-        <result property="isDel" column="is_del"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-    <resultMap type="com.boman.domain.entity.StatisticReport" id="StatisticReportResult">
-        <id property="id" column="id"/>
-        <result property="reportName" column="report_name"/>
-        <result property="reportId" column="report_id"/>
-        <result property="templateName" column="template_name"/>
-        <result property="startTime" column="start_time"/>
-        <result property="endTime" column="end_time"/>
-        <result property="reportStatus" column="report_status"/>
-        <result property="status" column="status"/>
-        <result property="repUploadFile" column="rep_upload_file"/>
-        <result property="personnelId" column="personnel_id" />
-        <result property="tableName" column="table_name" />
-        <result property="deptId" column="dept_id"/>
-        <result property="deptName" column="dept_name"/>
-        <result property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="remark" column="remark"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="isDel" column="is_del"/>
-    </resultMap>
-
-    <select id="selectList" parameterType="com.boman.domain.entity.StatisticReportPersonnel" resultMap="StatisticReportResult">
-        SELECT  r.*, p.id AS personnel_id, db.db_code as table_name,
-               p.dept_id,p.dept_name,p.user_id,p.user_name
-        FROM
-            statistic_report_personnel p
-        JOIN statistic_report r ON r.id = p.statistic_id
-        JOIN jimu_report t on t.id = r.report_id
-        JOIN jimu_report_db db on db.jimu_report_id = t.id
-        AND r.is_del = 'N'
-        AND r.`status` = '2'
-        <where>
-            <if test="createBy != null and createBy != ''">
-                AND p.create_by = #{createBy}
-            </if>
-            <if test="reportName != null and reportName != ''">
-                AND lower(r.report_name) like lower(concat('%', #{reportName}, '%'))
-            </if>
-            <if test="userName != null and userName != ''">
-                AND p.user_name = #{userName}
-            </if>
-            <if test="sTime != null and sTime != ''">
-                AND date_format(r.start_time, '%Y-%m-%d') &lt;= #{sTime}
-            </if>
-            <if test="eTime != null and eTime != ''">
-                AND date_format(r.end_time, '%Y-%m-%d') &gt;= #{eTime}
-            </if>
-            <if test="status != null and status != ''">
-                AND r.status = #{status}
-            </if>
-        </where>
-    </select>
-
-    <delete id="deleteByStatisticIds" parameterType="Long">
-        delete from statistic_report_personnel where statistic_id in
-        <foreach collection="array" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <update id="updateStatus" parameterType="com.boman.domain.entity.StatisticReportPersonnel">
-        update statistic_report_personnel set status = #{status},upload_file=#{uploadFile} where id = #{id}
-    </update>
-
-    <insert id="insert" parameterType="com.boman.domain.entity.StatisticReportPersonnel">
-        insert into statistic_report_personnel
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="reportName != null and reportName != ''">report_name,</if>
-            <if test="statisticId != null">statistic_id,</if>
-            <if test="deptId != null">dept_id,</if>
-            <if test="deptName != null">dept_name,</if>
-            <if test="userId != null">user_id,</if>
-            <if test="userName != null">user_name,</if>
-            <if test="isDel != null">is_del,</if>
-            <if test="status != null">status,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="reportName != null and reportName != ''">#{reportName},</if>
-            <if test="statisticId != null">#{statisticId},</if>
-            <if test="deptId != null">#{deptId},</if>
-            <if test="deptName != null">#{deptName},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="userName != null">#{userName},</if>
-            <if test="isDel != null">#{isDel},</if>
-            <if test="status != null">#{status},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-        </trim>
-    </insert>
-    <sql id="selectStatisticReportPersonnelVo">
-        select id, report_name, statistic_id, dept_id, dept_name, user_id, user_name,upload_file, is_del, status, create_by, create_time, update_by, update_time
-        from statistic_report_personnel
-    </sql>
-
-    <select id="selectByStatisticId" parameterType="Long" resultMap="StatisticReportPersonnelResult">
-        <include refid="selectStatisticReportPersonnelVo"/>
-        where statistic_id = #{id} and is_del = "N"
-    </select>
-</mapper>

boman-report/src/main/resources/static/jmreport/desreport_/cdn/html2canvas/canvas2image.js

@@ -1,265 +0,0 @@
-/**
- * covert canvas to image
- * and save the image file
- */
-
-var Canvas2Image = function () {
-
-	// check if support sth.
-	var $support = function () {
-		var canvas = document.createElement('canvas'),
-			ctx = canvas.getContext('2d');
-
-		return {
-			canvas: !!ctx,
-			imageData: !!ctx.getImageData,
-			dataURL: !!canvas.toDataURL,
-			btoa: !!window.btoa
-		};
-	}();
-
-	var downloadMime = 'image/octet-stream';
-
-	function scaleCanvas (canvas, width, height) {
-		var w = canvas.width,
-			h = canvas.height;
-		if (width == undefined) {
-			width = w;
-		}
-		if (height == undefined) {
-			height = h;
-		}
-
-		var retCanvas = document.createElement('canvas');
-		var retCtx = retCanvas.getContext('2d');
-		retCanvas.width = width;
-		retCanvas.height = height;
-		retCtx.drawImage(canvas, 0, 0, w, h, 0, 0, width, height);
-		return retCanvas;
-	}
-
-	function getDataURL (canvas, type, width, height) {
-		canvas = scaleCanvas(canvas, width, height);
-		return canvas.toDataURL(type);
-	}
-
-	function saveFile (strData) {
-		document.location.href = strData;
-	}
-
-	function genImage(strData) {
-		var img = document.createElement('img');
-		img.src = strData;
-		return img;
-	}
-	function fixType (type) {
-		type = type.toLowerCase().replace(/jpg/i, 'jpeg');
-		var r = type.match(/png|jpeg|bmp|gif/)[0];
-		return 'image/' + r;
-	}
-	function encodeData (data) {
-		if (!window.btoa) { throw 'btoa undefined' }
-		var str = '';
-		if (typeof data == 'string') {
-			str = data;
-		} else {
-			for (var i = 0; i < data.length; i ++) {
-				str += String.fromCharCode(data[i]);
-			}
-		}
-
-		return btoa(str);
-	}
-	function getImageData (canvas) {
-		var w = canvas.width,
-			h = canvas.height;
-		return canvas.getContext('2d').getImageData(0, 0, w, h);
-	}
-	function makeURI (strData, type) {
-		return 'data:' + type + ';base64,' + strData;
-	}
-
-
-	/**
-	 * create bitmap image
-	 * 按照规则生成图片响应头和响应体
-	 */
-	var genBitmapImage = function (oData) {
-
-		//
-		// BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
-		// BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
-		//
-
-		var biWidth  = oData.width;
-		var biHeight	= oData.height;
-		var biSizeImage = biWidth * biHeight * 3;
-		var bfSize  = biSizeImage + 54; // total header size = 54 bytes
-
-		//
-		//  typedef struct tagBITMAPFILEHEADER {
-		//  	WORD bfType;
-		//  	DWORD bfSize;
-		//  	WORD bfReserved1;
-		//  	WORD bfReserved2;
-		//  	DWORD bfOffBits;
-		//  } BITMAPFILEHEADER;
-		//
-		var BITMAPFILEHEADER = [
-			// WORD bfType -- The file type signature; must be "BM"
-			0x42, 0x4D,
-			// DWORD bfSize -- The size, in bytes, of the bitmap file
-			bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
-			// WORD bfReserved1 -- Reserved; must be zero
-			0, 0,
-			// WORD bfReserved2 -- Reserved; must be zero
-			0, 0,
-			// DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
-			54, 0, 0, 0
-		];
-
-		//
-		//  typedef struct tagBITMAPINFOHEADER {
-		//  	DWORD biSize;
-		//  	LONG  biWidth;
-		//  	LONG  biHeight;
-		//  	WORD  biPlanes;
-		//  	WORD  biBitCount;
-		//  	DWORD biCompression;
-		//  	DWORD biSizeImage;
-		//  	LONG  biXPelsPerMeter;
-		//  	LONG  biYPelsPerMeter;
-		//  	DWORD biClrUsed;
-		//  	DWORD biClrImportant;
-		//  } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
-		//
-		var BITMAPINFOHEADER = [
-			// DWORD biSize -- The number of bytes required by the structure
-			40, 0, 0, 0,
-			// LONG biWidth -- The width of the bitmap, in pixels
-			biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
-			// LONG biHeight -- The height of the bitmap, in pixels
-			biHeight & 0xff, biHeight >> 8  & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
-			// WORD biPlanes -- The number of planes for the target device. This value must be set to 1
-			1, 0,
-			// WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
-			// has a maximum of 2^24 colors (16777216, Truecolor)
-			24, 0,
-			// DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
-			0, 0, 0, 0,
-			// DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
-			biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
-			// LONG biXPelsPerMeter, unused
-			0,0,0,0,
-			// LONG biYPelsPerMeter, unused
-			0,0,0,0,
-			// DWORD biClrUsed, the number of color indexes of palette, unused
-			0,0,0,0,
-			// DWORD biClrImportant, unused
-			0,0,0,0
-		];
-
-		var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
-
-		var aImgData = oData.data;
-
-		var strPixelData = '';
-		var biWidth4 = biWidth<<2;
-		var y = biHeight;
-		var fromCharCode = String.fromCharCode;
-
-		do {
-			var iOffsetY = biWidth4*(y-1);
-			var strPixelRow = '';
-			for (var x = 0; x < biWidth; x++) {
-				var iOffsetX = x<<2;
-				strPixelRow += fromCharCode(aImgData[iOffsetY+iOffsetX+2]) +
-							   fromCharCode(aImgData[iOffsetY+iOffsetX+1]) +
-							   fromCharCode(aImgData[iOffsetY+iOffsetX]);
-			}
-
-			for (var c = 0; c < iPadding; c++) {
-				strPixelRow += String.fromCharCode(0);
-			}
-
-			strPixelData += strPixelRow;
-		} while (--y);
-
-		var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
-
-		return strEncoded;
-	};
-
-	/**
-	 * saveAsImage
-	 * @param canvasElement
-	 * @param {String} image type
-	 * @param {Number} [optional] png width
-	 * @param {Number} [optional] png height
-	 */
-	var saveAsImage = function (canvas, width, height, type) {
-		if ($support.canvas && $support.dataURL) {
-			if (typeof canvas == "string") { canvas = document.getElementById(canvas); }
-			if (type == undefined) { type = 'png'; }
-			type = fixType(type);
-			if (/bmp/.test(type)) {
-				var data = getImageData(scaleCanvas(canvas, width, height));
-				var strData = genBitmapImage(data);
-				saveFile(makeURI(strData, downloadMime));
-			} else {
-				var strData = getDataURL(canvas, type, width, height);
-				saveFile(strData.replace(type, downloadMime));
-			}
-		}
-	};
-
-	var convertToImage = function (canvas, width, height, type) {
-		if ($support.canvas && $support.dataURL) {
-			if (typeof canvas == "string") { canvas = document.getElementById(canvas); }
-			if (type == undefined) { type = 'png'; }
-			type = fixType(type);
-
-			if (/bmp/.test(type)) {
-				var data = getImageData(scaleCanvas(canvas, width, height));
-				var strData = genBitmapImage(data);
-				return genImage(makeURI(strData, 'image/bmp'));
-			} else {
-				var strData = getDataURL(canvas, type, width, height);
-				return genImage(strData);
-			}
-		}
-	};
-
-
-
-	return {
-		saveAsImage: saveAsImage,
-		saveAsPNG: function (canvas, width, height) {
-			return saveAsImage(canvas, width, height, 'png');
-		},
-		saveAsJPEG: function (canvas, width, height) {
-			return saveAsImage(canvas, width, height, 'jpeg');
-		},
-		saveAsGIF: function (canvas, width, height) {
-			return saveAsImage(canvas, width, height, 'gif');
-		},
-		saveAsBMP: function (canvas, width, height) {
-			return saveAsImage(canvas, width, height, 'bmp');
-		},
-
-		convertToImage: convertToImage,
-		convertToPNG: function (canvas, width, height) {
-			return convertToImage(canvas, width, height, 'png');
-		},
-		convertToJPEG: function (canvas, width, height) {
-			return convertToImage(canvas, width, height, 'jpeg');
-		},
-		convertToGIF: function (canvas, width, height) {
-			return convertToImage(canvas, width, height, 'gif');
-		},
-		convertToBMP: function (canvas, width, height) {
-			return convertToImage(canvas, width, height, 'bmp');
-		}
-	};
-
-}();

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.background.json

@@ -1,100 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "bar",
-    "data": [5, 20, 36, 10, 10, 20],
-    "showBackground": true,
-    "backgroundStyle": {
-      "color": "rgba(220, 220, 220, 0.8)"
-    },
-    "barWidth": 50,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":"#c43632"
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.horizontal.json

@@ -1,149 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["直接访问","邮件营销", "联盟广告"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger":"axis",
-    "axisPointer": {
-      "type": "shadow"
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type ": "value",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": {
-    "show":true,
-    "type": "category",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一", "周二", "周三", "周四", "周五"]
-  },
-  "series": [{
-    "name": "直接访问",
-    "type": "bar",
-    "data": [320, 332, 301, 334, 390],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "right",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "邮件营销",
-    "type": "bar",
-    "data": [120, 132, 101, 134, 90],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "right",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "联盟广告",
-    "type": "bar",
-    "data": [220, 182, 191, 234, 290],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "right",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.multi.json

@@ -1,149 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["直接访问","邮件营销", "联盟广告"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger":"axis",
-    "axisPointer": {
-      "type": "shadow"
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type": "category",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
-  },
-  "yAxis": {
-    "show":true,
-    "type ": "value",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "直接访问",
-    "type": "bar",
-    "data": [320, 332, 301, 334, 390, 330, 320],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "邮件营销",
-    "type": "bar",
-    "data": [120, 132, 101, 134, 90, 230, 210],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "联盟广告",
-    "type": "bar",
-    "data": [220, 182, 191, 234, 290, 330, 310],
-    "barWidth": 0,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.negative.json

@@ -1,140 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "利润统计",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": [ "利润", "支出", "收入"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger":"axis",
-    "axisPointer": {
-      "type": "shadow"
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type ": "value",
-    "splitLine":{
-      "show":true,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": {
-    "show":true,
-    "type": "category",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
-  },
-  "series": [
-    {
-      "name": "利润",
-      "type": "bar",
-      "stack": "利润",
-      "label": {
-        "show": true,
-        "position": "inside"
-      },
-      "barWidth": 25,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "barBorderRadius":0,
-        "color":""
-      },
-      "data": [200, 170, 240, 244, 200, 220, 210]
-    },
-    {
-      "name": "收入",
-      "type": "bar",
-      "stack": "总量",
-      "label": {
-        "show": true
-      },
-      "barWidth": 25,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "barBorderRadius":0,
-        "color":""
-      },
-      "data": [320, 302, 341, 374, 390, 450, 420]
-    },
-    {
-      "name": "支出",
-      "type": "bar",
-      "stack": "总量",
-      "label": {
-        "show": true,
-        "position": "left"
-      },
-      "barWidth": 5,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "barBorderRadius":0,
-        "color":""
-      },
-      "data": [-120, -132, -101, -134, -190, -230, -210]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.simple.json

@@ -1,108 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "top": "5",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  /*"legend": {
-    "show": false,
-    "data": ["销量"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "bar",
-    "data": [5, 20, 36, 10, 10, 20],
-    "barWidth": 50,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":"#c43632"
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.horizontal.json

@@ -1,125 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["直接访问","邮件营销", "联盟广告"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger":"axis",
-    "axisPointer": {
-      "type": "shadow"
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type ": "value",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": {
-    "show":true,
-    "type": "category",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一", "周二", "周三", "周四", "周五"]
-  },
-  "series": [{
-    "name": "直接访问",
-    "type": "bar",
-    "stack":"总量",
-    "data": [320, 332, 301, 334, 390],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "邮件营销",
-    "type": "bar",
-    "stack":"总量",
-    "data": [120, 132, 101, 134, 90],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "联盟广告",
-    "type": "bar",
-    "stack":"总量",
-    "data": [220, 182, 191, 234, 290],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/bar.stack.json

@@ -1,158 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["直接访问","邮件营销", "联盟广告","百度", "谷歌", "必应"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger":"axis",
-    "axisPointer": {
-      "type": "shadow"
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type": "category",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
-  },
-  "yAxis": {
-    "show":true,
-    "type ": "value",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "直接访问",
-    "type": "bar",
-    "stack":"",
-    "data": [320, 332, 301, 334, 390, 330, 320],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "邮件营销",
-    "type": "bar",
-    "stack":"总量",
-    "data": [120, 132, 101, 134, 90, 230, 210],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "联盟广告",
-    "type": "bar",
-    "stack":"总量",
-    "data": [220, 182, 191, 234, 290, 330, 310],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "百度",
-    "type": "bar",
-    "barWidth": 15,
-    "stack": "搜索引擎",
-    "data": [620, 732, 701, 734, 1090, 1130, 1120],
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  }, {
-    "name": "谷歌",
-    "type": "bar",
-    "stack": "搜索引擎",
-    "data": [120, 132, 101, 134, 290, 230, 220],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-    },{
-    "name": "必应",
-    "type": "bar",
-    "stack": "搜索引擎",
-    "data": [60, 72, 71, 74, 190, 130, 110],
-    "barMinHeight": 2,
-    "barWidth": 15,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-    }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/echartslist.json

@@ -1,1459 +0,0 @@
-{
-  "bar": {
-      "title": {
-          "show": true,
-          "text": "某站点用户访问来源",
-          "left": "left",
-          "padding": [5,20,5,20],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "legend": {
-          "show": true,
-          "data": ["销量"],
-          "top": "top",
-          "left": "center",
-          "orient": "horizontal",
-          "padding":[25,20,25,10],
-          "textStyle": {
-              "color":  "#333",
-              "fontSize": 12
-          }
-      },
-      "grid": {
-          "left": 60,
-          "top": 60,
-          "right": 60,
-          "bottom": 60
-      },
-      "tooltip": {
-          "show":true,
-          "textStyle":{
-              "color":"#fff",
-              "fontSize": 18
-          }
-      },
-      "xAxis": {
-          "show":true,
-          "name":"服饰",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "interval":"auto",
-              "rotate":0,
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          },
-          "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-      },
-      "yAxis": {
-          "show":true,
-          "name":"销量",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "series": [{
-          "name": "销量",
-          "type": "bar",
-          "data": [5, 20, 36, 10, 10, 20],
-          "barWidth": 50,
-          "barMinHeight": 2,
-          "itemStyle": {
-              "normal": {
-                  "barBorderRadius":0,
-                  "color":"#c43632",
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      }]
-  },
-  "bar3": {
-    "title": {
-      "show": true,
-      "text": "某站点用户访问来源",
-      "left": "left",
-      "padding": [5,20,5,20],
-      "textStyle": {
-        "fontSize": 18,
-        "fontWeight": "bolder",
-        "color": "#c23531"
-      }
-    },
-    "legend": {
-      "show": true,
-      "data": ["直接访问","邮件营销", "联盟广告"],
-      "top": "top",
-      "left": "center",
-      "orient": "horizontal",
-      "padding":[25,20,25,10],
-      "textStyle": {
-        "color":  "#333",
-        "fontSize": 12
-      }
-    },
-    "grid": {
-      "left": 60,
-      "top": 60,
-      "right": 60,
-      "bottom": 60
-    },
-    "tooltip": {
-      "show":true,
-      "trigger":"axis",
-      "axisPointer": {
-        "type": "shadow"
-      },
-      "textStyle":{
-        "color":"#fff",
-        "fontSize": 18
-      }
-    },
-    "xAxis": {
-      "show":true,
-      "type": "category",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "interval":"auto",
-        "rotate":0,
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      },
-      "data": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
-    },
-    "yAxis": {
-      "show":true,
-      "type ": "value",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      }
-    },
-    "series": [{
-      "name": "直接访问",
-      "type": "bar",
-      "data": [320, 332, 301, 334, 390, 330, 320],
-      "barWidth": 0,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "normal": {
-          "barBorderRadius":0,
-          "color":"",
-          "label": {
-            "show": true,
-            "position": "top",
-            "textStyle": {
-              "color": "black",
-              "fontSize": 16,
-              "fontWeight": "bolder"
-            }
-          }
-        }
-      }
-    },{
-      "name": "邮件营销",
-      "type": "bar",
-      "data": [120, 132, 101, 134, 90, 230, 210],
-      "barWidth": 0,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "normal": {
-          "barBorderRadius":0,
-          "color":"",
-          "label": {
-            "show": true,
-            "position": "top",
-            "textStyle": {
-              "color": "black",
-              "fontSize": 16,
-              "fontWeight": "bolder"
-            }
-          }
-        }
-      }
-    },{
-      "name": "联盟广告",
-      "type": "bar",
-      "data": [220, 182, 191, 234, 290, 330, 310],
-      "barWidth": 0,
-      "barMinHeight": 2,
-      "itemStyle": {
-        "normal": {
-          "barBorderRadius":0,
-          "color":"",
-          "label": {
-            "show": true,
-            "position": "top",
-            "textStyle": {
-              "color": "black",
-              "fontSize": 16,
-              "fontWeight": "bolder"
-            }
-          }
-        }
-      }
-    }]
-  },
-  "bar2": {
-      "title": {
-          "show": true,
-          "text": "某站点用户访问来源",
-          "left": "left",
-          "padding": [5,20,5,20],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "legend": {
-          "show": true,
-          "top": "top",
-          "left": "center",
-          "orient": "horizontal",
-          "padding":[25,20,25,10],
-          "textStyle": {
-              "fontSize": 12
-          }
-      },
-      "grid": {
-          "left": 60,
-          "top": 60,
-          "right": 60,
-          "bottom": 60
-      },
-      "tooltip": {
-          "show":true,
-          "textStyle":{
-              "color":"#fff",
-              "fontSize": 18
-          }
-      },
-      "dataset": {
-          "source": [
-              ["product", "2015", "2016", "2017"],
-              ["Matcha Latte", 43.3, 85.8, 93.7],
-              ["Milk Tea", 83.1, 73.4, 55.1],
-              ["Cheese Cocoa", 86.4, 65.2, 82.5],
-              ["Walnut Brownie", 72.4, 53.9, 39.1]
-          ]
-      },
-      "xAxis": {
-          "show":true,
-          "type":"category",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "interval":"auto",
-              "rotate":0,
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "yAxis": {
-          "show":true,
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "series": [{
-          "type": "bar",
-          "barWidth": 30,
-          "barMinHeight": 2,
-          "itemStyle": {
-              "normal": {
-                  "barBorderRadius":0,
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      },{
-          "type": "bar",
-          "barWidth": 30,
-          "barMinHeight": 2,
-          "itemStyle": {
-              "normal": {
-                  "barBorderRadius":0,
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      },{
-          "type": "bar",
-          "barWidth": 30,
-          "barMinHeight": 2,
-          "itemStyle": {
-              "normal": {
-                  "barBorderRadius":0,
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      }]
-  },
-  "line": {
-      "title": {
-          "show": true,
-          "text": "某站点用户访问来源",
-          "left": "left",
-          "padding": [5,20,5,10],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "legend": {
-          "show": true,
-          "data": ["销量"],
-          "top": "top",
-          "left": "center",
-          "orient": "horizontal",
-          "padding":[25,20,25,10],
-          "textStyle": {
-              "color":  "#333",
-              "fontSize": 12
-          }
-      },
-      "grid": {
-          "left": 60,
-          "top": 60,
-          "right": 60,
-          "bottom": 60
-      },
-      "tooltip": {
-          "show":true,
-          "textStyle":{
-              "color":"#fff",
-              "fontSize": 18
-          }
-      },
-      "xAxis": {
-          "show":true,
-          "name":"服饰",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "interval":"auto",
-              "rotate":0,
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          },
-          "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-      },
-      "yAxis": {
-          "show":true,
-          "name":"销量",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "series": [{
-          "name": "销量",
-          "type": "line",
-          "data": [5, 20, 36, 10, 10, 20],
-          "step": false,
-          "showSymbol": true,
-          "smooth": false,
-          "symbolSize":5,
-          "lineStyle":{
-              "width":2,
-              "color": "#c43632"
-          },
-          "itemStyle": {
-              "normal": {
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      }]
-  },
-  "line3": {
-      "title": {
-          "show": true,
-          "text": "某站点用户访问来源",
-          "left": "left",
-          "padding": [5,20,5,10],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "legend": {
-          "show": true,
-          "data": ["销量"],
-          "top": "top",
-          "left": "center",
-          "orient": "horizontal",
-          "padding":[25,20,25,10],
-          "textStyle": {
-              "color":  "#333",
-              "fontSize": 12
-          }
-      },
-      "grid": {
-          "left": 60,
-          "top": 60,
-          "right": 60,
-          "bottom": 60
-      },
-      "tooltip": {
-          "show":true,
-          "textStyle":{
-              "color":"#fff",
-              "fontSize": 18
-          }
-      },
-      "xAxis": {
-          "show":true,
-          "name":"服饰",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "interval":"auto",
-              "rotate":0,
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          },
-          "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-      },
-      "yAxis": {
-          "show":true,
-          "name":"销量",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "series": [{
-          "name": "销量",
-          "type": "line",
-          "data": [5, 20, 36, 10, 10, 20],
-          "step": false,
-          "showSymbol": true,
-          "smooth": true,
-          "symbolSize":5,
-          "lineStyle":{
-              "width":2,
-              "color": "#c43632"
-          },
-          "itemStyle": {
-              "normal": {
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      }]
-  },
-  "line4": {
-    "title": {
-      "show": true,
-      "text": "某楼盘销售情况",
-      "left": "left",
-      "textStyle": {
-        "fontSize": 18,
-        "fontWeight": "bolder",
-        "color": "#c23531"
-      }
-    },
-    "legend": {
-      "show": true,
-      "data": [ "意向","预购","成交"],
-      "top": "top",
-      "left": "center",
-      "orient": "horizontal",
-      "padding":[5,20,25,10],
-      "textStyle": {
-        "color":  "#333",
-        "fontSize": 12
-      }
-    },
-    "grid": {
-      "left": 60,
-      "top": 60,
-      "right": 60,
-      "bottom": 60
-    },
-    "tooltip": {
-      "show":true,
-      "trigger": "axis",
-      "textStyle":{
-        "color":"#fff",
-        "fontSize": 18
-      }
-    },
-    "xAxis": {
-      "show":true,
-      "type": "category",
-      "boundaryGap": false,
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "interval":"auto",
-        "rotate":0,
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      },
-      "data": ["周一","周二","周三","周四","周五"]
-    },
-    "yAxis": {
-      "show":true,
-      "type": "value",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      }
-    },
-    "series": [{
-      "name": "预购",
-      "type": "line",
-      "data":  [30, 182, 434, 791, 390],
-      "step": false,
-      "showSymbol": true,
-      "smooth": false,
-      "symbolSize":5,
-      "lineStyle":{
-        "width":2,
-        "color": null
-      },
-      "itemStyle": {
-        "normal": {
-          "label": {
-            "show": true,
-            "position": "top",
-            "textStyle": {
-              "color": "black",
-              "fontSize": 16,
-              "fontWeight": "bolder"
-            }
-          }
-        }
-      }
-    },
-      {
-        "name": "成交",
-        "type": "line",
-        "data":[10, 12, 21, 54, 260],
-        "step": false,
-        "showSymbol": true,
-        "smooth": false,
-        "symbolSize":5,
-        "lineStyle":{
-          "width":2,
-          "color": null
-        },
-        "itemStyle": {
-          "normal": {
-            "label": {
-              "show": true,
-              "position": "top",
-              "textStyle": {
-                "color": "black",
-                "fontSize": 16,
-                "fontWeight": "bolder"
-              }
-            }
-          }
-        }
-      },
-      {
-        "name": "意向",
-        "type": "line",
-        "data":[1320, 1132, 601, 234, 120],
-        "step": false,
-        "showSymbol": true,
-        "smooth": false,
-        "symbolSize":5,
-        "lineStyle":{
-          "width":2,
-          "color": null
-        },
-        "itemStyle": {
-          "normal": {
-            "label": {
-              "show": true,
-              "position": "top",
-              "textStyle": {
-                "color": "black",
-                "fontSize": 16,
-                "fontWeight": "bolder"
-              }
-            }
-          }
-        }
-      }]
-  },
-  "line5": {
-      "title": {
-          "show": true,
-          "text": "某站点用户访问来源",
-          "left": "left",
-          "padding": [5,20,5,10],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "legend": {
-          "show": true,
-          "data": ["销量"],
-          "top": "top",
-          "left": "center",
-          "orient": "horizontal",
-          "padding":[25,20,25,10],
-          "textStyle": {
-              "color":  "#333",
-              "fontSize": 12
-          }
-      },
-      "grid": {
-          "left": 60,
-          "top": 60,
-          "right": 60,
-          "bottom": 60
-      },
-      "tooltip": {
-          "show":true,
-          "textStyle":{
-              "color":"#fff",
-              "fontSize": 18
-          }
-      },
-      "xAxis": {
-          "show":true,
-          "name":"服饰",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "interval":"auto",
-              "rotate":0,
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          },
-          "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-      },
-      "yAxis": {
-          "show":true,
-          "name":"销量",
-          "splitLine":{
-              "show":false,
-              "lineStyle":{
-                  "color":"red",
-                  "width":1,
-                  "type":"solid"
-              }
-          },
-          "axisLabel":{
-              "textStyle":{
-                  "fontSize":12,
-                  "color": "#333"
-              }
-          },
-          "axisLine": {
-              "lineStyle": {
-                  "color": "#333"
-              }
-          }
-      },
-      "series": [{
-          "name": "销量",
-          "type": "line",
-          "data": [5, 20, 36, 10, 10, 20],
-          "step": true,
-          "showSymbol": true,
-          "smooth": false,
-          "symbolSize":5,
-          "lineStyle":{
-              "width":2,
-              "color": "#c43632"
-          },
-          "itemStyle": {
-              "normal": {
-                  "label": {
-                      "show": true,
-                      "position": "top",
-                      "textStyle": {
-                          "color": "black",
-                          "fontSize": 16,
-                          "fontWeight": "bolder"
-                      }
-                  }
-              }
-          }
-      }]
-  },
-  "pie": {
-        "title": {
-            "show": true,
-            "text": "某站点用户访问来源",
-            "left": "left",
-            "padding": [5,20,5,10],
-            "textStyle": {
-                "fontSize": 18,
-                "fontWeight": "bolder",
-                "color": "#c23531"
-            }
-        },
-        "tooltip": {
-            "show":true,
-            "textStyle":{
-                "color":"#fff",
-                "fontSize": 18
-            }
-        },
-        "legend": {
-            "show": true,
-            "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-            "top": "top",
-            "left": "center",
-            "orient": "horizontal",
-            "padding":[25,20,25,10],
-            "textStyle": {
-                "color":  "#333",
-                "fontSize": 12
-            }
-        },
-        "series": [
-            {
-                "name": "访问来源",
-                "type": "pie",
-                "isRadius":false,
-                "radius": "55%",
-                "minAngle":  0,
-                "roseType": "",
-                "autoSort": false,
-                "notCount": false,
-                "left": 60,
-                "top": 60,
-                "right": 60,
-                "bottom": 60,
-                "label": {
-                    "show": true,
-                    "position": "outside",
-                    "textStyle": {
-                        "color": "black",
-                        "fontSize": 16,
-                        "fontWeight": "bolder"
-                    }
-                },
-                "data":[
-                    {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-                    {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-                    {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-                    {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-                    {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-                ]
-            }
-        ]
-  },
-  "pie1": {
-        "title": {
-            "show": true,
-            "text": "某站点用户访问来源",
-            "left": "left",
-            "padding": [5,20,5,10],
-            "textStyle": {
-                "fontSize": 18,
-                "fontWeight": "bolder",
-                "color": "#c23531"
-            }
-        },
-        "tooltip": {
-            "show":true,
-            "textStyle":{
-                "color":"#fff",
-                "fontSize": 18
-            }
-        },
-        "legend": {
-            "show": true,
-            "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-            "top": "top",
-            "left": "center",
-            "orient": "horizontal",
-            "padding":[25,20,25,10],
-            "textStyle": {
-                "color":  "#333",
-                "fontSize": 12
-            }
-        },
-        "series": [
-            {
-                "name": "访问来源",
-                "type": "pie",
-                "isRadius":true,
-                "radius": ["45%","55%"],
-                "minAngle":  0,
-                "roseType": "",
-                "autoSort": false,
-                "notCount": false,
-                "label": {
-                    "show": true,
-                    "position": "outside",
-                    "textStyle": {
-                        "color": "black",
-                        "fontSize": 16,
-                        "fontWeight": "bolder"
-                    }
-                },
-                "data":[
-                    {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-                    {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-                    {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-                    {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-                    {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-                ]
-            }
-        ]
-  },
-  "pie2": {
-        "title": {
-            "show": true,
-            "text": "某站点用户访问来源",
-            "left": "left",
-            "padding": [5,20,5,10],
-            "textStyle": {
-                "fontSize": 18,
-                "fontWeight": "bolder",
-                "color": "#c23531"
-            }
-        },
-        "tooltip": {
-            "show":true,
-            "textStyle":{
-                "color":"#fff",
-                "fontSize": 18
-            }
-        },
-        "legend": {
-            "show": true,
-            "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-            "top": "top",
-            "left": "center",
-            "orient": "horizontal",
-            "padding":[25,20,25,10],
-            "textStyle": {
-                "color":  "#333",
-                "fontSize": 12
-            }
-        },
-        "series": [
-            {
-                "name": "访问来源",
-                "type": "pie",
-                "isRadius":false,
-                "radius": "55%",
-                "minAngle":  0,
-                "roseType": "radius",
-                "autoSort": false,
-                "notCount": false,
-                "label": {
-                    "show": true,
-                    "position": "outside",
-                    "textStyle": {
-                        "color": "black",
-                        "fontSize": 16,
-                        "fontWeight": "bolder"
-                    }
-                },
-                "data":[
-                    {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-                    {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-                    {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-                    {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-                    {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-                ]
-            }
-        ]
-  },
-  "linebar":{
-      "chartType":"linebar",
-      "title": {
-        "show": true,
-        "text": "某站点用户访问来源",
-        "left": "left",
-        "padding": [5,20,5,20],
-        "textStyle": {
-          "fontSize": 18,
-          "fontWeight": "bolder",
-          "color": "#c23531"
-        }
-      },
-      "legend": {
-        "show": true,
-        "data": ["蒸发量", "降水量", "平均温度"],
-        "top": "top",
-        "left": "center",
-        "orient": "horizontal",
-        "padding":[25,20,25,10],
-        "textStyle": {
-          "color":  "#333",
-          "fontSize": 12
-        }
-      },
-      "grid": {
-        "left": 60,
-        "top": 60,
-        "right": 60,
-        "bottom": 60
-      },
-      "tooltip": {
-        "show":true,
-        "trigger": "axis",
-        "axisPointer": {
-          "type": "cross",
-          "crossStyle": {
-            "color":"#999"
-          }
-        },
-        "textStyle":{
-          "color":"#fff",
-          "fontSize": 18
-        }
-      },
-      "xAxis": {
-        "show":true,
-        "type":  "category",
-        "data": [ "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-        "axisPointer": {
-          "type":  "shadow"
-        },
-        "splitLine":{
-          "show":false,
-          "lineStyle":{
-            "color":"red",
-            "width":1,
-            "type":"solid"
-          }
-        },
-        "axisLabel":{
-          "interval":"auto",
-          "rotate":0,
-          "textStyle":{
-            "fontSize":12,
-            "color": "#333"
-          }
-        },
-        "axisLine": {
-          "lineStyle": {
-            "color": "#333"
-          }
-        }
-      },
-      "yAxis": [{
-        "show":true,
-        "type": "value",
-        "name": "水量",
-        "splitLine":{
-          "show":false,
-          "lineStyle":{
-            "color":"red",
-            "width":1,
-            "type":"solid"
-          }
-        },
-        "axisLabel":{
-          "textStyle":{
-            "fontSize":12,
-            "color": "#333"
-          }
-        },
-        "axisLine": {
-          "lineStyle": {
-            "color": "#333"
-          }
-        }
-      },
-      {
-          "show":true,
-          "type": "value",
-          "name": "温度",
-          "splitLine":{
-            "show":false,
-            "lineStyle":{
-              "color":"red",
-              "width":1,
-              "type":"solid"
-            }
-          },
-          "axisLabel":{
-            "textStyle":{
-              "fontSize":12,
-              "color": "#333"
-            }
-          },
-          "axisLine": {
-            "lineStyle": {
-              "color": "#333"
-            }
-          }
-        }],
-      "series": [{
-        "name": "蒸发量",
-        "type": "bar",
-        "data": [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
-        "barWidth": 15,
-        "barMinHeight": 2,
-        "itemStyle": {
-          "normal": {
-            "barBorderRadius":0,
-            "color":null,
-            "label": {
-              "show": true,
-              "position": "top",
-              "textStyle": {
-                "color": "black",
-                "fontSize": 16,
-                "fontWeight": "bolder"
-              }
-            }
-          }
-        }
-      },{
-        "name": "降水量",
-        "type": "bar",
-        "data": [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3],
-        "barWidth":15,
-        "barMinHeight": 2,
-        "itemStyle": {
-          "normal": {
-            "barBorderRadius":0,
-            "color":null,
-            "label": {
-              "show": true,
-              "position": "top",
-              "textStyle": {
-                "color": "black",
-                "fontSize": 16,
-                "fontWeight": "bolder"
-              }
-            }
-          }
-        }
-      },
-      {
-        "name": "平均温度",
-        "type": "line",
-        "data": [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2],
-        "yAxisIndex": 1,
-        "step": false,
-        "showSymbol": true,
-        "smooth": false,
-        "symbolSize":5,
-        "lineStyle":{
-          "width":2,
-          "color": null
-        },
-        "itemStyle": {
-          "normal": {
-            "label": {
-              "show": true,
-              "position": "top",
-              "textStyle": {
-                "color": "black",
-                "fontSize": 16,
-                "fontWeight": "bolder"
-              }
-            }
-          }
-        }
-        }
-      ]
-    },
-  "map":{
-      "chartType":"map",
-      "title": {
-          "show": true,
-          "text": "地图",
-          "left": "left",
-          "padding": [5,20,5,10],
-          "textStyle": {
-              "fontSize": 18,
-              "fontWeight": "bolder",
-              "color": "#c23531"
-          }
-      },
-      "geo":{
-          "map": "china",
-          "layoutCenter": ["50%", "50%"],
-          "layoutSize": 600,
-          "zoom":0.5,
-          "roam": "move",
-          "label": {
-              "show": true,
-              "color":"#000",
-              "fontSize":12
-            },
-          "regions": [],
-          "emphasis": {
-              "label": {
-                  "color": "#fff"
-                },
-              "itemStyle": {
-                  "areaColor":"red"
-                }
-            },
-          "itemStyle": {
-              "borderWidth": 0.5,
-              "borderColor": "#000",
-              "areaColor": "#fff"
-            }
-      },
-      "series": [
-          {
-              "type": "map",
-              "coordinateSystem": "geo"
-          }
-      ]
-  },
-  "scatter": {
-    "title": {
-      "show": true,
-      "text": "散点图",
-      "left": "left",
-      "padding": [5,20,5,20],
-      "textStyle": {
-        "fontSize": 18,
-        "fontWeight": "bolder",
-        "color": "#c23531"
-      }
-    },
-    "legend": {
-      "show": true,
-      "data": [],
-      "top": "top",
-      "left": "center",
-      "orient": "horizontal",
-      "padding":[25,20,25,10],
-      "textStyle": {
-        "color":  "#333",
-        "fontSize": 12
-      }
-    },
-    "grid": {
-      "left": 60,
-      "top": 60,
-      "right": 60,
-      "bottom": 60
-    },
-    "tooltip": {
-      "show":true,
-      "textStyle":{
-        "color":"#fff",
-        "fontSize": 18
-      }
-    },
-    "xAxis": {
-      "show":true,
-      "name":"",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "interval":"auto",
-        "rotate":0,
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      }
-    },
-    "yAxis": {
-      "show":true,
-      "name":"",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      }
-    },
-    "series": [{
-      "type": "scatter",
-      "symbolSize": 20,
-      "data": [
-        [10.0, 8.04],
-        [8.0, 6.95],
-        [13.0, 7.58],
-        [9.0, 8.81],
-        [11.0, 8.33],
-        [14.0, 9.96],
-        [6.0, 7.24],
-        [4.0, 4.26],
-        [12.0, 10.84],
-        [7.0, 4.82],
-        [5.0, 5.68]
-      ],
-      "itemStyle": {
-        "normal": {
-          "color":null,
-          "label": {
-            "show": true,
-            "position": "top",
-            "textStyle": {
-              "color": "black",
-              "fontSize": 16,
-              "fontWeight": "bolder"
-            }
-          }
-        }
-      }
-    }]
-  }
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/funnel.pyramid.json

@@ -1,78 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["展现","点击","访问","咨询","订单"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "trigger": "item",
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "series": [
-    {
-      "name": "金字塔漏斗图",
-      "type": "funnel",
-      "left": "10%",
-      "top": 60,
-      "bottom": 60,
-      "width": "80%",
-      "sort": "ascending",
-      "gap": 2,
-      "orient": "vertical",
-      "label": {
-        "show": true,
-        "position": "inside",
-        "textStyle": {
-          "fontSize": 16,
-          "fontWeight": "normal"
-        }
-      },
-      "labelLine": {
-        "length": 10,
-        "lineStyle": {
-          "width": 1,
-          "type": "solid"
-        }
-      },
-      "itemStyle": {
-        "borderColor": "#fff",
-        "borderWidth": 1
-      },
-      "emphasis": {
-        "label": {
-          "fontSize": 20
-        }
-      },
-      "data": [
-        {"value": 60, "name": "访问"},
-        {"value": 40, "name": "咨询"},
-        {"value": 20, "name": "订单"},
-        {"value": 80, "name": "点击"},
-        {"value": 100, "name": "展现"}
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/funnel.simple.json

@@ -1,78 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["展现","点击","访问","咨询","订单"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "trigger": "item",
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "series": [
-    {
-      "name": "漏斗图",
-      "type": "funnel",
-      "left": "10%",
-      "top": 60,
-      "bottom": 60,
-      "width": "80%",
-      "sort": "descending",
-      "gap": 2,
-      "orient": "vertical",
-      "label": {
-        "show": true,
-        "position": "inside",
-        "textStyle": {
-          "fontSize": 16,
-          "fontWeight": "normal"
-        }
-      },
-      "labelLine": {
-        "length": 10,
-        "lineStyle": {
-          "width": 1,
-          "type": "solid"
-        }
-      },
-      "itemStyle": {
-        "borderColor": "#fff",
-        "borderWidth": 1
-      },
-      "emphasis": {
-        "label": {
-          "fontSize": 20
-        }
-      },
-      "data": [
-        {"value": 60, "name": "访问"},
-        {"value": 40, "name": "咨询"},
-        {"value": 20, "name": "订单"},
-        {"value": 80, "name": "点击"},
-        {"value": 100, "name": "展现"}
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple.json

@@ -1,76 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "series": [{
-    "name": "业务指标",
-    "type": "gauge",
-    "radius":"75%",
-    "center": [330, 200],
-    "itemStyle":{
-      "color":"#63869E"
-    },
-    "pointer": {
-      "show": true
-    },
-    "detail": {
-      "formatter": "{value}%",
-      "textStyle": {
-        "color": "rgba(0,0,0,1)",
-        "fontSize":25
-      }
-    },
-    "axisLabel": {
-      "show":true,
-      "color":"auto",
-      "textStyle": {
-        "fontSize": 10
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": [[0.2, "#91c7ae"], [0.8, "#63869E"], [1, "#C23531"]],
-        "width": 25
-      }
-    },
-    "axisTick": {
-      "length": 10,
-      "lineStyle": {
-        "color": "#fff"
-      }
-    },
-    "splitLine": {
-      "length": 30,
-      "lineStyle": {
-        "width": 3,
-        "color": "#ffffff"
-      }
-    },
-    "title": {
-      "show":true,
-      "textStyle": {
-        "fontSize": 20,
-        "color": "#000000",
-        "shadowColor": "#000",
-        "shadowBlur": 10
-      }
-    },
-    "data": [{"value": 50, "name": "完成率"}]
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/gauge.simple180.json

@@ -1,77 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "series": [{
-    "name": "业务指标",
-    "type": "gauge",
-    "startAngle":190,
-    "endAngle":-10,
-    "center": [330, 200],
-    "itemStyle":{
-      "color":"#63869E"
-    },
-    "pointer": {
-      "show": true
-    },
-    "detail": {
-      "formatter": "{value}%",
-      "textStyle": {
-        "color": "rgba(0,0,0,1)",
-        "fontSize":25
-      }
-    },
-    "axisLabel": {
-      "show":true,
-      "color":"auto",
-      "textStyle": {
-        "fontSize": 10
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": [[0.2, "#91c7ae"], [0.8, "#63869E"], [1, "#C23531"]],
-        "width": 25
-      }
-    },
-    "axisTick": {
-      "length": 10,
-      "lineStyle": {
-        "color": "#fff"
-      }
-    },
-    "splitLine": {
-      "length": 30,
-      "lineStyle": {
-        "width": 3,
-        "color": "#fff"
-      }
-    },
-    "title": {
-      "show":true,
-      "textStyle": {
-        "fontSize": 20,
-        "color": "#000",
-        "shadowColor": "#000",
-        "shadowBlur": 10
-      }
-    },
-    "data": [{"value": 60, "name": "成绩"}]
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/graph.simple.json

@@ -1,169 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["类目1","类目2","类目3","类目4","类目5","类目6"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
- // "animationDurationUpdate": 1500,
- // "animationEasingUpdate":"quinticInOut",
-  "series": [{
-    "name": "关系图",
-    "type": "graph",
-    "layout": "circular",
-    "center": [320, 150],
-    "categories": [{
-      "name":"类目1",
-      "itemStyle":{
-        "color": ""
-      }
-    },{
-      "name":"类目2",
-      "itemStyle":{
-        "color": ""
-      }
-    },{
-      "name":"类目3",
-      "itemStyle":{
-        "color": ""
-      }
-    },{
-      "name":"类目4",
-      "itemStyle":{
-        "color": ""
-      }
-    },{
-      "name":"类目5",
-      "itemStyle":{
-        "color": ""
-      }
-    },{
-      "name":"类目6",
-      "itemStyle":{
-        "color": ""
-      }
-    }],
-    "label": {
-      "show":true,
-      "position": "right",
-      "textStyle": {
-        "color":  "#333",
-        "fontSize": 12
-      }
-    },
-    "lineStyle": {
-      "color": "source",
-      "curveness": 0.3
-    },
-    "data": [{
-      "name":"测试0",
-      "value":28,
-      "category":0
-    },{
-      "name":"测试1",
-      "value":9,
-      "category":1
-    },{
-      "name":"测试2",
-      "value":23,
-      "category": 2
-    },{
-      "name":"测试3",
-      "value":8,
-      "category": 3
-    },{
-      "name":"测试4",
-      "value":8,
-      "category": 4
-    },{
-      "name":"测试5",
-      "value":20,
-      "category": 5
-    }],
-    "links": [{
-      "source":"测试1",
-      "target":"测试0"
-    },{
-      "source":"测试2",
-      "target":"测试0"
-    },{
-      "source":"测试3",
-      "target":"测试1"
-    },{
-      "source":"测试4",
-      "target":"测试1"
-    },{
-      "source":"测试5",
-      "target":"测试2"
-    },{
-      "source":"测试5",
-      "target":"测试3"
-    },{
-      "source":"测试3",
-      "target":"测试2"
-    },{
-      "source":"测试3",
-      "target":"测试1"
-    },{
-      "source":"测试2",
-      "target":"测试1"
-    },{
-      "source":"测试2",
-      "target":"测试5"
-    },{
-      "source":"测试4",
-      "target":"测试5"
-    },{
-      "source":"测试4",
-      "target":"测试0"
-    },{
-      "source":"测试4",
-      "target":"测试1"
-    },{
-      "source":"测试4",
-      "target":"测试2"
-    },{
-      "source":"测试5",
-      "target":"测试0"
-    },{
-      "source":"测试5",
-      "target":"测试4"
-    },{
-      "source":"测试4",
-      "target":"测试3"
-    },{
-      "source":"测试3",
-      "target":"测试0"
-    },{
-      "source":"测试3",
-      "target":"测试1"
-    },{
-      "source":"测试0",
-      "target":"测试4"
-    }]
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/line.area.json

@@ -1,117 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
- /* "legend": {
-    "show": false,
-    "data": ["销量"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "line",
-    "data": [5, 20, 36, 10, 10, 20],
-    "step": false,
-    "showSymbol": true,
-    "smooth": false,
-    "isArea": true,
-    "symbolSize":5,
-    "lineStyle":{
-      "width":2
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "areaStyle":{
-      "color": "#c43632",
-      "opacity":1
-    },
-    "itemStyle": {
-      "color": "#c43632"
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/line.multi.json

@@ -1,161 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某楼盘销售情况",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": [ "意向","预购","成交"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger": "axis",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type": "category",
-    "boundaryGap": true,
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["周一","周二","周三","周四","周五"]
-  },
-  "yAxis": {
-    "show":true,
-    "type": "value",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "预购",
-    "type": "line",
-    "data":  [30, 182, 434, 791, 390],
-    "step": false,
-    "showSymbol": true,
-    "smooth": false,
-    "symbolSize":5,
-    "lineStyle":{
-      "width":2
-    },
-    "itemStyle": {
-      "color":""
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  },
-    {
-      "name": "成交",
-      "type": "line",
-      "data":[10, 12, 21, 54, 260],
-      "step": false,
-      "showSymbol": true,
-      "smooth": false,
-      "symbolSize":5,
-      "lineStyle":{
-        "width":2
-      },
-      "itemStyle": {
-        "color":""
-      },
-      "label": {
-        "show": true,
-        "position": "top",
-        "textStyle": {
-          "color": "black",
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      }
-    },
-    {
-      "name": "意向",
-      "type": "line",
-      "data":[1320, 1132, 601, 234, 120],
-      "step": false,
-      "showSymbol": true,
-      "smooth": false,
-      "symbolSize":5,
-      "lineStyle":{
-        "width":2
-      },
-      "itemStyle": {
-        "color":""
-      },
-      "label": {
-        "show": true,
-        "position": "top",
-        "textStyle": {
-          "color": "black",
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      }
-    }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/line.simple.json

@@ -1,116 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-/*  "legend": {
-    "show": false,
-    "data": ["销量"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "line",
-    "data": [5, 20, 36, 10, 10, 20],
-    "step": false,
-    "showSymbol": true,
-    "smooth": false,
-    "symbolSize":5,
-    "isArea": false,
-    "lineStyle":{
-      "width":2
-    },
-    "itemStyle": {
-      "color":"#c43632"
-    },
-    "areaStyle":{
-      "color": "rgba(220,38,38,0)",
-      "opacity":1
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/line.smooth.json

@@ -1,117 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
- /* "legend": {
-    "show": false,
-    "data": ["销量"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "line",
-    "data": [5, 20, 36, 10, 10, 20],
-    "step": false,
-    "showSymbol": true,
-    "smooth": true,
-    "symbolSize":5,
-    "isArea": false,
-    "lineStyle":{
-      "width":2
-    },
-    "areaStyle":{
-      "color": "rgba(220,38,38,0)",
-      "opacity":1
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "color": "#c43632"
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/line.step.json

@@ -1,117 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  /*"legend": {
-    "show": false,
-    "data": ["销量"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"服饰",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-  },
-  "yAxis": {
-    "show":true,
-    "name":"销量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name": "销量",
-    "type": "line",
-    "data": [5, 20, 36, 10, 10, 20],
-    "step": true,
-    "showSymbol": true,
-    "smooth": false,
-    "isArea": false,
-    "symbolSize":5,
-    "lineStyle":{
-      "width":2
-    },
-    "areaStyle":{
-      "color": "rgba(220,38,38,0)",
-      "opacity":1
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "color": "#c43632"
-    }
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/map.scatter.json

@@ -1,85 +0,0 @@
-{
-  "chartType":"map",
-  "title": {
-    "show": true,
-    "text": "主要城市空气质量",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "geo":{
-    "map": "china",
-    "layoutCenter": ["50%", "50%"],
-    "layoutSize": 600,
-    "zoom":0.7,
-    "roam": true,
-    "label": {
-      "show": true,
-      "color":"#000",
-      "fontSize":12
-    },
-    "regions": [],
-    "emphasis": {
-      "label": {
-        "color": "#fff"
-      },
-      "itemStyle": {
-        "areaColor":"red"
-      }
-    },
-    "itemStyle": {
-      "borderWidth": 0.5,
-      "borderColor": "#000",
-      "areaColor": "#61A0A8"
-    }
-  },
-  "series": [
-    {
-      "name": "",
-      "type": "scatter",
-      "coordinateSystem": "geo",
-      "data": [
-        { "name":"河北","value":279},
-        { "name":"海南","value":273},
-        { "name":"山东","value":229},
-        { "name":"甘肃","value":194},
-        { "name":"宁夏","value":193},
-        { "name":"浙江","value":177},
-        { "name":"湖南","value":119},
-        { "name":"湖北","value":79},
-        { "name":"河南","value":67},
-        { "name":"北京","value":58},
-        { "name":"天津","value":59},
-        { "name":"上海","value":63},
-        { "name":"广州","value":74}
-      ],
-      "encode": {
-        "value": [2]
-      },
-      "label": {
-        "formatter": "{b}",
-        "position": "right",
-        "show": false
-      },
-      "itemStyle": {
-        "color": "purple"
-      },
-      "emphasis": {
-        "label": {
-          "show": true
-        }
-      }
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/map.simple.json

@@ -1,47 +0,0 @@
-{
-  "chartType":"map",
-  "title": {
-    "show": true,
-    "text": "中国地图",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "geo":{
-    "map": "china",
-    "layoutCenter": ["50%", "50%"],
-    "layoutSize": 600,
-    "zoom":0.7,
-    "roam": true,
-    "label": {
-      "show": true,
-      "color":"#000",
-      "fontSize":12
-    },
-    "regions": [],
-    "emphasis": {
-      "label": {
-        "color": "#fff"
-      },
-      "itemStyle": {
-        "areaColor":"red"
-      }
-    },
-    "itemStyle": {
-      "borderWidth": 0.5,
-      "borderColor": "#000",
-      "areaColor": "#61A0A8"
-    }
-  },
-  "series": [
-    {
-      "name": "地图",
-      "type": "map",
-      "coordinateSystem": "geo"
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/mixed.linebar.json

@@ -1,187 +0,0 @@
-{
-  "chartType":"linebar",
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["蒸发量", "降水量", "平均温度"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "trigger": "axis",
-    "axisPointer": {
-      "type": "cross",
-      "crossStyle": {
-        "color":"#999"
-      }
-    },
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "type":  "category",
-    "data": [ "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-    "axisPointer": {
-      "type":  "shadow"
-    },
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": [{
-    "show":true,
-    "type": "value",
-    "name": "水量",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },{
-      "show":true,
-      "type": "value",
-      "name": "温度",
-      "splitLine":{
-        "show":false,
-        "lineStyle":{
-          "color":"red",
-          "width":1,
-          "type":"solid"
-        }
-      },
-      "axisLabel":{
-        "textStyle":{
-          "fontSize":12,
-          "color": "#333"
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "#333"
-        }
-      }
-   }],
-  "series": [{
-    "name": "蒸发量",
-    "type": "line",
-    "data": [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
-    "barWidth": 15,
-    "barMinHeight": 2,
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    },
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    }
-  },{
-    "name": "降水量",
-    "type": "bar",
-    "data": [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3],
-    "barWidth":15,
-    "barMinHeight": 2,
-    "itemStyle": {
-      "barBorderRadius":0,
-      "color":""
-    },
-    "label": {
-      "show": true,
-      "position": "top",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  },
-    {
-      "name": "平均温度",
-      "type": "bar",
-      "data": [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2],
-      "yAxisIndex": 1,
-      "step": false,
-      "showSymbol": true,
-      "smooth": false,
-      "symbolSize":5,
-      "itemStyle": {
-        "color":""
-      },
-      "lineStyle":{
-        "width":2
-      },
-      "label": {
-        "show": true,
-        "position": "top",
-        "textStyle": {
-          "color": "",
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      }
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/pictorial.spirits.json

@@ -1,101 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "top": "5",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "max": 2000,
-    "name":"",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "margin": 10,
-      "textStyle":{
-        "fontSize":12,
-        "color": "green"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#999"
-      }
-    }
-  },
-  "grid": {
-    "top": 60,
-    "bottom": 60,
-    "left": 60,
-    "right": 60
-  },
-  "yAxis": {
-    "show":true,
-    "name":"",
-    "inverse": false,
-    "axisTick": {
-      "show": false
-    },
-    "axisLine": {
-      "show": false
-    },
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":16,
-        "color": "#999"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    },
-    "data": ["2017", "2018", "2019", "2020"]
-  },
-  "series": [{
-    "type": "pictorialBar",
-    "symbol": "",
-    "symbolRepeat": "fixed",
-    "symbolMargin": "5%!",
-    "symbolClip": true,
-    "symbolSize": 30,
-    "symbolBoundingData": 2000,
-    "double": false,
-    "secondOpacity": 0.2,
-    "data": [891, 1220, 660, 1670],
-    "label": {
-      "show": true,
-      "position": "right",
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  }]
-}
-
-

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/pie.doughnut.json

@@ -1,63 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{a} <br/>{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "series": [
-    {
-      "name": "访问来源",
-      "type": "pie",
-      "isRadius":true,
-      "radius": ["45%","55%"],
-      "minAngle":  0,
-      "roseType": "",
-      "isRose":false,
-      "autoSort": false,
-      "notCount": false,
-      "center": [320, 180],
-      "label": {
-        "show": true,
-        "position": "outside",
-        "textStyle": {
-          "color": "",
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      },
-      "data":[
-        {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-        {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-        {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-        {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-        {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/pie.rose.json

@@ -1,62 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{a} <br/>{b} : {c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "series": [
-    {
-      "name": "访问来源",
-      "type": "pie",
-      "isRadius":false,
-      "radius": "55%",
-      "minAngle":  0,
-      "roseType": "radius",
-      "isRose":true,
-      "autoSort": false,
-      "notCount": false,
-      "center": [320, 180],
-      "label": {
-        "show": true,
-        "position": "outside",
-        "textStyle": {
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      },
-      "data":[
-        {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-        {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-        {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-        {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-        {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/pie.simple.json

@@ -1,62 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "某站点用户访问来源",
-    "left": "left",
-    "padding": [5,20,5,10],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    },
-    "formatter": "{a} <br/>{b} : {c}"
-  },
-  "legend": {
-    "show": true,
-    "data": ["视频广告","联盟广告","邮件营销","直接访问","搜索引擎","间接访问"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "series": [
-    {
-      "name": "访问来源",
-      "type": "pie",
-      "isRadius":false,
-      "radius": "55%",
-      "minAngle":  0,
-      "roseType": "",
-      "isRose":false,
-      "autoSort": false,
-      "notCount": false,
-      "center": [320, 180],
-      "label": {
-        "show": true,
-        "position": "outside",
-        "textStyle": {
-          "fontSize": 16,
-          "fontWeight": "bolder"
-        }
-      },
-      "data":[
-        {"value":1170, "name":"视频广告","itemStyle":{"color":null }},
-        {"value":417, "name":"联盟广告","itemStyle":{"color":null }},
-        {"value":335, "name":"邮件营销","itemStyle":{"color":null }},
-        {"value":410, "name":"直接访问","itemStyle":{"color":null } },
-        {"value":800, "name":"搜索引擎","itemStyle":{"color":null }}
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/radar.basic.json

@@ -1,79 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "基础雷达图",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["预算分配（Allocated Budget）", "实际开销（Actual Spending）"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "radar": [{
-    "shape": "polygon",//circle
-    "center":[320, 200],
-    "name": {
-      "formatter": "【{value}】",
-      "textStyle": {
-        "fontSize":14,
-        "color": "#72ACD1"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "gray",
-        "opacity":0.5
-      }
-    },
-    "splitLine": {
-      "lineStyle": {
-        "color": "gray",
-        "opacity":0.5
-      }
-    },
-    "indicator": [
-      { "name": "销售（sales）", "max": 6500},
-      { "name": "管理（Administration）", "max": 16000},
-      { "name": "信息技术（Information Techology）", "max": 30000},
-      { "name": "客服（Customer Support）", "max": 38000},
-      { "name": "研发（Development）", "max": 52000},
-      { "name": "市场（Marketing）", "max": 25000}
-    ]
-  }],
-  "series": [{
-    "name": "预算 vs 开销（Budget vs spending）",
-    "type": "radar",
-    "data": [
-      {
-        "value": [4300, 10000, 28000, 35000, 50000, 19000],
-        "name": "预算分配（Allocated Budget）",
-        "lineStyle":{}
-      },
-      {
-        "value": [5000, 14000, 28000, 31000, 42000, 21000],
-        "name": "实际开销（Actual Spending）",
-        "lineStyle":{}
-      }
-    ]
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/radar.custom.json

@@ -1,97 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "圆形雷达图",
-    "left": "left",
-    "padding": [8,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "legend": {
-    "show": true,
-    "data": ["图一", "图二"],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "radar": [
-    {
-      "indicator": [
-        { "name": "指标一", "max": 6500},
-        { "name": "指标二", "max": 6500},
-        { "name": "指标三", "max": 6500},
-        { "name": "指标四", "max": 6500},
-        { "name": "指标五", "max": 6500}
-      ],
-      "center":[320, 200],
-      "radius": 90,
-      "startAngle": 90,
-      "splitNumber": 4,
-      "shape": "circle",
-      "name": {
-        "formatter": "【{value}】",
-        "textStyle": {
-          "color": "#72ACD1"
-        }
-      },
-      "splitArea": {
-        "areaStyle": {
-          "color": [
-            "rgba(114, 172, 209, 0.2)",
-            "rgba(114, 172, 209, 0.4)",
-            "rgba(114, 172, 209, 0.6)",
-            "rgba(114, 172, 209, 0.8)",
-            "rgba(114, 172, 209, 1)"
-          ],
-          "shadowColor": "rgba(0, 0, 0, 0.3)",
-          "shadowBlur": 10
-        }
-      },
-      "axisLine": {
-        "lineStyle": {
-          "color": "gray",
-          "opacity":0.5
-        }
-      },
-      "splitLine": {
-        "lineStyle": {
-          "color": "gray",
-          "opacity":0.5
-        }
-      }
-    }
-  ],
-  "series": [
-    {
-      "name": "雷达图",
-      "type": "radar",
-      "data": [
-        {
-          "value": [1000, 2000, 3000, 4000, 2000],
-          "name": "图一",
-          "lineStyle":{}
-        },
-        {
-          "value": [5000, 4000, 3000, 100, 1500],
-          "name": "图二",
-          "lineStyle":{}
-        }
-      ]
-    }
-  ]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/scatter.bubble.json

@@ -1,158 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "散点图",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "legend": {
-    "show": true,
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    },
-    "data": ["1990", "2015"]
-  },
-  "tooltip": {
-    "show":true,
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": {
-    "show":true,
-    "name":"",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "name":"1990",
-    "type": "scatter",
-    "symbolSize": 20,
-    "itemStyle": {
-      "shadowBlur": 10,
-      "shadowColor": "rgba(25, 100, 150, 0.5)",
-      "shadowOffsetY": 5,
-      "color": {
-        "type": "radial",
-        "r": 0.8,
-        "colorStops": [{
-          "offset": 0, "color": "#E7727C" // 0% 处的颜色
-        },{
-          "offset":1, "color": "#D7291F" // 100% 处的颜色
-        }]
-      }
-    },
-    "data": [
-      [28604,77],
-      [31163,77.4],
-      [1516,68],
-      [13670,74.7],
-      [28599,75],
-      [29476,77.1],
-      [31476,75.4],
-      [28666,78.1],
-      [1777,57.7],
-      [29550,79.1],
-      [2076,67.9],
-      [12087,72],
-      [24021,75.4],
-      [43296,76.8],
-      [10088,70.8],
-      [19349,69.6]
-    ]
-  },{
-    "name":"2015",
-    "type": "scatter",
-    "symbolSize": 20,
-    "itemStyle": {
-      "shadowBlur": 10,
-      "shadowColor": "rgba(25, 100, 150, 0.5)",
-      "shadowOffsetY": 5,
-      "color": {
-        "type": "radial",
-        "r": 0.8,
-        "colorStops": [{
-          "offset": 0, "color": "#70D1E1" // 0% 处的颜色
-         },{
-          "offset":1, "color": "#0188FB" // 100% 处的颜色
-        }]
-      }
-    },
-    "data": [
-      [44056,81.8],
-      [43294,81.7],
-      [13334,76.9],
-      [21291,78.5],
-      [38923,80.8],
-      [37599,81.9],
-      [44053,81.1],
-      [42182,82.8],
-      [5903,66.8],
-      [36162,83.5],
-      [1390,71.4],
-      [34644,80.7],
-      [34186,80.6],
-      [64304,81.6],
-      [24787,77.3]
-    ]
-  }]
-}

boman-report/src/main/resources/static/jmreport/desreport_/chartjson/scatter.simple.json

@@ -1,118 +0,0 @@
-{
-  "title": {
-    "show": true,
-    "text": "散点图",
-    "left": "left",
-    "padding": [5,20,5,20],
-    "textStyle": {
-      "fontSize": 18,
-      "fontWeight": "bolder",
-      "color": "#c23531"
-    }
-  },
-  /*"legend": {
-    "show": false,
-    "data": [],
-    "top": "top",
-    "left": "center",
-    "orient": "horizontal",
-    "padding":[25,20,25,10],
-    "textStyle": {
-      "color":  "#333",
-      "fontSize": 12
-    }
-  },*/
-  "grid": {
-    "left": 60,
-    "top": 60,
-    "right": 60,
-    "bottom": 60
-  },
-  "tooltip": {
-    "show":true,
-    "formatter": "{c}",
-    "textStyle":{
-      "color":"#fff",
-      "fontSize": 18
-    }
-  },
-  "xAxis": {
-    "show":true,
-    "name":"",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "interval":"auto",
-      "rotate":0,
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "yAxis": {
-    "show":true,
-    "name":"",
-    "splitLine":{
-      "show":false,
-      "lineStyle":{
-        "color":"red",
-        "width":1,
-        "type":"solid"
-      }
-    },
-    "axisLabel":{
-      "textStyle":{
-        "fontSize":12,
-        "color": "#333"
-      }
-    },
-    "axisLine": {
-      "lineStyle": {
-        "color": "#333"
-      }
-    }
-  },
-  "series": [{
-    "type": "scatter",
-    "symbolSize": 20,
-    "itemStyle": {
-      "color":"#C23531",
-      "opacity":1
-    },
-    "data": [
-      [10.0, 8.04],
-      [8.0, 6.95],
-      [13.0, 7.58],
-      [9.0, 8.81],
-      [11.0, 8.33],
-      [14.0, 9.96],
-      [6.0, 7.24],
-      [4.0, 4.26],
-      [12.0, 10.84],
-      [7.0, 4.82],
-      [5.0, 5.68]
-    ],
-    "label": {
-      "show": true,
-      "position": "top",
-      "opacity":1,
-      "textStyle": {
-        "color": "black",
-        "fontSize": 16,
-        "fontWeight": "bolder"
-      }
-    }
-  }]
-}