import问题

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

@@ -1,12 +1,6 @@
 package com.boman.domain;
 
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
-import com.boman.common.core.constant.GenConstants;
-import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * 业务表 gen_table
@@ -21,11 +15,11 @@ public class GenTable extends BaseEntity
     private Long tableId;
 
     /** 表名称 */
-    @NotBlank(message = "表名称不能为空")
+//    @NotBlank(message = "表名称不能为空")
     private String tableName;
 
     /** 表描述 */
-    @NotBlank(message = "表描述不能为空")
+//    @NotBlank(message = "表描述不能为空")
     private String tableComment;
 
     /** 关联父表的表名 */
@@ -74,11 +68,11 @@ public class GenTable extends BaseEntity
     private GenTable subTable;
 
     /** 表列信息 */
-    @Valid
+//    @Valid
     private List<GenTableColumn> columns;
 
     /** 主表关联的附表信息（附表包含字段信息） */
-    @Valid
+//    @Valid
     private List<GenTable> relationList;
 
     /** 其它生成选项 */
@@ -92,7 +86,7 @@ public class GenTable extends BaseEntity
     /**
      * 菜单权限(AMDQSUE)
      */
-    @NotBlank(message = "菜单权限不能为空")
+//    @NotBlank(message = "菜单权限不能为空")
     private String menuRole;
 
     /**
@@ -536,49 +530,48 @@ public class GenTable extends BaseEntity
         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 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;

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

@@ -1,14 +1,11 @@
 package com.boman.domain;
 
-import com.boman.common.core.utils.StringUtils;
-import com.boman.common.core.web.domain.BaseEntity;
-
 import java.util.List;
 import java.util.Map;
 
 /**
  * 代码生成业务字段表 gen_table_column
- * 
+ *
  * @author ruoyi
  */
 public class GenTableColumn extends BaseEntity
@@ -288,10 +285,10 @@ public class GenTableColumn extends BaseEntity
         return javaField;
     }
 
-    public String getCapJavaField()
-    {
-        return StringUtils.capitalize(javaField);
-    }
+//    public String getCapJavaField()
+//    {
+//        return StringUtils.capitalize(javaField);
+//    }
 
     public void setIsPk(String isPk)
     {
@@ -303,15 +300,15 @@ public class GenTableColumn extends BaseEntity
         return isPk;
     }
 
-    public boolean isPk()
-    {
-        return isPk(this.isPk);
-    }
+//    public boolean isPk()
+//    {
+//        return isPk(this.isPk);
+//    }
 
-    public boolean isPk(String isPk)
-    {
-        return isPk != null && StringUtils.equals("1", isPk);
-    }
+//    public boolean isPk(String isPk)
+//    {
+//        return isPk != null && StringUtils.equals("1", isPk);
+//    }
 
     public String getIsIncrement()
     {
@@ -323,15 +320,15 @@ public class GenTableColumn extends BaseEntity
         this.isIncrement = isIncrement;
     }
 
-    public boolean isIncrement()
-    {
-        return isIncrement(this.isIncrement);
-    }
+//    public boolean isIncrement()
+//    {
+//        return isIncrement(this.isIncrement);
+//    }
 
-    public boolean isIncrement(String isIncrement)
-    {
-        return isIncrement != null && StringUtils.equals("1", isIncrement);
-    }
+//    public boolean isIncrement(String isIncrement)
+//    {
+//        return isIncrement != null && StringUtils.equals("1", isIncrement);
+//    }
 
     public void setIsRequired(String isRequired)
     {
@@ -343,15 +340,15 @@ public class GenTableColumn extends BaseEntity
         return isRequired;
     }
 
-    public boolean isRequired()
-    {
-        return isRequired(this.isRequired);
-    }
+//    public boolean isRequired()
+//    {
+//        return isRequired(this.isRequired);
+//    }
 
-    public boolean isRequired(String isRequired)
-    {
-        return isRequired != null && StringUtils.equals("1", isRequired);
-    }
+//    public boolean isRequired(String isRequired)
+//    {
+//        return isRequired != null && StringUtils.equals("1", isRequired);
+//    }
 
     public void setIsInsert(String isInsert)
     {
@@ -363,15 +360,15 @@ public class GenTableColumn extends BaseEntity
         return isInsert;
     }
 
-    public boolean isInsert()
-    {
-        return isInsert(this.isInsert);
-    }
+//    public boolean isInsert()
+//    {
+//        return isInsert(this.isInsert);
+//    }
 
-    public boolean isInsert(String isInsert)
-    {
-        return isInsert != null && StringUtils.equals("1", isInsert);
-    }
+//    public boolean isInsert(String isInsert)
+//    {
+//        return isInsert != null && StringUtils.equals("1", isInsert);
+//    }
 
     public void setIsEdit(String isEdit)
     {
@@ -383,15 +380,15 @@ public class GenTableColumn extends BaseEntity
         return isEdit;
     }
 
