update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理

疯狂的狮子li

2021-09-02 ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -2,17 +2,16 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
@@ -34,10 +33,7 @@
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -134,18 +130,7 @@
        int row = baseMapper.updateById(genTable);
        if (row > 0) {
            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
                genTableColumnMapper.update(cenTableColumn,
                        new LambdaUpdateWrapper<GenTableColumn>()
                     .set(StringUtils.isBlank(cenTableColumn.getColumnComment()), GenTableColumn::getColumnComment, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsPk()), GenTableColumn::getIsPk, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsIncrement()), GenTableColumn::getIsIncrement, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsInsert()), GenTableColumn::getIsInsert, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsEdit()), GenTableColumn::getIsEdit, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsList()), GenTableColumn::getIsList, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsQuery()), GenTableColumn::getIsQuery, null)
                     .set(StringUtils.isBlank(cenTableColumn.getIsRequired()), GenTableColumn::getIsRequired, null)
                     .set(StringUtils.isBlank(cenTableColumn.getDictType()), GenTableColumn::getDictType, "")
                     .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
                genTableColumnMapper.updateById(cenTableColumn);
            }
        }
    }
@@ -178,17 +163,21 @@
                String tableName = table.getTableName();
                GenUtils.initTable(table, operName);
                int row = baseMapper.insert(table);
                if (row > 0) {
                    // 保存列信息
                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
                    for (GenTableColumn column : genTableColumns) {
                        GenUtils.initColumnField(column, table);
                  genTableColumnMapper.insert(column);
                    }
            if (row > 0) {
               // 保存列信息
               List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
               List<GenTableColumn> saveColumns = new ArrayList<>();
               for (GenTableColumn column : genTableColumns) {
                  GenUtils.initColumnField(column, table);
                  saveColumns.add(column);
               }
               if (CollUtil.isNotEmpty(saveColumns)) {
                  genTableColumnMapper.insertAll(saveColumns);
               }
            }
            }
        } catch (Exception e) {
            throw new CustomException("导入失败：" + e.getMessage());
            throw new ServiceException("导入失败：" + e.getMessage());
        }
    }

@@ -264,8 +253,12 @@
                StringWriter sw = new StringWriter();
                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
                tpl.merge(context, sw);
                String path = getGenPath(table, template);
                FileUtils.writeUtf8String(sw.toString(), path);
            try {
                   String path = getGenPath(table, template);
                   FileUtils.writeUtf8String(sw.toString(), path);
            } catch (Exception e) {
               throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
            }
            }
        }
    }
@@ -284,16 +277,20 @@

        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());

        dbTableColumns.forEach(column -> {
            if (!tableColumnNames.contains(column.getColumnName())) {
                GenUtils.initColumnField(column, table);
            genTableColumnMapper.insert(column);
      List<GenTableColumn> saveColumns = new ArrayList<>();
      dbTableColumns.forEach(column -> {
         if (!tableColumnNames.contains(column.getColumnName())) {
            GenUtils.initColumnField(column, table);
            saveColumns.add(column);
         }
      });
      if (CollUtil.isNotEmpty(saveColumns)) {
         genTableColumnMapper.insertAll(saveColumns);
      }

        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
        if (CollUtil.isNotEmpty(delColumns)) {
@@ -364,16 +361,16 @@
        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
         Map<String, Object> paramsObj = genTable.getParams();
            if (StringUtils.isEmpty(paramsObj.get(GenConstants.TREE_CODE))) {
                throw new CustomException("树编码字段不能为空");
                throw new ServiceException("树编码字段不能为空");
            } else if (StringUtils.isEmpty(paramsObj.get(GenConstants.TREE_PARENT_CODE))) {
                throw new CustomException("树父编码字段不能为空");
                throw new ServiceException("树父编码字段不能为空");
            } else if (StringUtils.isEmpty(paramsObj.get(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("子表关联的外键名不能为空");
                }
            }
        }