constant 移到 domain

boman-web-core/src/main/java/com/boman/web/core/constant/DictConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/DictConstant.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.constant;
+package com.boman.domain.constant;
 
 /**
  * @author shiqian

boman-web-core/src/main/java/com/boman/web/core/constant/MaskConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/MaskConstant.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.constant;
+package com.boman.domain.constant;
 
 
 /**

boman-web-core/src/main/java/com/boman/web/core/constant/SqlConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/SqlConstant.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.constant;
+package com.boman.domain.constant;
 
 
 /**

boman-web-core/src/main/java/com/boman/web/core/constant/SubmitConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/SubmitConstant.java

@@ -1,12 +1,9 @@
-package com.boman.web.core.constant;
-
-import lombok.Data;
+package com.boman.domain.constant;
 
 /**
  * @author shiqian
  * @date 2021年04月01日 13:56
  **/
-@Data
 public class SubmitConstant {
 
     /**

boman-web-core/src/main/java/com/boman/web/core/domain/TriggerActionConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/TriggerActionConstant.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.domain;
+package com.boman.domain.constant;
 
 /**
  * @author tjf

boman-api/boman-domain/src/main/java/com.boman.domain/UserEnvConstant.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/UserEnvConstant.java

@@ -1,4 +1,4 @@
-package com.boman.domain;
+package com.boman.domain.constant;
 
 
 

boman-web-core/src/main/java/com/boman/web/core/domain/ViewConst.java → boman-api/boman-domain/src/main/java/com.boman.domain/constant/ViewConst.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.domain;
+package com.boman.domain.constant;
 
 /**
  * @author shiqian

boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java

@@ -140,6 +140,10 @@ public class GenTableColumn extends BaseEntity
      */
     private Object columnValue;
 
+    /**
+     * 查询时：{"fkTableName":"外键表的表名", "fkColumnName":"关联外键表的列名", "dkColumnName":"关联表需要展示的字段名"}
+     * 根据列名获取关联表字段的值和名称{"name":"12", "value":"dept_id"}
+     */
     private Map<String, String> fkInfo;
 
 

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableColumnServiceImpl.java

@@ -7,6 +7,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.log.enums.BusinessType;
+import com.boman.domain.constant.FormDataConstant;
 import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
 import com.boman.gen.domain.TableSql;
@@ -75,8 +76,8 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
             GenTableColumn fkTableColumn = selectGenTableColumnListByColumnId(Long.parseLong(foreignKey));
             String columnName = fkTableColumn.getColumnName();
             Map<String, String> map = Maps.newHashMap();
-            map.put("name", foreignKey);
-            map.put("value", columnName);
+            map.put(FormDataConstant.SINGLE_OBJ_NAME, foreignKey);
+            map.put(FormDataConstant.SINGLE_OBJ_VALUE, columnName);
             tableColumn.setFkInfo(map);
         }
 

boman-web-core/src/main/java/com/boman/web/core/domain/FormDataDto.java

@@ -2,9 +2,6 @@ package com.boman.web.core.domain;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.ltZero;
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;
-import static com.boman.web.core.constant.MaskConstant.*;
+import static com.boman.domain.constant.MaskConstant.*;
 import static com.boman.web.core.utils.ColumnUtils.withoutHr;
 
 /**

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -13,7 +13,7 @@ import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.SysDictData;
-import com.boman.domain.constant.FormDataConstant;
+import com.boman.domain.constant.*;
 import com.boman.gen.api.RemoteGenTableColumnService;
 import com.boman.gen.api.RemoteGenTableService;
 import com.boman.gen.controller.MyController;
@@ -21,8 +21,6 @@ import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
 import com.boman.system.api.RemoteDictDataService;
 import com.boman.system.api.domain.SysFile;
-import com.boman.web.core.constant.MaskConstant;
-import com.boman.web.core.constant.SubmitConstant;
 import com.boman.web.core.domain.*;
 import com.boman.web.core.service.delete.IBaseDeleteService;
 import com.boman.web.core.service.save.IBaseSaveService;
@@ -587,7 +585,7 @@ public class TableServiceCmdService {
         List<JSONObject> commitData = condition.getCommitData();
         requireNonNull(commitData, "啥都不提交, 调什么接口？？");
 
-        String tableName = requireNonNull(genTable.getTableName());
+        String tableName = requireNonNull(genTable.getTableName(), "tableName = [" + genTable.getTableName() + "] 此表不存在");
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
         // 先去查出之前的状态
@@ -704,7 +702,7 @@ public class TableServiceCmdService {
         GenTable genTable = redisService.getCacheObject(key);
         if (ObjectUtils.isEmpty(genTable)) {
             genTable = remoteGenTableService.getByTableName(tableName);
-            requireNonNull(genTable, "数据库中，未找到表对应的信息");
+            requireNonNull(genTable, "数据库中，未找到表对应的信息, tableName = " + tableName);
             // {@link com.boman.gen.controller.MyController.packTableAndInsertToRedis} 失效时间
             redisService.setCacheObject(key, genTable, 12L, TimeUnit.DAYS);
         }