创建和修改表单时操作人存id

src/main/java/org/springblade/flow/base/model/dictionarytype/DictionaryExportModel.java

@@ -19,7 +19,9 @@ import org.springblade.flow.base.model.dictionarydata.DictionaryDataExportModel;
 @Data
 public class DictionaryExportModel implements Serializable {
 
-    /**
+	private static final long serialVersionUID = 1L;
+
+	/**
      * 字典分类
      */
     private List<DictionaryTypeEntity> list;

src/main/java/org/springblade/flow/base/service/impl/DataInterfaceServiceImpl.java

@@ -27,7 +27,7 @@ import org.springblade.flow.util.ServletUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
 import org.springblade.flow.util.wxutil.HttpUtil;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/base/service/impl/DbTableServiceImpl.java

@@ -26,7 +26,7 @@ import org.springblade.flow.database.util.JdbcUtil;
 import org.springblade.flow.util.PageUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/datalog/common/ExportService.java

@@ -18,8 +18,8 @@ import org.springblade.flow.datalog.service.DataExportTaskService;
 import org.springblade.flow.util.JsonUtil;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.service.VisualdevService;
-import org.springblade.flow.visual.onlinedev.common.formdata.FormDataWithTableService;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationField;
+import org.springblade.flow.visual.onlinedev.formdata.opt.FormDataWithTableService;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationField;
 import org.springblade.flow.visual.onlinedev.model.PaginationModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/org/springblade/flow/datalog/controller/DataImportLogController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/paas/visualdev/data/import")
-@Api(tags = "AA表单数据导入记录接口", value = "DataExportTasDataImportLogkLog")
+@Api(tags = "AA表单数据导入记录接口", value = "DataImportLog")
 public class DataImportLogController {
 
 	@Value("${blade.file.uploadPath}")

src/main/java/org/springblade/flow/datalog/service/DataImportLogService.java

@@ -7,7 +7,7 @@ import java.util.Date;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.flow.datalog.mapper.DataImportLogMapper;
 import org.springblade.flow.datalog.model.DataImportLog;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelFormParam;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelFormParam;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/datalog/service/FormDataLogService.java

@@ -15,7 +15,7 @@ import org.springblade.flow.datalog.enums.FormDataLogType;
 import org.springblade.flow.datalog.mapper.FormDataLogMapper;
 import org.springblade.flow.datalog.model.FormDataLog;
 import org.springblade.flow.util.DateUtil;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/engine/custom/behavior/impl/CustomCallActivityActivityBehavior.java

@@ -78,7 +78,7 @@ import org.springblade.flow.util.ReflectionUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
 import org.springblade.flow.util.context.SpringContext;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;

src/main/java/org/springblade/flow/engine/service/impl/FlowDynamicServiceImpl.java

@@ -41,7 +41,7 @@ import org.springblade.flow.util.JsonUtilEx;
 import org.springblade.flow.util.RandomUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/engine/service/impl/FlowTaskNewServiceImpl.java

@@ -146,7 +146,7 @@ import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
 import org.springblade.flow.util.context.SpringContext;
 import org.springblade.flow.util.wxutil.HttpUtil;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/org/springblade/flow/scheduletask/service/impl/TimetaskServiceImpl.java

@@ -22,7 +22,7 @@ import org.springblade.flow.util.JsonUtil;
 import org.springblade.flow.util.RandomUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.util.UserProvider;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/org/springblade/flow/visual/base/service/impl/VisualdevServiceImpl.java

@@ -95,7 +95,7 @@ public class VisualdevServiceImpl extends ServiceImpl<VisualdevMapper, Visualdev
 		}
 
 		entity.setCreatorTime(new Date());
-		entity.setCreatorUser(SecureUtil.getNickName());
+		entity.setCreatorUser(String.valueOf(SecureUtil.getUserId()));
 		boolean flag = this.save(entity);
 		if (flag) {
 			LambdaQueryWrapper<VisualdevDataPermission> wrapper = Wrappers.lambdaQuery(VisualdevDataPermission.class)
@@ -158,7 +158,7 @@ public class VisualdevServiceImpl extends ServiceImpl<VisualdevMapper, Visualdev
 			}
 		}
 		entity.setLastModifyTime(new Date());
