Merge remote-tracking branch 'origin/master'

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -82,15 +82,14 @@ public class TableServiceCmdService {
      * 功能描述: 通用删除接口 (真的删除)
      *
      * @param dto 前台传过来的dto
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult objectDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
         requiredNonNull(idArr);
         // 拿到pkName
-        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + requireNonNull(dto.getTable()));
-        requireNonNull(genTable);
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
         RowResult rowResult = deleteService.objectDelete(idArr, dto.getTable(), requireNonNull(pkName));
@@ -103,7 +102,7 @@ public class TableServiceCmdService {
      * 功能描述: 通用删除接口 (真的删除)
      *
      * @param dto 前台传过来的dto
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult objectLogicDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
@@ -111,8 +110,7 @@ public class TableServiceCmdService {
         requiredNonNull(idArr);
 
         // 拿到pkName
-        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + requireNonNull(dto.getTable()));
-        requireNonNull(genTable);
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
         JSONObject jsonObject= new JSONObject();
@@ -127,14 +125,13 @@ public class TableServiceCmdService {
      * 功能描述: 获取单表单数据
      *
      * @param dto condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult queryList(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
 
         // 拿到每个字段对应的查询类型，=、 like、 >、 <
-        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + requireNonNull(dto.getTable()));
-        requireNonNull(genTable);
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         JSONObject fixedData = dto.getFixedData();
         requireNonNull(fixedData);
         // 查询条件
@@ -153,15 +150,14 @@ public class TableServiceCmdService {
      * 功能描述: 获取单表单数据
      *
      * @param dto condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult getObject(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
 
         // 拿到每个字段对应的查询类型，=、 like、 >、 <
         // 拿到pkName
-        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + requireNonNull(dto.getTable()));
-        requireNonNull(genTable);
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, dto.getTable());
         String pkName = IdUtils.getPkName(genTable.getColumns());
 
         JSONObject fixedData = dto.getFixedData();
@@ -211,12 +207,10 @@ public class TableServiceCmdService {
      *                        }
      *
      * @param condition condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     public AjaxResult getTableQuery(BaseTableSaveDTO condition) {
-        String tableName = requireNonNull(condition.getTable());
-        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + tableName);
-        requireNonNull(genTable);
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
 
         List<GenTableColumn> columns = genTable.getColumns();
         JSONObject jsonObject = new JSONObject();
@@ -247,4 +241,33 @@ public class TableServiceCmdService {
         requireNonNull(queryType);
         return value + "_" + queryType + "_" + columnType;
     }
+
+    /**
+     * 功能描述: 获取表单子表
+     *
+     * @param condition condition
+     * @return com.boman.common.core.web.domain.AjaxResult
+     */
+    public AjaxResult objectTab(BaseTableSaveDTO condition) {
+        GenTable genTable = getTableFromRedisByTableName(RedisKey.RELATION, condition.getTable());
+
+        List<GenTable> childTableList = genTable.getRelationList();
+        // 此表没有关联子表，查啥查
+        requireNonNull(childTableList);
+
+        for (GenTable childTable : childTableList) {
+            String childTableName = childTable.getTableName();
+
+
+        }
+
+
+        return AjaxResult.success();
+    }
+
+    private GenTable getTableFromRedisByTableName(String redisKeyPrefix, String tableName){
+        GenTable genTable = redisService.getCacheObject(redisKeyPrefix + requireNonNull(tableName));
+        return requireNonNull(genTable);
+    }
+
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/ObjController.java

@@ -39,7 +39,7 @@ public class ObjController {
      *                }
      *
      * @param baseTableSaveDTO 前台传过来的dto
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象保存")
     @PostMapping("/objectSave")
@@ -60,7 +60,7 @@ public class ObjController {
      *
      *
      * @param baseTableSaveDTO 前台传过来的dto
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象删除")
     @PostMapping("/objectDelete")
@@ -82,7 +82,7 @@ public class ObjController {
      *                       }
      *
      * @param baseTableSaveDTO 前台传过来的dto
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象逻辑删除")
     @PostMapping("/objectLogicDelete")
@@ -99,7 +99,7 @@ public class ObjController {
      *                            }
      *                        }
      * @param condition condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "获取单表单数据")
     @PostMapping("/getObject")
@@ -126,7 +126,7 @@ public class ObjController {
      *                            }
      *                        }
      * @param condition condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "获取表单列表数据")
     @PostMapping("/queryList")
@@ -144,7 +144,7 @@ public class ObjController {
      *                        }
      *
      * @param condition condition
-     * @return com.boman.system.common.ValueHolder
+     * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "获取表单查询字段和按钮")
     @PostMapping("/getTableQuery")
@@ -152,5 +152,17 @@ public class ObjController {
         return tableServiceCmdService.getTableQuery(condition);
     }
 
+    /**
+     * 功能描述: 获取表单子表
+     *
+     * @param condition condition
+     * @return com.boman.common.core.web.domain.AjaxResult
+     */
+    @ApiOperation(value = "获取表单子表")
+    @PostMapping("/objectTab")
+    public AjaxResult objectTab(@RequestBody BaseTableSaveDTO condition) {
+        return tableServiceCmdService.objectTab(condition);
+    }
+
 
 }