Merge branch 'master' of http://124.70.58.209:3000/buzhanyi/ankaibeiProjectManagement

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -277,12 +277,11 @@ public class CostInfoController {
     @PostMapping("/listRuntimeTaskByProjectAdd")
     public ResMsg listRuntimeTaskByProjectAdd(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
-        String username = TokenData.takeFromRequest().getLoginName();
         //---查询到所有的任务量
         final Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
         listRuntimeTaskRequestVo.setPageNum(1);
         listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
-        MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
+        MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(TokenData.takeFromRequest().getLoginName(), listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "新建项目";
         return PackageAgain(flowTaskVoList, pageNum, queryType);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ProjectInfoServiceImpl.java

@@ -130,6 +130,7 @@ public class ProjectInfoServiceImpl implements ProjectInfoService {
         Optional<UserInfoEntity> projectPrincipal = userInfoMapper.findById(projectInfoEntity1.getProjectPrincipal());
         UserInfoEntity userInfoEntity = projectPrincipal.orElse(null);
         projectInfoEntity1.setProjectPrincipal(userInfoEntity != null ? userInfoEntity.getShowName() : null);
+        projectInfoEntity1.setProjectStage(ProjectPeriodEnum.getEnumByCode(projectInfoEntity1.getProjectStage()).getReason());
         return new ResMsg(CodeEnum.OK, projectInfoEntity1);
     }
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDataPermController.java

@@ -75,12 +75,12 @@ public class SysDataPermController {
         }
         Set<String> deptIdSet = null;
         if (result.getData() != null) {
-            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<Long>>() {
+            deptIdSet = result.getData().getObject("deptIdSet", new TypeReference<Set<String>>() {
             });
         }
         Set<String> menuIdSet = null;
         if (result.getData() != null) {
-            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<Long>>() {
+            menuIdSet = result.getData().getObject("menuIdSet", new TypeReference<Set<String>>() {
             });
         }
         sysDataPermService.saveNew(sysDataPerm, deptIdSet, menuIdSet);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDeptController.java

@@ -258,19 +258,15 @@ public class SysDeptController {
      */
     @PostMapping("/listSysDeptPost")
     public ResponseResult<MyPageData<SysPostVo>> listSysDeptPost(
-            @MyRequestBody(required = true) Long deptId,
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
-        if (!sysDeptService.existId(deptId)) {
+            @RequestBody SysPostDto sysPostDtoFilter) {
+        if (!sysDeptService.existId(sysPostDtoFilter.getDeptId())) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
-        if (pageParam != null) {
-            PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        if (sysPostDtoFilter.getPageNum() != null) {
+            PageMethod.startPage(sysPostDtoFilter.getPageNum(), sysPostDtoFilter.getPageSize());
         }
         SysPost filter = MyModelUtil.copyTo(sysPostDtoFilter, SysPost.class);
-        String orderBy = MyOrderParam.buildOrderBy(orderParam, SysPost.class);
-        List<SysPost> sysPostList = sysPostService.getSysPostListByDeptId(deptId, filter, orderBy);
+        List<SysPost> sysPostList = sysPostService.getSysPostListByDeptId(sysPostDtoFilter.getDeptId(), filter, null);
         return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE));
     }
 

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -87,11 +87,11 @@ public class SysUserController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<String> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {
+        Set<String> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<String>>() {
         });
-        Set<String> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {
+        Set<String> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<String>>() {
         });
-        Set<String> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {
+        Set<String> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<String>>() {
         });
         sysUser.setUserType(1);
         sysUserService.saveNew(sysUser, roleIdSet, deptPostIdSet, dataPermIdSet);
@@ -191,8 +191,8 @@ public class SysUserController {
             PageMethod.startPage(sysUserDtoFilter.getPageNum(), sysUserDtoFilter.getPageSize());
         }
         SysUser sysUserFilter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
-        List<SysUserVo> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
-        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList));
+        List<SysUser> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
+        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList, SysUser.INSTANCE));
     }
 
     /**

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/dto/SysPostDto.java

@@ -19,6 +19,12 @@ import javax.validation.constraints.*;
 @Data
 public class SysPostDto extends MyPageParam {
 
+    /**
+     * 岗位Id。
+     */
+    private Long deptId;
+
+
     /**
      * 岗位Id。
      */

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysPostService.java

@@ -54,7 +54,6 @@ public interface SysPostService extends IBaseService<SysPost, Long> {
      * 如果仅仅需要获取主表数据，请移步(getSysPostList)，以便获取更好的查询性能。
      *
      * @param filter  主表过滤对象。
-     * @param orderBy 排序参数。
      * @return 查询结果集。
      */
     List<SysPost> getSysPostListWithRelation(SysPost filter);

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysUserService.java

@@ -91,7 +91,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param filter 主表过滤对象。
      * @return 查询结果集。
      */
-    List<SysUserVo> getSysUserListWithRelation(SysUser filter);
+    List<SysUser> getSysUserListWithRelation(SysUser filter);
 
     /**
      * 获取指定角色的用户列表。

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -261,22 +261,16 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 查询结果集。
      */
     @Override
-    public List<SysUserVo> getSysUserListWithRelation(SysUser filter) {
-        List<SysUser> list = sysUserMapper.getSysUserList(filter);
-        List<SysUserVo> resultList = new ArrayList<>();
+    public List<SysUser> getSysUserListWithRelation(SysUser filter) {
+        List<SysUser> resultList = sysUserMapper.getSysUserList(filter);
+        for (SysUser user : resultList) {
+            List<SysUserPost> userPostList = sysPostService.getSysUserPostListByUserId(user.getUserId());
+            user.setSysUserPostList(userPostList);
+        }
         // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
-        int batchSize = list instanceof Page ? 0 : 1000;
-        this.buildRelationForDataList(list, MyRelationParam.normal(), batchSize);
-        for (SysUser user : list) {
-            SysUserVo userVo = new SysUserVo();
-            BeanUtils.copyProperties(user, userVo);
-            userVo.setUserId(user.getUserId() + "");
-            userVo.setDeptId(user.getDeptId() + "");
-            userVo.setCreateUserId(user.getCreateUserId() + "");
-            userVo.setUpdateUserId(user.getUpdateUserId() + "");
-            resultList.add(userVo);
-        }
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }
 

common/common-flow-online/src/main/java/com/ankaibei/workFlow/common/flow/online/controller/FlowOnlineOperationController.java

@@ -349,7 +349,7 @@ public class FlowOnlineOperationController {
         if (StrUtil.isBlank(flowWorkOrderExt.getDraftData())) {
             return ResponseResult.success(null);
         }
-        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(flowWorkOrder.getOnlineTableId());
+        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(Long.valueOf(flowWorkOrder.getOnlineTableId()));
         JSONObject draftData = JSON.parseObject(flowWorkOrderExt.getDraftData());
         JSONObject masterData = draftData.getJSONObject(FlowConstant.MASTER_DATA_KEY);
         JSONObject slaveData = draftData.getJSONObject(FlowConstant.SLAVE_DATA_KEY);
@@ -929,8 +929,7 @@ public class FlowOnlineOperationController {
         Set<String> businessKeySet = flowWorkOrderVoList.stream()
                 .filter(c -> c.getBusinessKey() != null)
                 .map(FlowWorkOrderVo::getBusinessKey).collect(Collectors.toSet());
-        String tableId = flowWorkOrderVoList.get(0).getOnlineTableId();
-        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(tableId);
+        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(flowWorkOrderVoList.get(0).getOnlineTableId());
         if (CollUtil.isNotEmpty(businessKeySet)) {
             Set<?> convertedBusinessKeySet =
                     onlineOperationHelper.convertToTypeValue(masterTable.getPrimaryKeyColumn(), businessKeySet);
@@ -988,7 +987,7 @@ public class FlowOnlineOperationController {
                 List<OnlineDatasourceRelation> slaveRelationList = null;
                 if (slaveData != null) {
                     OnlineDatasource datasource =
-                            onlineDatasourceService.getOnlineDatasourceByMasterTableId(tableId);
+                            onlineDatasourceService.getOnlineDatasourceByMasterTableId(flowWorkOrderVoList.get(0).getOnlineTableId());
                     ResponseResult<List<OnlineDatasourceRelation>> relationListResult =
                             onlineOperationHelper.verifyAndGetRelationList(datasource.getDatasourceId(), RelationType.ONE_TO_ONE);
                     if (!relationListResult.isSuccess()) {

common/common-flow-online/src/main/java/com/ankaibei/workFlow/common/flow/online/service/FlowOnlineOperationService.java

@@ -65,7 +65,7 @@ public interface FlowOnlineOperationService {
      * @return 流程工单对象。
      */
     FlowWorkOrder saveNewDraftAndStartProcess(
-            String processDefinitionId, String tableId, JSONObject masterData, JSONObject slaveData);
+            String processDefinitionId, Long tableId, JSONObject masterData, JSONObject slaveData);
 
     /**
      * 保存在线表单的数据，同时Take用户任务。

common/common-flow-online/src/main/java/com/ankaibei/workFlow/common/flow/online/service/impl/FlowOnlineBusinessServiceImpl.java

@@ -41,7 +41,7 @@ public class FlowOnlineBusinessServiceImpl extends BaseFlowOnlineService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateFlowStatus(FlowWorkOrder workOrder) {
-        OnlineTable onlineTable = onlineTableService.getOnlineTableFromCache(workOrder.getOnlineTableId());
+        OnlineTable onlineTable = onlineTableService.getOnlineTableFromCache(Long.valueOf(workOrder.getOnlineTableId()));
         if (onlineTable == null) {
             log.error("OnlineTableId [{}] doesn't exist while calling FlowOnlineBusinessServiceImpl.updateFlowStatus",
                     workOrder.getOnlineTableId());

common/common-flow-online/src/main/java/com/ankaibei/workFlow/common/flow/online/service/impl/FlowOnlineOperationServiceImpl.java

@@ -89,7 +89,7 @@ public class FlowOnlineOperationServiceImpl implements FlowOnlineOperationServic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public FlowWorkOrder saveNewDraftAndStartProcess(
-            String processDefinitionId, String tableId, JSONObject masterData, JSONObject slaveData) {
+            String processDefinitionId, Long tableId, JSONObject masterData, JSONObject slaveData) {
         ProcessInstance instance = flowApiService.start(processDefinitionId, null);
         return flowWorkOrderService.saveNewWithDraft(
                 instance, tableId, null, JSON.toJSONString(masterData), JSON.toJSONString(slaveData));

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/model/FlowWorkOrder.java

@@ -64,7 +64,7 @@ public class FlowWorkOrder {
      * 在线表单的主表Id。
      */
     @TableField(value = "online_table_id")
-    private String onlineTableId;
+    private Long onlineTableId;
 
     /**
      * 静态表单所使用的数据表名。

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/FlowWorkOrderService.java

@@ -26,7 +26,7 @@ public interface FlowWorkOrderService extends IBaseService<FlowWorkOrder, Long>
      * @param tableName     面向静态表单所使用的表名。
      * @return 新增的工作流工单对象。
      */
-    FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, String onlineTableId, String tableName);
+    FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId, String tableName);
 
     /**
      * 保存工单草稿。
@@ -39,7 +39,7 @@ public interface FlowWorkOrderService extends IBaseService<FlowWorkOrder, Long>
      * @return 工单对象。
      */
     FlowWorkOrder saveNewWithDraft(
-            ProcessInstance instance, String onlineTableId, String tableName, String masterData, String slaveData);
+            ProcessInstance instance, Long onlineTableId, String tableName, String masterData, String slaveData);
 
     /**
      * 更新流程工单的草稿数据。

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/impl/FlowWorkOrderServiceImpl.java

@@ -83,7 +83,7 @@ public class FlowWorkOrderServiceImpl extends BaseService<FlowWorkOrder, Long> i
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, String onlineTableId, String tableName) {
+    public FlowWorkOrder saveNew(ProcessInstance instance, Object dataId, Long onlineTableId, String tableName) {
         FlowWorkOrder flowWorkOrder = this.createWith(instance);
         flowWorkOrder.setWorkOrderCode(this.generateWorkOrderCode(instance.getProcessDefinitionKey()));
         flowWorkOrder.setBusinessKey(dataId.toString());
@@ -97,7 +97,7 @@ public class FlowWorkOrderServiceImpl extends BaseService<FlowWorkOrder, Long> i
     @Transactional(rollbackFor = Exception.class)
     @Override
     public FlowWorkOrder saveNewWithDraft(
-            ProcessInstance instance, String onlineTableId, String tableName, String masterData, String slaveData) {
+            ProcessInstance instance, Long onlineTableId, String tableName, String masterData, String slaveData) {
         FlowWorkOrder flowWorkOrder = this.createWith(instance);
         flowWorkOrder.setWorkOrderCode(this.generateWorkOrderCode(instance.getProcessDefinitionKey()));
         flowWorkOrder.setOnlineTableId(onlineTableId);

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/vo/FlowWorkOrderVo.java

@@ -58,7 +58,7 @@ public class FlowWorkOrderVo {
      * 在线表单的主表Id。
      */
     @ApiModelProperty(value = "在线表单的主表Id")
-    private String onlineTableId;
+    private Long onlineTableId;
 
     /**
      * 业务主键值。

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineColumnController.java

@@ -87,7 +87,7 @@ public class OnlineColumnController {
             errorMsg = "数据验证失败，指定的数据表Id不存在！";
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMsg);
         }
-        onlineColumnService.saveNewList(CollUtil.newLinkedList(sqlTableColumn), tableId + "");
+        onlineColumnService.saveNewList(CollUtil.newLinkedList(sqlTableColumn), tableId);
         return ResponseResult.success();
     }
 

common/common-online-api/src/main/java/com/ankaibei/workFlow/common/online/api/controller/OnlineFormController.java

@@ -256,7 +256,7 @@ public class OnlineFormController {
         List<OnlineDatasource> onlineDatasourceList =
                 onlineDatasourceService.getOnlineDatasourceListFromCache(datasourceIdSet);
         jsonObject.putOpt("onlineDatasourceList", onlineDatasourceList);
-        Set<String> tableIdSet = onlineDatasourceList.stream()
+        Set<Long> tableIdSet = onlineDatasourceList.stream()
                 .map(OnlineDatasource::getMasterTableId).collect(Collectors.toSet());
         List<OnlineDatasourceRelation> onlineDatasourceRelationList =
                 onlineDatasourceRelationService.getOnlineDatasourceRelationListFromCache(datasourceIdSet);
@@ -267,7 +267,7 @@ public class OnlineFormController {
         }
         List<OnlineTable> onlineTableList = new LinkedList<>();
         List<OnlineColumn> onlineColumnList = new LinkedList<>();
-        for (String tableId : tableIdSet) {
+        for (Long tableId : tableIdSet) {
             OnlineTable table = onlineTableService.getOnlineTableFromCache(tableId);
             onlineTableList.add(table);
             onlineColumnList.addAll(table.getColumnMap().values());
@@ -286,7 +286,7 @@ public class OnlineFormController {
                 jsonObject.putOpt("onlineDictList", onlineDictList);
             }
         }
-        Set<String> columnIdSet = onlineColumnList.stream().map(OnlineColumn::getColumnId).collect(Collectors.toSet());
+        Set<Long> columnIdSet = onlineColumnList.stream().map(OnlineColumn::getColumnId).collect(Collectors.toSet());
         List<OnlineColumnRule> colunmRuleList = onlineRuleService.getOnlineColumnRuleListByColumnIds(columnIdSet);
         if (CollUtil.isNotEmpty(colunmRuleList)) {
             jsonObject.putOpt("onlineColumnRuleList", colunmRuleList);

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/controller/OnlineOperationController.java

@@ -847,7 +847,7 @@ public class OnlineOperationController {
     @GetMapping("/getColumnRuleCode")
     public ResponseResult<String> getColumnRuleCode(@RequestParam Long tableId, @RequestParam Long columnId) {
         String errorMessage;
-        OnlineColumn column = onlineTableService.getOnlineColumnFromCache(tableId + "", columnId + "");
+        OnlineColumn column = onlineTableService.getOnlineColumnFromCache(tableId, columnId);
         if (column == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
         }
@@ -1021,7 +1021,7 @@ public class OnlineOperationController {
             List<OnlineDatasourceRelation> allRelationList,
             List<ExportInfo> exportInfoList) {
         Map<String, String> headerMap = new LinkedHashMap<>(16);
-        Map<String, OnlineDatasourceRelation> allRelationMap = null;
+        Map<Long, OnlineDatasourceRelation> allRelationMap = null;
         if (CollUtil.isNotEmpty(allRelationList)) {
             allRelationMap = allRelationList.stream()
                     .collect(Collectors.toMap(OnlineDatasourceRelation::getSlaveTableId, r -> r));

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineColumn.java

@@ -28,7 +28,7 @@ public class OnlineColumn {
      * 主键Id。
      */
     @TableId(value = "column_id")
-    private String columnId;
+    private Long columnId;
 
     /**
      * 字段名。
@@ -40,7 +40,7 @@ public class OnlineColumn {
      * 数据表Id。
      */
     @TableField(value = "table_id")
-    private String tableId;
+    private Long tableId;
 
     /**
      * 数据表中的字段类型。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineDatasource.java

@@ -50,7 +50,7 @@ public class OnlineDatasource {
      * 主表Id。
      */
     @TableField(value = "master_table_id")
-    private String masterTableId;
+    private Long masterTableId;
 
     /**
      * 更新时间。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineDatasourceRelation.java

@@ -65,13 +65,13 @@ public class OnlineDatasourceRelation {
      * 从表Id。
      */
     @TableField(value = "slave_table_id")
-    private String slaveTableId;
+    private Long slaveTableId;
 
     /**
      * 从表关联字段Id。
      */
     @TableField(value = "slave_column_id")
-    private String slaveColumnId;
+    private Long slaveColumnId;
 
     /**
      * 删除主表的时候是否级联删除一对一和一对多的从表数据，多对多只是删除关联，不受到这个标记的影响。。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineDatasourceTable.java

@@ -35,5 +35,5 @@ public class OnlineDatasourceTable {
      * 数据表Id。
      */
     @TableField(value = "table_id")
-    private String tableId;
+    private Long tableId;
 }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineForm.java

@@ -63,7 +63,7 @@ public class OnlineForm {
      * 表单主表id。
      */
     @TableField(value = "master_table_id")
-    private String masterTableId;
+    private Long masterTableId;
 
     /**
      * 表单组件JSON。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineTable.java

@@ -26,7 +26,7 @@ public class OnlineTable {
      * 主键Id。
      */
     @TableId(value = "table_id")
-    private String tableId;
+    private Long tableId;
 
     /**
      * 表名称。
@@ -70,7 +70,7 @@ public class OnlineTable {
      * 该字段会被缓存，因此在线表单执行操作时可以从缓存中读取该数据，并可基于columnId进行快速检索。
      */
     @TableField(exist = false)
-    private Map<String, OnlineColumn> columnMap;
+    private Map<Long, OnlineColumn> columnMap;
 
     /**
      * 当前表的主键字段，该字段仅仅用于动态表单运行时的SQL拼装。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/model/OnlineVirtualColumn.java

@@ -27,7 +27,7 @@ public class OnlineVirtualColumn {
      * 所在表Id。
      */
     @TableField(value = "table_id")
-    private String tableId;
+    private Long tableId;
 
     /**
      * 字段名称。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineColumnService.java

@@ -24,7 +24,7 @@ public interface OnlineColumnService extends IBaseService<OnlineColumn, Long> {
      * @param onlineTableId 在线表对象的主键Id。
      * @return 插入的在线表字段数据。
      */
-    List<OnlineColumn> saveNewList(List<SqlTableColumn> columnList, String onlineTableId);
+    List<OnlineColumn> saveNewList(List<SqlTableColumn> columnList, Long onlineTableId);
 
     /**
      * 更新数据对象。
@@ -50,7 +50,7 @@ public interface OnlineColumnService extends IBaseService<OnlineColumn, Long> {
      * @param columnId 字段Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(String tableId, String columnId);
+    boolean remove(Long tableId, String columnId);
 
     /**
      * 批量添加多对多关联关系。
@@ -92,14 +92,14 @@ public interface OnlineColumnService extends IBaseService<OnlineColumn, Long> {
      * @param tableId 主表主键Id。
      * @return 删除数量。
      */
-    int removeByTableId(String tableId);
+    int removeByTableId(Long tableId);
 
     /**
      * 删除指定数据表Id集合中的表字段。
      *
      * @param tableIdSet 待删除的数据表Id集合。
      */
-    void removeByTableIdSet(Set<String> tableIdSet);
+    void removeByTableIdSet(Set<Long> tableIdSet);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -135,7 +135,7 @@ public interface OnlineColumnService extends IBaseService<OnlineColumn, Long> {
      * @param columnName 字段名。
      * @return 查询出的字段对象。
      */
-    OnlineColumn getOnlineColumnByTableIdAndColumnName(String tableId, String columnName);
+    OnlineColumn getOnlineColumnByTableIdAndColumnName(Long tableId, String columnName);
 
     /**
      * 验证主键是否正确。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineDatasourceService.java

@@ -132,5 +132,5 @@ public interface OnlineDatasourceService extends IBaseService<OnlineDatasource,
      * @param masterTableId 主表Id。
      * @return 在线表单数据源对象。
      */
-    OnlineDatasource getOnlineDatasourceByMasterTableId(String masterTableId);
+    OnlineDatasource getOnlineDatasourceByMasterTableId(Long masterTableId);
 }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineFormService.java

@@ -77,7 +77,7 @@ public interface OnlineFormService extends IBaseService<OnlineForm, Long> {
      * @param tableId 数据表Id。
      * @return 使用该数据表的表单列表。
      */
-    List<OnlineForm> getOnlineFormListByTableId(String tableId);
+    List<OnlineForm> getOnlineFormListByTableId(Long tableId);
 
     /**
      * 获取指定表单的数据源列表。

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineRuleService.java

@@ -87,5 +87,5 @@ public interface OnlineRuleService extends IBaseService<OnlineRule, Long> {
      * @param columnIdSet 指定的字段Id列表。
      * @return 关联的字段规则对象列表。
      */
-    List<OnlineColumnRule> getOnlineColumnRuleListByColumnIds(Set<String> columnIdSet);
+    List<OnlineColumnRule> getOnlineColumnRuleListByColumnIds(Set<Long> columnIdSet);
 }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineTableService.java

@@ -39,14 +39,14 @@ public interface OnlineTableService extends IBaseService<OnlineTable, Long> {
      * @param tableId 主键Id。
      * @return 成功返回true，否则false。
      */
-    boolean remove(String tableId);
+    boolean remove(Long tableId);
 
     /**
      * 删除指定数据表Id集合中的表，及其关联字段。
      *
      * @param tableIdSet 待删除的数据表Id集合。
      */
-    void removeByTableIdSet(Set<String> tableIdSet);
+    void removeByTableIdSet(Set<Long> tableIdSet);
 
     /**
      * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -92,7 +92,7 @@ public interface OnlineTableService extends IBaseService<OnlineTable, Long> {
      * @param tableId 表主键Id。
      * @return 查询后的在线表对象。
      */
-    OnlineTable getOnlineTableFromCache(String tableId);
+    OnlineTable getOnlineTableFromCache(Long tableId);
 
     /**
      * 从缓存中获取指定的表字段。优先从缓存中读取，如果不存在则从数据库中读取，并同步到缓存。
@@ -102,5 +102,5 @@ public interface OnlineTableService extends IBaseService<OnlineTable, Long> {
      * @param columnId 字段Id。
      * @return 查询后的在线表对象。
      */
-    OnlineColumn getOnlineColumnFromCache(String tableId, String columnId);
+    OnlineColumn getOnlineColumnFromCache(Long tableId, Long columnId);
 }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/OnlineVirtualColumnService.java

@@ -65,5 +65,5 @@ public interface OnlineVirtualColumnService extends IBaseService<OnlineVirtualCo
      * @param tableIdSet 在线数据表Id集合。
      * @return 关联的虚拟字段数据列表。
      */
-    List<OnlineVirtualColumn> getOnlineVirtualColumnListByTableIds(Set<String> tableIdSet);
+    List<OnlineVirtualColumn> getOnlineVirtualColumnListByTableIds(Set<Long> tableIdSet);
 }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineColumnServiceImpl.java

@@ -78,7 +78,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<OnlineColumn> saveNewList(List<SqlTableColumn> columnList, String onlineTableId) {
+    public List<OnlineColumn> saveNewList(List<SqlTableColumn> columnList, Long onlineTableId) {
         List<OnlineColumn> onlineColumnList = new LinkedList<>();
         if (CollUtil.isEmpty(columnList)) {
             return onlineColumnList;
@@ -87,8 +87,8 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
         for (SqlTableColumn column : columnList) {
             OnlineColumn onlineColumn = new OnlineColumn();
             BeanUtil.copyProperties(column, onlineColumn, false);
-            onlineColumn.setColumnId(idGenerator.nextLongId() + "");
-            onlineColumn.setTableId(onlineTableId + "");
+            onlineColumn.setColumnId(idGenerator.nextLongId());
+            onlineColumn.setTableId(onlineTableId);
             this.setDefault(onlineColumn);
             onlineColumnMapper.insert(onlineColumn);
             onlineColumnList.add(onlineColumn);
@@ -141,7 +141,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String tableId, String columnId) {
+    public boolean remove(Long tableId, String columnId) {
         this.evictTableCache(tableId);
         return onlineColumnMapper.deleteById(columnId) == 1;
     }
@@ -154,7 +154,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public int removeByTableId(String tableId) {
+    public int removeByTableId(Long tableId) {
         OnlineColumn deletedObject = new OnlineColumn();
         deletedObject.setTableId(tableId);
         return onlineColumnMapper.delete(new QueryWrapper<>(deletedObject));
@@ -167,7 +167,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeByTableIdSet(Set<String> tableIdSet) {
+    public void removeByTableIdSet(Set<Long> tableIdSet) {
         onlineColumnMapper.delete(new QueryWrapper<OnlineColumn>().lambda().in(OnlineColumn::getTableId, tableIdSet));
     }
 
@@ -221,7 +221,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
      * @return 查询出的字段对象。
      */
     @Override
-    public OnlineColumn getOnlineColumnByTableIdAndColumnName(String tableId, String columnName) {
+    public OnlineColumn getOnlineColumnByTableIdAndColumnName(Long tableId, String columnName) {
         OnlineColumn filter = new OnlineColumn();
         filter.setTableId(tableId);
         filter.setColumnName(columnName);
@@ -346,7 +346,7 @@ public class OnlineColumnServiceImpl extends BaseService<OnlineColumn, Long> imp
         onlineColumn.setCreateTime(now);
     }
 
-    private void evictTableCache(String tableId) {
+    private void evictTableCache(Long tableId) {
         String tableIdKey = OnlineRedisKeyUtil.makeOnlineTableKey(tableId);
         redissonClient.getBucket(tableIdKey).delete();
     }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDatasourceRelationServiceImpl.java

@@ -290,7 +290,7 @@ public class OnlineDatasourceRelationServiceImpl
             return CallResult.error(String.format(errorMessageFormat, "主表关联字段Id"));
         }
         if (this.needToVerify(relation, originalRelation, OnlineDatasourceRelation::getSlaveTableId)
-                && !onlineTableService.existId(Long.valueOf(relation.getSlaveTableId()))) {
+                && !onlineTableService.existId(relation.getSlaveTableId())) {
             return CallResult.error(String.format(errorMessageFormat, "从表Id"));
         }
         if (this.needToVerify(relation, originalRelation, OnlineDatasourceRelation::getSlaveColumnId)

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineDatasourceServiceImpl.java

@@ -140,7 +140,7 @@ public class OnlineDatasourceServiceImpl extends BaseService<OnlineDatasource, L
         QueryWrapper<OnlineDatasourceTable> queryWrapper = new QueryWrapper<>(filter);
         List<OnlineDatasourceTable> datasourceTableList = onlineDatasourceTableMapper.selectList(queryWrapper);
         onlineDatasourceTableMapper.delete(queryWrapper);
-        Set<String> tableIdSet = datasourceTableList.stream()
+        Set<Long> tableIdSet = datasourceTableList.stream()
                 .map(OnlineDatasourceTable::getTableId).collect(Collectors.toSet());
         onlineTableService.removeByTableIdSet(tableIdSet);
         return true;
@@ -258,7 +258,7 @@ public class OnlineDatasourceServiceImpl extends BaseService<OnlineDatasource, L
     }
 
     @Override
-    public OnlineDatasource getOnlineDatasourceByMasterTableId(String masterTableId) {
+    public OnlineDatasource getOnlineDatasourceByMasterTableId(Long masterTableId) {
         return onlineDatasourceMapper.selectOne(
                 new LambdaQueryWrapper<OnlineDatasource>().eq(OnlineDatasource::getMasterTableId, masterTableId));
     }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineFormServiceImpl.java

@@ -210,9 +210,9 @@ public class OnlineFormServiceImpl extends BaseService<OnlineForm, Long> impleme
      * @return 使用该数据表的表单列表。
      */
     @Override
-    public List<OnlineForm> getOnlineFormListByTableId(String tableId) {
+    public List<OnlineForm> getOnlineFormListByTableId(Long tableId) {
         OnlineForm filter = new OnlineForm();
-        filter.setMasterTableId(tableId + "");
+        filter.setMasterTableId(tableId);
         return onlineFormMapper.selectList(new QueryWrapper<>(filter));
     }
 

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineOperationServiceImpl.java

@@ -669,7 +669,7 @@ public class OnlineOperationServiceImpl implements OnlineOperationService {
         if (CollUtil.isEmpty(relationList)) {
             return null;
         }
-        Map<String, OnlineColumn> masterTableColumnMap = masterTable.getColumnMap();
+        Map<Long, OnlineColumn> masterTableColumnMap = masterTable.getColumnMap();
         List<JoinTableInfo> joinInfoList = new LinkedList<>();
         for (OnlineDatasourceRelation relation : relationList) {
             JoinTableInfo joinInfo = new JoinTableInfo();

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineRuleServiceImpl.java

@@ -195,7 +195,7 @@ public class OnlineRuleServiceImpl extends BaseService<OnlineRule, Long> impleme
      * @return 关联的字段规则对象列表。
      */
     @Override
-    public List<OnlineColumnRule> getOnlineColumnRuleListByColumnIds(Set<String> columnIdSet) {
+    public List<OnlineColumnRule> getOnlineColumnRuleListByColumnIds(Set<Long> columnIdSet) {
         LambdaQueryWrapper<OnlineColumnRule> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(OnlineColumnRule::getColumnId, columnIdSet);
         List<OnlineColumnRule> columnRuleList = onlineColumnRuleMapper.selectList(queryWrapper);

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineTableServiceImpl.java

@@ -77,7 +77,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
     public OnlineTable saveNewFromSqlTable(SqlTable sqlTable) {
         OnlineTable onlineTable = new OnlineTable();
         onlineTable.setDblinkId(sqlTable.getDblinkId());
-        onlineTable.setTableId(idGenerator.nextLongId() + "");
+        onlineTable.setTableId(idGenerator.nextLongId());
         onlineTable.setTableName(sqlTable.getTableName());
         String modelName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, sqlTable.getTableName());
         onlineTable.setModelName(modelName);
@@ -115,7 +115,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean remove(String tableId) {
+    public boolean remove(Long tableId) {
         if (onlineTableMapper.deleteById(tableId) == 0) {
             return false;
         }
@@ -131,7 +131,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void removeByTableIdSet(Set<String> tableIdSet) {
+    public void removeByTableIdSet(Set<Long> tableIdSet) {
         tableIdSet.forEach(this::evictTableCache);
         onlineTableMapper.delete(
                 new QueryWrapper<OnlineTable>().lambda().in(OnlineTable::getTableId, tableIdSet));
@@ -200,14 +200,14 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
      * @return 查询后的在线表对象。
      */
     @Override
-    public OnlineTable getOnlineTableFromCache(String tableId) {
+    public OnlineTable getOnlineTableFromCache(Long tableId) {
         String redisKey = OnlineRedisKeyUtil.makeOnlineTableKey(tableId);
         RBucket<String> tableBucket = redissonClient.getBucket(redisKey);
         if (tableBucket.isExists()) {
             String tableInfo = tableBucket.get();
             return JSON.parseObject(tableInfo, OnlineTable.class);
         }
-        OnlineTable table = this.getByIdWithRelation(Long.valueOf(tableId), MyRelationParam.full());
+        OnlineTable table = this.getByIdWithRelation(tableId, MyRelationParam.full());
         if (table == null) {
             return null;
         }
@@ -220,7 +220,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
                 table.setLogicDeleteColumn(column);
             }
         }
-        Map<String, OnlineColumn> columnMap =
+        Map<Long, OnlineColumn> columnMap =
                 table.getColumnList().stream().collect(Collectors.toMap(OnlineColumn::getColumnId, c -> c));
         table.setColumnMap(columnMap);
         table.setColumnList(null);
@@ -230,7 +230,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
     }
 
     @Override
-    public OnlineColumn getOnlineColumnFromCache(String tableId, String columnId) {
+    public OnlineColumn getOnlineColumnFromCache(Long tableId, Long columnId) {
         OnlineTable table = this.getOnlineTableFromCache(tableId);
         if (table == null) {
             return null;
@@ -238,7 +238,7 @@ public class OnlineTableServiceImpl extends BaseService<OnlineTable, Long> imple
         return table.getColumnMap().get(columnId);
     }
 
-    private void evictTableCache(String tableId) {
+    private void evictTableCache(Long tableId) {
         String tableIdKey = OnlineRedisKeyUtil.makeOnlineTableKey(tableId);
         redissonClient.getBucket(tableIdKey).delete();
     }

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/service/impl/OnlineVirtualColumnServiceImpl.java

@@ -143,7 +143,7 @@ public class OnlineVirtualColumnServiceImpl
      * @return 关联的虚拟字段数据列表。
      */
     @Override
-    public List<OnlineVirtualColumn> getOnlineVirtualColumnListByTableIds(Set<String> tableIdSet) {
+    public List<OnlineVirtualColumn> getOnlineVirtualColumnListByTableIds(Set<Long> tableIdSet) {
         LambdaQueryWrapper<OnlineVirtualColumn> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(OnlineVirtualColumn::getTableId, tableIdSet);
         return onlineVirtualColumnMapper.selectList(queryWrapper);

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/util/OnlineOperationHelper.java

@@ -71,7 +71,7 @@ public class OnlineOperationHelper {
         if (datasource == null) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
-        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(datasource.getMasterTableId());
+        OnlineTable masterTable = onlineTableService.getOnlineTableFromCache(Long.valueOf(datasource.getMasterTableId()));
         if (masterTable == null) {
             errorMessage = "数据验证失败，数据源主表Id不存在！";
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -165,7 +165,7 @@ public class OnlineOperationHelper {
      * @return 在线表的数据记录。
      */
     public ResponseResult<List<ColumnData>> buildTableData(
-            OnlineTable table, JSONObject tableData, boolean forUpdate, String ignoreSetColumnId) {
+            OnlineTable table, JSONObject tableData, boolean forUpdate, Long ignoreSetColumnId) {
         List<ColumnData> columnDataList = new LinkedList<>();
         String errorMessage;
         for (OnlineColumn column : table.getColumnMap().values()) {

common/common-online/src/main/java/com/ankaibei/workFlow/common/online/util/OnlineRedisKeyUtil.java

@@ -14,7 +14,7 @@ public class OnlineRedisKeyUtil {
      * @param tableId 在线表主键Id。
      * @return 在线表对象缓存在Redis中的键值。
      */
-    public static String makeOnlineTableKey(String tableId) {
+    public static String makeOnlineTableKey(Long tableId) {
         return "ONLINE_TABLE:" + tableId;
     }