-		entity.setLastModifyUser(SecureUtil.getNickName());
+		entity.setLastModifyUser(String.valueOf(SecureUtil.getUserId()));
 		return this.updateById(entity);
 	}
 

src/main/java/org/springblade/flow/visual/base/util/GetGenDataSourceUtil.java

@@ -8,7 +8,7 @@ import org.springblade.flow.database.source.impl.DbOracle;
 import org.springblade.flow.database.util.DbTypeUtil;
 import org.springblade.flow.util.UserProvider;
 import org.springblade.flow.util.context.SpringContext;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 

src/main/java/org/springblade/flow/visual/generater/service/impl/VisualdevGenServiceImpl.java

@@ -57,7 +57,7 @@ import org.springblade.flow.visual.generater.model.GenBaseInfo;
 import org.springblade.flow.visual.generater.model.GenFileNameSuffix;
 import org.springblade.flow.visual.generater.model.SearchTypeModel;
 import org.springblade.flow.visual.generater.service.VisualdevGenService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/visual/onlinedev/controller/VisualdevModelDataController.java

@@ -42,11 +42,11 @@ import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.service.VisualdevService;
 import org.springblade.flow.visual.base.service.impl.DataPermissionUserService;
 import org.springblade.flow.visual.base.service.impl.VisualdevDataPermissionService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelFormParam;
-import org.springblade.flow.visual.onlinedev.common.formdata.FormDataWithTableService;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationField;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationUtil;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelFormParam;
+import org.springblade.flow.visual.onlinedev.formdata.opt.FormDataWithTableService;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationField;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationUtil;
 import org.springblade.flow.visual.onlinedev.model.BatchRemoveIdsVo;
 import org.springblade.flow.visual.onlinedev.model.ColumnDataInfoVO;
 import org.springblade.flow.visual.onlinedev.model.DataInfoVO;
@@ -324,7 +324,7 @@ public class VisualdevModelDataController extends BladeController {
 		return ret;
 	}
 