-    public boolean isEdit()
-    {
-        return isInsert(this.isEdit);
-    }
+//    public boolean isEdit()
+//    {
+//        return isInsert(this.isEdit);
+//    }
 
-    public boolean isEdit(String isEdit)
-    {
-        return isEdit != null && StringUtils.equals("1", isEdit);
-    }
+//    public boolean isEdit(String isEdit)
+//    {
+//        return isEdit != null && StringUtils.equals("1", isEdit);
+//    }
 
     public void setIsList(String isList)
     {
@@ -403,15 +400,15 @@ public class GenTableColumn extends BaseEntity
         return isList;
     }
 
-    public boolean isList()
-    {
-        return isList(this.isList);
-    }
+//    public boolean isList()
+//    {
+//        return isList(this.isList);
+//    }
 
-    public boolean isList(String isList)
-    {
-        return isList != null && StringUtils.equals("1", isList);
-    }
+//    public boolean isList(String isList)
+//    {
+//        return isList != null && StringUtils.equals("1", isList);
+//    }
 
     public void setIsQuery(String isQuery)
     {
@@ -423,15 +420,15 @@ public class GenTableColumn extends BaseEntity
         return isQuery;
     }
 
-    public boolean isQuery()
-    {
-        return isQuery(this.isQuery);
-    }
+//    public boolean isQuery()
+//    {
+//        return isQuery(this.isQuery);
+//    }
 
-    public boolean isQuery(String isQuery)
-    {
-        return isQuery != null && StringUtils.equals("1", isQuery);
-    }
+//    public boolean isQuery(String isQuery)
+//    {
+//        return isQuery != null && StringUtils.equals("1", isQuery);
+//    }
 
     public void setQueryType(String queryType)
     {
@@ -473,53 +470,53 @@ public class GenTableColumn extends BaseEntity
         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 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;

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableRelation.java

@@ -1,6 +1,5 @@
 package com.boman.domain;
 
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * @author tjf

boman-api/boman-domain/src/main/java/com.boman.domain/TableSql.java

@@ -1,6 +1,5 @@
 package com.boman.domain;
 
-import com.boman.common.core.web.domain.BaseEntity;
 
 /**
  * @author tjf

boman-web-core/src/main/java/com/boman/web/core/service/update/BaseUpdateServiceImpl.java

@@ -72,7 +72,7 @@ public class BaseUpdateServiceImpl implements IBaseUpdateService {
 
     private String covert(String columnType, String value) {
         // false 不需要转义
-        boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR)
+        boolean needEscape = columnType.contains(VARCHAR) || columnType.contains(CHAR) || columnType.contains(BLOB)
                 || columnType.contains(DATETIME) || columnType.contains(TIMESTAMP);
         return needEscape ? escapeStr(value) : value;
     }

boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -45,13 +45,13 @@ public class ColumnUtils {
             }
 
             if (UPDATE_TIME.equalsIgnoreCase(columnName)) {
-                jsonObject.put(columnName, currentTime.toString());
+                jsonObject.put(columnName, currentTime);
                 continue;
             }
 
             if (isSave) {
                 if (CREATE_TIME.equalsIgnoreCase(columnName)) {
-                    jsonObject.put(columnName, currentTime.toString());
+                    jsonObject.put(columnName, currentTime);
                     continue;
                 }
                 if (CREATE_BY.equalsIgnoreCase(columnName)) {
@@ -59,15 +59,17 @@ public class ColumnUtils {
                     continue;
                 }
                 if (DATETIME.equalsIgnoreCase(column.getColumnType())) {
-                    Object value = jsonObject.get(columnName);
-                    if (isEmpty(((String) value))) {
-                        jsonObject.put(columnName, currentTime.toString());
+                    Object value = jsonObject.getTimestamp(columnName);
+                    if (isNotEmpty(value)) {
+                        jsonObject.put(columnName, jsonObject.getTimestamp(columnName));
                     }
                 }
             } else {
                 // 修改时，修改非创建时间的其他时间类型
-                if (!CREATE_TIME.equalsIgnoreCase(columnName) && DATETIME.equalsIgnoreCase(column.getColumnType())) {
-                    jsonObject.put(columnName, currentTime.toString());
+                if (DATETIME.equalsIgnoreCase(column.getColumnType())) {
+                    if (!CREATE_TIME.equalsIgnoreCase(columnName) && isNotEmpty(jsonObject.get(columnName))) {
+                        jsonObject.put(columnName, jsonObject.getTimestamp(columnName));
+                    }
                 }
             }
         }