فهرست منبع

数据表创建增加MEDIUMTEXT类型,以支持长文本

szjbdgzl 2 سال پیش
والد
کامیت
5a95d51860

+ 8 - 1
ibps-base-root/modules/base-db/src/main/java/com/lc/ibps/base/db/table/colmap/MySQLColumnMap.java

@@ -143,11 +143,18 @@ public class MySQLColumnMap implements RowMapper<Column> {
 			return;
 		}
 
-		if (dbtype.endsWith("text")) {
+		if (dbtype.equals("text")) {
 			columnModel.setColumnType(Column.COLUMN_TYPE_CLOB);
 			columnModel.setCharLen(65535);
 			return;
 		}
+
+		if (dbtype.equals("mediumtext")) {
+			columnModel.setColumnType(Column.COLUMN_TYPE_MEDIUMTEXT);
+			columnModel.setCharLen(16777215);
+			return;
+		}
+
 		if (dbtype.endsWith("blob")) {
 			columnModel.setColumnType(Column.COLUMN_TYPE_CLOB);
 			columnModel.setCharLen(65535);

+ 3 - 1
ibps-base-root/modules/base-db/src/main/java/com/lc/ibps/base/db/table/impl/mysql/MySQLTableMeta.java

@@ -344,7 +344,9 @@ public class MySQLTableMeta extends BaseTableMeta {
 			return "BIGINT(" + intLen + ")";
 		} else if (Column.COLUMN_TYPE_CLOB.equals(columnType)) {
 			return "TEXT";
-		} else {
+		} else if(Column.COLUMN_TYPE_MEDIUMTEXT.equals(columnType)){
+			return "MEDIUMTEXT";
+		}else {
 			return "";
 		}
 	}

+ 1 - 1
ibps-base-root/modules/base-framework/src/main/java/com/lc/ibps/base/framework/table/model/Column.java

@@ -31,7 +31,7 @@ public interface Column {
 	/**时间戳*/
 	String COLUMN_TYPE_TIMESTAMP = "timestamp";
 	String COLUMN_TYPE_DATETIME = "datetime";
-
+	String COLUMN_TYPE_MEDIUMTEXT = "mediumtext";
 	/**
 	 * 属性名
 	 * 

+ 6 - 6
ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/service/impl/BpmTaskActionServiceImpl.java

@@ -191,10 +191,10 @@ public class BpmTaskActionServiceImpl implements BpmTaskActionService{
 			ITaskActionHandlerDefine def = (ITaskActionHandlerDefine)taskActionHandlerConfig.getTaskActionHandlerDef(taskCmd.getActionName());
 			//执行和返回
 			StopWatchUtil.stopAndStartNewLocal(localId, step, "execute");
-			//new Thread(() ->{
+			new Thread(() ->{
 				//boolean result =h handler.execute(taskActionPluginSession,def);
-			Boolean exe = handler.execute(taskActionPluginSession, def);//TODO 性能很低
-			//}).start();w
+				handler.execute(taskActionPluginSession,def);//TODO 性能很低
+			}).start();
 			//后置事件抛出
 			StopWatchUtil.stopAndStartNewLocal(localId, step, "publicDoNextEvent.post");
 			AppUtil.publishEvent(getDoNextEvent(cmd, AopType.POST));
@@ -203,7 +203,7 @@ public class BpmTaskActionServiceImpl implements BpmTaskActionService{
 			StopWatchUtil.stopAndStartNewLocal(localId, step, "clearTaskByInstId");
 			BpmnContextUtil.clearTaskByInstId(taskCmd.getInstId());
 
-			if(exe) {
+			//if(result) {
 			StopWatchUtil.stopAndStartNewLocal(localId, step, "updataTimes");
 			bpmCommonStatmentService.updateTimes(cmd.getApprovalOpinion(), cmd.getCurUser(), cmd.getActionName());
 			StopWatchUtil.stopAndStartNewLocal(localId, step, "getActionCmd.1");
@@ -216,8 +216,8 @@ public class BpmTaskActionServiceImpl implements BpmTaskActionService{
 				BpmExecUtil.multipleInstancesRejectAdjust(rejectAfterExecutionId.toString());
 			}
 			return true;
-				}
-			throw new BaseException("任务办理失败");
+			//	}
+			//throw new BaseException("任务办理失败");
 		}
 		catch (Exception e) {
 			Throwable t = e.getCause();//org.activiti.engine.ActivitiException

+ 1 - 2
ibps-form-root/modules/bo-biz/src/main/java/com/lc/ibps/base/bo/domain/BoTable.java

@@ -566,8 +566,7 @@ public class BoTable extends AbstractDomain<String, BoTablePo> {
 	 * @param oldColumnList
 	 * @return
 	 */
-	private Map<String, List<Column>> caculatePhysicalColumns(
-			List<Column> newColumnList, List<Column> oldColumnList,String dbtype) {
+	private Map<String, List<Column>> caculatePhysicalColumns(List<Column> newColumnList, List<Column> oldColumnList,String dbtype) {
 		List<Column> addColumnList = new ArrayList<Column>();
 		List<Column> updColumnList = new ArrayList<Column>();
 		Map<String, List<Column>> resultMap = new HashMap<String, List<Column>>();

+ 9 - 7
ibps-form-root/modules/bo-biz/src/main/java/com/lc/ibps/base/bo/repository/impl/BoTableRepositoryImpl.java

@@ -498,16 +498,18 @@ public class BoTableRepositoryImpl extends AbstractRepository<String, BoTablePo,
 		} else if ("long".equals(dataType) || "number".equals(dataType) || "float".equals(dataType)
 				|| "double".equals(dataType)) {
 			dataType = Column.COLUMN_TYPE_NUMBER;
-		} 
-		else if (DataType.DATE.equals(dataType) 
-				|| DataType.DATETIME.equals(dataType) 
+		}
+		else if (DataType.DATE.equals(dataType)
+				|| DataType.DATETIME.equals(dataType)
 				|| DataType.TIME.equals(dataType)
 				|| DataType.TIMESTAMP.equals(dataType)
-				) {
-			
+		) {
+
 			dataType = DataType.DATE;
-			
-		} else {
+
+		} else if ("mediumtext".equals(dataType)){
+			dataType = Column.COLUMN_TYPE_MEDIUMTEXT;
+		}else{
 			dataType = Column.COLUMN_TYPE_VARCHAR;
 		}