-	@ApiOperation("数据操作 - 删除（暂仅支持单表）")
+	@ApiOperation("数据操作 - 删除")
 	@DeleteMapping("/{modelId}/{id}")
 	public ActionResult<String> delete(@PathVariable("id") String id, @PathVariable("modelId") String modelId)
 			throws DataException, SQLException, WorkFlowException {

src/main/java/org/springblade/flow/visual/onlinedev/common/dynamic/DataSourceService.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.dynamic;
+package org.springblade.flow.visual.onlinedev.formdata.dynamic;
 
 import java.util.HashMap;
 import java.util.List;
@@ -13,9 +13,9 @@ import org.springblade.cube.dto.TableLinkJoin;
 import org.springblade.cube.dto.TableLinkJoin.JoinKey;
 import org.springblade.flow.database.model.DbLinkEntity;
 import org.springblade.flow.util.JsonUtil;
-import org.springblade.flow.visual.onlinedev.common.enums.DsType;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationBean;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationUtil;
+import org.springblade.flow.visual.onlinedev.formdata.enums.DsType;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationBean;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/org/springblade/flow/visual/onlinedev/common/dynamic/DynamicDataService.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.dynamic;
+package org.springblade.flow.visual.onlinedev.formdata.dynamic;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -21,7 +21,7 @@ import org.springblade.bi.client.model.DataSourceModel;
 import org.springblade.bi.client.model.PageModel;
 import org.springblade.cube.enums.ViewColumnTypeEnum;
 import org.springblade.cube.utils.CubeConstants;
-import org.springblade.flow.visual.onlinedev.common.enums.DsType;
+import org.springblade.flow.visual.onlinedev.formdata.enums.DsType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -224,7 +224,8 @@ public class DynamicDataService {
 					String field = entry.getKey();
 					String value = row.getData(field).getValue();
 					ViewColumnTypeEnum columnType = headerMap.get(field);
-
+					log.info("***************************");
+					log.info("field="+field+",value="+value);
 					if (columnType == ViewColumnTypeEnum.DATETIME) {
 						java.sql.Timestamp dateValue = null;
 						try {

src/main/java/org/springblade/flow/visual/onlinedev/common/dynamic/TableData.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.dynamic;
+package org.springblade.flow.visual.onlinedev.formdata.dynamic;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

src/main/java/org/springblade/flow/visual/onlinedev/common/dynamic/TableFieldData.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.dynamic;
+package org.springblade.flow.visual.onlinedev.formdata.dynamic;
 
 import org.springblade.cube.enums.ViewColumnTypeEnum;
 

src/main/java/org/springblade/flow/visual/onlinedev/common/dynamic/TableRowData.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.dynamic;
+package org.springblade.flow.visual.onlinedev.formdata.dynamic;
 
 import java.util.LinkedHashMap;
 import java.util.Set;

src/main/java/org/springblade/flow/visual/onlinedev/common/enums/DsType.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.enums;
+package org.springblade.flow.visual.onlinedev.formdata.enums;
 
 /**
  * 数据库类型，数据集适配原有自带的

src/main/java/org/springblade/flow/visual/onlinedev/common/enums/SearchType.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.enums;
+package org.springblade.flow.visual.onlinedev.formdata.enums;
 
 /**
  * 查询类型

src/main/java/org/springblade/flow/visual/onlinedev/common/excel/ExcelFormParam.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.excel;
+package org.springblade.flow.visual.onlinedev.formdata.excel;
 
 import java.util.List;
 

src/main/java/org/springblade/flow/visual/onlinedev/common/excel/ExcelRead4MultipleTableListener.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.excel;
+package org.springblade.flow.visual.onlinedev.formdata.excel;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -14,16 +14,16 @@ import org.springblade.cube.dto.TableLinkJoin.JoinKey;
 import org.springblade.cube.enums.ViewColumnTypeEnum;
 import org.springblade.flow.util.JsonUtil;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DynamicDataService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.TableData;
-import org.springblade.flow.visual.onlinedev.common.dynamic.TableFieldData;
-import org.springblade.flow.visual.onlinedev.common.dynamic.TableRowData;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelFormParam.ExcelFieldIndex;
-import org.springblade.flow.visual.onlinedev.common.formdata.FormDataWithTableService;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationBean;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationField;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationUtil;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DynamicDataService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.TableData;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.TableFieldData;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.TableRowData;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelFormParam.ExcelFieldIndex;
+import org.springblade.flow.visual.onlinedev.formdata.opt.FormDataWithTableService;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationBean;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationField;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationUtil;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
@@ -159,6 +159,7 @@ public class ExcelRead4MultipleTableListener extends AnalysisEventListener<Linke
 				// 如果该表有主键
 				TableRowData tableRow = tableRowMap.get(table);
 				String keyValue = IdWorker.getIdStr();
+				log.info("table="+table+", key="+key+", value="+keyValue);
 				TableFieldData keyData = new TableFieldData(ViewColumnTypeEnum.NUMBER, key, keyValue);
 				tableRow.add(key, keyData);
 			}
@@ -176,13 +177,15 @@ public class ExcelRead4MultipleTableListener extends AnalysisEventListener<Linke
 					if (parentRelation != null) {
 						// 该字段存在关联字段
 						TableRowData childRow = tableRowMap.get(childTable);
-						TableFieldData childFieldData = childRow.getData(childField);
-						// 取父表对应字段的值，并且赋值给该表字段
-						TableRowData parentRow = tableRowMap.get(parentRelation.getTableName());
-						String parentField = parentRelation.getField();
-						String parentValue = parentRow.get(parentField).getValue();
-						childFieldData.setValue(parentValue);
-						childRow.add(childField, childFieldData);
+						if(childRow!=null) {
+							TableFieldData childFieldData = childRow.getData(childField);
+							// 取父表对应字段的值，并且赋值给该表字段
+							TableRowData parentRow = tableRowMap.get(parentRelation.getTableName());
+							String parentField = parentRelation.getField();
+							String parentValue = parentRow.get(parentField).getValue();
+							childFieldData.setValue(parentValue);
+							childRow.add(childField, childFieldData);
+						}
 					}
 				});
 			});
@@ -262,7 +265,8 @@ public class ExcelRead4MultipleTableListener extends AnalysisEventListener<Linke
 			valueBuffer.append(")");
 
 			String insertSql = fieldBuffer.toString() + valueBuffer.toString();
-
+			log.info("ExcelRead4MultipleTableListener::rowList is "+JSON.toJSONString(rowList, true));
+			log.info("ExcelRead4MultipleTableListener::insert sql is "+insertSql);
 			dynamicDataService.batchSaveForMultipleTable(ds, insertSql, BATCH_COUNT, headerMap, rowList);
 
 			if (CollUtil.isNotEmpty(relation.getChildren())) {

src/main/java/org/springblade/flow/visual/onlinedev/common/excel/ExcelRead4SingleTableListener.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.excel;
+package org.springblade.flow.visual.onlinedev.formdata.excel;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -12,11 +12,11 @@ import org.springblade.bi.client.model.DataSourceModel;
 import org.springblade.cube.enums.ViewColumnTypeEnum;
 import org.springblade.flow.util.JsonUtil;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DynamicDataService;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelFormParam.ExcelFieldIndex;
-import org.springblade.flow.visual.onlinedev.common.formdata.FormDataWithTableService;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationField;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DynamicDataService;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelFormParam.ExcelFieldIndex;
+import org.springblade.flow.visual.onlinedev.formdata.opt.FormDataWithTableService;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationField;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;

src/main/java/org/springblade/flow/visual/onlinedev/common/formdata/FormDataWithTableService.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.formdata;
+package org.springblade.flow.visual.onlinedev.formdata.opt;
 
 import java.io.File;
 import java.sql.SQLException;
@@ -24,18 +24,19 @@ import org.springblade.flow.util.JsonUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.service.VisualdevService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DynamicDataService;
-import org.springblade.flow.visual.onlinedev.common.enums.DsType;
-import org.springblade.flow.visual.onlinedev.common.enums.SearchType;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelFormParam.ExcelFieldIndex;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelRead4MultipleTableListener;
-import org.springblade.flow.visual.onlinedev.common.excel.ExcelRead4SingleTableListener;
-import org.springblade.flow.visual.onlinedev.common.formdata.UpdateBean.UpdateColumn;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationBean;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationField;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationKey;
-import org.springblade.flow.visual.onlinedev.common.relation.RelationUtil;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DynamicDataService;
+import org.springblade.flow.visual.onlinedev.formdata.enums.DsType;
+import org.springblade.flow.visual.onlinedev.formdata.enums.SearchType;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelFormParam.ExcelFieldIndex;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelRead4MultipleTableListener;
+import org.springblade.flow.visual.onlinedev.formdata.excel.ExcelRead4SingleTableListener;
+import org.springblade.flow.visual.onlinedev.formdata.param.UpdateBean;
+import org.springblade.flow.visual.onlinedev.formdata.param.UpdateBean.UpdateColumn;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationBean;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationField;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationKey;
+import org.springblade.flow.visual.onlinedev.formdata.relation.RelationUtil;
 import org.springblade.flow.visual.onlinedev.model.PaginationModel;
 import org.springblade.flow.visual.onlinedev.model.VisualdevModelDataCrForm;
 import org.springblade.flow.visual.onlinedev.model.VisualdevModelDataUpForm;
@@ -351,7 +352,7 @@ public class FormDataWithTableService {
 				if (CollUtil.isNotEmpty(tableList)) {
 					DataSourceModel ds = dataSourceService.getReportDatasource(String.valueOf(cubeData.getId()));
 					tableList.forEach(table -> {
-						String sql = "TRUNCATE TABLE "+table;
+						String sql = "TRUNCATE TABLE " + table;
 						dynamicDataService.executeSql(ds, sql);
 					});
 				}
@@ -617,8 +618,8 @@ public class FormDataWithTableService {
 			String idsStr = idList.stream().collect(Collectors.joining(","));
 			if (primaryColumn.getJavaType().equalsIgnoreCase("String")) {
 				// 主键为字符串类型
-				idsStr = idList.stream().collect(Collectors.joining("\", \""));
-				idsStr = "\"" + idsStr + "\"";
+				idsStr = idList.stream().collect(Collectors.joining("', '"));
+				idsStr = "'" + idsStr + "'";
 			}
 			sqlBuffer.append("delete from " + tableName + " ");
 			sqlBuffer.append("where " + primaryColumn.getColumnName() + " ");
@@ -664,19 +665,19 @@ public class FormDataWithTableService {
 			String idsStr = idList.stream().collect(Collectors.joining(","));
 			if (primaryColumn.getJavaType().equalsIgnoreCase("String")) {
 				// 主键为字符串类型
-				idsStr = idList.stream().collect(Collectors.joining("\", \""));
-				idsStr = "\"" + idsStr + "\"";
+				idsStr = idList.stream().collect(Collectors.joining("', '"));
+				idsStr = "'" + idsStr + "'";
 			}
 			whereBuffer.append(" in (" + idsStr + ")");
 			sqlBuffer.append(whereBuffer);
 			String sql = sqlBuffer.toString();
 			log.info("batch delete sql is : " + sql);
 			dynamicDataService.executeSql(ds, sql);
-			return ActionResult.success("批量删除成功");
+			return ActionResult.success("删除成功");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return ActionResult.fail("批量删除失败");
+		return ActionResult.fail("删除失败");
 	}
 
 	private void buildDeleteStringBuffer(String parentTableAlias, List<RelationBean> relationTree,
@@ -900,62 +901,6 @@ public class FormDataWithTableService {
 		}
 	}
 
-	// private ActionResult<String> updateForSingleTable(Column primaryColumn,
-	// String tableName, DataSourceModel ds,
-	// Map<String, Object> formDataMap, String id) {
-	// try {
-	// DsType dsType = DsType.reslove(ds.getDsType());
-	// StringBuffer sqlBuffer = new StringBuffer();
-	// sqlBuffer.append("update " + tableName + " ");
-	//
-	// StringBuffer valueSql = new StringBuffer("set ");
-	// formDataMap.forEach((key, object) -> {
-	// String value = object == null || object.toString().equalsIgnoreCase("[]") ?
-	// null : object.toString();
-	// CubeTableColumnModel field =
-	// dataSourceService.getFieldInfo(Integer.parseInt(key));
-	// String fieldName = field.getColumnName();
-	//
-	// if (value != null) {
-	// ViewColumnTypeEnum dataType =
-	// ViewColumnTypeEnum.resolve(field.getViewDataType());
-	// if (dataType == ViewColumnTypeEnum.STRING) {
-	// value = "'" + value + "'";
-	// } else if (dataType == ViewColumnTypeEnum.DATETIME) {
-	// // 时间日期类型
-	// value = "'" + value + "'";
-	// if (dsType == DsType.Oracle) {
-	// value = "to_date(" + value + ",'yyyy-mm-dd HH24:mi:ss')";
-	// }
-	// }
-	// }
-	// if (!primaryColumn.getColumnName().equalsIgnoreCase(fieldName)) {
-	// // 不是主键
-	// valueSql.append(fieldName + "=" + value);
-	// valueSql.append(",");
-	// }
-	// });
-	//
-	// String vsql = valueSql.toString();
-	// vsql = vsql.substring(0, vsql.length() - 1);
-	// sqlBuffer.append(vsql);
-	// sqlBuffer.append(" where " + primaryColumn.getColumnName() + "=");
-	// String symbol = "";
-	// if (primaryColumn.getJavaType().equalsIgnoreCase("String")) {
-	// // 主键是字符串
-	// symbol = "'";
-	// }
-	// sqlBuffer.append(symbol + id + symbol + " ");
-	//
-	// String sql = sqlBuffer.toString();
-	// log.info("update sql of single table is " + sql);
-	// dynamicDataService.executeSql(ds, sql);
-	// return ActionResult.success("更新成功");
-	// } catch (Exception e) {
-	// }
-	// return ActionResult.fail("更新失败");
-	// }
-
 	/**
 	 * 获取某个表的主键字段
 	 * 

src/main/java/org/springblade/flow/visual/onlinedev/formdata/opt/FormTest.java

@@ -0,0 +1,24 @@
+package org.springblade.flow.visual.onlinedev.formdata.opt;
+
+import org.apache.commons.lang3.math.NumberUtils;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+import cn.hutool.core.lang.Console;
+
+/**
+ * 
+ * @author William
+ * @date 2022年12月12日 上午10:39:50
+ */
+public class FormTest {
+
+	public FormTest() {
+	}
+
+	public static void main(String[] args) {
+		String value = IdWorker.getIdStr();
+		Console.log(value);
+		Console.log(NumberUtils.toDouble(value, 0D));
+	}
+}

src/main/java/org/springblade/flow/visual/onlinedev/common/formdata/UpdateBean.java

@@ -1,10 +1,10 @@
-package org.springblade.flow.visual.onlinedev.common.formdata;
+package org.springblade.flow.visual.onlinedev.formdata.param;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springblade.flow.util.DateUtil;
-import org.springblade.flow.visual.onlinedev.common.enums.DsType;
+import org.springblade.flow.visual.onlinedev.formdata.enums.DsType;
 
 /**
  * 表单数据更新中间类
@@ -113,7 +113,7 @@ public class UpdateBean {
 		whereList.add(column);
 	}
 
-	static class UpdateColumn {
+	public static class UpdateColumn {
 		private String column;
 		private Object value;
 		private String dataType;

src/main/java/org/springblade/flow/visual/onlinedev/common/relation/RelationBean.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.relation;
+package org.springblade.flow.visual.onlinedev.formdata.relation;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/org/springblade/flow/visual/onlinedev/common/relation/RelationField.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.relation;
+package org.springblade.flow.visual.onlinedev.formdata.relation;
 
 import java.io.Serializable;
 

src/main/java/org/springblade/flow/visual/onlinedev/common/relation/RelationKey.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.relation;
+package org.springblade.flow.visual.onlinedev.formdata.relation;
 
 import lombok.Data;
 

src/main/java/org/springblade/flow/visual/onlinedev/common/relation/RelationUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.flow.visual.onlinedev.common.relation;
+package org.springblade.flow.visual.onlinedev.formdata.relation;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/org/springblade/flow/visual/onlinedev/service/impl/VisualDevListServiceImpl.java

@@ -17,9 +17,9 @@ import org.springblade.flow.util.PageUtil;
 import org.springblade.flow.util.StringUtil;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.model.template6.ColumnListField;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
-import org.springblade.flow.visual.onlinedev.common.formdata.FormDataWithTableService;
 import org.springblade.flow.visual.onlinedev.entity.VisualdevModelDataEntity;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.opt.FormDataWithTableService;
 import org.springblade.flow.visual.onlinedev.mapper.VisualdevModelDataMapper;
 import org.springblade.flow.visual.onlinedev.model.PaginationModel;
 import org.springblade.flow.visual.onlinedev.model.OnlineDevListModel.OnlineDevListDataVO;

src/main/java/org/springblade/flow/visual/onlinedev/service/impl/VisualdevModelDataServiceImpl.java

@@ -30,8 +30,8 @@ import org.springblade.flow.util.UserProvider;
 import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.model.template6.ColumnListField;
 import org.springblade.flow.visual.base.util.VisualUtils;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
 import org.springblade.flow.visual.onlinedev.entity.VisualdevModelDataEntity;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springblade.flow.visual.onlinedev.mapper.VisualdevModelDataMapper;
 import org.springblade.flow.visual.onlinedev.model.PaginationModel;
 import org.springblade.flow.visual.onlinedev.model.PaginationModelExport;

src/main/java/org/springblade/flow/visual/onlinedev/util/onlineDevUtil/OnlineDevListUtils.java

@@ -45,7 +45,7 @@ import org.springblade.flow.visual.base.entity.VisualdevEntity;
 import org.springblade.flow.visual.base.model.template6.ColumnListField;
 import org.springblade.flow.visual.base.service.VisualdevService;
 import org.springblade.flow.visual.base.util.VisualUtils;
-import org.springblade.flow.visual.onlinedev.common.dynamic.DataSourceService;
+import org.springblade.flow.visual.onlinedev.formdata.dynamic.DataSourceService;
 import org.springblade.flow.visual.onlinedev.model.VisualdevModelDataInfoVO;
 import org.springblade.flow.visual.onlinedev.model.OnlineDevEnum.CacheKeyEnum;
 import org.springblade.flow.visual.onlinedev.model.OnlineDevEnum.OnlineDataTypeEnum;