rename

boman-web-core/src/main/java/com/boman/web/core/controller/CommonController.java

@@ -1,7 +1,7 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.BaseTableDTO;
+import com.boman.web.core.domain.FormDataDto;
 import com.boman.web.core.service.common.ICommonService;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,7 +38,7 @@ public class CommonController {
      * @return com.boman.common.core.web.domain.AjaxResult
      */
     @PostMapping
-    public AjaxResult getByMap(@RequestBody BaseTableDTO dto) {
+    public AjaxResult getByMap(@RequestBody FormDataDto dto) {
         return AjaxResult.success(commonService.getByMap(dto.getTable(), dto.getFixedData()));
     }
 

boman-web-core/src/main/java/com/boman/web/core/controller/ObjController.java

@@ -2,7 +2,7 @@ package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.gen.controller.MyController;
-import com.boman.web.core.domain.BaseTableSaveDTO;
+import com.boman.web.core.domain.FormDataDto;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +38,13 @@ public class ObjController {
      *                    }
      *                }
      *
-     * @param baseTableSaveDTO 前台传过来的dto
+     * @param formDataDto 前台传过来的dto
      * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象保存")
     @PostMapping("/objectSave")
-    public AjaxResult objectSave(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
-        return tableServiceCmdService.objectSave(baseTableSaveDTO);
+    public AjaxResult objectSave(@RequestBody FormDataDto formDataDto) {
+        return tableServiceCmdService.objectSave(formDataDto);
     }
 
     /**
@@ -59,13 +59,13 @@ public class ObjController {
      *
      *
      *
-     * @param baseTableSaveDTO 前台传过来的dto
+     * @param formDataDto 前台传过来的dto
      * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象删除")
     @PostMapping("/objectDelete")
-    public AjaxResult objectDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
-        return tableServiceCmdService.objectDelete(baseTableSaveDTO);
+    public AjaxResult objectDelete(@RequestBody FormDataDto formDataDto) {
+        return tableServiceCmdService.objectDelete(formDataDto);
     }
 
     /**
@@ -81,13 +81,13 @@ public class ObjController {
      *                           ]
      *                       }
      *
-     * @param baseTableSaveDTO 前台传过来的dto
+     * @param formDataDto 前台传过来的dto
      * @return com.boman.common.core.web.domain.AjaxResult
      */
     @ApiOperation(value = "单对象逻辑删除")
     @PostMapping("/objectLogicDelete")
-    public AjaxResult objectLogicDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
-        return tableServiceCmdService.objectLogicDelete(baseTableSaveDTO);
+    public AjaxResult objectLogicDelete(@RequestBody FormDataDto formDataDto) {
+        return tableServiceCmdService.objectLogicDelete(formDataDto);
     }
 
     /**
@@ -103,7 +103,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取单表单数据")
     @PostMapping("/getObject")
-    public AjaxResult getObject(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getObject(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.getObject(condition);
     }
 
@@ -130,7 +130,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单列表数据")
     @PostMapping("/queryList")
-    public AjaxResult queryList(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult queryList(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.queryList(condition);
     }
 
@@ -148,7 +148,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单查询字段和按钮")
     @PostMapping("/getTableQuery")
-    public AjaxResult getTableQuery(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getTableQuery(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.getTableQuery(condition);
     }
 
@@ -166,7 +166,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单查询字段")
     @PostMapping("/getQueryParam")
-    public AjaxResult getQueryParam(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getQueryParam(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.getQueryParam(condition);
     }
 
@@ -185,7 +185,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单表头")
     @PostMapping("/getTableHead")
-    public AjaxResult getTableHead(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getTableHead(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.getTableHead(condition);
     }
 
@@ -203,7 +203,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单按钮")
     @PostMapping("/getButton")
-    public AjaxResult getButton(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getButton(@RequestBody FormDataDto condition) {
         return AjaxResult.success( tableServiceCmdService.getButton(condition.getTable()));
     }
 
@@ -215,7 +215,7 @@ public class ObjController {
      */
     @ApiOperation(value = "获取表单子表")
     @PostMapping("/objectTab")
-    public AjaxResult objectTab(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult objectTab(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.objectTab(condition);
     }
 
@@ -237,7 +237,7 @@ public class ObjController {
      */
     @ApiOperation(value = "表单提交接口")
     @PostMapping("/objectSubmit")
-    public AjaxResult objectSubmit(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult objectSubmit(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.objectSubmit(condition, true);
     }
 
@@ -261,7 +261,7 @@ public class ObjController {
      */
     @ApiOperation(value = "反提交接口")
     @PostMapping("/objectUnSubmit")
-    public AjaxResult objectUnSubmit(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult objectUnSubmit(@RequestBody FormDataDto condition) {
         return tableServiceCmdService.objectSubmit(condition, false);
     }
 

boman-web-core/src/main/java/com/boman/web/core/controller/TableController.java

@@ -2,7 +2,6 @@ package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.gen.domain.GenTable;
-import com.boman.web.core.domain.BaseTableSaveDTO;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,50 +0,0 @@
-package com.boman.web.core.domain;
-
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.annotation.JSONField;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 09:53
- **/
-public class BaseTableDTO {
-
-    @JSONField(name = "objId")
-    private Long objId;
-
-    @JSONField(name = "fixedData")
-    private JSONObject fixedData;
-
-    /**
-     * 前台传参中的表名
-     */
-    @JSONField(name = "table")
-    private String table;
-
-
-    public Long getObjId() {
-        return objId;
-    }
-
-    public void setObjId(Long objId) {
-        this.objId = objId;
-    }
-
-    public JSONObject getFixedData() {
-        return fixedData;
-    }
-
-    public void setFixedData(JSONObject fixedData) {
-        this.fixedData = fixedData;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public void setTable(String table) {
-        this.table = table;
-    }
-
-}

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

@@ -14,7 +14,7 @@ import java.util.List;
  * @since:2018/12/27
  * @createat:2018/12/274:41 PM
  */
-public class BaseTableSaveDTO implements Serializable {
+public class FormDataDto implements Serializable {
 
     private static final long serialVersionUID = -8653990707913725671L;
     @JSONField(name = "objId")

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

@@ -8,7 +8,6 @@ import com.boman.gen.domain.GenTable;
 import com.boman.gen.domain.GenTableColumn;
 import com.boman.web.core.utils.IdUtils;
 
-import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 
@@ -31,7 +30,7 @@ public class TableContext {
     private JSONObject commitData;
     private List<GenTableColumn> columns;
 
-    public static TableContext createContext(BaseTableSaveDTO dto) {
+    public static TableContext createContext(FormDataDto dto) {
         TableContext context = new TableContext();
         context.setId(dto.getObjId());
         String tableName = requireNonNull(dto.getTable(), "tableName is empty");
@@ -58,7 +57,7 @@ public class TableContext {
 
     }
 
-    private static void packCommitData(BaseTableSaveDTO dto, TableContext context, List<GenTableColumn> columns
+    private static void packCommitData(FormDataDto dto, TableContext context, List<GenTableColumn> columns
             , JSONObject fixedData, JSONObject commitData) {
         boolean isInsert = ltZero(dto.getObjId());
         context.setActionType(isInsert ? ActionType.INSERT : ActionType.UPDATE);

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

@@ -0,0 +1,22 @@
+package com.boman.web.core.domain;
+
+/**
+ * @author shiqian
+ * @date 2021年04月20日 16:20
+ **/
+public class ViewConst {
+
+    public static final String VIEW_TYPE = "viewType";
+
+    /**  只有主表展示信息的模板  页面   **/
+   public static final String CRUD = "crud";
+
+    /**  上面展示主表信息、下面是列表  页面   **/
+   public static final String HEAD_TAB = "headTab";
+
+    /**  tab切换子表信息 页面    **/
+   public static final String ITEM_TAB = "itemTab";
+
+    /**  tree 页面    **/
+   public static final String TREE = "tree";
+}

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

@@ -33,7 +33,6 @@ import com.boman.web.core.service.update.IBaseUpdateService;
 import com.boman.web.core.utils.IdUtils;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.slf4j.Logger;
@@ -83,7 +82,7 @@ public class TableServiceCmdService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TableServiceCmdService.class);
 
-    public final AjaxResult objectSave(BaseTableSaveDTO dto) {
+    public final AjaxResult objectSave(FormDataDto dto) {
         AjaxResult result = AjaxResult.success();
 
         TableContext context = TableContext.createContext(dto);
@@ -124,7 +123,7 @@ public class TableServiceCmdService {
      * @param dto 前台传过来的dto
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult objectDelete(BaseTableSaveDTO dto) {
+    public AjaxResult objectDelete(FormDataDto dto) {
         requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
         requireNonNull(idArr);
@@ -151,7 +150,7 @@ public class TableServiceCmdService {
      * @param dto 前台传过来的dto
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult objectLogicDelete(BaseTableSaveDTO dto) {
+    public AjaxResult objectLogicDelete(FormDataDto dto) {
         requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
         requireNonNull(idArr);
@@ -178,7 +177,7 @@ public class TableServiceCmdService {
      * @param dto condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult queryList(BaseTableSaveDTO dto) {
+    public AjaxResult queryList(FormDataDto dto) {
         requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
 
         // 拿到每个字段对应的查询类型，=、 like、 >、 <
@@ -372,7 +371,7 @@ public class TableServiceCmdService {
      * @param dto condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult getObject(BaseTableSaveDTO dto) {
+    public AjaxResult getObject(FormDataDto dto) {
         String tableName = requireNonNull(dto.getTable(), "tableName = [" + dto.getTable() + "] 此表不存在");
 
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, tableName);
@@ -502,7 +501,7 @@ public class TableServiceCmdService {
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult getTableQuery(BaseTableSaveDTO condition) {
+    public AjaxResult getTableQuery(FormDataDto condition) {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<GenTableColumn> columns = genTable.getColumns();
         JSONObject jsonObject = new JSONObject();
@@ -528,7 +527,7 @@ public class TableServiceCmdService {
         // genTable.getMenuRole() 暂时数据库没有数据，
         jsonObject.put(FormDataConstant.BUTTON_LIST, Strings.nullToEmpty(genTable.getMenuRole()));
 
-        // jsonObject.put(FormDataConstant.TABLE_HEAD_LIST, getTableHeadList(genTable));
+         jsonObject.put(ViewConst.VIEW_TYPE, genTable.getTplCategory());
         return AjaxResult.success(jsonObject);
     }
 
@@ -544,7 +543,7 @@ public class TableServiceCmdService {
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult getQueryParam(BaseTableSaveDTO condition) {
+    public AjaxResult getQueryParam(FormDataDto condition) {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<GenTableColumn> columns = genTable.getColumns();
         // 查询字段
@@ -574,7 +573,7 @@ public class TableServiceCmdService {
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult getTableHead(BaseTableSaveDTO condition) {
+    public AjaxResult getTableHead(FormDataDto condition) {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         return AjaxResult.success(getTableHeadList(genTable));
     }
@@ -609,7 +608,7 @@ public class TableServiceCmdService {
      * @param condition condition
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult objectTab(BaseTableSaveDTO condition) {
+    public AjaxResult objectTab(FormDataDto condition) {
         //获取到主表对象
         GenTable genTable = getTableFromRedisByTableName(RedisKey.RELATION, condition.getTable());
         //从主表对象的relationList中获取出所有子表表对象
@@ -650,7 +649,7 @@ public class TableServiceCmdService {
      * @param isSubmit  提交true， 反提交false
      * @return com.boman.common.core.web.domain.AjaxResult
      */
-    public AjaxResult objectSubmit(BaseTableSaveDTO condition, boolean isSubmit) {
+    public AjaxResult objectSubmit(FormDataDto condition, boolean isSubmit) {
         GenTable genTable = getTableFromRedisByTableName(RedisKey.TABLE_INFO, condition.getTable());
         List<JSONObject> commitData = condition.getCommitData();
         requireNonNull(commitData, "啥都不提交, 调什么接口？？");
@@ -815,6 +814,7 @@ public class TableServiceCmdService {
         List<GenTableColumn> parentColumns = GenUtils.filterHrAndSort(allColumns);
         // 所有新增可见的列
         allColumns = filterData(allColumns, 0, MaskConstant.INSERT_VISIBLE::equals);
+        // 带折叠
         if (BooleanUtils.isTrue(isUi)) {
             // 把孩子放入父亲的怀抱
             for (GenTableColumn hrColumn : parentColumns) {
@@ -833,6 +833,7 @@ public class TableServiceCmdService {
             }
             resultCols = parentColumns;
         } else {
+            // 不带折叠
             packDictDataToColumns(allColumns, ObjectUtils::isNotEmpty);
             resultCols = allColumns;
         }