优化自动化代码

admin

2022-04-07 211840b64fa1132d76d6dff6c779e9ba2c0c450f

 src/main/java/org/yeshi/utils/generater/vo/dao/MyBatisDBDaoVO.java

@@ -7,6 +7,7 @@
import org.yeshi.utils.generater.entity.*;
import org.yeshi.utils.generater.mybatis.Column;
import org.yeshi.utils.generater.mybatis.ColumnParseUtil;
import org.yeshi.utils.generater.mybatis.ColumnUtil;
import org.yeshi.utils.generater.mybatis.Table;
import org.yeshi.utils.generater.vo.ExceptionVO;
import org.yeshi.utils.generater.vo.xmlconfig.dao.DaoData;
@@ -113,13 +114,18 @@
                }

                String property = fd.getName();
                String column = fd.getName();
                String column = null;
                for (Annotation a : as) {
                    //不参与解析
                    if (a instanceof Column) {
                        column = ((Column) a).name();
                        break;
                    }
                }

                //驼峰写法，首字母小写
                if (column == null) {
                    column = ColumnUtil.getColumnFromProperty(fd.getName());
                }

                MybatisColumnData columData = new MybatisColumnData(column, property, fd.getType().getSimpleName(), ColumnParseUtil.getJDBCType(fd.getType().getName()));
@@ -144,16 +150,19 @@

                if (daoData != null) {
                    //查询条件从外部传入
                    for (DaoQuery query : daoData.getQueryList()) {
                        if (query.getName().equalsIgnoreCase(columData.getProperty())) {
                            if (fd.getType().getSimpleName().equalsIgnoreCase("Date")) {
                                daoQueryColumnList.add(new DaoQueryColumnData("max" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.lt));
                                daoQueryColumnList.add(new DaoQueryColumnData("min" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.gte));
                            } else {
                                daoQueryColumnList.add(new DaoQueryColumnData(columData.getProperty(), columData, fd.getType().getSimpleName(), query.getQueryType()));
                    if (daoData.getQueryList() != null)
                        for (DaoQuery query : daoData.getQueryList()) {
                            if (query.getName().equalsIgnoreCase(columData.getProperty())) {
                                if (fd.getType().getSimpleName().equalsIgnoreCase("Date")) {
                                    daoQueryColumnList.add(new DaoQueryColumnData("max" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.lt));
                                    daoQueryColumnList.add(new DaoQueryColumnData("min" + StringUtil.firstCharToUpper(columData.getProperty()), columData, fd.getType().getSimpleName(), DaoQueryCondition.QueryType.gte));
                                } else {
                                    daoQueryColumnList.add(new DaoQueryColumnData(columData.getProperty(), columData, fd.getType().getSimpleName(), query.getQueryType()));
                                }
                            } else if (query.getName().equalsIgnoreCase(columData.getColumn())) {
                                daoQueryColumnList.add(new DaoQueryColumnData(columData.getColumn(), columData, fd.getType().getSimpleName(), query.getQueryType()));
                            }
                        }
                    }

                } else {
                    //获取注解查询条件
@@ -236,4 +245,6 @@
    public void setTable(String table) {
        this.table = table;
    }


}