RuoYi
2021-08-16 20d6d3d73682b6fd25e038f898651b6e138b501e
src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
@@ -25,7 +25,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.text.CharsetKit;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.tool.gen.domain.GenTable;
@@ -180,7 +180,7 @@
        }
        catch (Exception e)
        {
            throw new CustomException("导入失败:" + e.getMessage());
            throw new ServiceException("导入失败:" + e.getMessage());
        }
    }
@@ -269,7 +269,7 @@
                }
                catch (IOException e)
                {
                    throw new CustomException("渲染模板失败,表名:" + table.getTableName());
                    throw new ServiceException("渲染模板失败,表名:" + table.getTableName());
                }
            }
        }
@@ -291,7 +291,7 @@
        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
        if (StringUtils.isEmpty(dbTableColumns))
        {
            throw new CustomException("同步数据失败,原表结构不存在");
            throw new ServiceException("同步数据失败,原表结构不存在");
        }
        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
@@ -383,26 +383,26 @@
            JSONObject paramsObj = JSONObject.parseObject(options);
            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
            {
                throw new CustomException("树编码字段不能为空");
                throw new ServiceException("树编码字段不能为空");
            }
            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
            {
                throw new CustomException("树父编码字段不能为空");
                throw new ServiceException("树父编码字段不能为空");
            }
            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
            {
                throw new CustomException("树名称字段不能为空");
                throw new ServiceException("树名称字段不能为空");
            }
        }
        else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
        {
            if (StringUtils.isEmpty(genTable.getSubTableName()))
            {
                throw new CustomException("关联子表的表名不能为空");
                throw new ServiceException("关联子表的表名不能为空");
            }
            else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
            {
                throw new CustomException("子表关联的外键名不能为空");
                throw new ServiceException("子表关联的外键名不能为空");
            }
        }
    }